/* packet-udp.c
* Routines for UDP packet disassembly
*
- * $Id: packet-udp.c,v 1.77 2000/11/05 09:26:47 oabad Exp $
+ * $Id: packet-udp.c,v 1.89 2001/03/28 21:33:31 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
#include <glib.h>
#include "globals.h"
#include "resolv.h"
+#include "in_cksum.h"
-#include "plugins.h"
#include "packet-udp.h"
#include "packet-ip.h"
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;
guint16 uh_sum;
} e_udphdr;
-/* UDP Ports -> should go in packet-udp.h */
-
-#define UDP_PORT_VINES 573
-
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
-decode_udp_ports(const u_char *pd, int offset, frame_data *fd, proto_tree *tree,
- int uh_sport, int uh_dport)
+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 (old_try_conversation_dissector(&pi.src, &pi.dst, PT_UDP,
- uh_sport, uh_dport, pd, offset, fd, tree))
- return;
-
- /* try to apply the plugins */
-#ifdef HAVE_PLUGINS
- {
- plugin *pt_plug = plugin_list;
-
- if (enabled_plugins_number > 0) {
- while (pt_plug) {
- if (pt_plug->enabled && strstr(pt_plug->protocol, "udp") &&
- tree && dfilter_apply(pt_plug->filter, tree, pd, fd->cap_len)) {
- pt_plug->dissector(pd, offset, fd, tree);
- return;
- }
- pt_plug = pt_plug->next;
- }
- }
- }
-#endif
+ 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 (old_dissector_try_port(udp_dissector_table, uh_sport, pd, offset, fd, tree) ||
- old_dissector_try_port(udp_dissector_table, uh_dport, pd, offset, fd, tree))
+ 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 (old_dissector_try_heuristic(heur_subdissector_list, pd, offset, fd, tree))
+ if (dissector_try_heuristic(heur_subdissector_list, next_tvb, pinfo, tree))
return;
- /* XXX - we should do these with the subdissector table as well. */
-#define PORT_IS(port) (uh_sport == port || uh_dport == port)
- if (PORT_IS(UDP_PORT_VINES)) {
- /* FIXME: AFAIK, src and dst port must be the same */
- dissect_vines_frp(pd, offset, fd, tree);
- } else
- old_dissect_data(pd, offset, fd, tree);
+ dissect_data(next_tvb, 0, pinfo, tree);
}
static void
-dissect_udp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
+dissect_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
e_udphdr uh;
guint16 uh_sport, uh_dport, uh_ulen, uh_sum;
proto_tree *udp_tree;
proto_item *ti;
-
- OLD_CHECK_DISPLAY_AS_DATA(proto_udp, pd, offset, fd, tree);
-
- if (!BYTES_ARE_IN_FRAME(offset, sizeof(e_udphdr))) {
- old_dissect_data(pd, offset, fd, tree);
- return;
- }
+ 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. */
- memcpy(&uh, &pd[offset], sizeof(e_udphdr));
+ 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 (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "UDP");
- if (check_col(fd, COL_INFO))
- col_add_fstr(fd, COL_INFO, "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 = proto_tree_add_item(tree, proto_udp, NullTVB, offset, 8, FALSE);
+ 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, NullTVB, offset, 2, uh_sport,
+ 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, NullTVB, offset + 2, 2, uh_dport,
+ 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, NullTVB, offset, 2, uh_sport);
- proto_tree_add_uint_hidden(udp_tree, hf_udp_port, NullTVB, offset+2, 2, uh_dport);
-
- proto_tree_add_uint(udp_tree, hf_udp_length, NullTVB, offset + 4, 2, uh_ulen);
- proto_tree_add_uint_format(udp_tree, hf_udp_checksum, NullTVB, offset + 6, 2, uh_sum,
- "Checksum: 0x%04x", uh_sum);
+ 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;
- pi.ptype = PT_UDP;
- pi.srcport = uh_sport;
- pi.destport = uh_dport;
+ pinfo->ptype = PT_UDP;
+ pinfo->srcport = uh_sport;
+ pinfo->destport = uh_dport;
/* call sub-dissectors */
- decode_udp_ports( pd, offset, fd, tree, uh_sport, uh_dport);
+ decode_udp_ports( tvb, offset, pinfo, tree, uh_sport, uh_dport);
}
{ "Length", "udp.length", FT_UINT16, BASE_DEC, NULL, 0x0,
"" }},
+ { &hf_udp_checksum_bad,
+ { "Bad Checksum", "udp.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+ "" }},
+
{ &hf_udp_checksum,
{ "Checksum", "udp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
"" }},
&ett_udp,
};
- proto_udp = proto_register_protocol("User Datagram Protocol", "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);
}
void
proto_reg_handoff_udp(void)
{
- old_dissector_add("ip.proto", IP_PROTO_UDP, dissect_udp);
+ dissector_add("ip.proto", IP_PROTO_UDP, dissect_udp, proto_udp);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff