diff options
| author | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-05-09 12:10:06 +0000 |
|---|---|---|
| committer | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-05-09 12:10:06 +0000 |
| commit | d76272ca47f5c7bb0db089e56563db480074643a (patch) | |
| tree | a141840ab1b12c4c9008d2effab31ea17a58c265 /packet-portmap.c | |
| parent | 9ef67936d57123161a541196d92f87a60d0de0fd (diff) | |
Added parsing of PORTMAP GETPORT functions.
When we see PRTOMAP GETPORT calls for UDP, make sure all further UDP packets to or from
this port goes to the ONC-RPC dissector regardless of the port on the other side.
We need this because if there is ONC-RPC traffic going between the ONC-RPC Program port to a port which has a normal ethereal dissector, ethereal would dissect the traffic as the protocol associated with the other port instead.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5430 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-portmap.c')
| -rw-r--r-- | packet-portmap.c | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/packet-portmap.c b/packet-portmap.c index 604990c361..dff5543f12 100644 --- a/packet-portmap.c +++ b/packet-portmap.c @@ -1,7 +1,7 @@ /* packet-portmap.c * Routines for portmap dissection * - * $Id: packet-portmap.c,v 1.35 2002/04/14 23:04:03 guy Exp $ + * $Id: packet-portmap.c,v 1.36 2002/05/09 12:10:05 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -37,6 +37,8 @@ #include "packet-rpc.h" #include "packet-portmap.h" #include "ipproto.h" +#include "epan/conversation.h" +#include "epan/packet_info.h" /* * See: @@ -66,6 +68,8 @@ static gint ett_portmap = -1; static gint ett_portmap_rpcb = -1; static gint ett_portmap_entry = -1; +static dissector_handle_t rpc_handle; +static dissector_handle_t rpc_tcp_handle; /* Dissect a getport call */ static int @@ -75,6 +79,17 @@ dissect_getport_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, guint32 proto; guint32 prog; + /* make sure we remember protocol type until the reply packet */ + if(!pinfo->fd->flags.visited){ + rpc_call_info_value *rpc_call=pinfo->private_data; + if(rpc_call){ + proto = tvb_get_ntohl(tvb, offset+8); + if(proto==17){ /* only do this for UDP */ + rpc_call->private_data=(void *)PT_UDP; + } + } + } + if ( tree ) { prog = tvb_get_ntohl(tvb, offset+0); @@ -99,6 +114,24 @@ static int dissect_getport_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree) { + /* we might have learnt a <ipaddr><protocol><port> mapping for ONC-RPC*/ + if(!pinfo->fd->flags.visited){ + rpc_call_info_value *rpc_call=pinfo->private_data; + /* only do this for UDP, TCP does not need anything like this */ + if(rpc_call && ((int)rpc_call->private_data==PT_UDP) ){ + guint32 port; + port=tvb_get_ntohl(tvb, offset); + if(port){ + conversation_t *conv; + conv=find_conversation(&pinfo->src, &pinfo->dst, (port_type)rpc_call->private_data, port, 0, NO_ADDR_B|NO_PORT_B); + if(!conv){ + conv=conversation_new(&pinfo->src, &pinfo->dst, (port_type)rpc_call->private_data, port, 0, NO_ADDR_B|NO_PORT_B); + } + conversation_set_dissector(conv, rpc_handle); + } + } + } + offset = dissect_rpc_uint32(tvb, tree, hf_portmap_port, offset); return offset; @@ -530,4 +563,6 @@ proto_reg_handoff_portmap(void) rpc_init_proc_table(PORTMAP_PROGRAM, 2, portmap2_proc); rpc_init_proc_table(PORTMAP_PROGRAM, 3, portmap3_proc); rpc_init_proc_table(PORTMAP_PROGRAM, 4, portmap4_proc); + rpc_handle = find_dissector("rpc"); + rpc_tcp_handle = find_dissector("rpc-tcp"); } |