X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=packet-udp.c;h=de0db83c55c8499c52b4119c7d41d1c4b6f758f0;hb=063cdb6bd1119e4cd87712d0b07e8db540fe70cc;hp=fd9036b8f6c6a5935282f3f0e04935e0e3dd9739;hpb=c040b79b20c8e4dfe9bdedf9d2608a23a3f4f949;p=obnox%2Fwireshark%2Fwip.git diff --git a/packet-udp.c b/packet-udp.c index fd9036b8f6..de0db83c55 100644 --- a/packet-udp.c +++ b/packet-udp.c @@ -1,12 +1,14 @@ /* packet-udp.c * Routines for UDP packet disassembly * - * $Id: packet-udp.c,v 1.3 1998/09/21 16:16:01 gram Exp $ + * $Id: packet-udp.c,v 1.94 2001/06/18 02:17:53 guy Exp $ * * Ethereal - Network traffic analyzer - * By Gerald Combs + * By Gerald Combs * Copyright 1998 Gerald Combs * + * Richard Sharpe, 13-Feb-1999, added dispatch table support and + * support for tftp. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -27,10 +29,6 @@ # include "config.h" #endif -#include - -#include - #ifdef HAVE_SYS_TYPES_H # include #endif @@ -39,59 +37,250 @@ # include #endif -#include "ethereal.h" +#include +#include +#include + +#include #include "packet.h" #include "resolv.h" +#include "ipproto.h" +#include "in_cksum.h" +#include "prefs.h" + +#include "packet-udp.h" + +#include "packet-ip.h" +#include "conversation.h" + +static int proto_udp = -1; +static int hf_udp_srcport = -1; +static int hf_udp_dstport = -1; +static int hf_udp_port = -1; +static int hf_udp_length = -1; +static int hf_udp_checksum = -1; +static int hf_udp_checksum_bad = -1; + +static gint ett_udp = -1; + +/* Place UDP summary in proto tree */ +static gboolean udp_summary_in_tree = TRUE; + +/* UDP structs and definitions */ + +typedef struct _e_udphdr { + guint16 uh_sport; + guint16 uh_dport; + guint16 uh_ulen; + guint16 uh_sum; +} e_udphdr; + +static dissector_table_t udp_dissector_table; +static heur_dissector_list_t heur_subdissector_list; +static conv_dissector_list_t conv_subdissector_list; + +/* Determine if there is a sub-dissector and call it. This has been */ +/* separated into a stand alone routine to other protocol dissectors */ +/* can call to it, ie. socks */ void -dissect_udp(const u_char *pd, int offset, frame_data *fd, GtkTree *tree) { - e_udphdr *uh; +decode_udp_ports(tvbuff_t *tvb, int offset, packet_info *pinfo, + proto_tree *tree, int uh_sport, int uh_dport) +{ + tvbuff_t *next_tvb; + + next_tvb = tvb_new_subset(tvb, offset, -1, -1); + +/* determine if this packet is part of a conversation and call dissector */ +/* for the conversation if available */ + + if (try_conversation_dissector(&pinfo->src, &pinfo->dst, PT_UDP, + uh_sport, uh_dport, next_tvb, pinfo, tree)) + return; + + /* do lookup with the subdissector table */ + if (dissector_try_port(udp_dissector_table, uh_sport, next_tvb, pinfo, tree) || + dissector_try_port(udp_dissector_table, uh_dport, next_tvb, pinfo, tree)) + return; + + /* do lookup with the heuristic subdissector table */ + if (dissector_try_heuristic(heur_subdissector_list, next_tvb, pinfo, tree)) + return; + + dissect_data(next_tvb, 0, pinfo, tree); +} + + +static void +dissect_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + e_udphdr uh; guint16 uh_sport, uh_dport, uh_ulen, uh_sum; - GtkWidget *udp_tree, *ti; - - /* To do: Check for {cap len,pkt len} < struct len */ - uh = (e_udphdr *) &pd[offset]; - uh_sport = ntohs(uh->uh_sport); - uh_dport = ntohs(uh->uh_dport); - uh_ulen = ntohs(uh->uh_ulen); - uh_sum = ntohs(uh->uh_sum); + proto_tree *udp_tree; + proto_item *ti; + guint len; + guint reported_len; + vec_t cksum_vec[4]; + guint32 phdr[2]; + guint16 computed_cksum; + int offset = 0; + + if (check_col(pinfo->fd, COL_PROTOCOL)) + col_set_str(pinfo->fd, COL_PROTOCOL, "UDP"); + if (check_col(pinfo->fd, COL_INFO)) + col_clear(pinfo->fd, COL_INFO); + + /* Avoids alignment problems on many architectures. */ + tvb_memcpy(tvb, (guint8 *)&uh, offset, sizeof(e_udphdr)); + uh_sport = ntohs(uh.uh_sport); + uh_dport = ntohs(uh.uh_dport); + uh_ulen = ntohs(uh.uh_ulen); + uh_sum = ntohs(uh.uh_sum); - if (fd->win_info[0]) { - strcpy(fd->win_info[3], "UDP"); - sprintf(fd->win_info[4], "Source port: %s Destination port: %s", + if (check_col(pinfo->fd, COL_INFO)) + col_add_fstr(pinfo->fd, COL_INFO, "Source port: %s Destination port: %s", get_udp_port(uh_sport), get_udp_port(uh_dport)); - } - + if (tree) { - ti = add_item_to_tree(GTK_WIDGET(tree), offset, 8, - "User Datagram Protocol"); - udp_tree = gtk_tree_new(); - add_subtree(ti, udp_tree, ETT_UDP); - add_item_to_tree(udp_tree, offset, 2, "Source port: %s", get_udp_port(uh_sport)); - add_item_to_tree(udp_tree, offset + 2, 2, "Destination port: %s", get_udp_port(uh_dport)); - add_item_to_tree(udp_tree, offset + 4, 2, "Length: %d", uh_ulen); - add_item_to_tree(udp_tree, offset + 6, 2, "Checksum: 0x%04x", uh_sum); + if (udp_summary_in_tree) { + ti = proto_tree_add_protocol_format(tree, proto_udp, tvb, offset, 8, + "User Datagram Protocol, Src Port: %s (%u), Dst Port: %s (%u)", + get_udp_port(uh_sport), uh_sport, get_udp_port(uh_dport), uh_dport); + } else { + ti = proto_tree_add_item(tree, proto_udp, tvb, offset, 8, FALSE); + } + udp_tree = proto_item_add_subtree(ti, ett_udp); + + proto_tree_add_uint_format(udp_tree, hf_udp_srcport, tvb, offset, 2, uh_sport, + "Source port: %s (%u)", get_udp_port(uh_sport), uh_sport); + proto_tree_add_uint_format(udp_tree, hf_udp_dstport, tvb, offset + 2, 2, uh_dport, + "Destination port: %s (%u)", get_udp_port(uh_dport), uh_dport); + + proto_tree_add_uint_hidden(udp_tree, hf_udp_port, tvb, offset, 2, uh_sport); + proto_tree_add_uint_hidden(udp_tree, hf_udp_port, tvb, offset+2, 2, uh_dport); + + proto_tree_add_uint(udp_tree, hf_udp_length, tvb, offset + 4, 2, uh_ulen); + reported_len = tvb_reported_length(tvb); + len = tvb_length(tvb); + if (uh_sum == 0) { + /* No checksum supplied in the packet. */ + proto_tree_add_uint_format(udp_tree, hf_udp_checksum, tvb, + offset + 6, 2, uh_sum, "Checksum: 0x%04x (none)", uh_sum); + } else if (!pinfo->fragmented && len >= reported_len) { + /* The packet isn't part of a fragmented datagram and isn't + truncated, so we can checksum it. + XXX - make a bigger scatter-gather list once we do fragment + reassembly? */ + + /* Set up the fields of the pseudo-header. */ + cksum_vec[0].ptr = pinfo->src.data; + cksum_vec[0].len = pinfo->src.len; + cksum_vec[1].ptr = pinfo->dst.data; + cksum_vec[1].len = pinfo->dst.len; + cksum_vec[2].ptr = (const guint8 *)&phdr; + switch (pinfo->src.type) { + + case AT_IPv4: + phdr[0] = htonl((IP_PROTO_UDP<<16) + reported_len); + cksum_vec[2].len = 4; + break; + + case AT_IPv6: + phdr[0] = htonl(reported_len); + phdr[1] = htonl(IP_PROTO_UDP); + cksum_vec[2].len = 8; + break; + + default: + /* TCP runs only atop IPv4 and IPv6.... */ + g_assert_not_reached(); + break; + } + cksum_vec[3].ptr = tvb_get_ptr(tvb, offset, len); + cksum_vec[3].len = reported_len; + computed_cksum = in_cksum(&cksum_vec[0], 4); + if (computed_cksum == 0) { + proto_tree_add_uint_format(udp_tree, hf_udp_checksum, tvb, + offset + 6, 2, uh_sum, "Checksum: 0x%04x (correct)", uh_sum); + } else { + proto_tree_add_boolean_hidden(udp_tree, hf_udp_checksum_bad, tvb, + offset + 6, 2, TRUE); + proto_tree_add_uint_format(udp_tree, hf_udp_checksum, tvb, + offset + 6, 2, uh_sum, + "Checksum: 0x%04x (incorrect, should be 0x%04x)", uh_sum, + in_cksum_shouldbe(uh_sum, computed_cksum)); + } + } else { + proto_tree_add_uint_format(udp_tree, hf_udp_checksum, tvb, + offset + 6, 2, uh_sum, "Checksum: 0x%04x", uh_sum); + } } /* Skip over header */ offset += 8; - /* To do: make sure we aren't screwing ourselves with the MIN call. */ - switch (MIN(uh_sport, uh_dport)) { - case UDP_PORT_BOOTPS: - dissect_bootp(pd, offset, fd, tree); - break; - case UDP_PORT_DNS: - dissect_dns(pd, offset, fd, tree); - break; - case UDP_PORT_RIP: - /* we should check the source port too (RIP: UDP src and dst port 520) */ - dissect_rip(pd, offset, fd, tree); - break; - case UDP_PORT_IPX: /* RFC 1234 */ - dissect_ipx(pd, offset, fd, tree); - break; - default: - dissect_data(pd, offset, fd, tree); - } + pinfo->ptype = PT_UDP; + pinfo->srcport = uh_sport; + pinfo->destport = uh_dport; + +/* call sub-dissectors */ + decode_udp_ports( tvb, offset, pinfo, tree, uh_sport, uh_dport); + +} + +void +proto_register_udp(void) +{ + module_t *udp_module; + static hf_register_info hf[] = { + { &hf_udp_srcport, + { "Source Port", "udp.srcport", FT_UINT16, BASE_DEC, NULL, 0x0, + "", HFILL }}, + + { &hf_udp_dstport, + { "Destination Port", "udp.dstport", FT_UINT16, BASE_DEC, NULL, 0x0, + "", HFILL }}, + + { &hf_udp_port, + { "Source or Destination Port", "udp.port", FT_UINT16, BASE_DEC, NULL, 0x0, + "", HFILL }}, + + { &hf_udp_length, + { "Length", "udp.length", FT_UINT16, BASE_DEC, NULL, 0x0, + "", HFILL }}, + + { &hf_udp_checksum_bad, + { "Bad Checksum", "udp.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0, + "", HFILL }}, + + { &hf_udp_checksum, + { "Checksum", "udp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0, + "", HFILL }}, + }; + static gint *ett[] = { + &ett_udp, + }; + + proto_udp = proto_register_protocol("User Datagram Protocol", + "UDP", "udp"); + proto_register_field_array(proto_udp, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + +/* subdissector code */ + udp_dissector_table = register_dissector_table("udp.port"); + register_heur_dissector_list("udp", &heur_subdissector_list); + register_conv_dissector_list("udp", &conv_subdissector_list); + + /* Register configuration preferences */ + udp_module = prefs_register_protocol(proto_udp, NULL); + prefs_register_bool_preference(udp_module, "udp_summary_in_tree", + "Show UDP summary in protocol treee", + "Whether the UDP summary line should be shown in the protocol tree", + &udp_summary_in_tree); +} + +void +proto_reg_handoff_udp(void) +{ + dissector_add("ip.proto", IP_PROTO_UDP, dissect_udp, proto_udp); }