adopt MacOS deprecation workaround from FreeRADIUS

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index 3b33fee325cac114a83148683623590f43edf307..c74bdae1be4f6bca56bf9ee3cd5b77932127587a 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -41,7 +41,7 @@ static const char rcsid[] _U_ =
 #include "ip.h"
 #include "ipproto.h"
 
-struct tok ip_option_values[] = {
+static const struct tok ip_option_values[] = {
     { IPOPT_EOL, "EOL" },
     { IPOPT_NOP, "NOP" },
     { IPOPT_TS, "timestamp" },
@@ -303,7 +303,7 @@ trunc:
 
 #define IP_RES 0x8000
 
-static struct tok ip_frag_values[] = {
+static const struct tok ip_frag_values[] = {
         { IP_MF,        "+" },
         { IP_DF,        "DF" },
        { IP_RES,       "rsvd" }, /* The RFC3514 evil ;-) bit */
@@ -482,7 +482,7 @@ again:
                break;
 
        default:
-               if ((proto = getprotobynumber(ipds->nh)) != NULL)
+               if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL)
                        ND_PRINT((ndo, " %s", proto->p_name));
                else
                        ND_PRINT((ndo, " ip-proto-%d", ipds->nh));