diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-11-15 20:35:51 -0500 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-11-16 13:45:18 +0000 |
| commit | f92ed4df2d4720720080d8013da124a0eb956de7 (patch) | |
| tree | 2b3bf92972a849fe668f121e53e45bfe1b7c6451 /asn1/t38 | |
| parent | 3b8ed366ddd149f2cc1428a713235c18afc192e7 (diff) | |
| download | wireshark-f92ed4df2d4720720080d8013da124a0eb956de7.tar.gz | |
Remove ipproto member of packet_info.
All situations can be handled with "shimmed" dissector functions.
Change-Id: Ic85483b32d99d3270b193c9f6b29574d8fad46a8
Reviewed-on: https://code.wireshark.org/review/5327
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'asn1/t38')
| -rw-r--r-- | asn1/t38/packet-t38-template.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index 0a719463be..11a1aa2c42 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -615,19 +615,6 @@ dissect_t38_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } -static void -dissect_t38(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -{ - if(pinfo->ipproto == IP_PROTO_TCP) - { - dissect_t38_tcp(tvb, pinfo, tree); - } - else if(pinfo->ipproto == IP_PROTO_UDP) - { - dissect_t38_udp(tvb, pinfo, tree); - } -} - /* Look for conversation info and display any setup info found */ void show_setup_info(tvbuff_t *tvb, proto_tree *tree, t38_conv *p_t38_conversation) @@ -732,7 +719,7 @@ proto_register_t38(void) proto_register_subtree_array(ett, array_length(ett)); expert_t38 = expert_register_protocol(proto_t38); expert_register_field_array(expert_t38, ei, array_length(ei)); - register_dissector("t38", dissect_t38, proto_t38); + register_dissector("t38_udp", dissect_t38_udp, proto_t38); /* Init reassemble tables for HDLC */ register_init_routine(t38_defragment_init); |