adopt MacOS deprecation workaround from FreeRADIUS

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index 1fa7aab0d6cae8830aa92c9f8ac3cf37dfb9d01a..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 */
@@ -350,7 +350,7 @@ again:
                ipds->nh = enh & 0xff;
                goto again;
        }
-       
+
        case IPPROTO_IPCOMP:
        {
                int enh;
@@ -370,25 +370,25 @@ again:
        case IPPROTO_DCCP:
                dccp_print(ipds->cp, (const u_char *)ipds->ip, ipds->len);
                break;
-               
+
        case IPPROTO_TCP:
                /* pass on the MF bit plus the offset to detect fragments */
                tcp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,
                          ipds->off & (IP_MF|IP_OFFMASK));
                break;
-               
+
        case IPPROTO_UDP:
                /* pass on the MF bit plus the offset to detect fragments */
                udp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,
                          ipds->off & (IP_MF|IP_OFFMASK));
                break;
-               
+
        case IPPROTO_ICMP:
                /* pass on the MF bit plus the offset to detect fragments */
                icmp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip,
                           ipds->off & (IP_MF|IP_OFFMASK));
                break;
-               
+
        case IPPROTO_PIGP:
                /*
                 * XXX - the current IANA protocol number assignments
@@ -405,11 +405,11 @@ again:
                 */
                igrp_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
                break;
-               
+
        case IPPROTO_EIGRP:
                eigrp_print(ipds->cp, ipds->len);
                break;
-               
+
        case IPPROTO_ND:
                ND_PRINT((ndo, " nd %d", ipds->len));
                break;
@@ -434,7 +434,7 @@ again:
                        return;
                }
                break;
-               
+
 #ifdef INET6
        case IPPROTO_IPV6:
                /* ip6-in-ip encapsulation */
@@ -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));
@@ -490,7 +490,7 @@ again:
                break;
        }
 }
-              
+
 void
 ip_print_inner(netdissect_options *ndo,
               const u_char *bp,
@@ -597,7 +597,7 @@ ip_print(netdissect_options *ndo,
             }
 
             if (ipds->ip->ip_ttl >= 1)
-                (void)printf(", ttl %u", ipds->ip->ip_ttl);    
+                (void)printf(", ttl %u", ipds->ip->ip_ttl);
 
            /*
             * for the firewall guys, print id, offset.
@@ -661,11 +661,11 @@ ip_print(netdissect_options *ndo,
            if (ipds->off & 0x1fff) {
                (void)printf("%s > %s:", ipaddr_string(&ipds->ip->ip_src),
                             ipaddr_string(&ipds->ip->ip_dst));
-               if ((proto = getprotobynumber(ipds->ip->ip_p)) != NULL)
+               if (!ndo->ndo_nflag && (proto = getprotobynumber(ipds->ip->ip_p)) != NULL)
                    (void)printf(" %s", proto->p_name);
                else
                    (void)printf(" ip-proto-%d", ipds->ip->ip_p);
-           } 
+           }
        }
 }