Check in trivial changes before generating a big diff...

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

diff --git a/diameter/imscxdx.xml b/diameter/imscxdx.xml
index 535f7e56ff6d9424f9573c4e330ed4278b416924..8cc3d475a1245e59afb40ce414db2ca62a863df3 100644 (file)
--- a/diameter/imscxdx.xml
+++ b/diameter/imscxdx.xml
@@ -28,7 +28,7 @@
                                 <gavp name="Server-Name"/>
                         </grouped>
                </avp>
-               <avp name="Mandatory-Capability" code="5" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+               <avp name="Mandatory-Capability" code="5" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
                        <type type-name="Unsigned32"/>
                </avp>
                <avp name="Optional-Capability" code="6" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
@@ -37,7 +37,7 @@
                <avp name="User-Data" code="7" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
                        <type type-name="OctetString"/>
                </avp>
-               <avp name="SIP-Number-Auth-Items" code="8" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
+               <avp name="SIP-Number-Auth-Items" code="8" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="no">
                        <type type-name="Unsigned32"/>
                </avp>
                <avp name="SIP-Authentication-Scheme" code="9" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
@@ -155,11 +155,11 @@
                        <type type-name="UTF8String"/>
                </avp>
                <avp name="Server-Capabilities" code="603" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
-                        <grouped>
-                                <gavp name="Mandatory-Capability"/>
-                                <gavp name="Optional-Capability"/>
-                                <gavp name="Server-Name"/>
-                        </grouped>
+                       <grouped>
+                               <gavp name="Mandatory-Capability"/>
+                               <gavp name="Optional-Capability"/>
+                               <gavp name="Server-Name"/>
+                       </grouped>
                </avp>
                <avp name="Mandatory-Capability" code="604" mandatory="must" vendor-bit="must" vendor-id="TGPP" may-encrypt="yes">
                        <type type-name="Unsigned32"/>

diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index dae7b5db7fe9354a5b975bb896abd907223810b2..b5c80544b9c49d3911727c40b5c7afa13b232549 100644 (file)
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -6820,7 +6820,7 @@ void proto_register_inap(void) {
 
   /* Register protocol */
   proto_inap = proto_register_protocol(PNAME, PSNAME, PFNAME);
-/*XXX  register_dissector("inap", dissect_inap, proto_inap);*/
+  register_dissector("inap", dissect_inap, proto_inap);
   /* Register fields and subtrees */
   proto_register_field_array(proto_inap, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));

diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 04388306f0dd7e6656d5fd7a8ddeb0996060b7cf..d524d6160cd2feaa31abcc01c49db54aa7aff868 100644 (file)
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -2030,7 +2030,6 @@ static void remember_outgoing_sr(packet_info *pinfo, long lsr)
        /* Copy current conversation data into packet info */
        p_packet_data->last_received_set = TRUE;
        p_packet_data->last_received_frame_number = p_conv_data->last_received_frame_number;
-       p_packet_data->last_received_timestamp = p_conv_data->last_received_timestamp;
 }
 
 

diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c
index ee53a4de2bd75aa585e9e8893402fed459fa005f..c0770133ac402272e51da98001be03415f60e911 100644 (file)
--- a/epan/dissectors/packet-sigcomp.c
+++ b/epan/dissectors/packet-sigcomp.c
@@ -2560,7 +2560,7 @@ proto_register_sigcomp(void)
     static enum_val_t udvm_detail_vals[] = {
        {"no-printout", "No-Printout", 0},
        {"low-detail", "Low-detail", 1},
-       {"medium-detail", "medium-detail", 2},
+       {"medium-detail", "Medium-detail", 2},
        {"high-detail", "High-detail", 3},
        {NULL, NULL, -1}
     };

diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c
index ea5763bf02ff47958cfb28230d983644d7518f5e..1e56d67d99b29ba3653535b79f42d32dddc0546e 100644 (file)
--- a/epan/dissectors/packet-umts_fp.c
+++ b/epan/dissectors/packet-umts_fp.c
@@ -33,7 +33,7 @@
 #include "packet-umts_fp.h"
 
 /* TODO:
-   - IU interface-specific formats
+   - IUR interface-specific formats
    - verify header & payload CRCs
    - look for (and report as expert info) possible spare extension bytes
    - R7?

diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c
index 95847bad35cfd824fcea04a8bbf02ed3b28cee2a..af4e2690739744b13bcd6cee8026a5d7299d3c63 100644 (file)
--- a/wiretap/catapult_dct2000.c
+++ b/wiretap/catapult_dct2000.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-/*#include <inttypes.h>*/
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
@@ -48,6 +47,8 @@
 #define AAL_HEADER_CHARS           12
 
 /* TODO:
+   - support for FP over AAL0
+   - support for IuR interface FP
    - support for x.25?
 */