[svn-commits] dvossel: branch dvossel/aoc_send r1544 - /team/dvossel/aoc_send/

[SVN commits to the Digium repositories]

Author: dvossel
Date: Wed Mar 17 13:54:09 2010
New Revision: 1544

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1544
Log:
move aoc send functions into pri_aoc.c

Modified:
    team/dvossel/aoc_send/libpri.h
    team/dvossel/aoc_send/pri.c
    team/dvossel/aoc_send/pri_aoc.c
    team/dvossel/aoc_send/pri_q931.h
    team/dvossel/aoc_send/q931.c

Modified: team/dvossel/aoc_send/libpri.h
URL: http://svnview.digium.com/svn/libpri/team/dvossel/aoc_send/libpri.h?view=diff&rev=1544&r1=1543&r2=1544
==============================================================================
--- team/dvossel/aoc_send/libpri.h (original)
+++ team/dvossel/aoc_send/libpri.h Wed Mar 17 13:54:09 2010
@@ -1468,10 +1468,10 @@
 void pri_enslave(struct pri *master, struct pri *slave);
 
 /* Send AOC-D message */
-int pri_aoc_d(struct pri *pri, q931_call *c, int channel, const struct pri_subcmd_aoc_d *aoc_d);
+int pri_aoc_d_send(struct pri *pri, q931_call *c, const struct pri_subcmd_aoc_d *aoc_d);
 
 /* Send AOC-E message */
-int pri_aoc_e(struct pri *pri, q931_call *c, int channel, const struct pri_subcmd_aoc_e *aoc_e);
+int pri_aoc_e_send(struct pri *pri, q931_call *c, const struct pri_subcmd_aoc_e *aoc_e);
 
 #define PRI_GR303_SUPPORT
 #define PRI_ENSLAVE_SUPPORT

Modified: team/dvossel/aoc_send/pri.c
URL: http://svnview.digium.com/svn/libpri/team/dvossel/aoc_send/pri.c?view=diff&rev=1544&r1=1543&r2=1544
==============================================================================
--- team/dvossel/aoc_send/pri.c (original)
+++ team/dvossel/aoc_send/pri.c Wed Mar 17 13:54:09 2010
@@ -650,22 +650,6 @@
 	return q931_call_progress(pri, call, channel, info);
 }
 
-int pri_aoc_d(struct pri *pri, q931_call *call, int channel, const struct pri_subcmd_aoc_d *aoc_d)
-{
-	if (!pri || !call)
-		return -1;
-
-	return q931_aoc_d(pri, call, channel, aoc_d);
-}
-
-int pri_aoc_e(struct pri *pri, q931_call *call, int channel, const struct pri_subcmd_aoc_e *aoc_e)
-{
-	if (!pri || !call)
-		return -1;
-
-	return q931_aoc_e(pri, call, channel, aoc_e);
-}
-
 int pri_information(struct pri *pri, q931_call *call, char digit)
 {
 	if (!pri || !call)

Modified: team/dvossel/aoc_send/pri_aoc.c
URL: http://svnview.digium.com/svn/libpri/team/dvossel/aoc_send/pri_aoc.c?view=diff&rev=1544&r1=1543&r2=1544
==============================================================================
--- team/dvossel/aoc_send/pri_aoc.c (original)
+++ team/dvossel/aoc_send/pri_aoc.c Wed Mar 17 13:54:09 2010
@@ -677,5 +677,25 @@
 	}
 }
 
+int pri_aoc_d_send(struct pri *pri, q931_call *call, const struct pri_subcmd_aoc_d *aoc_d)
+{
+	if (!pri || !call)
+		return -1;
+
+	/* TODO encode d message */
+	return 0;
+}
+
+int pri_aoc_e_send(struct pri *pri, q931_call *call, const struct pri_subcmd_aoc_e *aoc_e)
+{
+	if (!pri || !call)
+		return -1;
+
+	/* TODO encode e message */
+	return 0;
+}
+
+
+
 /* ------------------------------------------------------------------- */
 /* end pri_aoc.c */

Modified: team/dvossel/aoc_send/pri_q931.h
URL: http://svnview.digium.com/svn/libpri/team/dvossel/aoc_send/pri_q931.h?view=diff&rev=1544&r1=1543&r2=1544
==============================================================================
--- team/dvossel/aoc_send/pri_q931.h (original)
+++ team/dvossel/aoc_send/pri_q931.h Wed Mar 17 13:54:09 2010
@@ -468,10 +468,6 @@
 
 extern int q931_call_proceeding(struct pri *pri, q931_call *call, int channel, int info);
 
-extern int q931_aoc_d(struct pri *pri, q931_call *c, int channel, const struct pri_subcmd_aoc_d *aoc_d);
-
-extern int q931_aoc_e(struct pri *pri, q931_call *c, int channel, const struct pri_subcmd_aoc_e *aoc_e);
-
 extern int q931_setup_ack(struct pri *pri, q931_call *call, int channel, int nonisdn);
 
 extern int q931_information(struct pri *pri, q931_call *call, char digit);

Modified: team/dvossel/aoc_send/q931.c
URL: http://svnview.digium.com/svn/libpri/team/dvossel/aoc_send/q931.c?view=diff&rev=1544&r1=1543&r2=1544
==============================================================================
--- team/dvossel/aoc_send/q931.c (original)
+++ team/dvossel/aoc_send/q931.c Wed Mar 17 13:54:09 2010
@@ -4620,18 +4620,6 @@
 	return send_message(ctrl, c, Q931_ALERTING, alerting_ies);
 }
 
-int q931_aoc_d(struct pri *pri, q931_call *c, int channel, const struct pri_subcmd_aoc_d *aoc_d)
-{
-	/* TODO XXX make this actually send the message*/
-	return 0;
-}
-
-int q931_aoc_e(struct pri *pri, q931_call *c, int channel, const struct pri_subcmd_aoc_e *aoc_e)
-{
-	/* TODO XXX make this actually send the message*/
-	return 0;
-}
-
 static int setup_ack_ies[] = { Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, -1 };
  
 int q931_setup_ack(struct pri *ctrl, q931_call *c, int channel, int nonisdn)