[Asterisk-cvs] libpri libpri.h,1.27,1.28 q931.c,1.69,1.70

[markster at lists.digium.com]

Update of /usr/cvsroot/libpri
In directory mongoose.digium.com:/tmp/cvs-serv5050

Modified Files:
	libpri.h q931.c 
Log Message:
Separate PROGRESS and PROCEEDING


Index: libpri.h
===================================================================
RCS file: /usr/cvsroot/libpri/libpri.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- libpri.h	14 Jun 2004 02:48:24 -0000	1.27
+++ libpri.h	14 Jun 2004 21:25:41 -0000	1.28
@@ -71,6 +71,7 @@
 #define PRI_EVENT_SETUP_ACK	14	/* When we get SETUP_ACKNOWLEDGE */
 #define PRI_EVENT_HANGUP_REQ	15	/* Requesting the higher layer to hangup */
 #define PRI_EVENT_NOTIFY	16	/* Notification received */
+#define PRI_EVENT_PROGRESS	17	/* When we get CALL_PROCEEDING or PROGRESS */
 
 /* Simple states */
 #define PRI_STATE_DOWN		0

Index: q931.c
===================================================================
RCS file: /usr/cvsroot/libpri/q931.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- q931.c	14 Jun 2004 03:29:19 -0000	1.69
+++ q931.c	14 Jun 2004 21:25:41 -0000	1.70
@@ -2431,6 +2431,7 @@
 			q931_destroycall(pri, c->cr);
 			break;
 		}
+		pri->ev.e = PRI_EVENT_PROGRESS;
 		/* Fall through */
 	case Q931_CALL_PROCEEDING:
 		if (c->newcall) {
@@ -2444,9 +2445,9 @@
 			q931_status(pri,c,PRI_CAUSE_WRONG_MESSAGE);
 			break;
 		}
-		pri->ev.e = PRI_EVENT_PROCEEDING;
 		pri->ev.proceeding.channel = c->channelno | (c->ds1no << 8);
 		if (mh->msg == Q931_CALL_PROCEEDING) {
+			pri->ev.e = PRI_EVENT_PROCEEDING;
 			c->ourcallstate = Q931_CALL_STATE_OUTGOING_CALL_PROCEEDING;
 			c->peercallstate = Q931_CALL_STATE_INCOMING_CALL_PROCEEDING;
 		}