Avoid -E and -M options inconsistencies with no libcrypto

[tcpdump] / print-pim.c

diff --git a/print-pim.c b/print-pim.c
index 1e63062e88d93177886b3d1c21be733c912749d6..9241db3218cd63965656061e76749bf2de5791e6 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -21,9 +21,7 @@
 
 /* \summary: Protocol Independent Multicast (PIM) printer */
 
 
 /* \summary: Protocol Independent Multicast (PIM) printer */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 


@@ -34,6 +32,7 @@
 #include "ip.h"
 #include "ip6.h"
 #include "ipproto.h"
 #include "ip.h"
 #include "ip6.h"
 #include "ipproto.h"

+#include "af.h"

 
 #define PIMV1_TYPE_QUERY           0
 #define PIMV1_TYPE_REGISTER        1
 
 #define PIMV1_TYPE_QUERY           0
 #define PIMV1_TYPE_REGISTER        1


@@ -137,7 +136,7 @@ static const struct tok pimv2_df_election_flag_values[] = {
 
 /*
  * XXX: We consider a case where IPv6 is not ready yet for portability,
 
 /*
  * XXX: We consider a case where IPv6 is not ready yet for portability,

- * but PIM dependent defintions should be independent of IPv6...
+ * but PIM dependent definitions should be independent of IPv6...

  */
 
 struct pim {
  */
 
 struct pim {


@@ -189,7 +188,6 @@ pimv1_join_prune_print(netdissect_options *ndo,
 
        if (len < sizeof(nd_ipv4))
                goto trunc;
 
        if (len < sizeof(nd_ipv4))
                goto trunc;

-       ND_TCHECK_LEN(bp, sizeof(nd_ipv4));

        if (ndo->ndo_vflag > 1)
                ND_PRINT("\n");
        ND_PRINT(" Upstream Nbr: %s", GET_IPADDR_STRING(bp));
        if (ndo->ndo_vflag > 1)
                ND_PRINT("\n");
        ND_PRINT(" Upstream Nbr: %s", GET_IPADDR_STRING(bp));


@@ -218,13 +216,11 @@ pimv1_join_prune_print(netdissect_options *ndo,
                 */
                if (len < 4)
                        goto trunc;
                 */
                if (len < 4)
                        goto trunc;

-               ND_TCHECK_LEN(bp, sizeof(nd_ipv4));

                ND_PRINT("\n\tGroup: %s", GET_IPADDR_STRING(bp));
                bp += 4;
                len -= 4;
                if (len < 4)
                        goto trunc;
                ND_PRINT("\n\tGroup: %s", GET_IPADDR_STRING(bp));
                bp += 4;
                len -= 4;
                if (len < 4)
                        goto trunc;

-               ND_TCHECK_LEN(bp, sizeof(nd_ipv4));

                if (GET_BE_U_4(bp) != 0xffffffff)
                        ND_PRINT("/%s", GET_IPADDR_STRING(bp));
                bp += 4;
                if (GET_BE_U_4(bp) != 0xffffffff)
                        ND_PRINT("/%s", GET_IPADDR_STRING(bp));
                bp += 4;


@@ -259,7 +255,6 @@ pimv1_join_prune_print(netdissect_options *ndo,
        return;
 trunc:
        nd_print_trunc(ndo);
        return;
 trunc:
        nd_print_trunc(ndo);

-       return;

 }
 
 void
 }
 
 void


@@ -303,13 +298,11 @@ pimv1_print(netdissect_options *ndo,
                          GET_IPADDR_STRING(bp + 24));
                break;
        case PIMV1_TYPE_REGISTER_STOP:
                          GET_IPADDR_STRING(bp + 24));
                break;
        case PIMV1_TYPE_REGISTER_STOP:

-               ND_TCHECK_LEN(bp + 12, sizeof(nd_ipv4));

                ND_PRINT(" for %s > %s", GET_IPADDR_STRING(bp + 8),
                          GET_IPADDR_STRING(bp + 12));
                break;
        case PIMV1_TYPE_RP_REACHABILITY:
                if (ndo->ndo_vflag) {
                ND_PRINT(" for %s > %s", GET_IPADDR_STRING(bp + 8),
                          GET_IPADDR_STRING(bp + 12));
                break;
        case PIMV1_TYPE_RP_REACHABILITY:
                if (ndo->ndo_vflag) {

-                       ND_TCHECK_2(bp + 22);

                        ND_PRINT(" group %s", GET_IPADDR_STRING(bp + 8));
                        if (GET_BE_U_4(bp + 12) != 0xffffffff)
                                ND_PRINT("/%s", GET_IPADDR_STRING(bp + 12));
                        ND_PRINT(" group %s", GET_IPADDR_STRING(bp + 8));
                        if (GET_BE_U_4(bp + 12) != 0xffffffff)
                                ND_PRINT("/%s", GET_IPADDR_STRING(bp + 12));


@@ -318,7 +311,6 @@ pimv1_print(netdissect_options *ndo,
                }
                break;
        case PIMV1_TYPE_ASSERT:
                }
                break;
        case PIMV1_TYPE_ASSERT:

-               ND_TCHECK_LEN(bp + 16, sizeof(nd_ipv4));

                ND_PRINT(" for %s > %s", GET_IPADDR_STRING(bp + 16),
                          GET_IPADDR_STRING(bp + 8));
                if (GET_BE_U_4(bp + 12) != 0xffffffff)
                ND_PRINT(" for %s > %s", GET_IPADDR_STRING(bp + 16),
                          GET_IPADDR_STRING(bp + 8));
                if (GET_BE_U_4(bp + 12) != 0xffffffff)


@@ -344,7 +336,6 @@ pimv1_print(netdissect_options *ndo,
 
 trunc:
        nd_print_trunc(ndo);
 
 trunc:
        nd_print_trunc(ndo);

-       return;

 }
 
 /*
 }
 
 /*


@@ -410,7 +401,6 @@ cisco_autorp_print(netdissect_options *ndo,
 
                if (len < 4)
                        goto trunc;
 
                if (len < 4)
                        goto trunc;

-               ND_TCHECK_4(bp);

                ND_PRINT(" RP %s", GET_IPADDR_STRING(bp));
                bp += 4;
                len -= 4;
                ND_PRINT(" RP %s", GET_IPADDR_STRING(bp));
                bp += 4;
                len -= 4;


@@ -457,7 +447,6 @@ cisco_autorp_print(netdissect_options *ndo,
 
 trunc:
        nd_print_trunc(ndo);
 
 trunc:
        nd_print_trunc(ndo);

-       return;

 }
 
 void
 }
 
 void


@@ -468,9 +457,6 @@ pim_print(netdissect_options *ndo,
        uint8_t pim_typever;
 
        ndo->ndo_protocol = "pim";
        uint8_t pim_typever;
 
        ndo->ndo_protocol = "pim";

-#ifdef notyet                  /* currently we see only version and type */
-       ND_TCHECK_1(pim->pim_rsv);
-#endif

 
        pim_typever = GET_U_1(pim->pim_typever);
        switch (PIM_VER(pim_typever)) {
 
        pim_typever = GET_U_1(pim->pim_typever);
        switch (PIM_VER(pim_typever)) {


@@ -572,13 +558,12 @@ pimv2_addr_print(netdissect_options *ndo,
        if (addr_len == 0) {
                if (len < 2)
                        goto trunc;
        if (addr_len == 0) {
                if (len < 2)
                        goto trunc;

-               switch (GET_U_1(bp)) {
-               case 1:
-                       af = AF_INET;
+               af = GET_U_1(bp);
+               switch (af) {
+               case AFNUM_IP:

                        addr_len = (u_int)sizeof(nd_ipv4);
                        break;
                        addr_len = (u_int)sizeof(nd_ipv4);
                        break;

-               case 2:
-                       af = AF_INET6;
+               case AFNUM_IP6:

                        addr_len = (u_int)sizeof(nd_ipv6);
                        break;
                default:
                        addr_len = (u_int)sizeof(nd_ipv6);
                        break;
                default:


@@ -590,14 +575,13 @@ pimv2_addr_print(netdissect_options *ndo,
        } else {
                switch (addr_len) {
                case sizeof(nd_ipv4):
        } else {
                switch (addr_len) {
                case sizeof(nd_ipv4):

-                       af = AF_INET;
+                       af = AFNUM_IP;

                        break;
                case sizeof(nd_ipv6):
                        break;
                case sizeof(nd_ipv6):

-                       af = AF_INET6;
+                       af = AFNUM_IP6;

                        break;
                default:
                        return -1;
                        break;
                default:
                        return -1;

-                       break;

                }
                hdrlen = 0;
        }
                }
                hdrlen = 0;
        }


@@ -609,11 +593,10 @@ pimv2_addr_print(netdissect_options *ndo,
                if (len < addr_len)
                        goto trunc;
                ND_TCHECK_LEN(bp, addr_len);
                if (len < addr_len)
                        goto trunc;
                ND_TCHECK_LEN(bp, addr_len);

-               if (af == AF_INET) {
+               if (af == AFNUM_IP) {

                        if (!silent)
                                ND_PRINT("%s", GET_IPADDR_STRING(bp));
                        if (!silent)
                                ND_PRINT("%s", GET_IPADDR_STRING(bp));

-               }
-               else if (af == AF_INET6) {
+               } else if (af == AFNUM_IP6) {

                        if (!silent)
                                ND_PRINT("%s", GET_IP6ADDR_STRING(bp));
                }
                        if (!silent)
                                ND_PRINT("%s", GET_IP6ADDR_STRING(bp));
                }


@@ -623,14 +606,13 @@ pimv2_addr_print(netdissect_options *ndo,
                if (len < addr_len + 2)
                        goto trunc;
                ND_TCHECK_LEN(bp, addr_len + 2);
                if (len < addr_len + 2)
                        goto trunc;
                ND_TCHECK_LEN(bp, addr_len + 2);

-               if (af == AF_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));
                        }
                        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 == AF_INET6) {
+               } else if (af == AFNUM_IP6) {

                        if (!silent) {
                                ND_PRINT("%s", GET_IP6ADDR_STRING(bp + 2));
                                if (GET_U_1(bp + 1) != 128)
                        if (!silent) {
                                ND_PRINT("%s", GET_IP6ADDR_STRING(bp + 2));
                                if (GET_U_1(bp + 1) != 128)


@@ -771,7 +753,7 @@ pimv2_print(netdissect_options *ndo,
        case PIMV2_TYPE_HELLO:
            {
                uint16_t otype, olen;
        case PIMV2_TYPE_HELLO:
            {
                uint16_t otype, olen;

-               while (len > 0) {
+               while (len != 0) {

                        if (len < 4)
                                goto trunc;
                        otype = GET_BE_U_2(bp);
                        if (len < 4)
                                goto trunc;
                        otype = GET_BE_U_2(bp);


@@ -828,7 +810,6 @@ pimv2_print(netdissect_options *ndo,
                                        ND_PRINT("[option length %u != 4]", olen);
                                        nd_print_invalid(ndo);
                                        return;
                                        ND_PRINT("[option length %u != 4]", olen);
                                        nd_print_invalid(ndo);
                                        return;

-                                       break;

                                }
                                break;
 
                                }
                                break;
 


@@ -913,7 +894,6 @@ pimv2_print(netdissect_options *ndo,
                ip = (const struct ip *)bp;
                switch (IP_V(ip)) {
                 case 0: /* Null header */
                ip = (const struct ip *)bp;
                switch (IP_V(ip)) {
                 case 0: /* Null header */

-                       ND_TCHECK_4(ip->ip_dst);

                        ND_PRINT("IP-Null-header %s > %s",
                                  GET_IPADDR_STRING(ip->ip_src),
                                  GET_IPADDR_STRING(ip->ip_dst));
                        ND_PRINT("IP-Null-header %s > %s",
                                  GET_IPADDR_STRING(ip->ip_src),
                                  GET_IPADDR_STRING(ip->ip_dst));


@@ -1101,7 +1081,6 @@ pimv2_print(netdissect_options *ndo,
 
                                if (len < 2)
                                        goto trunc;
 
                                if (len < 2)
                                        goto trunc;

-                               ND_TCHECK_2(bp);

                                ND_PRINT(",holdtime=");
                                unsigned_relts_print(ndo,
                                                     GET_BE_U_2(bp));
                                ND_PRINT(",holdtime=");
                                unsigned_relts_print(ndo,
                                                     GET_BE_U_2(bp));