diff options
| author | Nardi Ivan <nardi.ivan@gmail.com> | 2020-07-09 12:50:15 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-07-10 06:28:47 +0000 |
| commit | 770872790d80502f172d8df586e843f3f31c00c7 (patch) | |
| tree | 35c7002cc33772f8a2f80a284844b2d97b59e5cf /epan | |
| parent | 734287d6d465539ceea1948436ddf7b457e9033c (diff) | |
Stun: add heuristic over TCP
Change-Id: Id059773a9f9567b1e66935aebafd0c1f73c9f15b
Reviewed-on: https://code.wireshark.org/review/37814
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-stun.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index 80b7eff03a..0725201f57 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -1367,15 +1367,17 @@ dissect_stun_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data } static gboolean -dissect_stun_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) +dissect_stun_heur_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { - if (dissect_stun_message(tvb, pinfo, tree, TRUE, TRUE) == 0) { - /* - * It wasn't a valid STUN message, and wasn't - * dissected as such. - */ + if (dissect_stun_message(tvb, pinfo, tree, TRUE, FALSE) == 0) + return FALSE; + return TRUE; +} +static gboolean +dissect_stun_heur_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) +{ + if (dissect_stun_message(tvb, pinfo, tree, TRUE, TRUE) == 0) return FALSE; - } return TRUE; } @@ -1719,7 +1721,7 @@ proto_register_stun(void) register_dissector("stun-tcp", dissect_stun_tcp, proto_stun); register_dissector("stun-udp", dissect_stun_udp, proto_stun); - register_dissector("stun-heur", dissect_stun_heur, proto_stun); + register_dissector("stun-heur", dissect_stun_heur_udp, proto_stun); } void @@ -1738,7 +1740,8 @@ proto_reg_handoff_stun(void) dissector_add_string("tls.alpn", "stun.nat-discovery", stun_tcp_handle); dissector_add_string("dtls.alpn", "stun.nat-discovery", stun_udp_handle); - heur_dissector_add("udp", dissect_stun_heur, "STUN over UDP", "stun_udp", proto_stun, HEURISTIC_ENABLE); + heur_dissector_add("udp", dissect_stun_heur_udp, "STUN over UDP", "stun_udp", proto_stun, HEURISTIC_ENABLE); + heur_dissector_add("tcp", dissect_stun_heur_tcp, "STUN over TCP", "stun_tcp", proto_stun, HEURISTIC_ENABLE); data_handle = find_dissector("data"); } |