Merge Anders' and my own fixes to some bugs

- most paramaters have data set to NULL, have them added to the tree
- avoid the context tracing mecanism bailing out if a ContextList appears in the packet.
- in q9150 do not attempt to dissect sdp unless we believe it is sdp
    (BTW we need heuristics for sdp and other potential payloads of this parameter..)


svn path=/trunk/; revision=20649

2 files changed, 14 insertions, 27 deletions

diff --git a/asn1/h248/h248v3.asn b/asn1/h248/h248v3.asn
index a5ba74b499..694494b413 100644
--- a/asn1/h248/h248v3.asn
+++ b/asn1/h248/h248v3.asn
@@ -1,7 +1,7 @@
 MEDIA-GATEWAY-CONTROL {itu-t(0) recommendation(0) h(8) h248(248) modules(0)
 media-gateway-control(0) version3(3)}
 --
--- $Id:$
+-- $Id$
 --DEFINITIONS AUTOMATIC TAGS ::=
 --BEGIN
 -- Has been modified to pass through the ASN2ETH compiler
@@ -67,7 +67,7 @@ BEGIN
 		-- of alphanumeric digits, hyphens and dots. No two dots shall occur
 		-- consecutively.
 
-	portNumber			[1] INTEGER(0..65535) OPTIONAL
+		portNumber			[1] INTEGER(0..65535) OPTIONAL
 	}
 
 	IP4Address ::= SEQUENCE
@@ -175,6 +175,9 @@ BEGIN
 		commandReply			[3] SEQUENCE OF CommandReply
 	}
 
+	-- WireShark Specific
+	ContextIDinList ::= INTEGER(0..4294967295)
+
 	ContextRequest ::= SEQUENCE
 	{
 		priority				[0] INTEGER(0..15) OPTIONAL,
@@ -183,9 +186,14 @@ BEGIN
 		...,
 		iepscallind				[3] BOOLEAN OPTIONAL,
 		contextProp				[4] SEQUENCE OF PropertyParm OPTIONAL,
-		contextList				[5] SEQUENCE OF ContextID OPTIONAL
+		
+		-- WireShark Specific
+		-- contextList				[5] SEQUENCE OF ContextID OPTIONAL
+		contextList				[5] SEQUENCE OF ContextIDinList OPTIONAL
+		-- Currently the way that WS tracing code's persistent data is
+		-- organized disallows to relate a request to multiple contexts
 	}
-
+	
 -- When returning a contextList, the contextId in the ActionReply construct will
 -- return the contextId from the associated ActionRequest.
 
@@ -993,7 +1001,7 @@ BEGIN
 		serviceChangeIncompleteFlag [10] NULL OPTIONAL
 	}
 
--- WsĦreshark extension to decode serviceChangeReason
+-- Wireshark extension to decode serviceChangeReason
 	SCreasonValue ::= SEQUENCE OF SCreasonValueOctetStr
 	SCreasonValueOctetStr ::= OCTET STRING
 	ServiceChangeReasonStr ::= IA5String
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index da7d47da30..615a809fcf 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -702,27 +702,6 @@ void h248_register_package(h248_package_t* pkg) {
 	g_ptr_array_add(packages,pkg);
 }
 
-#if 0
-static void
-dissect_h248_pkg_data(gboolean implicit_tag, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,guint16 name_major, guint16 name_minor){
-
-guint offset=0;
-
-	switch ( name_major ){
-		case 0x001e: /* Bearer Characteristics Q.1950 Annex A */
-        {
-            guint bearer_type = 0;
-			offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset, hf_h248_pkg_bcp_BNCChar_PDU, &bearer_type);
-            if ( bearer_type && curr_info.term )
-                curr_info.term->type = bearer_type;
-			break;
-        }
-	}
-
-}
-
-#endif
-
 static guint32 packageandid;
 
 static int dissect_h248_PkgdName(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index) {
@@ -948,7 +927,7 @@ dissect_h248_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa
 		prop = &no_param;
 	}
 
-	if (prop && prop->hfid && prop->data) {
+	if (prop && prop->hfid ) {
 		if (!prop->dissector) prop = &no_param;
 		prop->dissector(tree, next_tvb, pinfo, *(prop->hfid), &curr_info, prop->data);
 	}