[Asterisk-cvs] libpri libpri.h,1.57,1.58 q931.c,1.135,1.136

[kpfleming]

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

Modified Files:
	libpri.h q931.c 
Log Message:
send calling plan info for RDNIS and originally called number in new call events


Index: libpri.h
===================================================================
RCS file: /usr/cvsroot/libpri/libpri.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- libpri.h	12 Jul 2005 02:33:25 -0000	1.57
+++ libpri.h	2 Sep 2005 18:37:03 -0000	1.58
@@ -295,6 +295,7 @@
 } pri_event_facname;
 
 #define PRI_CALLINGPLANANI
+#define PRI_CALLINGPLANRDNIS
 typedef struct pri_event_ring {
 	int e;
 	int channel;				/* Channel requested */
@@ -310,6 +311,7 @@
 	char redirectingnum[256];	/* Redirecting number */
 	char redirectingname[256];	/* Redirecting name */
 	int redirectingreason;		/* Reason for redirect */
+	int callingplanrdnis;			/* Dialing plan of Redirecting Number */
 	char useruserinfo[256];		/* User->User info */
 	int flexible;				/* Are we flexible with our channel selection? */
 	int cref;					/* Call Reference Number */
@@ -322,6 +324,7 @@
 	int progressmask;
 	char origcalledname[256];
 	char origcallednum[256];
+	int callingplanorigcalled;		/* Dialing plan of Originally Called Number */
 	int origredirectingreason;
 } pri_event_ring;
 

Index: q931.c
===================================================================
RCS file: /usr/cvsroot/libpri/q931.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- q931.c	12 Jul 2005 02:33:25 -0000	1.135
+++ q931.c	2 Sep 2005 18:37:03 -0000	1.136
@@ -3210,6 +3210,8 @@
 		pri->ev.ring.callingpres = c->callerpres;
 		pri->ev.ring.callingplan = c->callerplan;
 		pri->ev.ring.callingplanani = c->callerplanani;
+		pri->ev.ring.callingplanrdnis = c->redirectingplan;
+		pri->ev.ring.callingplanorigcalled = c->origcalledplan;
 		pri->ev.ring.ani2 = c->ani2;
 		libpri_copy_string(pri->ev.ring.callingani, c->callerani, sizeof(pri->ev.ring.callingani));
 		libpri_copy_string(pri->ev.ring.callingnum, c->callernum, sizeof(pri->ev.ring.callingnum));