diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-04-14 06:17:23 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-04-14 06:17:23 +0000 |
| commit | d419701eeac64d5e4b5db89ac89c28afa2f72425 (patch) | |
| tree | 2d6eddc27269201f13319831dac5d8967be15780 /packet-udp.c | |
| parent | 61167a3c28f1413cfe0f3a3fb0f9454815a02b16 (diff) | |
| download | wireshark-d419701eeac64d5e4b5db89ac89c28afa2f72425.tar.gz wireshark-d419701eeac64d5e4b5db89ac89c28afa2f72425.tar.bz2 wireshark-d419701eeac64d5e4b5db89ac89c28afa2f72425.zip | |
RFC 1058, on RIP V1, says:
Specific queries and debugging requests may be sent from ports
other than 520, but they are directed to port 520 on the target
machine.
and RFC 2453, on RIP V2, says:
Specific queries may be sent from ports other than the RIP port,
but they must be directed to the RIP port on the target machine.
so there is no requirement that RIP packets have 520 as both source and
destination port numbers. It's therefore OK to register it as the
dissector for UDP port 520 - no need to handle it specially in the UDP
dissector as a reminder to make it check both source and destination
ports - so we do so.
svn path=/trunk/; revision=1855
Diffstat (limited to 'packet-udp.c')
| -rw-r--r-- | packet-udp.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/packet-udp.c b/packet-udp.c index a137fc214d..11bf09ceca 100644 --- a/packet-udp.c +++ b/packet-udp.c @@ -1,7 +1,7 @@ /* packet-udp.c * Routines for UDP packet disassembly * - * $Id: packet-udp.c,v 1.62 2000/04/14 05:39:43 gram Exp $ + * $Id: packet-udp.c,v 1.63 2000/04/14 06:17:22 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -74,7 +74,6 @@ typedef struct _e_udphdr { /* UDP Ports -> should go in packet-udp.h */ #define UDP_PORT_TFTP 69 -#define UDP_PORT_RIP 520 #define UDP_PORT_NCP 524 #define UDP_PORT_VINES 573 #define UDP_PORT_RX_LOW 7000 @@ -131,10 +130,7 @@ decode_udp_ports( const u_char *pd, int offset, frame_data *fd, /* XXX - we should do all of this through the table of ports. */ #define PORT_IS(port) (uh_sport == port || uh_dport == port) - if (PORT_IS(UDP_PORT_RIP)) { - /* we should check the source port too (RIP: UDP src and dst port 520) */ - dissect_rip(pd, offset, fd, tree); - } else if (PORT_IS(UDP_PORT_NCP)) + if (PORT_IS(UDP_PORT_NCP)) dissect_ncp(pd, offset, fd, tree); /* XXX -- need to handle nw_server_address */ else if ((uh_sport >= UDP_PORT_RX_LOW && uh_sport <= UDP_PORT_RX_HIGH) || (uh_dport >= UDP_PORT_RX_LOW && uh_dport <= UDP_PORT_RX_HIGH) || |