aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/packet-bssgp.c2
-rw-r--r--epan/dissectors/packet-gsm_a_bssmap.c2
-rw-r--r--epan/dissectors/packet-gsm_a_common.c8
-rw-r--r--epan/dissectors/packet-gsm_a_dtap.c2
-rw-r--r--epan/dissectors/packet-gsm_a_gm.c2
-rw-r--r--epan/dissectors/packet-gsm_a_rp.c2
-rw-r--r--epan/dissectors/packet-gsm_a_rr.c2
-rw-r--r--epan/dissectors/packet-gsm_bsslap.c2
-rw-r--r--epan/dissectors/packet-gsm_bssmap_le.c2
-rw-r--r--epan/dissectors/packet-gsm_sms.c2
-rw-r--r--epan/dissectors/packet-nas_eps.c8
-rw-r--r--epan/dissectors/packet-sgsap.c2
12 files changed, 18 insertions, 18 deletions
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index 032cb5c744..f519e43ce7 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -6314,7 +6314,7 @@ proto_register_bssgp(void)
},
{ &hf_bssgp_elem_id,
{ "Element ID", "bssgp.elem_id",
- FT_UINT8, BASE_DEC, NULL, 0,
+ FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_bssgp_bss_area_ind,
diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c
index 1b4cd99892..fa6d1f923b 100644
--- a/epan/dissectors/packet-gsm_a_bssmap.c
+++ b/epan/dissectors/packet-gsm_a_bssmap.c
@@ -6602,7 +6602,7 @@ proto_register_gsm_a_bssmap(void)
},
{ &hf_gsm_a_bssmap_elem_id,
{ "Element ID", "gsm_a_bssmap.elem_id",
- FT_UINT8, BASE_DEC, NULL, 0,
+ FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_gsm_a_bssmap_field_elem_id,
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c
index 77d60087db..967f12a6d1 100644
--- a/epan/dissectors/packet-gsm_a_common.c
+++ b/epan/dissectors/packet-gsm_a_common.c
@@ -1519,8 +1519,8 @@ guint16 elem_tv_short(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint
other_decode_bitfield_value(buf, oct, 0xf0, 8);
proto_tree_add_text(subtree,
tvb, curr_offset, 1,
- "%s = Element ID",
- buf);
+ "%s = Element ID: 0x%1x-",
+ buf, oct>>4);
if (elem_funcs[idx] == NULL)
{
@@ -3462,7 +3462,7 @@ proto_register_gsm_a_common(void)
{
{ &hf_gsm_a_common_elem_id,
{ "Element ID", "gsm_a_common.elem_id",
- FT_UINT8, BASE_DEC, NULL, 0,
+ FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_gsm_a_l_ext,
@@ -3627,7 +3627,7 @@ proto_register_gsm_a_common(void)
},
{ &hf_gsm_a_L3_protocol_discriminator,
{ "Protocol discriminator", "gsm_a.L3_protocol_discriminator",
- FT_UINT8, BASE_DEC, VALS(protocol_discriminator_vals), 0x0f,
+ FT_UINT8, BASE_HEX, VALS(protocol_discriminator_vals), 0x0f,
NULL, HFILL }
},
{ &hf_gsm_a_call_prio,
diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c
index 495735cc04..ad831431b9 100644
--- a/epan/dissectors/packet-gsm_a_dtap.c
+++ b/epan/dissectors/packet-gsm_a_dtap.c
@@ -6579,7 +6579,7 @@ proto_register_gsm_a_dtap(void)
},
{ &hf_gsm_a_dtap_elem_id,
{ "Element ID", "gsm_a_dtap.elem_id",
- FT_UINT8, BASE_DEC, NULL, 0,
+ FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_gsm_a_cld_party_bcd_num,
diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c
index 0ad5871da6..93ba90d672 100644
--- a/epan/dissectors/packet-gsm_a_gm.c
+++ b/epan/dissectors/packet-gsm_a_gm.c
@@ -6900,7 +6900,7 @@ proto_register_gsm_a_gm(void)
},
{ &hf_gsm_a_gm_elem_id,
{ "Element ID", "gsm_a_gm.elem_id",
- FT_UINT8, BASE_DEC, NULL, 0,
+ FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_gsm_a_qos_delay_cls,
diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c
index 45696fcf7c..81c2da210a 100644
--- a/epan/dissectors/packet-gsm_a_rp.c
+++ b/epan/dissectors/packet-gsm_a_rp.c
@@ -539,7 +539,7 @@ proto_register_gsm_a_rp(void)
},
{ &hf_gsm_a_rp_elem_id,
{ "Element ID", "gsm_a_rp.elem_id",
- FT_UINT8, BASE_DEC, NULL, 0,
+ FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
};
diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c
index 89a15afcc5..049179143b 100644
--- a/epan/dissectors/packet-gsm_a_rr.c
+++ b/epan/dissectors/packet-gsm_a_rr.c
@@ -10470,7 +10470,7 @@ proto_register_gsm_a_rr(void)
},
{ &hf_gsm_a_rr_elem_id,
{ "Element ID", "gsm_a_rr.elem_id",
- FT_UINT8, BASE_DEC, NULL, 0,
+ FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_gsm_a_bcc,
diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c
index 696001597f..9e62c01761 100644
--- a/epan/dissectors/packet-gsm_bsslap.c
+++ b/epan/dissectors/packet-gsm_bsslap.c
@@ -873,7 +873,7 @@ proto_register_gsm_bsslap(void)
},
{ &hf_gsm_a_bsslap_elem_id,
{ "Element ID", "gsm_bsslap.elem_id",
- FT_UINT8, BASE_DEC, NULL, 0,
+ FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_gsm_bsslap_ta,
diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c
index 0146ddf0de..ebe209d41c 100644
--- a/epan/dissectors/packet-gsm_bssmap_le.c
+++ b/epan/dissectors/packet-gsm_bssmap_le.c
@@ -1024,7 +1024,7 @@ proto_register_gsm_bssmap_le(void)
},
{ &hf_gsm_bssmap_le_elem_id,
{ "Element ID", "bssmap_le.elem_id",
- FT_UINT8, BASE_DEC, NULL, 0,
+ FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_gsm_bssmap_le_apdu_protocol_id,
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index 87f81fe34b..4683ef6279 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -2543,7 +2543,7 @@ dis_field_ud_iei(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint8 length)
proto_tree_add_text(subtree,
tvb, offset, 1,
- "Information Element Identifier: %d",
+ "Information Element Identifier: 0x%02X",
oct);
offset++;
diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c
index 72f594b1bc..71881edf4a 100644
--- a/epan/dissectors/packet-nas_eps.c
+++ b/epan/dissectors/packet-nas_eps.c
@@ -4839,17 +4839,17 @@ proto_register_nas_eps(void) {
},
{ &hf_nas_eps_common_elem_id,
{ "Element ID", "nas_eps.common.elem_id",
- FT_UINT8, BASE_DEC, NULL, 0,
+ FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_nas_eps_emm_elem_id,
{ "Element ID", "nas_eps.emm.elem_id",
- FT_UINT8, BASE_DEC, NULL, 0,
+ FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_nas_eps_bearer_id,
{ "EPS bearer identity", "nas_eps.bearer_id",
- FT_UINT8, BASE_HEX, NULL, 0xf0,
+ FT_UINT8, BASE_DEC, NULL, 0xf0,
NULL, HFILL }
},
{ &hf_nas_eps_spare_bits,
@@ -5547,7 +5547,7 @@ proto_register_nas_eps(void) {
},
{ &hf_nas_eps_esm_elem_id,
{ "Element ID", "nas_eps.esm.elem_id",
- FT_UINT8, BASE_DEC, NULL, 0,
+ FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_nas_eps_esm_proc_trans_id,
diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c
index b8d8811352..5e6fff20ff 100644
--- a/epan/dissectors/packet-sgsap.c
+++ b/epan/dissectors/packet-sgsap.c
@@ -1456,7 +1456,7 @@ void proto_register_sgsap(void) {
},
{ &hf_sgsap_elem_id,
{ "Element ID", "sgsap.elem_id",
- FT_UINT8, BASE_DEC, NULL, 0x0,
+ FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_sgsap_eps_location_update_type,