[Asterisk-cvs] asterisk/channels iax2-parser.c,1.19,1.20 iax2-parser.h,1.7,1.8 iax2.h,1.14,1.15

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv17051/channels

Modified Files:
	iax2-parser.c iax2-parser.h iax2.h 
Log Message:
Enable understanding of service identifier and provisioning version


Index: iax2-parser.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/iax2-parser.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- iax2-parser.c	22 Apr 2004 19:16:52 -0000	1.19
+++ iax2-parser.c	25 May 2004 04:34:43 -0000	1.20
@@ -118,13 +118,14 @@
 	{ IAX_IE_TRANSFERID, "TRANSFER ID", dump_int },
 	{ IAX_IE_RDNIS, "REFERRING DNIS", dump_string },
 	{ IAX_IE_PROVISIONING, "PROVISIONING" },
-	{ IAX_IE_AESPROVISIONING, "AES PROVISIONING" },
+	{ IAX_IE_AESPROVISIONING, "AES PROVISIONG" },
 	{ IAX_IE_DATETIME, "DATE TIME", dump_int },
 	{ IAX_IE_DEVICETYPE, "DEVICE TYPE", dump_string },
 	{ IAX_IE_SERVICEIDENT, "SERVICE IDENT", dump_string },
 	{ IAX_IE_FIRMWAREVER, "FIRMWARE VER", dump_short },
 	{ IAX_IE_FWBLOCKDESC, "FW BLOCK DESC", dump_int },
 	{ IAX_IE_FWBLOCKDATA, "FW BLOCK DATA" },
+	{ IAX_IE_PROVVER, "PROVISIONG VER", dump_int },
 };
 
 const char *iax_ie2str(int ie)
@@ -543,6 +544,13 @@
 			ies->fwdata = data + 2;
 			ies->fwdatalen = len;
 			break;
+		case IAX_IE_PROVVER:
+			if (len != sizeof(unsigned int)) {
+				snprintf(tmp, sizeof(tmp), "Expected provisioning version to be %d bytes long but was %d\n", sizeof(unsigned int), len);
+				errorf(tmp);
+			} else
+				ies->provver = ntohl(*((unsigned int *)(data + 2)));
+			break;
 		default:
 			snprintf(tmp, sizeof(tmp), "Ignoring unknown information element '%s' (%d) of length %d\n", iax_ie2str(ie), ie, len);
 			errorf(tmp);

Index: iax2-parser.h
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/iax2-parser.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- iax2-parser.h	24 Feb 2004 21:27:16 -0000	1.7
+++ iax2-parser.h	25 May 2004 04:34:43 -0000	1.8
@@ -50,6 +50,7 @@
 	unsigned int fwdesc;
 	unsigned char *fwdata;
 	unsigned char fwdatalen;
+	unsigned int provver;
 };
 
 #define DIRECTION_INGRESS 1

Index: iax2.h
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/iax2.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- iax2.h	24 Feb 2004 21:27:16 -0000	1.14
+++ iax2.h	25 May 2004 04:34:43 -0000	1.15
@@ -111,6 +111,7 @@
 #define IAX_IE_FIRMWAREVER			34		/* Firmware revision -- u16 */
 #define IAX_IE_FWBLOCKDESC			35		/* Firmware block description -- u32 */
 #define IAX_IE_FWBLOCKDATA			36		/* Firmware block of data -- raw */
+#define IAX_IE_PROVVER				37		/* Provisioning Version (u32) */
 
 #define IAX_AUTH_PLAINTEXT			(1 << 0)
 #define IAX_AUTH_MD5				(1 << 1)