diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2015-04-27 13:24:49 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-04-27 11:27:28 +0000 |
| commit | af11fde75da076a809b87520404240e901032c52 (patch) | |
| tree | 23b912a3286d974698ed47d4c226ad84773c26b4 /epan | |
| parent | 5b1d62c50b36fcae939e61ba7ac6f65a4a846626 (diff) | |
[RANAP] Heuristics does not work with lenght detremant of 2 bytes.
Change-Id: Ib26b9d66e690770a27d63f75f4c9a935fc93b2b0
Reviewed-on: https://code.wireshark.org/review/8209
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ranap.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index d57a6b3873..c96009a119 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -13220,9 +13220,11 @@ dissect_sccp_ranap_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi temp = tvb_get_guint8(tvb, MSG_TYPE_OFFSET); if (temp > RANAP_MAX_PC) { return FALSE; } - /* Try to strengthen the heuristic further, by checking byte 6 and 7 which usually is a sequence-of length */ - word = tvb_get_ntohs(tvb,5); - if(word > 0x1ff){ + /* Try to strengthen the heuristic further, by checking the byte following the length and the bitfield indicating extensions etc + * which usually is a sequence-of length + */ + word = tvb_get_ntohs(tvb, offset + 1); + if (word > 0x1ff){ return FALSE; } dissect_ranap(tvb, pinfo, tree, data); @@ -16120,7 +16122,7 @@ void proto_register_ranap(void) { NULL, HFILL }}, /*--- End of included file: packet-ranap-hfarr.c ---*/ -#line 324 "../../asn1/ranap/packet-ranap-template.c" +#line 326 "../../asn1/ranap/packet-ranap-template.c" }; /* List of subtrees */ @@ -16457,7 +16459,7 @@ void proto_register_ranap(void) { &ett_ranap_Outcome, /*--- End of included file: packet-ranap-ettarr.c ---*/ -#line 332 "../../asn1/ranap/packet-ranap-template.c" +#line 334 "../../asn1/ranap/packet-ranap-template.c" }; @@ -16840,7 +16842,7 @@ proto_reg_handoff_ranap(void) /*--- End of included file: packet-ranap-dis-tab.c ---*/ -#line 382 "../../asn1/ranap/packet-ranap-template.c" +#line 384 "../../asn1/ranap/packet-ranap-template.c" } else { dissector_delete_uint("sccp.ssn", local_ranap_sccp_ssn, ranap_handle); } |