- Fix a broken comment in xml file

- Add/fix some AVPs
- Print unmatched command codes in decimal

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22275 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index da3affcf98545376e06edc5aad3b988656c88107..f41a325b9ccc6ff2edc9ca7c199dc1ef276028b6 100644 (file)
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -1310,6 +1310,15 @@
                <avp name="Service-ID" code="855" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
                        <type type-name="UTF8String"/>
                </avp>
+
+               <avp name="PoC-Controlling-Address" code="858" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+
+               <avp name="PoC-Group-Name" code="859" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+
                <avp name="Cause" code="860" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
                        <grouped>
                                <gavp name="Cause-Code"/>
@@ -1417,6 +1426,9 @@
                <avp name="Time-Quota-Threshold" code="868" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
+               <avp name="Volume-Quota-Threshold" code="869" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
+                       <type type-name="Unsigned32"/>
+               </avp>
                <avp name="Trigger-Type" code="870" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
                        <type type-name="Enumerated"/>
                        <enum name="CHANGE_IN_SGSN_IP_ADDRESS" code="1"/>
@@ -1444,7 +1456,7 @@
                        <enum name="CHANGEINLOCATION_CellId" code="34"/>
                        <enum name="CHANGEINPARTICIPANTS_Number" code="50"/>
                </avp>
-               <avp name="Quota-Holding-Time" code="871" mandatory="must">
+               <avp name="Quota-Holding-Time" code="871" mandatory="must" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Unsigned32"/>
                </avp>
                <avp name="PS-Append-Free-Format-Data" code="872" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
@@ -1574,10 +1586,18 @@
                        <enum name="ad-hoc PoC group session" code="3"/>
                </avp>
 
-               <avp name="Number-Of-Participants" code="885" mandatory="must">
+               <avp name="Number-Of-Participants" code="885" mandatory="must" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="Integer32"/>
                </avp>
 
+               <avp name="Participants-Involved" code="887" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="UTF8String"/>
+               </avp>
+
+               <avp name="Expires" code="888" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
+                       <type type-name="Unsigned32"/>
+               </avp>
+
                <avp name="Message-Body" code="889" mandatory="must" may-encrypt="no" protected="mustnot" vendor-bit="must" vendor-id="TGPP" >
                        <grouped>
                                <gavp name="Content-Type"/>
@@ -1667,7 +1687,7 @@ Note: The AVP codes from 915 to 999 are reserved for TS 29.061
                <avp name="Charging-Rule-Base-Name" code="1004" mandatory="must" may-encrypt="no" protected="may" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
-<--
+<!--
 1005 Charging-Rule-Name OctetString
 1006 Event-Trigger Enumerated
 1007 Metering-Method Enumerated
@@ -1745,7 +1765,7 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
 1227 PDP-Address Address
 1228 SGSN-Address Address
 -->
-               <avp name="PoC-Session-Id" code="1229" mandatory="must">
+               <avp name="PoC-Session-Id" code="1229" mandatory="must" vendor-bit="must" vendor-id="TGPP">
                        <type type-name="UTF8String"/>
                </avp>
                <avp name="Deferred-Location-Even-Type" code="1230" mandatory="must">

diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index c37ee350077ec1d301074c6e3c5406bb060d68b4..8a96bb474ef64e3630aec1af26963711779737ce 100644 (file)
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -1054,8 +1054,8 @@ diameter_command_to_str(guint32 commandCode, guint32 vendorId)
   }
 
   if ( suppress_console_output == FALSE )
-         g_warning("Diameter: Unable to find name for command code 0x%08x, Vendor \"%u\"!",
-                       commandCode, vendorId);
+         g_warning("Diameter: Unable to find name for command code 0x%08x (%u), Vendor \"%u\"!",
+                       commandCode, commandCode, vendorId);
   buffer=ep_alloc(64);
   g_snprintf(buffer, 64,
                   "Cmd-0x%08x", commandCode);
@@ -1070,8 +1070,8 @@ diameter_command_to_str(guint32 commandCode, guint32 vendorId)
       }
   
     if ( suppress_console_output == FALSE )
-          g_warning("Diameter: Unable to find name for command code 0x%08x!",
-                        commandCode);
+          g_warning("Diameter: Unable to find name for command code 0x%08x (%u)!",
+                    commandCode, commandCode);
     buffer=ep_alloc(64);
     g_snprintf(buffer, 64,
                    "Cmd-0x%08x", commandCode);