[svn-commits] rmudgett: branch rmudgett/facility r1082 - /team/rmudgett/facility/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Sep 15 16:42:32 2009
New Revision: 1082

URL: http://svn.asterisk.org/svn-view/libpri?view=rev&rev=1082
Log:
Added subcmds to new events just in case.

Modified:
    team/rmudgett/facility/libpri.h
    team/rmudgett/facility/q931.c

Modified: team/rmudgett/facility/libpri.h
URL: http://svn.asterisk.org/svn-view/libpri/team/rmudgett/facility/libpri.h?view=diff&rev=1082&r1=1081&r2=1082
==============================================================================
--- team/rmudgett/facility/libpri.h (original)
+++ team/rmudgett/facility/libpri.h Tue Sep 15 16:42:32 2009
@@ -685,12 +685,14 @@
 	int e;
 	int channel;
 	q931_call *call;
+	struct pri_subcommands *subcmds;
 };
 
 struct pri_event_hold_ack {
 	int e;
 	int channel;
 	q931_call *call;
+	struct pri_subcommands *subcmds;
 };
 
 struct pri_event_hold_rej {
@@ -698,6 +700,7 @@
 	int channel;
 	q931_call *call;
 	int cause;
+	struct pri_subcommands *subcmds;
 };
 
 struct pri_event_retrieve {
@@ -705,12 +708,14 @@
 	int channel;
 	q931_call *call;
 	int flexible;				/* Are we flexible with our channel selection? */
+	struct pri_subcommands *subcmds;
 };
 
 struct pri_event_retrieve_ack {
 	int e;
 	int channel;
 	q931_call *call;
+	struct pri_subcommands *subcmds;
 };
 
 struct pri_event_retrieve_rej {
@@ -718,6 +723,7 @@
 	int channel;
 	q931_call *call;
 	int cause;
+	struct pri_subcommands *subcmds;
 };
 
 typedef union {

Modified: team/rmudgett/facility/q931.c
URL: http://svn.asterisk.org/svn-view/libpri/team/rmudgett/facility/q931.c?view=diff&rev=1082&r1=1081&r2=1082
==============================================================================
--- team/rmudgett/facility/q931.c (original)
+++ team/rmudgett/facility/q931.c Tue Sep 15 16:42:32 2009
@@ -5572,6 +5572,7 @@
 				ctrl->ev.e = PRI_EVENT_HOLD;
 				ctrl->ev.hold.channel = q931_encode_channel(c);
 				ctrl->ev.hold.call = c;
+				ctrl->ev.hold.subcmds = &ctrl->subcmds;
 				res = Q931_RES_HAVEEVENT;
 
 				UPDATE_HOLD_STATE(ctrl, c, Q931_HOLD_STATE_HOLD_IND);
@@ -5601,6 +5602,7 @@
 			ctrl->ev.e = PRI_EVENT_HOLD_ACK;
 			ctrl->ev.hold_ack.channel = q931_encode_channel(c);
 			ctrl->ev.hold_ack.call = c;
+			ctrl->ev.hold_ack.subcmds = &ctrl->subcmds;
 			res = Q931_RES_HAVEEVENT;
 
 			UPDATE_HOLD_STATE(ctrl, c, Q931_HOLD_STATE_CALL_HELD);
@@ -5631,6 +5633,7 @@
 			ctrl->ev.hold_rej.channel = q931_encode_channel(c);
 			ctrl->ev.hold_rej.call = c;
 			ctrl->ev.hold_rej.cause = c->cause;
+			ctrl->ev.hold_rej.subcmds = &ctrl->subcmds;
 			res = Q931_RES_HAVEEVENT;
 
 			UPDATE_HOLD_STATE(ctrl, c, Q931_HOLD_STATE_IDLE);
@@ -5670,6 +5673,7 @@
 				ctrl->ev.retrieve.channel = q931_encode_channel(c);
 				ctrl->ev.retrieve.call = c;
 				ctrl->ev.retrieve.flexible = !(c->chanflags & FLAG_EXCLUSIVE);
+				ctrl->ev.retrieve.subcmds = &ctrl->subcmds;
 				res = Q931_RES_HAVEEVENT;
 
 				UPDATE_HOLD_STATE(ctrl, c, Q931_HOLD_STATE_RETRIEVE_IND);
@@ -5708,6 +5712,7 @@
 			ctrl->ev.e = PRI_EVENT_RETRIEVE_ACK;
 			ctrl->ev.retrieve_ack.channel = q931_encode_channel(c);
 			ctrl->ev.retrieve_ack.call = c;
+			ctrl->ev.retrieve_ack.subcmds = &ctrl->subcmds;
 			res = Q931_RES_HAVEEVENT;
 			break;
 		default:
@@ -5738,6 +5743,7 @@
 			ctrl->ev.retrieve_rej.channel = q931_encode_channel(c);
 			ctrl->ev.retrieve_rej.call = c;
 			ctrl->ev.retrieve_rej.cause = c->cause;
+			ctrl->ev.retrieve_rej.subcmds = &ctrl->subcmds;
 			res = Q931_RES_HAVEEVENT;
 			break;
 		default: