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

svn path=/trunk/; revision=20304

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"/>

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));

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;
 }
 
 

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}
     };

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?

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?
 */