CHANGES: Move change(s) backported to 4.99

[tcpdump] / print-arp.c

diff --git a/print-arp.c b/print-arp.c
index add9652c8b1e7cbb38d68ff9aaeb7994e103760c..950c3b24ef18d37bad7e84ca75bd4b10ebad2ae3 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -21,14 +21,11 @@
 
 /* \summary: Address Resolution Protocol (ARP) printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "ethertype.h"
@@ -65,7 +62,7 @@ struct  arp_pkthdr {
 #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 */
+#define ARPOP_NAK       10      /* NAK - only valid for ATM ARP */
 
 /*
  * The remaining fields are variable in size,
@@ -180,7 +177,7 @@ struct  atmarp_pkthdr {
 static int
 isnonzero(netdissect_options *ndo, const u_char *a, size_t len)
 {
-       while (len > 0) {
+       while (len != 0) {
                if (GET_U_1(a) != 0)
                        return (1);
                a++;
@@ -198,7 +195,7 @@ tpaddr_print_ip(netdissect_options *ndo,
        else if (PROTO_LEN(ap) != 4)
                ND_PRINT("<wrong len>");
        else
-               ND_PRINT("%s", ipaddr_string(ndo, TPA(ap)));
+               ND_PRINT("%s", GET_IPADDR_STRING(TPA(ap)));
 }
 
 static void
@@ -210,7 +207,7 @@ spaddr_print_ip(netdissect_options *ndo,
        else if (PROTO_LEN(ap) != 4)
                ND_PRINT("<wrong len>");
        else
-               ND_PRINT("%s", ipaddr_string(ndo, SPA(ap)));
+               ND_PRINT("%s", GET_IPADDR_STRING(SPA(ap)));
 }
 
 static void
@@ -221,10 +218,10 @@ atmarp_addr_print(netdissect_options *ndo,
        if (ha_len == 0)
                ND_PRINT("<No address>");
        else {
-               ND_PRINT("%s", linkaddr_string(ndo, ha, LINKADDR_ATM, ha_len));
+               ND_PRINT("%s", GET_LINKADDR_STRING(ha, LINKADDR_ATM, ha_len));
                if (srca_len != 0)
                        ND_PRINT(",%s",
-                                 linkaddr_string(ndo, srca, LINKADDR_ATM, srca_len));
+                                 GET_LINKADDR_STRING(srca, LINKADDR_ATM, srca_len));
        }
 }
 
@@ -237,7 +234,7 @@ atmarp_tpaddr_print(netdissect_options *ndo,
        else if (ATMTPROTO_LEN(ap) != 4)
                ND_PRINT("<wrong tplen>");
        else
-               ND_PRINT("%s", ipaddr_string(ndo, ATMTPA(ap)));
+               ND_PRINT("%s", GET_IPADDR_STRING(ATMTPA(ap)));
 }
 
 static void
@@ -249,7 +246,7 @@ atmarp_spaddr_print(netdissect_options *ndo,
        else if (ATMSPROTO_LEN(ap) != 4)
                ND_PRINT("<wrong splen>");
        else
-               ND_PRINT("%s", ipaddr_string(ndo, ATMSPA(ap)));
+               ND_PRINT("%s", GET_IPADDR_STRING(ATMSPA(ap)));
 }
 
 static void
@@ -266,11 +263,7 @@ atmarp_print(netdissect_options *ndo,
        pro = ATMPRO(ap);
        op = ATMOP(ap);
 
-       if (!ND_TTEST_LEN(aar_tpa(ap), ATMTPROTO_LEN(ap))) {
-               nd_print_trunc(ndo);
-               ND_DEFAULTPRINT((const u_char *)ap, length);
-               return;
-       }
+       ND_TCHECK_LEN(ATMTPA(ap), ATMTPROTO_LEN(ap));
 
         if (!ndo->ndo_eflag) {
             ND_PRINT("ARP, ");
@@ -286,7 +279,7 @@ atmarp_print(netdissect_options *ndo,
                           ATMSPROTO_LEN(ap),
                           ATMTPROTO_LEN(ap));
 
-                /* don't know know about the address formats */
+                /* don't know about the address formats */
                 if (!ndo->ndo_vflag) {
                     goto out;
                 }
@@ -347,10 +340,6 @@ atmarp_print(netdissect_options *ndo,
 
  out:
         ND_PRINT(", length %u", length);
-        return;
-
-trunc:
-       nd_print_trunc(ndo);
 }
 
 void
@@ -372,7 +361,7 @@ arp_print(netdissect_options *ndo,
         /* 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(ndo, ) accordingly */
+           and set the linkaddr type for GET_LINKADDR_STRING() accordingly */
 
         switch(hrd) {
         case ARPHRD_ATM2225:
@@ -382,15 +371,11 @@ arp_print(netdissect_options *ndo,
             linkaddr = LINKADDR_FRELAY;
             break;
         default:
-            linkaddr = LINKADDR_ETHER;
+            linkaddr = LINKADDR_MAC48;
             break;
        }
 
-       if (!ND_TTEST_LEN(TPA(ap), PROTO_LEN(ap))) {
-               nd_print_trunc(ndo);
-               ND_DEFAULTPRINT((const u_char *)ap, length);
-               return;
-       }
+       ND_TCHECK_LEN(TPA(ap), PROTO_LEN(ap));
 
         if (!ndo->ndo_eflag) {
             ND_PRINT("ARP, ");
@@ -407,7 +392,7 @@ arp_print(netdissect_options *ndo,
                       tok2str(ethertype_values, "Unknown Protocol (0x%04x)", pro),
                       PROTO_LEN(ap));
 
-            /* don't know know about the address formats */
+            /* don't know about the address formats */
             if (!ndo->ndo_vflag) {
                 goto out;
             }
@@ -425,7 +410,7 @@ arp_print(netdissect_options *ndo,
                tpaddr_print_ip(ndo, ap, pro);
                if (isnonzero(ndo, (const u_char *)THA(ap), HRD_LEN(ap)))
                        ND_PRINT(" (%s)",
-                                 linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)));
+                                 GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)));
                ND_PRINT(" tell ");
                spaddr_print_ip(ndo, ap, pro);
                break;
@@ -433,30 +418,46 @@ arp_print(netdissect_options *ndo,
        case ARPOP_REPLY:
                spaddr_print_ip(ndo, ap, pro);
                ND_PRINT(" is-at %s",
-                          linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)));
+                          GET_LINKADDR_STRING(SHA(ap), linkaddr, HRD_LEN(ap)));
                break;
 
        case ARPOP_REVREQUEST:
-               ND_PRINT("who-is %s tell %s",
-                         linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)),
-                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)));
+               /*
+                * XXX - GET_LINKADDR_STRING() may return a pointer to
+                * a static buffer, so we only have one call to it per
+                * ND_PRINT() call.
+                *
+                * This should be done in a cleaner fashion.
+                */
+               ND_PRINT("who-is %s",
+                         GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)));
+               ND_PRINT(" tell %s",
+                         GET_LINKADDR_STRING(SHA(ap), linkaddr, HRD_LEN(ap)));
                break;
 
        case ARPOP_REVREPLY:
                ND_PRINT("%s at ",
-                         linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)));
+                         GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)));
                tpaddr_print_ip(ndo, ap, pro);
                break;
 
        case ARPOP_INVREQUEST:
-               ND_PRINT("who-is %s tell %s",
-                         linkaddr_string(ndo, THA(ap), linkaddr, HRD_LEN(ap)),
-                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)));
+               /*
+                * XXX - GET_LINKADDR_STRING() may return a pointer to
+                * a static buffer, so we only have one call to it per
+                * ND_PRINT() call.
+                *
+                * This should be done in a cleaner fashion.
+                */
+               ND_PRINT("who-is %s",
+                         GET_LINKADDR_STRING(THA(ap), linkaddr, HRD_LEN(ap)));
+               ND_PRINT(" tell %s",
+                         GET_LINKADDR_STRING(SHA(ap), linkaddr, HRD_LEN(ap)));
                break;
 
        case ARPOP_INVREPLY:
                ND_PRINT("%s at ",
-                         linkaddr_string(ndo, SHA(ap), linkaddr, HRD_LEN(ap)));
+                         GET_LINKADDR_STRING(SHA(ap), linkaddr, HRD_LEN(ap)));
                spaddr_print_ip(ndo, ap, pro);
                break;
 
@@ -467,8 +468,4 @@ arp_print(netdissect_options *ndo,
 
  out:
         ND_PRINT(", length %u", length);
-
-       return;
-trunc:
-       nd_print_trunc(ndo);
 }