aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ansi_a.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2008-12-22 12:05:56 +0000
committerAnders Broman <anders.broman@ericsson.com>2008-12-22 12:05:56 +0000
commit92fb6ca65ff12a3fa205dbec78d2c12e111d2926 (patch)
treebde7ace211dd2042e17cc42589b07749e558328a /epan/dissectors/packet-ansi_a.c
parenta7cf5b830dc6409380db2093d48b8cbb817edead (diff)
From Michael Lum:
Minor enhancement for for MEID/pESN https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3100 svn path=/trunk/; revision=27079
Diffstat (limited to 'epan/dissectors/packet-ansi_a.c')
-rw-r--r--epan/dissectors/packet-ansi_a.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index 0a4f07170b..7b3bac7ffb 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -1687,11 +1687,21 @@ elem_cm_info_type_2(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len,
a_bigbuf,
(oct & 0x20) ? "Slotted" : "Non-Slotted");
+ if (oct & 0x10)
+ {
+ str = "";
+ g_strlcat(add_string, " (MEID configured)", string_len);
+ }
+ else
+ {
+ str = "not ";
+ }
+
other_decode_bitfield_value(a_bigbuf, oct, 0x10, 8);
proto_tree_add_text(subtree, tvb, curr_offset, 1,
"%s : MEID %sconfigured",
a_bigbuf,
- (oct & 0x10) ? "" : "not ");
+ str);
other_decode_bitfield_value(a_bigbuf, oct, 0x08, 8);
proto_tree_add_text(subtree, tvb, curr_offset, 1,
@@ -2203,7 +2213,9 @@ elem_mid(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gchar *add_
tvb, curr_offset, 4,
value);
- g_snprintf(add_string, string_len, " - ESN (0x%04x)", value);
+ g_snprintf(add_string, string_len, " - %sESN (0x%04x)",
+ (value & 0x80000000) ? "p" : "",
+ value);
curr_offset += 4;
break;
@@ -12074,5 +12086,4 @@ proto_reg_handoff_ansi_a(void)
ansi_a_elem_1_strings = ansi_a_ios401_elem_1_strings;
break;
}
-
}