[Asterisk-cvs] libpri-matt pri_internal.h, 1.2, 1.3 q931.c, 1.1.1.1, 1.2

[mattf at lists.digium.com]

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

Modified Files:
	pri_internal.h q931.c 
Log Message:
Need to expose all the new fields to the "public" libpri interface


Index: pri_internal.h
===================================================================
RCS file: /usr/cvsroot/libpri-matt/pri_internal.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pri_internal.h	10 Nov 2004 16:57:39 -0000	1.2
+++ pri_internal.h	12 Nov 2004 17:46:57 -0000	1.3
@@ -196,7 +196,7 @@
 	int redirectingreason;	      	/* Reason for redirect */
 	int origredirectingreason;      /* Original reason for redirect (in cases of multiple redirects) */
 	char origcallername[256];	/* Original name of person being called */
-	char origcallnum[256];		/* Orignal number of person being called */
+	char origcallernum[256];		/* Orignal number of person being called */
 	char redirectingnum[256];	/* Number of redirecting party */
 	char redirectingname[256];	/* Name of redirecting party */
 

Index: q931.c
===================================================================
RCS file: /usr/cvsroot/libpri-matt/q931.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- q931.c	5 Nov 2004 19:23:26 -0000	1.1.1.1
+++ q931.c	12 Nov 2004 17:46:57 -0000	1.2
@@ -2753,7 +2753,11 @@
                 c->redirectingplan = -1;
                 c->redirectingpres = -1;
                 c->redirectingreason = -1;
+		c->origredirectingreason = -1;
 		strcpy(c->redirectingnum, "");
+		strcpy(c->redirectingname, "");
+		strcpy(c->origcallername, "");
+		strcpy(c->origcallernum, "");
                 c->useruserprotocoldisc = -1; 
 		strcpy(c->useruserinfo, "");
 		c->complete = 0;
@@ -2951,7 +2955,12 @@
 		pri->ev.ring.calledplan = c->calledplan;
 		strncpy(pri->ev.ring.callingsubaddr, c->callingsubaddr, sizeof(pri->ev.ring.callingsubaddr) - 1);
 		strncpy(pri->ev.ring.callednum, c->callednum, sizeof(pri->ev.ring.callednum) - 1);
+		strncpy(pri->ev.ring.origcallername, c->origcallername, sizeof(pri->ev.ring.origcallername) - 1);
+		strncpy(pri->ev.ring.origcallernum, c->origcallernum, sizeof(pri->ev.ring.origcallernum) - 1);
+		pri->ev.ring.origredirectingreason = c->origredirectingreason;
                 strncpy(pri->ev.ring.redirectingnum, c->redirectingnum, sizeof(pri->ev.ring.redirectingnum) - 1);
+		strncpy(pri->ev.ring.redirectingname, c->redirectingname, sizeof(pri->ev.ring.redirectingname) - 1);
+		pri->ev.ring.redirectingreason = c->redirectingreason;
                 strncpy(pri->ev.ring.useruserinfo, c->useruserinfo, sizeof(pri->ev.ring.useruserinfo) - 1);
 		pri->ev.ring.flexible = ! (c->chanflags & FLAG_EXCLUSIVE);
 		pri->ev.ring.cref = c->cr;
@@ -2959,6 +2968,7 @@
 		pri->ev.ring.layer1 = c->userl1;
 		pri->ev.ring.complete = c->complete; 
 		pri->ev.ring.ctype = c->transcapability;
+		
 		if (c->transmoderate != TRANS_MODE_64_CIRCUIT) {
 			q931_release_complete(pri, c, PRI_CAUSE_BEARERCAPABILITY_NOTIMPL);
 			break;