- move UDP port numbers to udp.h

  - then the number defines# are acessible from outside

- make a differentiation between BFD_ECHO_PORT and BFD_CONTROL_PORT

diff --git a/print-bfd.c b/print-bfd.c
index 166f2684458ebc24bd21d96ad5a18cfcd7f0949c..e61268bac67c260a02e73fbae6b60f6d404fa21f 100644 (file)
--- a/print-bfd.c
+++ b/print-bfd.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bfd.c,v 1.2 2003-10-27 17:21:32 hannes Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-bfd.c,v 1.3 2003-10-27 22:44:37 hannes Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -31,6 +31,8 @@ static const char rcsid[] =
 #include "extract.h"
 #include "addrtoname.h"
 
+#include "udp.h"
+
 /*
  * Control packet, draft-katz-ward-bfd-01.txt
  *
@@ -67,8 +69,8 @@ struct bfd_header_t {
 #define        BFD_EXTRACT_DIAG(x)     ((x)&0x1f)
 
 static const struct tok bfd_port_values[] = {
-    { 3784, "Control" },
-    { 3785, "Echo" },
+    { BFD_CONTROL_PORT, "Control" },
+    { BFD_ECHO_PORT,    "Echo" },
     { 0, NULL }
 };
 
@@ -105,36 +107,52 @@ bfd_print(register const u_char *pptr, register u_int len, register u_int port)
         bfd_header = (const struct bfd_header_t *)pptr;
         TCHECK(*bfd_header);
 
-        if (vflag < 1 )
-        {
-            printf("BFDv%u, %s, Flags: [%s], length: %u",
+        switch (port) {
+
+        case BFD_CONTROL_PORT:
+            if (vflag < 1 )
+            {
+                printf("BFDv%u, %s, Flags: [%s], length: %u",
+                       BFD_EXTRACT_VERSION(bfd_header->version_diag),
+                       tok2str(bfd_port_values, "unknown (%u)", port),
+                       bittok2str(bfd_flag_values, "none", bfd_header->flags),
+                       len);
+                return;
+            }
+            
+            printf("BFDv%u, length: %u\n\t%s, Flags: [%s], Diagnostic: %s (0x%02x)",
                    BFD_EXTRACT_VERSION(bfd_header->version_diag),
+                   len,
                    tok2str(bfd_port_values, "unknown (%u)", port),
                    bittok2str(bfd_flag_values, "none", bfd_header->flags),
-                   len);
-            return;
-        }
-
-        printf("BFDv%u, length: %u\n\t%s, Flags: [%s], Diagnostic: %s (0x%02x)",
-               BFD_EXTRACT_VERSION(bfd_header->version_diag),
-               len,
-               tok2str(bfd_port_values, "unknown (%u)", port),
-               bittok2str(bfd_flag_values, "none", bfd_header->flags),
-               tok2str(bfd_diag_values,"unknown",BFD_EXTRACT_DIAG(bfd_header->version_diag)),
+                   tok2str(bfd_diag_values,"unknown",BFD_EXTRACT_DIAG(bfd_header->version_diag)),
                BFD_EXTRACT_DIAG(bfd_header->version_diag));
-        
-        printf("\n\tDetection Timer Multiplier: %u (%u ms Detection time), BFD Length: %u",
-               bfd_header->detect_time_multiplier,
-               bfd_header->detect_time_multiplier * EXTRACT_32BITS(bfd_header->desired_min_tx_interval)/1000,
-               bfd_header->length);
+            
+            printf("\n\tDetection Timer Multiplier: %u (%u ms Detection time), BFD Length: %u",
+                   bfd_header->detect_time_multiplier,
+                   bfd_header->detect_time_multiplier * EXTRACT_32BITS(bfd_header->desired_min_tx_interval)/1000,
+                   bfd_header->length);
 
 
-        printf("\n\tMy Discriminator: 0x%08x", EXTRACT_32BITS(bfd_header->my_discriminator));
-        printf(", Your Discriminator: 0x%08x", EXTRACT_32BITS(bfd_header->your_discriminator));
-        printf("\n\t  Desired min Tx Interval:    %4u ms", EXTRACT_32BITS(bfd_header->desired_min_tx_interval)/1000);
-        printf("\n\t  Required min Rx Interval:   %4u ms", EXTRACT_32BITS(bfd_header->required_min_rx_interval)/1000);
-        printf("\n\t  Required min Echo Interval: %4u ms", EXTRACT_32BITS(bfd_header->required_min_echo_interval)/1000);
+            printf("\n\tMy Discriminator: 0x%08x", EXTRACT_32BITS(bfd_header->my_discriminator));
+            printf(", Your Discriminator: 0x%08x", EXTRACT_32BITS(bfd_header->your_discriminator));
+            printf("\n\t  Desired min Tx Interval:    %4u ms", EXTRACT_32BITS(bfd_header->desired_min_tx_interval)/1000);
+            printf("\n\t  Required min Rx Interval:   %4u ms", EXTRACT_32BITS(bfd_header->required_min_rx_interval)/1000);
+            printf("\n\t  Required min Echo Interval: %4u ms", EXTRACT_32BITS(bfd_header->required_min_echo_interval)/1000);
+            break;
 
+        case BFD_ECHO_PORT: /* not yet supported - fall through */
+
+        default:
+            printf("BFD, %s, length: %u",
+                   tok2str(bfd_port_values, "unknown (%u)", port),
+                   len);
+            if (vflag >= 1) {
+                if(!print_unknown_data(pptr,"\n\t",len))
+                    return;
+            }
+            break;
+        }
         return;
 
 trunc:

diff --git a/print-udp.c b/print-udp.c
index dafc2b226b9a0e94b00a9ef6987cb0bbfe772fed..2bf77d4bfc1d995607f878a211dcda372516c5ff 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.122 2003-10-27 10:13:44 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.123 2003-10-27 22:44:37 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -362,46 +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 */
-#define BFD_CONTROL_PORT        3784 /* draft-katz-ward-bfd-v4v6-1hop-00.txt */
-#define BFD_ECHO_PORT           3785 /* draft-katz-ward-bfd-v4v6-1hop-00.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)
 {

diff --git a/udp.h b/udp.h
index 2e052cd88ee89a3dba7ca4cf24309011f8303367..47badfc7e78b94c14cc5a54a1ad905e91e2aad49 100644 (file)
--- a/udp.h
+++ b/udp.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/udp.h,v 1.4 2002-12-11 07:14:12 guy Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/udp.h,v 1.5 2003-10-27 22:44:37 hannes Exp $ (LBL) */
 /*
  * Copyright (c) 1982, 1986, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -44,3 +44,41 @@ struct udphdr {
        u_int16_t       uh_ulen;                /* udp length */
        u_int16_t       uh_sum;                 /* udp checksum */
 };
+
+#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 */
+#define BFD_CONTROL_PORT        3784 /* draft-katz-ward-bfd-v4v6-1hop-00.txt */
+#define BFD_ECHO_PORT           3785 /* draft-katz-ward-bfd-v4v6-1hop-00.txt */
+
+#ifdef INET6
+#define RIPNG_PORT 521         /*XXX*/
+#define DHCP6_SERV_PORT 546    /*XXX*/
+#define DHCP6_CLI_PORT 547     /*XXX*/
+#endif