diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-10-18 21:11:11 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-10-18 21:11:11 +0000 |
| commit | d3a09e0514f5e380fbe012f43fae29f504124fd7 (patch) | |
| tree | 801c73c67f6ab24c67962f05356cb676e4b9dbe0 /epan/dissectors/packet-udp.c | |
| parent | f86132a09a23ae8e39cc9e94667be23ebdacebbe (diff) | |
| download | wireshark-d3a09e0514f5e380fbe012f43fae29f504124fd7.tar.gz | |
- Remove hf_ integers from few more dissectors
- udp: remove proto_udp.
svn path=/trunk/; revision=52678
Diffstat (limited to 'epan/dissectors/packet-udp.c')
| -rw-r--r-- | epan/dissectors/packet-udp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index d285ddc211..5192e3d3be 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -53,8 +53,6 @@ void proto_reg_handoff_udp(void); static dissector_handle_t udp_handle; static dissector_handle_t udplite_handle; -static int proto_udp; - static int udp_tap = -1; static int udp_follow_tap = -1; @@ -289,7 +287,7 @@ decode_udp_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, gboolean prev_heur_found = FALSE; if (pinfo->fd->flags.visited) { - udp_p_info = (udp_p_info_t*)p_get_proto_data(pinfo->fd, proto_udp, pinfo->curr_layer_num); + udp_p_info = (udp_p_info_t*)p_get_proto_data(pinfo->fd, hfi_udp->id, pinfo->curr_layer_num); if (udp_p_info) { prev_heur_found = udp_p_info->found_heuristic; } @@ -334,7 +332,7 @@ decode_udp_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, udp_p_info = wmem_new0(wmem_file_scope(), udp_p_info_t); udp_p_info->found_heuristic = TRUE; /* pinfo->curr_layer_num-1 because the heuristic dissector added one */ - p_add_proto_data(pinfo->fd, proto_udp, pinfo->curr_layer_num-1, udp_p_info); + p_add_proto_data(pinfo->fd, hfi_udp->id, pinfo->curr_layer_num-1, udp_p_info); } return; } @@ -377,7 +375,7 @@ decode_udp_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, udp_p_info = wmem_new0(wmem_file_scope(), udp_p_info_t); udp_p_info->found_heuristic = TRUE; /* pinfo->curr_layer_num-1 because the heuristic dissector added one */ - p_add_proto_data(pinfo->fd, proto_udp, pinfo->curr_layer_num-1, udp_p_info); + p_add_proto_data(pinfo->fd, hfi_udp->id, pinfo->curr_layer_num-1, udp_p_info); } return; } @@ -753,7 +751,7 @@ proto_register_udp(void) { &ei_udp_checksum_bad, { "udp.checksum_bad.expert", PI_CHECKSUM, PI_ERROR, "Bad checksum", EXPFILL }}, }; - int proto_udplite; + int proto_udp, proto_udplite; proto_udp = proto_register_protocol("User Datagram Protocol", "UDP", "udp"); |