Enable understanding of service identifier and provisioning version

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3065 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c
index 07ca8cf481d09690e91e9d936b5d3b9a8329f30a..cc15c959b3b4e30fae88efcc4e849e79a217604e 100755 (executable)
--- a/channels/iax2-parser.c
+++ b/channels/iax2-parser.c
@@ -118,13 +118,14 @@ static struct iax2_ie {
        { 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 @@ int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen)
                        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);

diff --git a/channels/iax2-parser.h b/channels/iax2-parser.h
index 0b4ac5639b4ccb451cef7ba273bcd2d4790f9ec6..aff6a68b4b9339376258b9d024f796056eb8d261 100755 (executable)
--- a/channels/iax2-parser.h
+++ b/channels/iax2-parser.h
@@ -50,6 +50,7 @@ struct iax_ies {
        unsigned int fwdesc;
        unsigned char *fwdata;
        unsigned char fwdatalen;
+       unsigned int provver;
 };
 
 #define DIRECTION_INGRESS 1

diff --git a/channels/iax2.h b/channels/iax2.h
index 8997a71074a0dd00a4be575f8aa5cf6f898d687b..afc4424e8658b60f6cc79f661fca1d8c2194496c 100755 (executable)
--- a/channels/iax2.h
+++ b/channels/iax2.h
@@ -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)

diff --git a/contrib/firmware/iax/iaxy.bin b/contrib/firmware/iax/iaxy.bin
index b17c61b71ba68864aac78200d95bbbe796bcc2e1..85d50718bed90d29506b6aca34cc3552cb968c89 100755 (executable)
Binary files a/contrib/firmware/iax/iaxy.bin and b/contrib/firmware/iax/iaxy.bin differ