rework the ARP printer & add support for Frame-Relay ARP

diff --git a/addrtoname.c b/addrtoname.c
index 06e44e1b3ab012e46d629088c79b33cda6a1cad1..05a97142ec629daeea68d5684623819f9fae9e35 100644 (file)
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -23,7 +23,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
  */
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.115 2005-09-29 07:45:22 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.116 2006-02-11 22:11:40 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -505,14 +505,19 @@ etheraddr_string(register const u_char *ep)
 }
 
 const char *
 }
 
 const char *

-linkaddr_string(const u_char *ep, const unsigned int len)
+linkaddr_string(const u_char *ep, const unsigned int type, const unsigned int len)

 {
        register u_int i;
        register char *cp;
        register struct enamemem *tp;
 
 {
        register u_int i;
        register char *cp;
        register struct enamemem *tp;
 

-       if (len == 6)   /* XXX not totally correct... */
-               return etheraddr_string(ep);
+       if (type == LINKADDR_ETHER && len == ETHER_ADDR_LEN) {
+            return etheraddr_string(ep);
+        }
+
+        if (type == LINKADDR_FRELAY) {
+            return q922_string(ep);
+        }

 
        tp = lookup_bytestring(ep, len);
        if (tp->e_name)
 
        tp = lookup_bytestring(ep, len);
        if (tp->e_name)

diff --git a/addrtoname.h b/addrtoname.h
index 1a35f4c83f3244603235671b015a53c006fa0db8..2f39f748353137bbbd7ea80ecee3a89b5584de95 100644 (file)
--- a/addrtoname.h
+++ b/addrtoname.h
@@ -18,12 +18,19 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- * @(#) $Header: /tcpdump/master/tcpdump/addrtoname.h,v 1.18 2001-09-17 21:57:51 fenner Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/addrtoname.h,v 1.19 2006-02-11 22:11:40 hannes Exp $ (LBL)

  */
 
 /* Name to address translation routines. */
 
  */
 
 /* Name to address translation routines. */
 

-extern const char *linkaddr_string(const u_char *, const unsigned int);
+enum {
+    LINKADDR_ETHER,
+    LINKADDR_FRELAY,
+    LINKADDR_IEEE1394,
+    LINKADDR_ATM
+};
+
+extern const char *linkaddr_string(const u_char *, const unsigned int, const unsigned int);

 extern const char *etheraddr_string(const u_char *);
 extern const char *etherproto_string(u_short);
 extern const char *tcpport_string(u_short);
 extern const char *etheraddr_string(const u_char *);
 extern const char *etherproto_string(u_short);
 extern const char *tcpport_string(u_short);

diff --git a/interface.h b/interface.h
index 43590deae8e7ba68b6e93b598302056cde0d1479..86369042fd861e14951c1685bd1f46b5fdd75d45 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.267 2006-02-10 04:52:25 hannes Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.268 2006-02-11 22:11:40 hannes Exp $ (LBL)

  */
 
 #ifndef tcpdump_interface_h
  */
 
 #ifndef tcpdump_interface_h


@@ -209,6 +209,7 @@ extern u_int fr_if_print(const struct pcap_pkthdr *, const u_char *);
 extern u_int mfr_if_print(const struct pcap_pkthdr *, const u_char *);
 extern u_int fr_print(register const u_char *, u_int);
 extern u_int mfr_print(register const u_char *, u_int);
 extern u_int mfr_if_print(const struct pcap_pkthdr *, const u_char *);
 extern u_int fr_print(register const u_char *, u_int);
 extern u_int mfr_print(register const u_char *, u_int);

+extern char *q922_string(const u_char *);

 extern u_int ieee802_11_if_print(const struct pcap_pkthdr *, const u_char *);
 extern u_int ieee802_11_radio_if_print(const struct pcap_pkthdr *,
        const u_char *);
 extern u_int ieee802_11_if_print(const struct pcap_pkthdr *, const u_char *);
 extern u_int ieee802_11_radio_if_print(const struct pcap_pkthdr *,
        const u_char *);

diff --git a/print-ap1394.c b/print-ap1394.c
index 21e9c19cb0076cba2cb37e859a403472c908f8b3..dd9bc5a6c25dd131f4888bfb1289982c914c8dd7 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
  */
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ap1394.c,v 1.4 2005-07-07 01:22:17 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ap1394.c,v 1.5 2006-02-11 22:12:06 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -60,8 +60,8 @@ ap1394_hdr_print(register const u_char *bp, u_int length)
        fp = (const struct firewire_header *)bp;
 
        (void)printf("%s > %s",
        fp = (const struct firewire_header *)bp;
 
        (void)printf("%s > %s",

-                    linkaddr_string(fp->firewire_dhost, FIREWIRE_EUI64_LEN),
-                    linkaddr_string(fp->firewire_shost, FIREWIRE_EUI64_LEN));
+                    linkaddr_string(fp->firewire_dhost, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN),
+                    linkaddr_string(fp->firewire_shost, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN));

 
        if (!qflag) {
                (void)printf(", ethertype %s (0x%04x)",
 
        if (!qflag) {
                (void)printf(", ethertype %s (0x%04x)",

diff --git a/print-arp.c b/print-arp.c
index 3e3ce741d45a8a26114abf7617766b752cd824ba..d7f42fe4e1a02c1f825e63fd251b7e6040e776f3 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.64 2004-04-30 16:42:14 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.65 2006-02-11 22:11:40 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -49,24 +49,27 @@ static const char rcsid[] _U_ =
  * arp_tha and arp_tpa in that order, according to the lengths
  * specified.  Field names used correspond to RFC 826.
  */
  * arp_tha and arp_tpa in that order, according to the lengths
  * specified.  Field names used correspond to RFC 826.
  */

-struct arp_pkthdr {
-       u_short ar_hrd;         /* format of hardware address */
-#define ARPHRD_ETHER   1       /* ethernet hardware format */
-#define ARPHRD_IEEE802 6       /* token-ring hardware format */
-#define ARPHRD_ARCNET  7       /* arcnet hardware format */
-#define ARPHRD_FRELAY  15      /* frame relay hardware format */
-#define ARPHRD_STRIP   23      /* Ricochet Starmode Radio hardware format */
-#define ARPHRD_IEEE1394        24      /* IEEE 1394 (FireWire) hardware format */
-       u_short ar_pro;         /* format of protocol address */
-       u_char  ar_hln;         /* length of hardware address */
-       u_char  ar_pln;         /* length of protocol address */
-       u_short ar_op;          /* one of: */
-#define        ARPOP_REQUEST   1       /* request to resolve address */
-#define        ARPOP_REPLY     2       /* response to previous request */
-#define        ARPOP_REVREQUEST 3      /* request protocol address given hardware */
-#define        ARPOP_REVREPLY  4       /* response giving protocol address */
-#define ARPOP_INVREQUEST 8     /* request to identify peer */
-#define ARPOP_INVREPLY 9       /* response identifying peer */
+struct  arp_pkthdr {
+        u_short ar_hrd;         /* format of hardware address */
+#define ARPHRD_ETHER    1       /* ethernet hardware format */
+#define ARPHRD_IEEE802  6       /* token-ring hardware format */
+#define ARPHRD_ARCNET   7       /* arcnet hardware format */
+#define ARPHRD_FRELAY   15      /* frame relay hardware format */
+#define ARPHRD_ATM2225  19      /* ATM (RFC 2225) */
+#define ARPHRD_STRIP    23      /* Ricochet Starmode Radio hardware format */
+#define ARPHRD_IEEE1394 24      /* IEEE 1394 (FireWire) hardware format */
+        u_short ar_pro;         /* format of protocol address */
+        u_char  ar_hln;         /* length of hardware address */
+        u_char  ar_pln;         /* length of protocol address */
+        u_short ar_op;          /* one of: */
+#define ARPOP_REQUEST   1       /* request to resolve address */
+#define ARPOP_REPLY     2       /* response to previous request */
+#define ARPOP_REVREQUEST 3      /* request protocol address given hardware */
+#define ARPOP_REVREPLY  4       /* response giving protocol address */
+#define ARPOP_INVREQUEST 8      /* request to identify peer */
+#define ARPOP_INVREPLY  9       /* response identifying peer */
+#define ARPOP_NAK       10      /* NAK - only valif for ATM ARP */
+

 /*
  * The remaining fields are variable in size,
  * according to the sizes above.
 /*
  * The remaining fields are variable in size,
  * according to the sizes above.


@@ -86,8 +89,8 @@ struct        arp_pkthdr {
 #define ARP_HDRLEN     8
 
 #define HRD(ap) EXTRACT_16BITS(&(ap)->ar_hrd)
 #define ARP_HDRLEN     8
 
 #define HRD(ap) EXTRACT_16BITS(&(ap)->ar_hrd)

-#define HLN(ap) ((ap)->ar_hln)
-#define PLN(ap) ((ap)->ar_pln)
+#define HRD_LEN(ap) ((ap)->ar_hln)
+#define PROTO_LEN(ap) ((ap)->ar_pln)

 #define OP(ap)  EXTRACT_16BITS(&(ap)->ar_op)
 #define PRO(ap) EXTRACT_16BITS(&(ap)->ar_pro)
 #define SHA(ap) (ar_sha(ap))
 #define OP(ap)  EXTRACT_16BITS(&(ap)->ar_op)
 #define PRO(ap) EXTRACT_16BITS(&(ap)->ar_pro)
 #define SHA(ap) (ar_sha(ap))


@@ -95,6 +98,29 @@ struct       arp_pkthdr {
 #define THA(ap) (ar_tha(ap))
 #define TPA(ap) (ar_tpa(ap))
 
 #define THA(ap) (ar_tha(ap))
 #define TPA(ap) (ar_tpa(ap))
 

+
+struct tok arpop_values[] = {
+    { ARPOP_REQUEST, "Request" },
+    { ARPOP_REPLY, "Reply" },
+    { ARPOP_REVREQUEST, "Reverse Request" },
+    { ARPOP_REVREPLY, "Reverse Reply" },
+    { ARPOP_INVREQUEST, "Inverse Request" },
+    { ARPOP_INVREPLY, "Inverse Reply" },
+    { ARPOP_NAK, "NACK Reply" },
+    { 0, NULL }
+};
+
+struct tok arphrd_values[] = {
+    { ARPHRD_ETHER, "Ethernet" },
+    { ARPHRD_IEEE802, "TokenRing" },
+    { ARPHRD_ARCNET, "ArcNet" },
+    { ARPHRD_FRELAY, "FrameRelay" },
+    { ARPHRD_STRIP, "Strip" },
+    { ARPHRD_IEEE1394, "IEEE 1394" },
+    { ARPHRD_ATM2225, "ATM" },
+    { 0, NULL }
+};
+

 /*
  * ATM Address Resolution Protocol.
  *
 /*
  * ATM Address Resolution Protocol.
  *


@@ -104,20 +130,18 @@ struct    arp_pkthdr {
  * the ATM number and subaddress - and the hardware addresses consist
  * of an ATM number and an ATM subaddress.
  */
  * the ATM number and subaddress - and the hardware addresses consist
  * of an ATM number and an ATM subaddress.
  */

-struct atmarp_pkthdr {
-       u_short aar_hrd;        /* format of hardware address */
-#define ARPHRD_ATM2225 19      /* ATM (RFC 2225) */
-       u_short aar_pro;        /* format of protocol address */
-       u_char  aar_shtl;       /* length of source ATM number */
-       u_char  aar_sstl;       /* length of source ATM subaddress */
-#define ATMARP_IS_E164 0x40    /* bit in type/length for E.164 format */
-#define ATMARP_LEN_MASK        0x3F    /* length of {sub}address in type/length */
-       u_short aar_op;         /* same as regular ARP */
-#define ATMARPOP_NAK   10      /* NAK */
-       u_char  aar_spln;       /* length of source protocol address */
-       u_char  aar_thtl;       /* length of target ATM number */
-       u_char  aar_tstl;       /* length of target ATM subaddress */
-       u_char  aar_tpln;       /* length of target protocol address */
+struct  atmarp_pkthdr {
+        u_short aar_hrd;        /* format of hardware address */
+        u_short aar_pro;        /* format of protocol address */
+        u_char  aar_shtl;       /* length of source ATM number */
+        u_char  aar_sstl;       /* length of source ATM subaddress */
+#define ATMARP_IS_E164  0x40    /* bit in type/length for E.164 format */
+#define ATMARP_LEN_MASK 0x3F    /* length of {sub}address in type/length */
+        u_short aar_op;         /* same as regular ARP */
+        u_char  aar_spln;       /* length of source protocol address */
+        u_char  aar_thtl;       /* length of target ATM number */
+        u_char  aar_tstl;       /* length of target ATM subaddress */
+        u_char  aar_tpln;       /* length of target protocol address */

 /*
  * The remaining fields are variable in size,
  * according to the sizes above.
 /*
  * The remaining fields are variable in size,
  * according to the sizes above.


@@ -132,19 +156,19 @@ struct    atmarp_pkthdr {
 #endif
 
 #define ATMHRD(ap)  EXTRACT_16BITS(&(ap)->aar_hrd)
 #endif
 
 #define ATMHRD(ap)  EXTRACT_16BITS(&(ap)->aar_hrd)

-#define ATMSHLN(ap) ((ap)->aar_shtl & ATMARP_LEN_MASK)
+#define ATMSHRD_LEN(ap) ((ap)->aar_shtl & ATMARP_LEN_MASK)

 #define ATMSSLN(ap) ((ap)->aar_sstl & ATMARP_LEN_MASK)
 #define ATMSSLN(ap) ((ap)->aar_sstl & ATMARP_LEN_MASK)

-#define ATMSPLN(ap) ((ap)->aar_spln)
+#define ATMSPROTO_LEN(ap) ((ap)->aar_spln)

 #define ATMOP(ap)   EXTRACT_16BITS(&(ap)->aar_op)
 #define ATMPRO(ap)  EXTRACT_16BITS(&(ap)->aar_pro)
 #define ATMOP(ap)   EXTRACT_16BITS(&(ap)->aar_op)
 #define ATMPRO(ap)  EXTRACT_16BITS(&(ap)->aar_pro)

-#define ATMTHLN(ap) ((ap)->aar_thtl & ATMARP_LEN_MASK)
+#define ATMTHRD_LEN(ap) ((ap)->aar_thtl & ATMARP_LEN_MASK)

 #define ATMTSLN(ap) ((ap)->aar_tstl & ATMARP_LEN_MASK)
 #define ATMTSLN(ap) ((ap)->aar_tstl & ATMARP_LEN_MASK)

-#define ATMTPLN(ap) ((ap)->aar_tpln)
+#define ATMTPROTO_LEN(ap) ((ap)->aar_tpln)

 #define aar_sha(ap)    ((const u_char *)((ap)+1))
 #define aar_sha(ap)    ((const u_char *)((ap)+1))

-#define aar_ssa(ap)    (aar_sha(ap) + ATMSHLN(ap))
+#define aar_ssa(ap)    (aar_sha(ap) + ATMSHRD_LEN(ap))

 #define aar_spa(ap)    (aar_ssa(ap) + ATMSSLN(ap))
 #define aar_spa(ap)    (aar_ssa(ap) + ATMSSLN(ap))

-#define aar_tha(ap)    (aar_spa(ap) + ATMSPLN(ap))
-#define aar_tsa(ap)    (aar_tha(ap) + ATMTHLN(ap))
+#define aar_tha(ap)    (aar_spa(ap) + ATMSPROTO_LEN(ap))
+#define aar_tsa(ap)    (aar_tha(ap) + ATMTHRD_LEN(ap))

 #define aar_tpa(ap)    (aar_tsa(ap) + ATMTSLN(ap))
 };
 
 #define aar_tpa(ap)    (aar_tsa(ap) + ATMTSLN(ap))
 };
 


@@ -165,10 +189,10 @@ atmarp_addr_print(netdissect_options *ndo,
        if (ha_len == 0)
                ND_PRINT((ndo, "<No address>"));
        else {
        if (ha_len == 0)
                ND_PRINT((ndo, "<No address>"));
        else {

-               ND_PRINT((ndo, "%s", linkaddr_string(ha, ha_len)));
+               ND_PRINT((ndo, "%s", linkaddr_string(ha, LINKADDR_ATM, ha_len)));

                if (srca_len != 0) 
                        ND_PRINT((ndo, ",%s",
                if (srca_len != 0) 
                        ND_PRINT((ndo, ",%s",

-                                 linkaddr_string(srca, srca_len)));
+                                 linkaddr_string(srca, LINKADDR_ATM, srca_len)));

        }
 }
 
        }
 }
 


@@ -186,69 +210,85 @@ atmarp_print(netdissect_options *ndo,
        pro = ATMPRO(ap);
        op = ATMOP(ap);
 
        pro = ATMPRO(ap);
        op = ATMOP(ap);
 

-       if (!ND_TTEST2(*aar_tpa(ap), ATMTPLN(ap))) {
-               ND_PRINT((ndo, "truncated-atmarp"));
+       if (!ND_TTEST2(*aar_tpa(ap), ATMTPROTO_LEN(ap))) {
+               ND_PRINT((ndo, "[|ARP]"));

                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;
        }
 
                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;
        }
 

+        if (!ndo->ndo_eflag) {
+            ND_PRINT((ndo, "ARP"));
+        }
+

        if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||
        if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||

-           ATMSPLN(ap) != 4 || ATMTPLN(ap) != 4) {
-               ND_PRINT((ndo, "atmarp-#%d for proto #%d (%d/%d) hardware #%d",
-                         op, pro, ATMSPLN(ap), ATMTPLN(ap), hrd));
-               return;
+           ATMSPROTO_LEN(ap) != 4 ||
+            ATMTPROTO_LEN(ap) != 4 ||
+            ndo->ndo_vflag) {
+                ND_PRINT((ndo, "%s%s, %s (len %u/%u)",
+                          ndo->ndo_eflag ? "" : ", ",
+                          tok2str(arphrd_values, "Unknown Hardware (%u)", hrd),
+                          tok2str(ethertype_values, "Unknown Protocol (0x%04x)", pro),
+                          ATMSPROTO_LEN(ap),
+                          ATMTPROTO_LEN(ap)));
+
+                /* don't know know about the address formats */
+                if (!ndo->ndo_vflag) {
+                    goto out;
+                }

        }
        }

-       if (pro == ETHERTYPE_TRAIL)
-               ND_PRINT((ndo, "trailer-"));
+
+        /* print operation */
+        printf(", %s ", tok2str(arpop_values, "Unknown (%u)", op));
+

        switch (op) {
 
        case ARPOP_REQUEST:
        switch (op) {
 
        case ARPOP_REQUEST:

-               ND_PRINT((ndo, "arp who-has %s", ipaddr_string(ATMTPA(ap))));
-               if (ATMTHLN(ap) != 0) {
+               ND_PRINT((ndo, "who-has %s", ipaddr_string(ATMTPA(ap))));
+               if (ATMTHRD_LEN(ap) != 0) {

                        ND_PRINT((ndo, " ("));
                        ND_PRINT((ndo, " ("));

-                       atmarp_addr_print(ndo, ATMTHA(ap), ATMTHLN(ap),
+                       atmarp_addr_print(ndo, ATMTHA(ap), ATMTHRD_LEN(ap),

                            ATMTSA(ap), ATMTSLN(ap));
                        ND_PRINT((ndo, ")"));
                }
                            ATMTSA(ap), ATMTSLN(ap));
                        ND_PRINT((ndo, ")"));
                }

-               ND_PRINT((ndo, " tell %s", ipaddr_string(ATMSPA(ap))));
+               ND_PRINT((ndo, "tell %s", ipaddr_string(ATMSPA(ap))));

                break;
 
        case ARPOP_REPLY:
                break;
 
        case ARPOP_REPLY:

-               ND_PRINT((ndo, "arp reply %s", ipaddr_string(ATMSPA(ap))));
-               ND_PRINT((ndo, " is-at "));
-               atmarp_addr_print(ndo, ATMSHA(ap), ATMSHLN(ap), ATMSSA(ap),
-                   ATMSSLN(ap));
+               ND_PRINT((ndo, "%s is-at ", ipaddr_string(ATMSPA(ap))));
+               atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),
+                                  ATMSSLN(ap));

                break;
 
        case ARPOP_INVREQUEST:
                break;
 
        case ARPOP_INVREQUEST:

-               ND_PRINT((ndo, "invarp who-is "));
-               atmarp_addr_print(ndo, ATMTHA(ap), ATMTHLN(ap), ATMTSA(ap),
+               ND_PRINT((ndo, "who-is "));
+               atmarp_addr_print(ndo, ATMTHA(ap), ATMTHRD_LEN(ap), ATMTSA(ap),

                    ATMTSLN(ap));
                ND_PRINT((ndo, " tell "));
                    ATMTSLN(ap));
                ND_PRINT((ndo, " tell "));

-               atmarp_addr_print(ndo, ATMSHA(ap), ATMSHLN(ap), ATMSSA(ap),
+               atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),

                    ATMSSLN(ap));
                break;
 
        case ARPOP_INVREPLY:
                    ATMSSLN(ap));
                break;
 
        case ARPOP_INVREPLY:

-               ND_PRINT((ndo, "invarp reply "));
-               atmarp_addr_print(ndo, ATMSHA(ap), ATMSHLN(ap), ATMSSA(ap),
+               atmarp_addr_print(ndo, ATMSHA(ap), ATMSHRD_LEN(ap), ATMSSA(ap),

                    ATMSSLN(ap));
                    ATMSSLN(ap));

-               ND_PRINT((ndo, " at %s", ipaddr_string(ATMSPA(ap))));
+               ND_PRINT((ndo, "at %s", ipaddr_string(ATMSPA(ap))));

                break;
 
                break;
 

-       case ATMARPOP_NAK:
-               ND_PRINT((ndo, "nak reply for %s",
-                         ipaddr_string(ATMSPA(ap))));
+       case ARPOP_NAK:
+               ND_PRINT((ndo, "for %s", ipaddr_string(ATMSPA(ap))));

                break;
 
        default:
                break;
 
        default:

-               ND_PRINT((ndo, "atmarp-#%d", op));

                ND_DEFAULTPRINT((const u_char *)ap, caplen);
                return;
        }
                ND_DEFAULTPRINT((const u_char *)ap, caplen);
                return;
        }

-       return;
+
+ out:
+        ND_PRINT((ndo, ", length %u", length));
+        return;
+

 trunc:
 trunc:

-       ND_PRINT((ndo, "[|atmarp]"));
+       ND_PRINT((ndo, "[|ARP]"));

 }
 
 void
 }
 
 void


@@ -256,81 +296,114 @@ arp_print(netdissect_options *ndo,
          const u_char *bp, u_int length, u_int caplen)
 {
        const struct arp_pkthdr *ap;
          const u_char *bp, u_int length, u_int caplen)
 {
        const struct arp_pkthdr *ap;

-       u_short pro, hrd, op;
+       u_short pro, hrd, op, linkaddr;

 
        ap = (const struct arp_pkthdr *)bp;
        ND_TCHECK(*ap);
 
        ap = (const struct arp_pkthdr *)bp;
        ND_TCHECK(*ap);

+

        hrd = HRD(ap);
        hrd = HRD(ap);

-       if (hrd == ARPHRD_ATM2225) {
-               atmarp_print(ndo, bp, length, caplen);
-               return;
-       }

        pro = PRO(ap);
        op = OP(ap);
 
        pro = PRO(ap);
        op = OP(ap);
 

-       if (!ND_TTEST2(*ar_tpa(ap), PLN(ap))) {
-               ND_PRINT((ndo, "truncated-arp"));
+        
+        /* if its ATM then call the ATM ARP printer
+           for Frame-relay ARP most of the fields
+           are similar to Ethernet so overload the Ethernet Printer
+           and set the linkaddr type for linkaddr_string() accordingly */
+
+        switch(hrd) {
+        case ARPHRD_ATM2225:
+            atmarp_print(ndo, bp, length, caplen);
+            return;
+        case ARPHRD_FRELAY:
+            linkaddr = LINKADDR_FRELAY;
+        default:
+            linkaddr = LINKADDR_ETHER;
+            break;
+       }
+
+       if (!ND_TTEST2(*ar_tpa(ap), PROTO_LEN(ap))) {
+               ND_PRINT((ndo, "[|ARP]"));

                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;
        }
 
                ND_DEFAULTPRINT((const u_char *)ap, length);
                return;
        }
 

-       if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||
-           PLN(ap) != 4 || HLN(ap) == 0) {
-               ND_PRINT((ndo, "arp-#%d for proto #%d (%d) hardware #%d (%d)",
-                         op, pro, PLN(ap), hrd, HLN(ap)));
-               return;
+        if (!ndo->ndo_eflag) {
+            ND_PRINT((ndo, "ARP"));
+        }
+
+        /* print hardware type/len and proto type/len */
+        if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||
+           PROTO_LEN(ap) != 4 ||
+            HRD_LEN(ap) == 0 ||
+            ndo->ndo_vflag) {
+            ND_PRINT((ndo, "%s%s (len %u), %s (len %u)",
+                      ndo->ndo_eflag ? "" : ", ",
+                      tok2str(arphrd_values, "Unknown Hardware (%u)", hrd),
+                      HRD_LEN(ap),
+                      tok2str(ethertype_values, "Unknown Protocol (0x%04x)", pro),
+                      PROTO_LEN(ap)));
+
+            /* don't know know about the address formats */
+            if (!ndo->ndo_vflag) {
+                goto out;
+            }

        }
        }

-       if (pro == ETHERTYPE_TRAIL)
-               ND_PRINT((ndo, "trailer-"));
+
+        /* print operation */
+        printf(", %s ", tok2str(arpop_values, "Unknown (%u)", op));
+

        switch (op) {
 
        case ARPOP_REQUEST:
        switch (op) {
 
        case ARPOP_REQUEST:

-               ND_PRINT((ndo, "arp who-has %s", ipaddr_string(TPA(ap))));
-               if (memcmp((const char *)ezero, (const char *)THA(ap), HLN(ap)) != 0)
+               ND_PRINT((ndo, "who-has %s", ipaddr_string(TPA(ap))));
+               if (memcmp((const char *)ezero, (const char *)THA(ap), HRD_LEN(ap)) != 0)

                        ND_PRINT((ndo, " (%s)",
                        ND_PRINT((ndo, " (%s)",

-                                 linkaddr_string(THA(ap), HLN(ap))));
+                                 linkaddr_string(THA(ap), linkaddr, HRD_LEN(ap))));

                ND_PRINT((ndo, " tell %s", ipaddr_string(SPA(ap))));
                break;
 
        case ARPOP_REPLY:
                ND_PRINT((ndo, " tell %s", ipaddr_string(SPA(ap))));
                break;
 
        case ARPOP_REPLY:

-               ND_PRINT((ndo, "arp reply %s", ipaddr_string(SPA(ap))));
-               ND_PRINT((ndo, " is-at %s", linkaddr_string(SHA(ap), HLN(ap))));
+               ND_PRINT((ndo, "%s is-at %s",
+                          ipaddr_string(SPA(ap)),
+                          linkaddr_string(SHA(ap), linkaddr, HRD_LEN(ap))));

                break;
 
        case ARPOP_REVREQUEST:
                break;
 
        case ARPOP_REVREQUEST:

-               ND_PRINT((ndo, "rarp who-is %s tell %s",
-                         linkaddr_string(THA(ap), HLN(ap)),
-                         linkaddr_string(SHA(ap), HLN(ap))));
+               ND_PRINT((ndo, "who-is %s tell %s",
+                         linkaddr_string(THA(ap), linkaddr, HRD_LEN(ap)),
+                         linkaddr_string(SHA(ap), linkaddr, HRD_LEN(ap))));

                break;
 
        case ARPOP_REVREPLY:
                break;
 
        case ARPOP_REVREPLY:

-               ND_PRINT((ndo, "rarp reply %s at %s",
-                         linkaddr_string(THA(ap), HLN(ap)),
+               ND_PRINT((ndo, "%s at %s",
+                         linkaddr_string(THA(ap), linkaddr, HRD_LEN(ap)),

                          ipaddr_string(TPA(ap))));
                break;
 
        case ARPOP_INVREQUEST:
                          ipaddr_string(TPA(ap))));
                break;
 
        case ARPOP_INVREQUEST:

-               ND_PRINT((ndo, "invarp who-is %s tell %s",
-                         linkaddr_string(THA(ap), HLN(ap)),
-                         linkaddr_string(SHA(ap), HLN(ap))));
+               ND_PRINT((ndo, "who-is %s tell %s",
+                         linkaddr_string(THA(ap), linkaddr, HRD_LEN(ap)),
+                         linkaddr_string(SHA(ap), linkaddr, HRD_LEN(ap))));

                break;
 
        case ARPOP_INVREPLY:
                break;
 
        case ARPOP_INVREPLY:

-               ND_PRINT((ndo,"invarp reply %s at %s",
-                         linkaddr_string(THA(ap), HLN(ap)),
+               ND_PRINT((ndo,"%s at %s",
+                         linkaddr_string(THA(ap), linkaddr, HRD_LEN(ap)),

                          ipaddr_string(TPA(ap))));
                break;
 
        default:
                          ipaddr_string(TPA(ap))));
                break;
 
        default:

-               ND_PRINT((ndo, "arp-#%d", op));

                ND_DEFAULTPRINT((const u_char *)ap, caplen);
                return;
        }
                ND_DEFAULTPRINT((const u_char *)ap, caplen);
                return;
        }

-       if (hrd != ARPHRD_ETHER)
-               ND_PRINT((ndo, " hardware #%d", hrd));
+
+ out:
+        ND_PRINT((ndo, ", length %u", length));
+

        return;
 trunc:
        return;
 trunc:

-       ND_PRINT((ndo, "[|arp]"));
+       ND_PRINT((ndo, "[|ARP]"));

 }
 
 /*
 }
 
 /*

diff --git a/print-fr.c b/print-fr.c
index 1b712ac985ae926791e3b8db9b27ffc716334920..713e63ebe6764861d07b3d46cb18ebe92b601e33 100644 (file)
--- a/print-fr.c
+++ b/print-fr.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-       "@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.49 2005-12-13 13:44:30 hannes Exp $ (LBL)";
+       "@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.50 2006-02-11 22:11:40 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -100,7 +100,7 @@ struct tok frf_flag_values[] = {
 /* Finds out Q.922 address length, DLCI and flags. Returns 0 on success
  * save the flags dep. on address length
  */
 /* Finds out Q.922 address length, DLCI and flags. Returns 0 on success
  * save the flags dep. on address length
  */

-static int parse_q922_addr(const u_char *p, u_int *dlci, u_int *sdlcore,
+static int parse_q922_addr(const u_char *p, u_int *dlci,

                            u_int *addr_len, u_int8_t *flags)
 {
        if ((p[0] & FR_EA_BIT))
                            u_int *addr_len, u_int8_t *flags)
 {
        if ((p[0] & FR_EA_BIT))


@@ -130,14 +130,26 @@ static int parse_q922_addr(const u_char *p, u_int *dlci, u_int *sdlcore,
 
         flags[3] = p[0] & 0x02;
 
 
         flags[3] = p[0] & 0x02;
 

-       if (p[0] & 0x02)
-                *sdlcore =  p[0] >> 2;
-       else
-               *dlci = (*dlci << 6) | (p[0] >> 2);
+        *dlci = (*dlci << 6) | (p[0] >> 2);

 
        return 0;
 }
 
 
        return 0;
 }
 

+char *q922_string(const u_char *p) {
+
+    static u_int dlci, addr_len;
+    static u_int8_t flags[4];
+    static char buffer[sizeof("DLCI xxxxxxxxxx")];
+    memset(buffer, 0, sizeof(buffer));
+
+    if (parse_q922_addr(p, &dlci, &addr_len, flags) == 0){
+        snprintf(buffer, sizeof(buffer), "DLCI %u", dlci);
+    }
+
+    return buffer;
+}
+
+

 /* Frame Relay packet structure, with flags and CRC removed
 
                   +---------------------------+
 /* Frame Relay packet structure, with flags and CRC removed
 
                   +---------------------------+


@@ -222,13 +234,12 @@ fr_print(register const u_char *p, u_int length)
 {
        u_int16_t extracted_ethertype;
        u_int dlci;
 {
        u_int16_t extracted_ethertype;
        u_int dlci;

-        u_int sdlcore;

        u_int addr_len;
        u_int16_t nlpid;
        u_int hdr_len;
        u_int8_t flags[4];
 
        u_int addr_len;
        u_int16_t nlpid;
        u_int hdr_len;
        u_int8_t flags[4];
 

-       if (parse_q922_addr(p, &dlci, &sdlcore, &addr_len, flags)) {
+       if (parse_q922_addr(p, &dlci, &addr_len, flags)) {

                printf("Q.922, invalid address");
                return 0;
        }
                printf("Q.922, invalid address");
                return 0;
        }