Fix spaces

[tcpdump] / print-dhcp6.c

diff --git a/print-dhcp6.c b/print-dhcp6.c
index e9920082b413304a983cc4c8f77c2b30c8d279fd..5c8f15164912e4be2cbc4ff4c3b160cef92eac7d 100644 (file)
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -44,10 +44,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -105,13 +105,11 @@ static const struct tok dh6_msgtype_str[] = {
 /* DHCP6 base packet format */
 struct dhcp6 {
        union {
-               nd_uint8_t m;
-               nd_uint32_t x;
+               nd_uint8_t msgtype;
+               nd_uint32_t xid;
        } dh6_msgtypexid;
        /* options follow */
 };
-#define dh6_msgtype    dh6_msgtypexid.m
-#define dh6_xid                dh6_msgtypexid.x
 #define DH6_XIDMASK    0x00ffffff
 
 /* DHCPv6 relay messages */
@@ -282,15 +280,15 @@ dhcp6opt_print(netdissect_options *ndo,
 {
        const struct dhcp6opt *dh6o;
        const u_char *tp;
-       size_t i;
+       u_int i;
        uint16_t opttype;
-       size_t optlen;
+       uint16_t optlen;
        uint8_t auth_proto;
        uint8_t auth_alg;
        uint8_t auth_rdm;
        u_int authinfolen, authrealmlen;
-       int remain_len;  /* Length of remaining options */
-       int label_len;   /* Label length */
+       u_int remain_len;  /* Length of remaining options */
+       u_int label_len;   /* Label length */
        uint16_t subopt_code;
        uint16_t subopt_len;
        uint8_t dh6_reconf_type;
@@ -359,7 +357,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                }
                                break;
                        default:
-                               ND_PRINT(" type %d)", EXTRACT_BE_U_2(tp));
+                               ND_PRINT(" type %u)", EXTRACT_BE_U_2(tp));
                                break;
                        }
                        break;
@@ -399,7 +397,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       ND_PRINT(" %d)", EXTRACT_U_1(tp));
+                       ND_PRINT(" %u)", EXTRACT_U_1(tp));
                        break;
                case DH6OPT_ELAPSED_TIME:
                        if (optlen != 2) {
@@ -407,7 +405,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       ND_PRINT(" %d)", EXTRACT_BE_U_2(tp));
+                       ND_PRINT(" %u)", EXTRACT_BE_U_2(tp));
                        break;
                case DH6OPT_RELAY_MSG:
                        ND_PRINT(" (");
@@ -430,7 +428,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                ND_PRINT(" proto: reconfigure");
                                break;
                        default:
-                               ND_PRINT(" proto: %d", auth_proto);
+                               ND_PRINT(" proto: %u", auth_proto);
                                break;
                        }
                        tp++;
@@ -441,7 +439,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                ND_PRINT(", alg: HMAC-MD5");
                                break;
                        default:
-                               ND_PRINT(", alg: %d", auth_alg);
+                               ND_PRINT(", alg: %u", auth_alg);
                                break;
                        }
                        tp++;
@@ -451,7 +449,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                ND_PRINT(", RDM: mono");
                                break;
                        default:
-                               ND_PRINT(", RDM: %d", auth_rdm);
+                               ND_PRINT(", RDM: %u", auth_rdm);
                                break;
                        }
                        tp++;
@@ -617,7 +615,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       ND_PRINT(" %s/%d", ip6addr_string(ndo, tp + 9), EXTRACT_U_1(tp + 8));
+                       ND_PRINT(" %s/%u", ip6addr_string(ndo, tp + 9), EXTRACT_U_1(tp + 8));
                        ND_PRINT(" pltime:%u vltime:%u",
                            EXTRACT_BE_U_4(tp),
                            EXTRACT_BE_U_4(tp + 4));
@@ -634,7 +632,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       ND_PRINT(" %d)", EXTRACT_BE_U_4(tp));
+                       ND_PRINT(" %u)", EXTRACT_BE_U_4(tp));
                        break;
                case DH6OPT_REMOTE_ID:
                        if (optlen < 4) {
@@ -642,7 +640,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                break;
                        }
                        tp = (const u_char *)(dh6o + 1);
-                       ND_PRINT(" %d ", EXTRACT_BE_U_4(tp));
+                       ND_PRINT(" %u ", EXTRACT_BE_U_4(tp));
                        /*
                         * Print hex dump first 10 characters.
                         */
@@ -710,7 +708,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                tp += 2;
                                if (tp + subopt_len > cp + sizeof(*dh6o) + optlen)
                                        goto trunc;
-                               ND_PRINT(" subopt:%d", subopt_code);
+                               ND_PRINT(" subopt:%u", subopt_code);
                                switch (subopt_code) {
                                case DH6OPT_NTP_SUBOPTION_SRV_ADDR:
                                case DH6OPT_NTP_SUBOPTION_MC_ADDR:
@@ -746,7 +744,7 @@ dhcp6opt_print(netdissect_options *ndo,
                                label_len = EXTRACT_U_1(tp);
                                tp++;
                                if (label_len < remain_len - 1) {
-                                       (void)fn_printn(ndo, tp, label_len, NULL);
+                                       (void)nd_printn(ndo, tp, label_len, NULL);
                                        tp += label_len;
                                        remain_len -= (label_len + 1);
                                        if(EXTRACT_U_1(tp)) ND_PRINT(".");
@@ -766,7 +764,7 @@ dhcp6opt_print(netdissect_options *ndo,
                        }
                        tp = (const u_char *)(dh6o + 1);
                        ND_PRINT("=");
-                       (void)fn_printn(ndo, tp, (u_int)optlen, NULL);
+                       (void)nd_printn(ndo, tp, (u_int)optlen, NULL);
                        ND_PRINT(")");
                        break;
 
@@ -780,7 +778,7 @@ dhcp6opt_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("[|dhcp6ext]");
+       nd_print_trunc(ndo);
 }
 
 /*
@@ -797,16 +795,17 @@ dhcp6_print(netdissect_options *ndo,
        const u_char *extp;
        const char *name;
 
+       ndo->ndo_protocol = "dhcp6";
        ND_PRINT("dhcp6");
 
-       ep = (const u_char *)ndo->ndo_snapend;
+       ep = ndo->ndo_snapend;
        if (cp + length < ep)
                ep = cp + length;
 
        dh6 = (const struct dhcp6 *)cp;
        dh6relay = (const struct dhcp6_relay *)cp;
-       ND_TCHECK(dh6->dh6_xid);
-       msgtype = EXTRACT_U_1(dh6->dh6_msgtype);
+       ND_TCHECK_4(dh6->dh6_msgtypexid.xid);
+       msgtype = EXTRACT_U_1(dh6->dh6_msgtypexid.msgtype);
        name = tok2str(dh6_msgtype_str, "msgtype-%u", msgtype);
 
        if (!ndo->ndo_vflag) {
@@ -818,19 +817,16 @@ dhcp6_print(netdissect_options *ndo,
 
        ND_PRINT(" %s (", name);        /*)*/
        if (msgtype != DH6_RELAY_FORW && msgtype != DH6_RELAY_REPLY) {
-               ND_PRINT("xid=%x", EXTRACT_BE_U_4(dh6->dh6_xid) & DH6_XIDMASK);
+               ND_PRINT("xid=%x",
+                        EXTRACT_BE_U_4(dh6->dh6_msgtypexid.xid) & DH6_XIDMASK);
                extp = (const u_char *)(dh6 + 1);
                dhcp6opt_print(ndo, extp, ep);
        } else {                /* relay messages */
-               struct in6_addr addr6;
+               ND_TCHECK_16(dh6relay->dh6relay_peeraddr);
 
-               ND_TCHECK(dh6relay->dh6relay_peeraddr);
+               ND_PRINT("linkaddr=%s", ip6addr_string(ndo, dh6relay->dh6relay_linkaddr));
 
-               memcpy(&addr6, &dh6relay->dh6relay_linkaddr, sizeof (addr6));
-               ND_PRINT("linkaddr=%s", ip6addr_string(ndo, &addr6));
-
-               memcpy(&addr6, &dh6relay->dh6relay_peeraddr, sizeof (addr6));
-               ND_PRINT(" peeraddr=%s", ip6addr_string(ndo, &addr6));
+               ND_PRINT(" peeraddr=%s", ip6addr_string(ndo, dh6relay->dh6relay_peeraddr));
 
                dhcp6opt_print(ndo, (const u_char *)(dh6relay + 1), ep);
        }
@@ -839,5 +835,5 @@ dhcp6_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT("[|dhcp6]");
+       nd_print_trunc(ndo);
 }