fix version for next iteration

[tcpdump] / print-arp.c

diff --git a/print-arp.c b/print-arp.c
index a06c1901a7c492e86d1cc1a92107ecd9d5eb6c03..3e3ce741d45a8a26114abf7617766b752cd824ba 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.57 2002-09-04 11:22:13 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.64 2004-04-30 16:42:14 mcr Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -33,7 +33,7 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "ether.h"
 #include "ethertype.h"
 #include "addrtoname.h"
 #include "ether.h"
 #include "ethertype.h"


@@ -85,11 +85,11 @@ struct      arp_pkthdr {
 
 #define ARP_HDRLEN     8
 
 
 #define ARP_HDRLEN     8
 

-#define HRD(ap) ((ap)->ar_hrd)
+#define HRD(ap) EXTRACT_16BITS(&(ap)->ar_hrd)

 #define HLN(ap) ((ap)->ar_hln)
 #define PLN(ap) ((ap)->ar_pln)
 #define HLN(ap) ((ap)->ar_hln)
 #define PLN(ap) ((ap)->ar_pln)

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

 #define SHA(ap) (ar_sha(ap))
 #define SPA(ap) (ar_spa(ap))
 #define THA(ap) (ar_tha(ap))
 #define SHA(ap) (ar_sha(ap))
 #define SPA(ap) (ar_spa(ap))
 #define THA(ap) (ar_tha(ap))


@@ -131,12 +131,12 @@ struct    atmarp_pkthdr {
        u_char  aar_tpa[];      /* target protocol address */
 #endif
 
        u_char  aar_tpa[];      /* target protocol address */
 #endif
 

-#define ATMHRD(ap)  ((ap)->aar_hrd)
+#define ATMHRD(ap)  EXTRACT_16BITS(&(ap)->aar_hrd)

 #define ATMSHLN(ap) ((ap)->aar_shtl & ATMARP_LEN_MASK)
 #define ATMSSLN(ap) ((ap)->aar_sstl & ATMARP_LEN_MASK)
 #define ATMSPLN(ap) ((ap)->aar_spln)
 #define ATMSHLN(ap) ((ap)->aar_shtl & ATMARP_LEN_MASK)
 #define ATMSSLN(ap) ((ap)->aar_sstl & ATMARP_LEN_MASK)
 #define ATMSPLN(ap) ((ap)->aar_spln)

-#define ATMOP(ap)   ((ap)->aar_op)
-#define ATMPRO(ap)  ((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 ATMTSLN(ap) ((ap)->aar_tstl & ATMARP_LEN_MASK)
 #define ATMTPLN(ap) ((ap)->aar_tpln)
 #define ATMTHLN(ap) ((ap)->aar_thtl & ATMARP_LEN_MASK)
 #define ATMTSLN(ap) ((ap)->aar_tstl & ATMARP_LEN_MASK)
 #define ATMTPLN(ap) ((ap)->aar_tpln)


@@ -158,181 +158,184 @@ struct  atmarp_pkthdr {
 static u_char ezero[6];
 
 static void
 static u_char ezero[6];
 
 static void

-atmarp_addr_print(const u_char *ha, u_int ha_len, const u_char *sa,
-    u_int sa_len)
+atmarp_addr_print(netdissect_options *ndo,
+                 const u_char *ha, u_int ha_len, const u_char *srca,
+    u_int srca_len)

 {
 {

-       (void)printf("%s", linkaddr_string(ha, ha_len));
-       if (sa_len != 0)
-               (void)printf(",%s", linkaddr_string(sa, sa_len));
+       if (ha_len == 0)
+               ND_PRINT((ndo, "<No address>"));
+       else {
+               ND_PRINT((ndo, "%s", linkaddr_string(ha, ha_len)));
+               if (srca_len != 0) 
+                       ND_PRINT((ndo, ",%s",
+                                 linkaddr_string(srca, srca_len)));
+       }

 }
 
 static void
 }
 
 static void

-atmarp_print(const u_char *bp, u_int length, u_int caplen)
+atmarp_print(netdissect_options *ndo,
+            const u_char *bp, u_int length, u_int caplen)

 {
        const struct atmarp_pkthdr *ap;
        u_short pro, hrd, op;
 
        ap = (const struct atmarp_pkthdr *)bp;
 {
        const struct atmarp_pkthdr *ap;
        u_short pro, hrd, op;
 
        ap = (const struct atmarp_pkthdr *)bp;

-       TCHECK(*ap);
+       ND_TCHECK(*ap);

 
 

-       hrd = EXTRACT_16BITS(&ATMHRD(ap));
-       pro = EXTRACT_16BITS(&ATMPRO(ap));
-       op = EXTRACT_16BITS(&ATMOP(ap));
+       hrd = ATMHRD(ap);
+       pro = ATMPRO(ap);
+       op = ATMOP(ap);

 
 

-       if (!TTEST2(*aar_tpa(ap), ATMTPLN(ap))) {
-               (void)printf("truncated-atmarp");
-               default_print((const u_char *)ap, length);
+       if (!ND_TTEST2(*aar_tpa(ap), ATMTPLN(ap))) {
+               ND_PRINT((ndo, "truncated-atmarp"));
+               ND_DEFAULTPRINT((const u_char *)ap, length);

                return;
        }
 
        if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||
            ATMSPLN(ap) != 4 || ATMTPLN(ap) != 4) {
                return;
        }
 
        if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||
            ATMSPLN(ap) != 4 || ATMTPLN(ap) != 4) {

-               (void)printf("atmarp-#%d for proto #%d (%d/%d) hardware #%d",
-                               op, pro, ATMSPLN(ap), ATMTPLN(ap), hrd);
+               ND_PRINT((ndo, "atmarp-#%d for proto #%d (%d/%d) hardware #%d",
+                         op, pro, ATMSPLN(ap), ATMTPLN(ap), hrd));

                return;
        }
        if (pro == ETHERTYPE_TRAIL)
                return;
        }
        if (pro == ETHERTYPE_TRAIL)

-               (void)printf("trailer-");
+               ND_PRINT((ndo, "trailer-"));

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

-               (void)printf("arp who-has %s", ipaddr_string(ATMTPA(ap)));
+               ND_PRINT((ndo, "arp who-has %s", ipaddr_string(ATMTPA(ap))));

                if (ATMTHLN(ap) != 0) {
                if (ATMTHLN(ap) != 0) {

-                       (void)printf(" (");
-                       atmarp_addr_print(ATMTHA(ap), ATMTHLN(ap),
+                       ND_PRINT((ndo, " ("));
+                       atmarp_addr_print(ndo, ATMTHA(ap), ATMTHLN(ap),

                            ATMTSA(ap), ATMTSLN(ap));
                            ATMTSA(ap), ATMTSLN(ap));

-                       (void)printf(")");
+                       ND_PRINT((ndo, ")"));

                }
                }

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

                break;
 
        case ARPOP_REPLY:
                break;
 
        case ARPOP_REPLY:

-               (void)printf("arp reply %s", ipaddr_string(ATMSPA(ap)));
-               (void)printf(" is-at ");
-               if (ATMSHLN(ap) != 0)
-                       atmarp_addr_print(ATMSHA(ap), ATMSHLN(ap),
-                           ATMSSA(ap), ATMSSLN(ap));
-               else
-                       (void)printf("<No address>");
+               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));

                break;
 
        case ARPOP_INVREQUEST:
                break;
 
        case ARPOP_INVREQUEST:

-               (void)printf("invarp who-is ");
-               if (ATMTHLN(ap) != 0)
-                       atmarp_addr_print(ATMTHA(ap), ATMTHLN(ap),
-                           ATMTSA(ap), ATMTSLN(ap));
-               else
-                       (void)printf("<No address>");
-               (void)printf(" tell ");
-               if (ATMSHLN(ap) != 0)
-                       atmarp_addr_print(ATMSHA(ap), ATMSHLN(ap),
-                           ATMSSA(ap), ATMSSLN(ap));
-               else
-                       (void)printf("<No address>");
+               ND_PRINT((ndo, "invarp who-is "));
+               atmarp_addr_print(ndo, ATMTHA(ap), ATMTHLN(ap), ATMTSA(ap),
+                   ATMTSLN(ap));
+               ND_PRINT((ndo, " tell "));
+               atmarp_addr_print(ndo, ATMSHA(ap), ATMSHLN(ap), ATMSSA(ap),
+                   ATMSSLN(ap));

                break;
 
        case ARPOP_INVREPLY:
                break;
 
        case ARPOP_INVREPLY:

-               (void)printf("invarp reply ");
-               if (ATMSHLN(ap) != 0)
-                       atmarp_addr_print(ATMSHA(ap), ATMSHLN(ap),
-                           ATMSSA(ap), ATMSSLN(ap));
-               else
-                       (void)printf("<No address>");
-               (void)printf(" at %s", ipaddr_string(ATMSPA(ap)));
+               ND_PRINT((ndo, "invarp reply "));
+               atmarp_addr_print(ndo, ATMSHA(ap), ATMSHLN(ap), ATMSSA(ap),
+                   ATMSSLN(ap));
+               ND_PRINT((ndo, " at %s", ipaddr_string(ATMSPA(ap))));

                break;
 
        case ATMARPOP_NAK:
                break;
 
        case ATMARPOP_NAK:

-               (void)printf("nak reply for %s",
-                       ipaddr_string(ATMSPA(ap)));
+               ND_PRINT((ndo, "nak reply for %s",
+                         ipaddr_string(ATMSPA(ap))));

                break;
 
        default:
                break;
 
        default:

-               (void)printf("atmarp-#%d", op);
-               default_print((const u_char *)ap, caplen);
+               ND_PRINT((ndo, "atmarp-#%d", op));
+               ND_DEFAULTPRINT((const u_char *)ap, caplen);

                return;
        }
        return;
 trunc:
                return;
        }
        return;
 trunc:

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

 }
 
 void
 }
 
 void

-arp_print(const u_char *bp, u_int length, u_int caplen)
+arp_print(netdissect_options *ndo,
+         const u_char *bp, u_int length, u_int caplen)

 {
        const struct arp_pkthdr *ap;
        u_short pro, hrd, op;
 
        ap = (const struct arp_pkthdr *)bp;
 {
        const struct arp_pkthdr *ap;
        u_short pro, hrd, op;
 
        ap = (const struct arp_pkthdr *)bp;

-       TCHECK(*ap);
-       hrd = EXTRACT_16BITS(&HRD(ap));
+       ND_TCHECK(*ap);
+       hrd = HRD(ap);

        if (hrd == ARPHRD_ATM2225) {
        if (hrd == ARPHRD_ATM2225) {

-               atmarp_print(bp, length, caplen);
+               atmarp_print(ndo, bp, length, caplen);

                return;
        }
                return;
        }

-       pro = EXTRACT_16BITS(&PRO(ap));
-       op = EXTRACT_16BITS(&OP(ap));
+       pro = PRO(ap);
+       op = OP(ap);

 
 

-       if (!TTEST2(*ar_tpa(ap), PLN(ap))) {
-               (void)printf("truncated-arp");
-               default_print((const u_char *)ap, length);
+       if (!ND_TTEST2(*ar_tpa(ap), PLN(ap))) {
+               ND_PRINT((ndo, "truncated-arp"));
+               ND_DEFAULTPRINT((const u_char *)ap, length);

                return;
        }
 
        if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||
            PLN(ap) != 4 || HLN(ap) == 0) {
                return;
        }
 
        if ((pro != ETHERTYPE_IP && pro != ETHERTYPE_TRAIL) ||
            PLN(ap) != 4 || HLN(ap) == 0) {

-               (void)printf("arp-#%d for proto #%d (%d) hardware #%d (%d)",
-                               op, pro, PLN(ap), hrd, HLN(ap));
+               ND_PRINT((ndo, "arp-#%d for proto #%d (%d) hardware #%d (%d)",
+                         op, pro, PLN(ap), hrd, HLN(ap)));

                return;
        }
        if (pro == ETHERTYPE_TRAIL)
                return;
        }
        if (pro == ETHERTYPE_TRAIL)

-               (void)printf("trailer-");
+               ND_PRINT((ndo, "trailer-"));

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

-               (void)printf("arp who-has %s", ipaddr_string(TPA(ap)));
+               ND_PRINT((ndo, "arp who-has %s", ipaddr_string(TPA(ap))));

                if (memcmp((const char *)ezero, (const char *)THA(ap), HLN(ap)) != 0)
                if (memcmp((const char *)ezero, (const char *)THA(ap), HLN(ap)) != 0)

-                       (void)printf(" (%s)",
-                           linkaddr_string(THA(ap), HLN(ap)));
-               (void)printf(" tell %s", ipaddr_string(SPA(ap)));
+                       ND_PRINT((ndo, " (%s)",
+                                 linkaddr_string(THA(ap), HLN(ap))));
+               ND_PRINT((ndo, " tell %s", ipaddr_string(SPA(ap))));

                break;
 
        case ARPOP_REPLY:
                break;
 
        case ARPOP_REPLY:

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

                break;
 
        case ARPOP_REVREQUEST:
                break;
 
        case ARPOP_REVREQUEST:

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

                break;
 
        case ARPOP_REVREPLY:
                break;
 
        case ARPOP_REVREPLY:

-               (void)printf("rarp reply %s at %s",
-                       linkaddr_string(THA(ap), HLN(ap)),
-                       ipaddr_string(TPA(ap)));
+               ND_PRINT((ndo, "rarp reply %s at %s",
+                         linkaddr_string(THA(ap), HLN(ap)),
+                         ipaddr_string(TPA(ap))));

                break;
 
        case ARPOP_INVREQUEST:
                break;
 
        case ARPOP_INVREQUEST:

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

                break;
 
        case ARPOP_INVREPLY:
                break;
 
        case ARPOP_INVREPLY:

-               (void)printf("invarp reply %s at %s",
-                       linkaddr_string(THA(ap), HLN(ap)),
-                       ipaddr_string(TPA(ap)));
+               ND_PRINT((ndo,"invarp reply %s at %s",
+                         linkaddr_string(THA(ap), HLN(ap)),
+                         ipaddr_string(TPA(ap))));

                break;
 
        default:
                break;
 
        default:

-               (void)printf("arp-#%d", op);
-               default_print((const u_char *)ap, caplen);
+               ND_PRINT((ndo, "arp-#%d", op));
+               ND_DEFAULTPRINT((const u_char *)ap, caplen);

                return;
        }
        if (hrd != ARPHRD_ETHER)
                return;
        }
        if (hrd != ARPHRD_ETHER)

-               printf(" hardware #%d", hrd);
+               ND_PRINT((ndo, " hardware #%d", hrd));

        return;
 trunc:
        return;
 trunc:

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

 }
 }

+
+/*
+ * Local Variables:
+ * c-style: bsd
+ * End:
+ */
+