aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2019-01-17 13:00:39 +0100
committerAnders Broman <a.broman58@gmail.com>2019-01-17 14:52:34 +0000
commitcda1a591e9a835f626aacc0843a71bc6f25ce13b (patch)
treec468f37b963b675a606711830d0f87719b6e9810
parent75f9c958887dd5493cef39ff104fb3dd0c0060b1 (diff)
smpp: Make it clearer that it's a heuristic dissector.
Should this be default off? I had a false positive. While at it remove unused hf entry. Change-Id: Ia3ec0f2e127659349226af9bc2acb0812960a0a6 Reviewed-on: https://code.wireshark.org/review/31574 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-smpp.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index 5c405d4fa7..d51fa91aef 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -224,7 +224,6 @@ static int hf_smpp_dcs_cbs_class = -1;
/*
* Huawei SMPP+ extensions
*/
-static int hf_huawei_smpp_version = -1;
static int hf_huawei_smpp_smsc_addr = -1;
static int hf_huawei_smpp_msc_addr_noa = -1;
static int hf_huawei_smpp_msc_addr_npi = -1;
@@ -3564,12 +3563,6 @@ proto_register_smpp(void)
}
},
/* Huawei SMPP+ extensions */
- { &hf_huawei_smpp_version,
- { "Version of SMPP+", "smpp.smppplus_version",
- FT_UINT8, BASE_HEX, NULL, 0x00,
- "Indicates the SMPP+ version", HFILL
- }
- },
{ &hf_huawei_smpp_smsc_addr,
{ "SMPP+: GT of SMSC", "smpp.smsc_addr",
FT_STRING, BASE_NONE, NULL, 0x00,
@@ -3688,8 +3681,8 @@ proto_reg_handoff_smpp(void)
* however.
*/
dissector_add_for_decode_as_with_preference("tcp.port", smpp_handle);
- heur_dissector_add("tcp", dissect_smpp_heur, "SMPP over TCP", "smpp_tcp", proto_smpp, HEURISTIC_ENABLE);
- heur_dissector_add("x.25", dissect_smpp_heur, "SMPP over X.25", "smpp_x25", proto_smpp, HEURISTIC_ENABLE);
+ heur_dissector_add("tcp", dissect_smpp_heur, "SMPP over TCP Heuristics", "smpp_tcp", proto_smpp, HEURISTIC_ENABLE);
+ heur_dissector_add("x.25", dissect_smpp_heur, "SMPP over X.25 Heuristics", "smpp_x25", proto_smpp, HEURISTIC_ENABLE);
/* Required for call_dissector() */
gsm_sms_handle = find_dissector_add_dependency("gsm_sms_ud", proto_smpp);