[Asterisk-cvs] libpri libpri.h,1.21,1.22 pri.c,1.15,1.16 pri_q931.h,1.10,1.11 q931.c,1.52,1.53

[markster at lists.digium.com]

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

Modified Files:
	libpri.h pri.c pri_q931.h q931.c 
Log Message:
Allow progress to be sent with 1


Index: libpri.h
===================================================================
RCS file: /usr/cvsroot/libpri/libpri.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- libpri.h	19 May 2004 14:34:29 -0000	1.21
+++ libpri.h	19 May 2004 15:21:15 -0000	1.22
@@ -395,6 +395,6 @@
 
 #define PRI_PROGRESS
 /* Send call proceeding */
-extern int pri_progress(struct pri *pri, q931_call *c);
+extern int pri_progress(struct pri *pri, q931_call *c, int info);
 
 #endif

Index: pri.c
===================================================================
RCS file: /usr/cvsroot/libpri/pri.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- pri.c	19 May 2004 14:34:29 -0000	1.15
+++ pri.c	19 May 2004 15:21:15 -0000	1.16
@@ -191,11 +191,11 @@
 	return q931_alerting(pri, call, channel, info);
 }
 
-int pri_progress(struct pri *pri, q931_call *call)
+int pri_progress(struct pri *pri, q931_call *call, int info)
 {
 	if (!pri || !call)
 		return -1;
-	return q931_call_proceeding(pri, call);
+	return q931_call_proceeding(pri, call,info);
 }
 
 int pri_information(struct pri *pri, q931_call *call, char digit)

Index: pri_q931.h
===================================================================
RCS file: /usr/cvsroot/libpri/pri_q931.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pri_q931.h	12 Aug 2003 20:16:55 -0000	1.10
+++ pri_q931.h	19 May 2004 15:21:15 -0000	1.11
@@ -243,7 +243,7 @@
 
 extern int q931_alerting(struct pri *pri, q931_call *call, int channel, int info);
 
-extern int q931_call_proceeding(struct pri *pri, q931_call *call);
+extern int q931_call_proceeding(struct pri *pri, q931_call *call, int info);
 
 extern int q931_setup_ack(struct pri *pri, q931_call *call, int channel, int nonisdn);
 

Index: q931.c
===================================================================
RCS file: /usr/cvsroot/libpri/q931.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- q931.c	21 Apr 2004 21:21:29 -0000	1.52
+++ q931.c	19 May 2004 15:21:15 -0000	1.53
@@ -1565,10 +1565,16 @@
 
 static int call_proceeding_ies[] = { Q931_CHANNEL_IDENT, -1 };
 
-int q931_call_proceeding(struct pri *pri, q931_call *c)
+int q931_call_proceeding(struct pri *pri, q931_call *c, int info)
 {
 	c->ourcallstate = Q931_CALL_STATE_INCOMING_CALL_PROCEEDING;
 	c->peercallstate = Q931_CALL_STATE_OUTGOING_CALL_PROCEEDING;
+	if (info) {
+		c->progloc = LOC_PRIV_NET_LOCAL_USER;
+		c->progcode = CODE_CCITT;
+		c->progress = Q931_PROG_INBAND_AVAILABLE;
+	} else
+		c->progress = -1;
 	c->proc = 1;
 	c->alive = 1;
 	return send_message(pri, c, Q931_CALL_PROCEEDING, call_proceeding_ies);
@@ -1592,7 +1598,7 @@
 	} else
 		c->progress = -1;
 	if (!c->proc)
-		q931_call_proceeding(pri, c);
+		q931_call_proceeding(pri, c, 0);
 	c->ourcallstate = Q931_CALL_STATE_CALL_RECEIVED;
 	c->peercallstate = Q931_CALL_STATE_CALL_DELIVERED;
 	c->alive = 1;