Rename AF_INET{6} to AF_IP{6}.

That matches the descriptiions in the registry, and indicates that they
don't correspond to any AF_ values.

diff --git a/af.c b/af.c
index ea146014b0d98c49e7cc920d2f9052577ea1873e..ff95dfda538ba1ec2451b3b40effb9d50c17c245 100644 (file)
--- a/af.c
+++ b/af.c
@@ -25,8 +25,8 @@
 
 const struct tok af_values[] = {
     { 0,                      "Reserved"},
-    { AFNUM_INET,             "IPv4"},
-    { AFNUM_INET6,            "IPv6"},
+    { AFNUM_IP,               "IPv4"},
+    { AFNUM_IP6,              "IPv6"},
     { AFNUM_NSAP,             "NSAP"},
     { AFNUM_HDLC,             "HDLC"},
     { AFNUM_BBN1822,          "BBN 1822"},

diff --git a/af.h b/af.h
index 3c0c7908918e9cd01a8924b72b80daf3785160fc..1d8d457e33ae49ac8cd09b895616bd02a10ef57d 100644 (file)
--- a/af.h
+++ b/af.h
@@ -19,8 +19,8 @@ extern const struct tok af_values[];
 extern const struct tok bsd_af_values[];
 
 /* RFC1700 address family numbers */
-#define AFNUM_INET     1
-#define AFNUM_INET6    2
+#define AFNUM_IP       1
+#define AFNUM_IP6      2
 #define AFNUM_NSAP     3
 #define AFNUM_HDLC     4
 #define AFNUM_BBN1822  5

diff --git a/print-bgp.c b/print-bgp.c
index 2c088c0151de0ba72752d841dcdf763282d7ae61..59b080f2ae5445db7f36668259410350b9ead2a9 100644 (file)
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -1776,23 +1776,23 @@ bgp_mp_af_print(netdissect_options *ndo,
                   safi);
 
         switch(af<<8 | safi) {
-        case (AFNUM_INET<<8 | SAFNUM_UNICAST):
-        case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
-        case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
-        case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
-        case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
-        case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
-        case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
-        case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
-        case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN):
-        case (AFNUM_INET<<8 | SAFNUM_MDT):
-        case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
-        case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
-        case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
-        case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
-        case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
-        case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
-        case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
+        case (AFNUM_IP<<8 | SAFNUM_UNICAST):
+        case (AFNUM_IP<<8 | SAFNUM_MULTICAST):
+        case (AFNUM_IP<<8 | SAFNUM_UNIMULTICAST):
+        case (AFNUM_IP<<8 | SAFNUM_LABUNICAST):
+        case (AFNUM_IP<<8 | SAFNUM_RT_ROUTING_INFO):
+        case (AFNUM_IP<<8 | SAFNUM_VPNUNICAST):
+        case (AFNUM_IP<<8 | SAFNUM_VPNMULTICAST):
+        case (AFNUM_IP<<8 | SAFNUM_VPNUNIMULTICAST):
+        case (AFNUM_IP<<8 | SAFNUM_MULTICAST_VPN):
+        case (AFNUM_IP<<8 | SAFNUM_MDT):
+        case (AFNUM_IP6<<8 | SAFNUM_UNICAST):
+        case (AFNUM_IP6<<8 | SAFNUM_MULTICAST):
+        case (AFNUM_IP6<<8 | SAFNUM_UNIMULTICAST):
+        case (AFNUM_IP6<<8 | SAFNUM_LABUNICAST):
+        case (AFNUM_IP6<<8 | SAFNUM_VPNUNICAST):
+        case (AFNUM_IP6<<8 | SAFNUM_VPNMULTICAST):
+        case (AFNUM_IP6<<8 | SAFNUM_VPNUNIMULTICAST):
         case (AFNUM_NSAP<<8 | SAFNUM_UNICAST):
         case (AFNUM_NSAP<<8 | SAFNUM_MULTICAST):
         case (AFNUM_NSAP<<8 | SAFNUM_UNIMULTICAST):
@@ -1826,9 +1826,9 @@ bgp_nlri_print(netdissect_options *ndo, uint16_t af, uint8_t safi,
        u_int path_id = 0;
 
        switch (af<<8 | safi) {
-            case (AFNUM_INET<<8 | SAFNUM_UNICAST):
-            case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
-            case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
+            case (AFNUM_IP<<8 | SAFNUM_UNICAST):
+            case (AFNUM_IP<<8 | SAFNUM_MULTICAST):
+            case (AFNUM_IP<<8 | SAFNUM_UNIMULTICAST):
                 if (add_path4) {
                     path_id = GET_BE_U_4(tptr);
                     tptr += 4;
@@ -1845,7 +1845,7 @@ bgp_nlri_print(netdissect_options *ndo, uint16_t af, uint8_t safi,
                    advance += 4;
                 }
                 break;
-            case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
+            case (AFNUM_IP<<8 | SAFNUM_LABUNICAST):
                 advance = decode_labeled_prefix4(ndo, tptr, len, buf, buflen);
                 if (advance == -1)
                     ND_PRINT("\n\t    (illegal prefix length)");
@@ -1856,20 +1856,20 @@ bgp_nlri_print(netdissect_options *ndo, uint16_t af, uint8_t safi,
                 else
                     ND_PRINT("\n\t      %s", buf);
                 break;
-            case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
-            case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
-            case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
+            case (AFNUM_IP<<8 | SAFNUM_VPNUNICAST):
+            case (AFNUM_IP<<8 | SAFNUM_VPNMULTICAST):
+            case (AFNUM_IP<<8 | SAFNUM_VPNUNIMULTICAST):
                 advance = decode_labeled_vpn_prefix4(ndo, tptr, buf, buflen);
                 if (advance == -1)
                     ND_PRINT("\n\t    (illegal prefix length)");
                 else
                     ND_PRINT("\n\t      %s", buf);
                 break;
-            case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
+            case (AFNUM_IP<<8 | SAFNUM_RT_ROUTING_INFO):
                 advance = decode_rt_routing_info(ndo, tptr);
                 break;
-            case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN): /* fall through */
-            case (AFNUM_INET6<<8 | SAFNUM_MULTICAST_VPN):
+            case (AFNUM_IP<<8 | SAFNUM_MULTICAST_VPN): /* fall through */
+            case (AFNUM_IP6<<8 | SAFNUM_MULTICAST_VPN):
                 advance = decode_multicast_vpn(ndo, tptr, buf, buflen);
                 if (advance == -1)
                     ND_PRINT("\n\t    (illegal prefix length)");
@@ -1879,7 +1879,7 @@ bgp_nlri_print(netdissect_options *ndo, uint16_t af, uint8_t safi,
                     ND_PRINT("\n\t      %s", buf);
                 break;
 
-            case (AFNUM_INET<<8 | SAFNUM_MDT):
+            case (AFNUM_IP<<8 | SAFNUM_MDT):
                 advance = decode_mdt_vpn_nlri(ndo, tptr, buf, buflen);
                 if (advance == -1)
                     ND_PRINT("\n\t    (illegal prefix length)");
@@ -1888,9 +1888,9 @@ bgp_nlri_print(netdissect_options *ndo, uint16_t af, uint8_t safi,
                 else
                     ND_PRINT("\n\t      %s", buf);
                 break;
-            case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
-            case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
-            case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
+            case (AFNUM_IP6<<8 | SAFNUM_UNICAST):
+            case (AFNUM_IP6<<8 | SAFNUM_MULTICAST):
+            case (AFNUM_IP6<<8 | SAFNUM_UNIMULTICAST):
                 if (add_path6) {
                     path_id = GET_BE_U_4(tptr);
                     tptr += 4;
@@ -1907,7 +1907,7 @@ bgp_nlri_print(netdissect_options *ndo, uint16_t af, uint8_t safi,
                    advance += 4;
                 }
                 break;
-            case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
+            case (AFNUM_IP6<<8 | SAFNUM_LABUNICAST):
                 advance = decode_labeled_prefix6(ndo, tptr, len, buf, buflen);
                 if (advance == -1)
                     ND_PRINT("\n\t    (illegal prefix length)");
@@ -1918,9 +1918,9 @@ bgp_nlri_print(netdissect_options *ndo, uint16_t af, uint8_t safi,
                 else
                     ND_PRINT("\n\t      %s", buf);
                 break;
-            case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
-            case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
-            case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
+            case (AFNUM_IP6<<8 | SAFNUM_VPNUNICAST):
+            case (AFNUM_IP6<<8 | SAFNUM_VPNMULTICAST):
+            case (AFNUM_IP6<<8 | SAFNUM_VPNUNIMULTICAST):
                 advance = decode_labeled_vpn_prefix6(ndo, tptr, buf, buflen);
                 if (advance == -1)
                     ND_PRINT("\n\t    (illegal prefix length)");
@@ -2185,13 +2185,13 @@ bgp_attr_print(netdissect_options *ndo,
                     ND_PRINT(", " );
                 }
                 switch(af<<8 | safi) {
-                case (AFNUM_INET<<8 | SAFNUM_UNICAST):
-                case (AFNUM_INET<<8 | SAFNUM_MULTICAST):
-                case (AFNUM_INET<<8 | SAFNUM_UNIMULTICAST):
-                case (AFNUM_INET<<8 | SAFNUM_LABUNICAST):
-                case (AFNUM_INET<<8 | SAFNUM_RT_ROUTING_INFO):
-                case (AFNUM_INET<<8 | SAFNUM_MULTICAST_VPN):
-                case (AFNUM_INET<<8 | SAFNUM_MDT):
+                case (AFNUM_IP<<8 | SAFNUM_UNICAST):
+                case (AFNUM_IP<<8 | SAFNUM_MULTICAST):
+                case (AFNUM_IP<<8 | SAFNUM_UNIMULTICAST):
+                case (AFNUM_IP<<8 | SAFNUM_LABUNICAST):
+                case (AFNUM_IP<<8 | SAFNUM_RT_ROUTING_INFO):
+                case (AFNUM_IP<<8 | SAFNUM_MULTICAST_VPN):
+                case (AFNUM_IP<<8 | SAFNUM_MDT):
                     if (tnhlen < sizeof(nd_ipv4)) {
                         ND_PRINT("invalid len");
                         tptr += tnhlen;
@@ -2204,9 +2204,9 @@ bgp_attr_print(netdissect_options *ndo,
                         tlen -= sizeof(nd_ipv4);
                     }
                     break;
-                case (AFNUM_INET<<8 | SAFNUM_VPNUNICAST):
-                case (AFNUM_INET<<8 | SAFNUM_VPNMULTICAST):
-                case (AFNUM_INET<<8 | SAFNUM_VPNUNIMULTICAST):
+                case (AFNUM_IP<<8 | SAFNUM_VPNUNICAST):
+                case (AFNUM_IP<<8 | SAFNUM_VPNMULTICAST):
+                case (AFNUM_IP<<8 | SAFNUM_VPNUNIMULTICAST):
                     if (tnhlen < sizeof(nd_ipv4)+BGP_VPN_RD_LEN) {
                         ND_PRINT("invalid len");
                         tptr += tnhlen;
@@ -2221,10 +2221,10 @@ bgp_attr_print(netdissect_options *ndo,
                         tnhlen -= (sizeof(nd_ipv4)+BGP_VPN_RD_LEN);
                     }
                     break;
-                case (AFNUM_INET6<<8 | SAFNUM_UNICAST):
-                case (AFNUM_INET6<<8 | SAFNUM_MULTICAST):
-                case (AFNUM_INET6<<8 | SAFNUM_UNIMULTICAST):
-                case (AFNUM_INET6<<8 | SAFNUM_LABUNICAST):
+                case (AFNUM_IP6<<8 | SAFNUM_UNICAST):
+                case (AFNUM_IP6<<8 | SAFNUM_MULTICAST):
+                case (AFNUM_IP6<<8 | SAFNUM_UNIMULTICAST):
+                case (AFNUM_IP6<<8 | SAFNUM_LABUNICAST):
                     if (tnhlen < sizeof(nd_ipv6)) {
                         ND_PRINT("invalid len");
                         tptr += tnhlen;
@@ -2237,9 +2237,9 @@ bgp_attr_print(netdissect_options *ndo,
                         tnhlen -= sizeof(nd_ipv6);
                     }
                     break;
-                case (AFNUM_INET6<<8 | SAFNUM_VPNUNICAST):
-                case (AFNUM_INET6<<8 | SAFNUM_VPNMULTICAST):
-                case (AFNUM_INET6<<8 | SAFNUM_VPNUNIMULTICAST):
+                case (AFNUM_IP6<<8 | SAFNUM_VPNUNICAST):
+                case (AFNUM_IP6<<8 | SAFNUM_VPNMULTICAST):
+                case (AFNUM_IP6<<8 | SAFNUM_VPNUNIMULTICAST):
                     if (tnhlen < sizeof(nd_ipv6)+BGP_VPN_RD_LEN) {
                         ND_PRINT("invalid len");
                         tptr += tnhlen;

diff --git a/print-cfm.c b/print-cfm.c
index e950719e691d3dd40b6a25a0c272f0c7516ded65..2f9b89cf9b252b45369529a07dd48f7880ffbd53 100644 (file)
--- a/print-cfm.c
+++ b/print-cfm.c
@@ -239,7 +239,7 @@ cfm_network_addr_print(netdissect_options *ndo,
      * Resolve the passed in Address.
      */
     switch(network_addr_type) {
-    case AFNUM_INET:
+    case AFNUM_IP:
         if (length != 1 + 4) {
             ND_PRINT("(invalid IPv4 address length %u)", length - 1);
             hexdump = TRUE;
@@ -248,7 +248,7 @@ cfm_network_addr_print(netdissect_options *ndo,
         ND_PRINT(", %s", GET_IPADDR_STRING(tptr + 1));
         break;
 
-    case AFNUM_INET6:
+    case AFNUM_IP6:
         if (length != 1 + 16) {
             ND_PRINT("(invalid IPv6 address length %u)", length - 1);
             hexdump = TRUE;

diff --git a/print-ldp.c b/print-ldp.c
index 896bc40395fa0225e6b27d005b77202f0f2d5c0a..a62d22ba95a60a08f30b946d5ecaf038e635567a 100644 (file)
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -307,14 +307,14 @@ ldp_tlv_print(netdissect_options *ndo,
        ND_PRINT("\n\t      Address Family: %s, addresses",
                tok2str(af_values, "Unknown (%u)", af));
         switch (af) {
-        case AFNUM_INET:
+        case AFNUM_IP:
            while(tlv_tlen >= sizeof(nd_ipv4)) {
                ND_PRINT(" %s", GET_IPADDR_STRING(tptr));
                tlv_tlen-=sizeof(nd_ipv4);
                tptr+=sizeof(nd_ipv4);
            }
             break;
-        case AFNUM_INET6:
+        case AFNUM_IP6:
            while(tlv_tlen >= sizeof(nd_ipv6)) {
                ND_PRINT(" %s", GET_IP6ADDR_STRING(tptr));
                tlv_tlen-=sizeof(nd_ipv6);
@@ -354,7 +354,7 @@ ldp_tlv_print(netdissect_options *ndo,
            af = GET_BE_U_2(tptr);
            tptr+=2;
            tlv_tlen-=2;
-           if (af == AFNUM_INET) {
+           if (af == AFNUM_IP) {
                i=decode_prefix4(ndo, tptr, tlv_tlen, buf, sizeof(buf));
                if (i == -2)
                    goto trunc;
@@ -365,7 +365,7 @@ ldp_tlv_print(netdissect_options *ndo,
                else
                    ND_PRINT(": IPv4 prefix %s", buf);
            }
-           else if (af == AFNUM_INET6) {
+           else if (af == AFNUM_IP6) {
                i=decode_prefix6(ndo, tptr, tlv_tlen, buf, sizeof(buf));
                if (i == -2)
                    goto trunc;

diff --git a/print-lldp.c b/print-lldp.c
index 7895c1adb4a10e9c5440c4e7f94c64e396ad174e..6a41d187a0da1f86ac23db05a8c7c8472604fe71 100644 (file)
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -1349,12 +1349,12 @@ lldp_network_addr_print(netdissect_options *ndo, const u_char *tptr, u_int len)
     len--;
     af = GET_U_1(tptr);
     switch (af) {
-    case AFNUM_INET:
+    case AFNUM_IP:
         if (len < sizeof(nd_ipv4))
           return NULL;
         pfunc = ipaddr_string;
         break;
-    case AFNUM_INET6:
+    case AFNUM_IP6:
         if (len < sizeof(nd_ipv6))
           return NULL;
         pfunc = ip6addr_string;

diff --git a/print-pgm.c b/print-pgm.c
index 39597e7f57e41bc69a278921d73c7a6b5bfd3756..3b063ba76f87f1fa9faee1a0aa43586cc0fa3113 100644 (file)
--- a/print-pgm.c
+++ b/print-pgm.c
@@ -229,12 +229,12 @@ pgm_print(netdissect_options *ndo,
            bp = (const u_char *) (spm + 1);
 
            switch (GET_BE_U_2(spm->pgms_nla_afi)) {
-           case AFNUM_INET:
+           case AFNUM_IP:
                ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
                addrtostr(bp, nla_buf, sizeof(nla_buf));
                bp += sizeof(nd_ipv4);
                break;
-           case AFNUM_INET6:
+           case AFNUM_IP6:
                ND_TCHECK_LEN(bp, sizeof(nd_ipv6));
                addrtostr6(bp, nla_buf, sizeof(nla_buf));
                bp += sizeof(nd_ipv6);
@@ -261,12 +261,12 @@ pgm_print(netdissect_options *ndo,
            bp = (const u_char *) (pgm_poll + 1);
 
            switch (GET_BE_U_2(pgm_poll->pgmp_nla_afi)) {
-           case AFNUM_INET:
+           case AFNUM_IP:
                ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
                addrtostr(bp, nla_buf, sizeof(nla_buf));
                bp += sizeof(nd_ipv4);
                break;
-           case AFNUM_INET6:
+           case AFNUM_IP6:
                ND_TCHECK_LEN(bp, sizeof(nd_ipv6));
                addrtostr6(bp, nla_buf, sizeof(nla_buf));
                bp += sizeof(nd_ipv6);
@@ -339,12 +339,12 @@ pgm_print(netdissect_options *ndo,
             * and stopping if we don't have enough.
             */
            switch (GET_BE_U_2(nak->pgmn_source_afi)) {
-           case AFNUM_INET:
+           case AFNUM_IP:
                ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
                addrtostr(bp, source_buf, sizeof(source_buf));
                bp += sizeof(nd_ipv4);
                break;
-           case AFNUM_INET6:
+           case AFNUM_IP6:
                ND_TCHECK_LEN(bp, sizeof(nd_ipv6));
                addrtostr6(bp, source_buf, sizeof(source_buf));
                bp += sizeof(nd_ipv6);
@@ -360,12 +360,12 @@ pgm_print(netdissect_options *ndo,
             */
            bp += (2 * sizeof(uint16_t));
            switch (GET_BE_U_2(bp)) {
-           case AFNUM_INET:
+           case AFNUM_IP:
                ND_TCHECK_LEN(bp, sizeof(nd_ipv4));
                addrtostr(bp, group_buf, sizeof(group_buf));
                bp += sizeof(nd_ipv4);
                break;
-           case AFNUM_INET6:
+           case AFNUM_IP6:
                ND_TCHECK_LEN(bp, sizeof(nd_ipv6));
                addrtostr6(bp, group_buf, sizeof(group_buf));
                bp += sizeof(nd_ipv6);
@@ -572,7 +572,7 @@ pgm_print(netdissect_options *ndo,
                    nla_afnum = GET_BE_U_2(bp);
                    bp += 2+2;
                    switch (nla_afnum) {
-                   case AFNUM_INET:
+                   case AFNUM_IP:
                        if (opt_len != PGM_OPT_REDIRECT_FIXED_LEN + sizeof(nd_ipv4)) {
                            ND_PRINT("[Bad OPT_REDIRECT option, length %u != %u + address size]",
                                opt_len, PGM_OPT_REDIRECT_FIXED_LEN);
@@ -583,7 +583,7 @@ pgm_print(netdissect_options *ndo,
                        bp += sizeof(nd_ipv4);
                        opts_len -= PGM_OPT_REDIRECT_FIXED_LEN + sizeof(nd_ipv4);
                        break;
-                   case AFNUM_INET6:
+                   case AFNUM_IP6:
                        if (opt_len != PGM_OPT_REDIRECT_FIXED_LEN + sizeof(nd_ipv6)) {
                            ND_PRINT("[Bad OPT_REDIRECT option, length %u != %u + address size]",
                                opt_len, PGM_OPT_REDIRECT_FIXED_LEN);
@@ -729,7 +729,7 @@ pgm_print(netdissect_options *ndo,
                    nla_afnum = GET_BE_U_2(bp);
                    bp += 2+2;
                    switch (nla_afnum) {
-                   case AFNUM_INET:
+                   case AFNUM_IP:
                        if (opt_len != PGM_OPT_PGMCC_DATA_FIXED_LEN + sizeof(nd_ipv4)) {
                            ND_PRINT("[Bad OPT_PGMCC_DATA option, length %u != %u + address size]",
                                opt_len, PGM_OPT_PGMCC_DATA_FIXED_LEN);
@@ -740,7 +740,7 @@ pgm_print(netdissect_options *ndo,
                        bp += sizeof(nd_ipv4);
                        opts_len -= PGM_OPT_PGMCC_DATA_FIXED_LEN + sizeof(nd_ipv4);
                        break;
-                   case AFNUM_INET6:
+                   case AFNUM_IP6:
                        if (opt_len != PGM_OPT_PGMCC_DATA_FIXED_LEN + sizeof(nd_ipv6)) {
                            ND_PRINT("[Bad OPT_PGMCC_DATA option, length %u != %u + address size]",
                                opt_len, PGM_OPT_PGMCC_DATA_FIXED_LEN);
@@ -772,7 +772,7 @@ pgm_print(netdissect_options *ndo,
                    nla_afnum = GET_BE_U_2(bp);
                    bp += 2+2;
                    switch (nla_afnum) {
-                   case AFNUM_INET:
+                   case AFNUM_IP:
                        if (opt_len != PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN + sizeof(nd_ipv4)) {
                            ND_PRINT("[Bad OPT_PGMCC_FEEDBACK option, length %u != %u + address size]",
                                opt_len, PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN);
@@ -783,7 +783,7 @@ pgm_print(netdissect_options *ndo,
                        bp += sizeof(nd_ipv4);
                        opts_len -= PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN + sizeof(nd_ipv4);
                        break;
-                   case AFNUM_INET6:
+                   case AFNUM_IP6:
                        if (opt_len != PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN + sizeof(nd_ipv6)) {
                            ND_PRINT("[Bad OPT_PGMCC_FEEDBACK option, length %u != %u + address size]",
                                opt_len, PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN);

diff --git a/print-pim.c b/print-pim.c
index ab0973292c6a1f38155ca9c1b3fbb8e3b04f943c..cd288e8dc9c90a963bfec59750c64d9c14b4b410 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -562,10 +562,10 @@ pimv2_addr_print(netdissect_options *ndo,
                        goto trunc;
                af = GET_U_1(bp);
                switch (af) {
-               case AFNUM_INET:
+               case AFNUM_IP:
                        addr_len = (u_int)sizeof(nd_ipv4);
                        break;
-               case AFNUM_INET6:
+               case AFNUM_IP6:
                        addr_len = (u_int)sizeof(nd_ipv6);
                        break;
                default:
@@ -577,10 +577,10 @@ pimv2_addr_print(netdissect_options *ndo,
        } else {
                switch (addr_len) {
                case sizeof(nd_ipv4):
-                       af = AFNUM_INET;
+                       af = AFNUM_IP;
                        break;
                case sizeof(nd_ipv6):
-                       af = AFNUM_INET6;
+                       af = AFNUM_IP6;
                        break;
                default:
                        return -1;
@@ -596,11 +596,11 @@ pimv2_addr_print(netdissect_options *ndo,
                if (len < addr_len)
                        goto trunc;
                ND_TCHECK_LEN(bp, addr_len);
-               if (af == AFNUM_INET) {
+               if (af == AFNUM_IP) {
                        if (!silent)
                                ND_PRINT("%s", GET_IPADDR_STRING(bp));
                }
-               else if (af == AFNUM_INET6) {
+               else if (af == AFNUM_IP6) {
                        if (!silent)
                                ND_PRINT("%s", GET_IP6ADDR_STRING(bp));
                }
@@ -610,14 +610,14 @@ pimv2_addr_print(netdissect_options *ndo,
                if (len < addr_len + 2)
                        goto trunc;
                ND_TCHECK_LEN(bp, addr_len + 2);
-               if (af == AFNUM_INET) {
+               if (af == AFNUM_IP) {
                        if (!silent) {
                                ND_PRINT("%s", GET_IPADDR_STRING(bp + 2));
                                if (GET_U_1(bp + 1) != 32)
                                        ND_PRINT("/%u", GET_U_1(bp + 1));
                        }
                }
-               else if (af == AFNUM_INET6) {
+               else if (af == AFNUM_IP6) {
                        if (!silent) {
                                ND_PRINT("%s", GET_IP6ADDR_STRING(bp + 2));
                                if (GET_U_1(bp + 1) != 128)

diff --git a/print-rsvp.c b/print-rsvp.c
index df9edc6cd25c9820759091d32fb9476c63a75b4d..f26cc16640aa7e0c691c46dd267dd18d35806e22 100644 (file)
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -1299,13 +1299,13 @@ rsvp_obj_print(netdissect_options *ndo,
                     case RSVP_GEN_UNI_SUBOBJ_DESTINATION_TNA_ADDRESS:
 
                         switch(af) {
-                        case AFNUM_INET:
+                        case AFNUM_IP:
                             if (subobj_len < 8)
                                 goto subobj_tooshort;
                             ND_PRINT("%s    UNI IPv4 TNA address: %s",
                                    indent, GET_IPADDR_STRING(obj_tptr + 4));
                             break;
-                        case AFNUM_INET6:
+                        case AFNUM_IP6:
                             if (subobj_len < 20)
                                 goto subobj_tooshort;
                             ND_PRINT("%s    UNI IPv6 TNA address: %s",