From Brian Ginsbach: add the Cray NV1 CPU to the list of CPUs that don't

[tcpdump] / print-udp.c

diff --git a/print-udp.c b/print-udp.c
index 46f66e9ecea2ad829fa17cf886fb414ce97b31fa..69ef39d542788246f8fe196764e403d2eca3f16e 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.120 2003-08-06 06:49:40 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.126 2003-11-16 09:36:41 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -362,44 +362,6 @@ static int udp6_cksum(const struct ip6_hdr *ip6, const struct udphdr *up,
 }
 #endif
 
-
-/* XXX probably should use getservbyname() and cache answers */
-#define TFTP_PORT 69           /*XXX*/
-#define KERBEROS_PORT 88       /*XXX*/
-#define SUNRPC_PORT 111                /*XXX*/
-#define SNMP_PORT 161          /*XXX*/
-#define NTP_PORT 123           /*XXX*/
-#define SNMPTRAP_PORT 162      /*XXX*/
-#define ISAKMP_PORT 500                /*XXX*/
-#define TIMED_PORT 525         /*XXX*/
-#define RIP_PORT 520           /*XXX*/
-#define LDP_PORT 646
-#define AODV_PORT 654          /*XXX*/
-#define KERBEROS_SEC_PORT 750  /*XXX*/
-#define L2TP_PORT 1701         /*XXX*/
-#define ISAKMP_PORT_USER1 7500 /*XXX - nonstandard*/
-#define ISAKMP_PORT_USER2 8500 /*XXX - nonstandard*/
-#define RX_PORT_LOW 7000       /*XXX*/
-#define RX_PORT_HIGH 7009      /*XXX*/
-#define NETBIOS_NS_PORT   137
-#define NETBIOS_DGRAM_PORT   138
-#define CISCO_AUTORP_PORT 496  /*XXX*/
-#define RADIUS_PORT 1645
-#define RADIUS_NEW_PORT 1812
-#define RADIUS_ACCOUNTING_PORT 1646
-#define RADIUS_NEW_ACCOUNTING_PORT 1813
-#define HSRP_PORT 1985         /*XXX*/
-#define LWRES_PORT             921
-#define ZEPHYR_SRV_PORT                2103
-#define ZEPHYR_CLT_PORT                2104
-#define MPLS_LSP_PING_PORT      3503 /* draft-ietf-mpls-lsp-ping-02.txt */
-
-#ifdef INET6
-#define RIPNG_PORT 521         /*XXX*/
-#define DHCP6_SERV_PORT 546    /*XXX*/
-#define DHCP6_CLI_PORT 547     /*XXX*/
-#endif
-
 static void
 udpipaddr_print(const struct ip *ip, int sport, int dport)
 {
@@ -562,15 +524,12 @@ udp_print(register const u_char *bp, u_int length,
                        break;
 
                case PT_AODV:
-                       (void)printf("%s.%s > %s.%s: ",
-                               ipaddr_string(&ip->ip_src),
-                               udpport_string(sport),
-                               ipaddr_string(&ip->ip_dst),
-                               udpport_string(dport));
+                       udpipaddr_print(ip, sport, dport);
+                       aodv_print((const u_char *)(up + 1), length,
 #ifdef INET6
-                       aodv_print((void *)(up + 1), length, (void *) ip6);
+                           ip6 != NULL);
 #else
-                       aodv_print((void *)(up + 1), length, NULL);
+                           FALSE);
 #endif
                        break;
                }
@@ -640,8 +599,10 @@ udp_print(register const u_char *bp, u_int length,
 
        if (!qflag) {
 #define ISPORT(p) (dport == (p) || sport == (p))
-               if (ISPORT(NAMESERVER_PORT) || ISPORT(MULTICASTDNS_PORT))
-                       ns_print((const u_char *)(up + 1), length);
+               if (ISPORT(NAMESERVER_PORT))
+                       ns_print((const u_char *)(up + 1), length, 0);
+               else if (ISPORT(MULTICASTDNS_PORT))
+                       ns_print((const u_char *)(up + 1), length, 1);
                else if (ISPORT(TIMED_PORT))
                        timed_print((const u_char *)(up + 1));
                else if (ISPORT(TFTP_PORT))
@@ -651,10 +612,11 @@ udp_print(register const u_char *bp, u_int length,
                else if (ISPORT(RIP_PORT))
                        rip_print((const u_char *)(up + 1), length);
                else if (ISPORT(AODV_PORT))
+                       aodv_print((const u_char *)(up + 1), length,
 #ifdef INET6
-                       aodv_print((const u_char *)(up + 1), length, (void *) ip6);
+                           ip6 != NULL);
 #else
-                       aodv_print((const u_char *)(up + 1), length, NULL);
+                           FALSE);
 #endif
                else if (ISPORT(ISAKMP_PORT))
                        isakmp_print((const u_char *)(up + 1), length, bp2);
@@ -716,10 +678,13 @@ udp_print(register const u_char *bp, u_int length,
                        ldp_print((const u_char *)(up + 1), length);
                 else if (ISPORT(MPLS_LSP_PING_PORT))
                        mpls_lsp_ping_print((const u_char *)(up + 1), length);
+               else if (dport == BFD_CONTROL_PORT ||
+                        dport == BFD_ECHO_PORT )
+                       bfd_print((const u_char *)(up+1), length, dport);
                else
-                       (void)printf("udp %u",
+                       (void)printf("UDP, length: %u",
                            (u_int32_t)(ulen - sizeof(*up)));
 #undef ISPORT
        } else
-               (void)printf("udp %u", (u_int32_t)(ulen - sizeof(*up)));
+               (void)printf("UDP, length: %u", (u_int32_t)(ulen - sizeof(*up)));
 }