[libpri-commits] rmudgett: branch rmudgett/facility r1095 - /team/rmudgett/facility/q931.c

[SVN commits to the libpri project]

Author: rmudgett
Date: Thu Sep 17 18:40:05 2009
New Revision: 1095

URL: http://svn.asterisk.org/svn-view/libpri?view=rev&rev=1095
Log:
Actually send the HOLD/RETRIEVE events to the upper layer.

Modified:
    team/rmudgett/facility/q931.c

Modified: team/rmudgett/facility/q931.c
URL: http://svn.asterisk.org/svn-view/libpri/team/rmudgett/facility/q931.c?view=diff&rev=1095&r1=1094&r2=1095
==============================================================================
--- team/rmudgett/facility/q931.c (original)
+++ team/rmudgett/facility/q931.c Thu Sep 17 18:40:05 2009
@@ -5553,6 +5553,7 @@
 		}
 		return res;
 	case Q931_HOLD:
+		res = 0;
 		switch (c->ourcallstate) {
 		case Q931_CALL_STATE_CALL_RECEIVED:
 		case Q931_CALL_STATE_CONNECT_REQUEST:
@@ -5600,8 +5601,9 @@
 			q931_send_hold_rej(ctrl, c, PRI_CAUSE_WRONG_CALL_STATE);
 			break;
 		}
-		break;
+		return res;
 	case Q931_HOLD_ACKNOWLEDGE:
+		res = 0;
 		switch (c->hold_state) {
 		case Q931_HOLD_STATE_HOLD_REQ:
 			ctrl->ev.e = PRI_EVENT_HOLD_ACK;
@@ -5626,8 +5628,9 @@
 			/* Ignore response.  Response is late or spurrious. */
 			break;
 		}
-		break;
+		return res;
 	case Q931_HOLD_REJECT:
+		res = 0;
 		switch (c->hold_state) {
 		case Q931_HOLD_STATE_HOLD_REQ:
 			if (missingmand) {
@@ -5651,8 +5654,9 @@
 			/* Ignore response.  Response is late or spurrious. */
 			break;
 		}
-		break;
+		return res;
 	case Q931_RETRIEVE:
+		res = 0;
 		switch (c->ourcallstate) {
 		case Q931_CALL_STATE_CALL_RECEIVED:
 		case Q931_CALL_STATE_CONNECT_REQUEST:
@@ -5704,8 +5708,9 @@
 			q931_send_retrieve_rej(ctrl, c, PRI_CAUSE_WRONG_CALL_STATE);
 			break;
 		}
-		break;
+		return res;
 	case Q931_RETRIEVE_ACKNOWLEDGE:
+		res = 0;
 		switch (c->hold_state) {
 		case Q931_HOLD_STATE_RETRIEVE_REQ:
 			UPDATE_HOLD_STATE(ctrl, c, Q931_HOLD_STATE_IDLE);
@@ -5724,8 +5729,9 @@
 			/* Ignore response.  Response is late or spurrious. */
 			break;
 		}
-		break;
+		return res;
 	case Q931_RETRIEVE_REJECT:
+		res = 0;
 		switch (c->hold_state) {
 		case Q931_HOLD_STATE_RETRIEVE_REQ:
 			UPDATE_HOLD_STATE(ctrl, c, Q931_HOLD_STATE_CALL_HELD);
@@ -5755,7 +5761,7 @@
 			/* Ignore response.  Response is late or spurrious. */
 			break;
 		}
-		break;
+		return res;
 	case Q931_USER_INFORMATION:
 	case Q931_SEGMENT:
 	case Q931_CONGESTION_CONTROL: