Add separate union entries to fvalue.value for signed and unsigned

32-bit numbers.  Separate signed and unsigned accessors have been
added and used where appropriate.

Definitely not for 0.99.5.


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

4 files changed, 25 insertions, 9 deletions

diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index a450d96d41..53da620012 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -400,7 +400,8 @@ dissector_handle_t look_for_dissector(char *protocol_name)
     if ((strcmp(protocol_name, "fp") == 0) ||
         (strcmp(protocol_name, "fp_r4") == 0) ||
         (strcmp(protocol_name, "fp_r5") == 0) ||
-        (strcmp(protocol_name, "fp_r6") == 0))
+        (strcmp(protocol_name, "fp_r6") == 0) ||
+        (strcmp(protocol_name, "fpiur_r5") == 0))
     {
         return find_dissector("fp");
     }
@@ -485,8 +486,9 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_
     }
     memset(p_fp_info, 0, sizeof(struct _fp_info));
 
-    /* Read values from array into their places */
-    if (outhdr_values_found < 5)
+    /* Check that the number of outhdr values looks sensible */
+    if (((strcmp(protocol_name, "fpiur_r5") == 0) && (outhdr_values_found != 2)) ||
+        (outhdr_values_found < 5))
     {
         return;
     }
@@ -508,6 +510,10 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_
     {
         p_fp_info->release = 6;
     }
+    else if (strcmp(protocol_name, "fpiur_r5") == 0)
+    {
+        p_fp_info->release = 5;
+    }
     else
     {
         return;
@@ -525,6 +531,14 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_
     p_fp_info->is_uplink = (( received  && (p_fp_info->node_type == 2)) ||
                             (!received  && (p_fp_info->node_type == 1)));
 
+    /* IUR only uses the above... */
+    if (strcmp(protocol_name, "fpiur_r5") == 0)
+    {
+        /* Store info in packet */
+        p_add_proto_data(pinfo->fd, proto_fp, p_fp_info);
+        return;
+    }
+
     /* DCH CRC present */
     p_fp_info->dch_crc_present = outhdr_values[i++];
 
@@ -702,7 +716,8 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if ((strcmp(protocol_name, "fp") == 0) ||
         (strcmp(protocol_name, "fp_r4") == 0) ||
         (strcmp(protocol_name, "fp_r5") == 0) ||
-        (strcmp(protocol_name, "fp_r6") == 0))
+        (strcmp(protocol_name, "fp_r6") == 0) ||
+        (strcmp(protocol_name, "fpiur_r5") == 0))
     {
         parse_outhdr_string(tvb_get_ephemeral_string(tvb, outhdr_start, outhdr_length));
         attach_fp_info(pinfo, direction, protocol_name,
diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc
index f7d08989f1..c11ad5b917 100644
--- a/epan/dissectors/packet-ncp2222.inc
+++ b/epan/dissectors/packet-ncp2222.inc
@@ -1663,10 +1663,10 @@ get_finfo_value_integer(field_info *finfo)
 	   since we sometimes fake the entries to speed things up.
 	   this dissector should not call fvalue_ functions directly.
 	*/
-	if(!finfo->value.ftype->get_value_integer){
+	if(!finfo->value.ftype->get_value_uinteger){
 		return 0;
 	}
-	return fvalue_get_integer(&finfo->value);
+	return fvalue_get_uinteger(&finfo->value);
 }
 static guint
 get_item_value(proto_item *item)
diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c
index 32e2d25a5c..1d524604f6 100644
--- a/epan/dissectors/packet-smb-sidsnooping.c
+++ b/epan/dissectors/packet-smb-sidsnooping.c
@@ -124,7 +124,7 @@ samr_query_dispinfo(void *dummy _U_, packet_info *pinfo, epan_dissect_t *edt, co
 		return 0;
 	}
 	fi=gp->pdata[0];
-	info_level=fi->value.value.integer;
+	info_level=fi->value.value.sinteger;
 
 	if(info_level!=1){
 		return 0;
@@ -209,7 +209,7 @@ samr_query_dispinfo(void *dummy _U_, packet_info *pinfo, epan_dissect_t *edt, co
 		fi_name=gp_names->pdata[num_rids-1];
 		strncpy(sid_name, sid, len);
 		sid_name[len++]='-';
-		g_snprintf(sid_name+len, 256-len, "%d",fi_rid->value.value.integer);
+		g_snprintf(sid_name+len, 256-len, "%d",fi_rid->value.value.sinteger);
 		add_sid_name_mapping(sid_name, fi_name->value.value.string);
 	}
 	return 1;
@@ -235,7 +235,7 @@ lsa_policy_information(void *dummy _U_, packet_info *pinfo _U_, epan_dissect_t *
 		return 0;
 	}
 	fi=gp->pdata[0];
-	info_level=fi->value.value.integer;
+	info_level=fi->value.value.sinteger;
 
 	switch(info_level){
 	case 3:
diff --git a/epan/dissectors/packet-text-media.c b/epan/dissectors/packet-text-media.c
index 0fffe4a777..7b3a36120a 100644
--- a/epan/dissectors/packet-text-media.c
+++ b/epan/dissectors/packet-text-media.c
@@ -157,4 +157,5 @@ proto_reg_handoff_text_lines(void)
 
 	dissector_add_string("media_type", "text/vnd.sun.j2me.app-descriptor", text_lines_handle);
 	dissector_add_string("media_type", "application/vnd.poc.refer-to", text_lines_handle);
+	dissector_add_string("media_type", "application/vnd.drm.message", text_lines_handle);
 }