[Asterisk-cvs] libpri libpri.h,1.31,1.32 q931.c,1.85,1.86

[markster at lists.digium.com]

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

Modified Files:
	libpri.h q931.c 
Log Message:
Merge BKW's ANI2 patch (bug #2450)


Index: libpri.h
===================================================================
RCS file: /usr/cvsroot/libpri/libpri.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- libpri.h	26 Jun 2004 04:37:09 -0000	1.31
+++ libpri.h	17 Sep 2004 04:02:16 -0000	1.32
@@ -279,6 +279,7 @@
 	char callingnum[256];		/* Calling number */
 	char callingname[256];		/* Calling name (if provided) */
 	int calledplan;				/* Dialing plan of Called number */
+	int ani2;                   /* ANI II */
 	char callednum[256];		/* Called number */
 	char redirectingnum[256];		/* Redirecting number */
 	char useruserinfo[256];			/* User->User info */

Index: q931.c
===================================================================
RCS file: /usr/cvsroot/libpri/q931.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- q931.c	16 Sep 2004 20:38:13 -0000	1.85
+++ q931.c	17 Sep 2004 04:02:16 -0000	1.86
@@ -255,6 +255,8 @@
 	int callerpres;			/* Caller presentation */
 	char callernum[256];	/* Caller */
 	char callername[256];
+
+	int ani2;               /* ANI II */
 	
 	int  calledplan;
 	int nonisdn;
@@ -1415,6 +1417,7 @@
 
 static FUNC_RECV(receive_line_information)
 {
+	call->ani2 = ie->data[0];
 	return 0;
 }
 
@@ -2646,6 +2649,7 @@
 		pri->ev.ring.channel = c->channelno | (c->ds1no << 8);
 		pri->ev.ring.callingpres = c->callerpres;
 		pri->ev.ring.callingplan = c->callerplan;
+		pri->ev.ring.ani2 = c->ani2;
 		strncpy(pri->ev.ring.callingnum, c->callernum, sizeof(pri->ev.ring.callingnum) - 1);
 		strncpy(pri->ev.ring.callingname, c->callername, sizeof(pri->ev.ring.callingname) - 1);
 		pri->ev.ring.calledplan = c->calledplan;