OpenFlow: Have a function for each message type.

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index b4e287a633f49408ae98add46005d7944be31204..e6e6d7568c9dd97ce75bfc597b0444a5c5ce6310 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -66,14 +66,13 @@ ip_printroute(netdissect_options *ndo,
        }
        if ((length + 1) & 3)
                ND_PRINT(" [bad length %u]", length);
        }
        if ((length + 1) & 3)
                ND_PRINT(" [bad length %u]", length);

-       ND_TCHECK_1(cp + 2);

        ptr = GET_U_1(cp + 2) - 1;
        if (ptr < 3 || ((ptr + 1) & 3) || ptr > length + 1)
                ND_PRINT(" [bad ptr %u]", GET_U_1(cp + 2));
 
        for (len = 3; len < length; len += 4) {
        ptr = GET_U_1(cp + 2) - 1;
        if (ptr < 3 || ((ptr + 1) & 3) || ptr > length + 1)
                ND_PRINT(" [bad ptr %u]", GET_U_1(cp + 2));
 
        for (len = 3; len < length; len += 4) {

-               ND_TCHECK_4(cp + len);
-               ND_PRINT(" %s", ipaddr_string(ndo, cp + len));
+               ND_TCHECK_4(cp + len);  /* Needed to print the IP addresses */
+               ND_PRINT(" %s", GET_IPADDR_STRING(cp + len));

                if (ptr > len)
                        ND_PRINT(",");
        }
                if (ptr > len)
                        ND_PRINT(",");
        }


@@ -107,14 +106,12 @@ ip_finddst(netdissect_options *ndo,
        for (; length != 0; cp += len, length -= len) {
                int tt;
 
        for (; length != 0; cp += len, length -= len) {
                int tt;
 

-               ND_TCHECK_1(cp);

                tt = GET_U_1(cp);
                if (tt == IPOPT_EOL)
                        break;
                else if (tt == IPOPT_NOP)
                        len = 1;
                else {
                tt = GET_U_1(cp);
                if (tt == IPOPT_EOL)
                        break;
                else if (tt == IPOPT_NOP)
                        len = 1;
                else {

-                       ND_TCHECK_1(cp + 1);

                        len = GET_U_1(cp + 1);
                        if (len < 2)
                                break;
                        len = GET_U_1(cp + 1);
                        if (len < 2)
                                break;


@@ -183,16 +180,13 @@ ip_printts(netdissect_options *ndo,
                return (0);
        }
        ND_PRINT(" TS{");
                return (0);
        }
        ND_PRINT(" TS{");

-       ND_TCHECK_1(cp + 3);

        hoplen = ((GET_U_1(cp + 3) & 0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
        if ((length - 4) & (hoplen-1))
                ND_PRINT("[bad length %u]", length);
        hoplen = ((GET_U_1(cp + 3) & 0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
        if ((length - 4) & (hoplen-1))
                ND_PRINT("[bad length %u]", length);

-       ND_TCHECK_1(cp + 2);

        ptr = GET_U_1(cp + 2) - 1;
        len = 0;
        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
                ND_PRINT("[bad ptr %u]", GET_U_1(cp + 2));
        ptr = GET_U_1(cp + 2) - 1;
        len = 0;
        if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
                ND_PRINT("[bad ptr %u]", GET_U_1(cp + 2));

-       ND_TCHECK_1(cp + 3);

        switch (GET_U_1(cp + 3)&0xF) {
        case IPOPT_TS_TSONLY:
                ND_PRINT("TSONLY");
        switch (GET_U_1(cp + 3)&0xF) {
        case IPOPT_TS_TSONLY:
                ND_PRINT("TSONLY");


@@ -200,16 +194,7 @@ ip_printts(netdissect_options *ndo,
        case IPOPT_TS_TSANDADDR:
                ND_PRINT("TS+ADDR");
                break;
        case IPOPT_TS_TSANDADDR:
                ND_PRINT("TS+ADDR");
                break;

-       /*
-        * prespecified should really be 3, but some ones might send 2
-        * instead, and the IPOPT_TS_PRESPEC constant can apparently
-        * have both values, so we have to hard-code it here.
-        */
-
-       case 2:
-               ND_PRINT("PRESPEC2.0");
-               break;
-       case 3:                 /* IPOPT_TS_PRESPEC */
+       case IPOPT_TS_PRESPEC:

                ND_PRINT("PRESPEC");
                break;
        default:
                ND_PRINT("PRESPEC");
                break;
        default:


@@ -223,7 +208,7 @@ ip_printts(netdissect_options *ndo,
                        type = " ^ ";
                ND_TCHECK_LEN(cp + len, hoplen);
                ND_PRINT("%s%u@%s", type, GET_BE_U_4(cp + len + hoplen - 4),
                        type = " ^ ";
                ND_TCHECK_LEN(cp + len, hoplen);
                ND_PRINT("%s%u@%s", type, GET_BE_U_4(cp + len + hoplen - 4),

-                         hoplen!=8 ? "" : ipaddr_string(ndo, cp + len));
+                         hoplen!=8 ? "" : GET_IPADDR_STRING(cp + len));

                type = " ";
        }
 
                type = " ";
        }
 


@@ -257,7 +242,6 @@ ip_optprint(netdissect_options *ndo,
                ND_PRINT("%s", sep);
                sep = ",";
 
                ND_PRINT("%s", sep);
                sep = ",";
 

-               ND_TCHECK_1(cp);

                option_code = GET_U_1(cp);
 
                ND_PRINT("%s",
                option_code = GET_U_1(cp);
 
                ND_PRINT("%s",


@@ -268,7 +252,6 @@ ip_optprint(netdissect_options *ndo,
                        option_len = 1;
 
                else {
                        option_len = 1;
 
                else {

-                       ND_TCHECK_1(cp + 1);

                        option_len = GET_U_1(cp + 1);
                        if (option_len < 2) {
                                ND_PRINT(" [bad length %u]", option_len);
                        option_len = GET_U_1(cp + 1);
                        if (option_len < 2) {
                                ND_PRINT(" [bad length %u]", option_len);


@@ -468,8 +451,8 @@ ip_print(netdissect_options *ndo,
            ND_PRINT(")\n    ");
            if (truncated) {
                ND_PRINT("%s > %s: ",
            ND_PRINT(")\n    ");
            if (truncated) {
                ND_PRINT("%s > %s: ",

-                        ipaddr_string(ndo, ip->ip_src),
-                        ipaddr_string(ndo, ip->ip_dst));
+                        GET_IPADDR_STRING(ip->ip_src),
+                        GET_IPADDR_STRING(ip->ip_dst));

                nd_print_trunc(ndo);
                nd_pop_packet_info(ndo);
                return;
                nd_print_trunc(ndo);
                nd_pop_packet_info(ndo);
                return;


@@ -487,10 +470,10 @@ ip_print(netdissect_options *ndo,
                if (nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
                    nh != IPPROTO_SCTP && nh != IPPROTO_DCCP) {
                        ND_PRINT("%s > %s: ",
                if (nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
                    nh != IPPROTO_SCTP && nh != IPPROTO_DCCP) {
                        ND_PRINT("%s > %s: ",

-                                    ipaddr_string(ndo, ip->ip_src),
-                                    ipaddr_string(ndo, ip->ip_dst));
+                                    GET_IPADDR_STRING(ip->ip_src),
+                                    GET_IPADDR_STRING(ip->ip_dst));

                }
                }

-               ip_print_demux(ndo, (const u_char *)ip + hlen, len, 4,
+               ip_demux_print(ndo, (const u_char *)ip + hlen, len, 4,

                    off & IP_MF, GET_U_1(ip->ip_ttl), nh, bp);
        } else {
                /*
                    off & IP_MF, GET_U_1(ip->ip_ttl), nh, bp);
        } else {
                /*


@@ -507,8 +490,8 @@ ip_print(netdissect_options *ndo,
                 * next level protocol header.  print the ip addr
                 * and the protocol.
                 */
                 * next level protocol header.  print the ip addr
                 * and the protocol.
                 */

-               ND_PRINT("%s > %s:", ipaddr_string(ndo, ip->ip_src),
-                         ipaddr_string(ndo, ip->ip_dst));
+               ND_PRINT("%s > %s:", GET_IPADDR_STRING(ip->ip_src),
+                         GET_IPADDR_STRING(ip->ip_dst));

                if (!ndo->ndo_nflag && (p_name = netdb_protoname(ip_proto)) != NULL)
                        ND_PRINT(" %s", p_name);
                else
                if (!ndo->ndo_nflag && (p_name = netdb_protoname(ip_proto)) != NULL)
                        ND_PRINT(" %s", p_name);
                else


@@ -519,19 +502,17 @@ ip_print(netdissect_options *ndo,
 
 trunc:
        nd_print_trunc(ndo);
 
 trunc:
        nd_print_trunc(ndo);

-       return;

 }
 
 void
 ipN_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
 }
 
 void
 ipN_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {

-       ndo->ndo_protocol = "ipN";
+       ndo->ndo_protocol = "ipn";

        if (length < 1) {
                ND_PRINT("truncated-ip %u", length);
                return;
        }
 
        if (length < 1) {
                ND_PRINT("truncated-ip %u", length);
                return;
        }
 

-       ND_TCHECK_1(bp);

        switch (GET_U_1(bp) & 0xF0) {
        case 0x40:
                ip_print(ndo, bp, length);
        switch (GET_U_1(bp) & 0xF0) {
        case 0x40:
                ip_print(ndo, bp, length);


@@ -543,9 +524,4 @@ ipN_print(netdissect_options *ndo, const u_char *bp, u_int length)
                ND_PRINT("unknown ip %u", (GET_U_1(bp) & 0xF0) >> 4);
                break;
        }
                ND_PRINT("unknown ip %u", (GET_U_1(bp) & 0xF0) >> 4);
                break;
        }

-       return;
-
-trunc:
-       nd_print_trunc(ndo);
-       return;

 }
 }