X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/59690cf6b7ffce3cc86936cbe658909c6ec3a687..d7b497cac78b6e22a66a6bae9bdec60a8044f67a:/print-dhcp6.c diff --git a/print-dhcp6.c b/print-dhcp6.c index 70c0e15c..e6986da0 100644 --- a/print-dhcp6.c +++ b/print-dhcp6.c @@ -26,6 +26,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + +/* \summary: IPv6 DHCP printer */ + /* * RFC3315: DHCPv6 * supported DHCPv6 options: @@ -40,17 +43,16 @@ * RFC6334: Dual-Stack Lite option, */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include #include #include -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" #include "extract.h" @@ -81,11 +83,30 @@ #define DH6_LEASEQUERY 14 #define DH6_LQ_REPLY 15 +static const struct tok dh6_msgtype_str[] = { + { DH6_SOLICIT, "solicit" }, + { DH6_ADVERTISE, "advertise" }, + { DH6_REQUEST, "request" }, + { DH6_CONFIRM, "confirm" }, + { DH6_RENEW, "renew" }, + { DH6_REBIND, "rebind" }, + { DH6_REPLY, "reply" }, + { DH6_RELEASE, "release" }, + { DH6_DECLINE, "decline" }, + { DH6_RECONFIGURE, "reconfigure" }, + { DH6_INFORM_REQ, "inf-req" }, + { DH6_RELAY_FORW, "relay-fwd" }, + { DH6_RELAY_REPLY, "relay-reply" }, + { DH6_LEASEQUERY, "leasequery" }, + { DH6_LQ_REPLY, "leasequery-reply" }, + { 0, NULL } +}; + /* DHCP6 base packet format */ struct dhcp6 { union { - u_int8_t m; - u_int32_t x; + nd_uint8_t m; + nd_uint32_t x; } dh6_msgtypexid; /* options follow */ }; @@ -95,10 +116,10 @@ struct dhcp6 { /* DHCPv6 relay messages */ struct dhcp6_relay { - u_int8_t dh6relay_msgtype; - u_int8_t dh6relay_hcnt; - u_int8_t dh6relay_linkaddr[16]; /* XXX: badly aligned */ - u_int8_t dh6relay_peeraddr[16]; + nd_uint8_t dh6relay_msgtype; + nd_uint8_t dh6relay_hcnt; + nd_uint8_t dh6relay_linkaddr[16]; /* XXX: badly aligned */ + nd_uint8_t dh6relay_peeraddr[16]; /* options follow */ }; @@ -173,159 +194,86 @@ struct dhcp6_relay { # define DH6OPT_NTP_SUBOPTION_MC_ADDR 2 # define DH6OPT_NTP_SUBOPTION_SRV_FQDN 3 #define DH6OPT_AFTR_NAME 64 +#define DH6OPT_MUDURL 112 + +static const struct tok dh6opt_str[] = { + { DH6OPT_CLIENTID, "client-ID" }, + { DH6OPT_SERVERID, "server-ID" }, + { DH6OPT_IA_NA, "IA_NA" }, + { DH6OPT_IA_TA, "IA_TA" }, + { DH6OPT_IA_ADDR, "IA_ADDR" }, + { DH6OPT_ORO, "option-request" }, + { DH6OPT_PREFERENCE, "preference" }, + { DH6OPT_ELAPSED_TIME, "elapsed-time" }, + { DH6OPT_RELAY_MSG, "relay-message" }, + { DH6OPT_AUTH, "authentication" }, + { DH6OPT_UNICAST, "server-unicast" }, + { DH6OPT_STATUS_CODE, "status-code" }, + { DH6OPT_RAPID_COMMIT, "rapid-commit" }, + { DH6OPT_USER_CLASS, "user-class" }, + { DH6OPT_VENDOR_CLASS, "vendor-class" }, + { DH6OPT_VENDOR_OPTS, "vendor-specific-info" }, + { DH6OPT_INTERFACE_ID, "interface-ID" }, + { DH6OPT_RECONF_MSG, "reconfigure-message" }, + { DH6OPT_RECONF_ACCEPT, "reconfigure-accept" }, + { DH6OPT_SIP_SERVER_D, "SIP-servers-domain" }, + { DH6OPT_SIP_SERVER_A, "SIP-servers-address" }, + { DH6OPT_DNS_SERVERS, "DNS-server" }, + { DH6OPT_DOMAIN_LIST, "DNS-search-list" }, + { DH6OPT_IA_PD, "IA_PD" }, + { DH6OPT_IA_PD_PREFIX, "IA_PD-prefix" }, + { DH6OPT_SNTP_SERVERS, "SNTP-servers" }, + { DH6OPT_LIFETIME, "lifetime" }, + { DH6OPT_NIS_SERVERS, "NIS-server" }, + { DH6OPT_NISP_SERVERS, "NIS+-server" }, + { DH6OPT_NIS_NAME, "NIS-domain-name" }, + { DH6OPT_NISP_NAME, "NIS+-domain-name" }, + { DH6OPT_BCMCS_SERVER_D, "BCMCS-domain-name" }, + { DH6OPT_BCMCS_SERVER_A, "BCMCS-server" }, + { DH6OPT_GEOCONF_CIVIC, "Geoconf-Civic" }, + { DH6OPT_REMOTE_ID, "Remote-ID" }, + { DH6OPT_SUBSCRIBER_ID, "Subscriber-ID" }, + { DH6OPT_CLIENT_FQDN, "Client-FQDN" }, + { DH6OPT_PANA_AGENT, "PANA-agent" }, + { DH6OPT_NEW_POSIX_TIMEZONE, "POSIX-timezone" }, + { DH6OPT_NEW_TZDB_TIMEZONE, "POSIX-tz-database" }, + { DH6OPT_ERO, "Echo-request-option" }, + { DH6OPT_LQ_QUERY, "Lease-query" }, + { DH6OPT_CLIENT_DATA, "LQ-client-data" }, + { DH6OPT_CLT_TIME, "Clt-time" }, + { DH6OPT_LQ_RELAY_DATA, "LQ-relay-data" }, + { DH6OPT_LQ_CLIENT_LINK, "LQ-client-link" }, + { DH6OPT_NTP_SERVER, "NTP-server" }, + { DH6OPT_AFTR_NAME, "AFTR-Name" }, + { DH6OPT_MUDURL, "MUD-URL" }, + { 0, NULL } +}; + +static const struct tok dh6opt_stcode_str[] = { + { DH6OPT_STCODE_SUCCESS, "Success" }, /* RFC3315 */ + { DH6OPT_STCODE_UNSPECFAIL, "UnspecFail" }, /* RFC3315 */ + { DH6OPT_STCODE_NOADDRAVAIL, "NoAddrsAvail" }, /* RFC3315 */ + { DH6OPT_STCODE_NOBINDING, "NoBinding" }, /* RFC3315 */ + { DH6OPT_STCODE_NOTONLINK, "NotOnLink" }, /* RFC3315 */ + { DH6OPT_STCODE_USEMULTICAST, "UseMulticast" }, /* RFC3315 */ + { DH6OPT_STCODE_NOPREFIXAVAIL, "NoPrefixAvail" }, /* RFC3633 */ + { DH6OPT_STCODE_UNKNOWNQUERYTYPE, "UnknownQueryType" }, /* RFC5007 */ + { DH6OPT_STCODE_MALFORMEDQUERY, "MalformedQuery" }, /* RFC5007 */ + { DH6OPT_STCODE_NOTCONFIGURED, "NotConfigured" }, /* RFC5007 */ + { DH6OPT_STCODE_NOTALLOWED, "NotAllowed" }, /* RFC5007 */ + { 0, NULL } +}; struct dhcp6opt { - u_int16_t dh6opt_type; - u_int16_t dh6opt_len; + nd_uint16_t dh6opt_type; + nd_uint16_t dh6opt_len; /* type-dependent data follows */ }; static const char * -dhcp6opt_name(int type) +dhcp6stcode(const uint16_t code) { - static char genstr[sizeof("opt_65535") + 1]; /* XXX thread unsafe */ - - if (type > 65535) - return "INVALID-option"; - - switch(type) { - case DH6OPT_CLIENTID: - return "client-ID"; - case DH6OPT_SERVERID: - return "server-ID"; - case DH6OPT_IA_NA: - return "IA_NA"; - case DH6OPT_IA_TA: - return "IA_TA"; - case DH6OPT_IA_ADDR: - return "IA_ADDR"; - case DH6OPT_ORO: - return "option-request"; - case DH6OPT_PREFERENCE: - return "preference"; - case DH6OPT_ELAPSED_TIME: - return "elapsed-time"; - case DH6OPT_RELAY_MSG: - return "relay-message"; - case DH6OPT_AUTH: - return "authentication"; - case DH6OPT_UNICAST: - return "server-unicast"; - case DH6OPT_STATUS_CODE: - return "status-code"; - case DH6OPT_RAPID_COMMIT: - return "rapid-commit"; - case DH6OPT_USER_CLASS: - return "user-class"; - case DH6OPT_VENDOR_CLASS: - return "vendor-class"; - case DH6OPT_VENDOR_OPTS: - return "vendor-specific-info"; - case DH6OPT_INTERFACE_ID: - return "interface-ID"; - case DH6OPT_RECONF_MSG: - return "reconfigure-message"; - case DH6OPT_RECONF_ACCEPT: - return "reconfigure-accept"; - case DH6OPT_SIP_SERVER_D: - return "SIP-servers-domain"; - case DH6OPT_SIP_SERVER_A: - return "SIP-servers-address"; - case DH6OPT_DNS_SERVERS: - return "DNS-server"; - case DH6OPT_DOMAIN_LIST: - return "DNS-search-list"; - case DH6OPT_IA_PD: - return "IA_PD"; - case DH6OPT_IA_PD_PREFIX: - return "IA_PD-prefix"; - case DH6OPT_SNTP_SERVERS: - return "SNTP-servers"; - case DH6OPT_LIFETIME: - return "lifetime"; - case DH6OPT_NIS_SERVERS: - return "NIS-server"; - case DH6OPT_NISP_SERVERS: - return "NIS+-server"; - case DH6OPT_NIS_NAME: - return "NIS-domain-name"; - case DH6OPT_NISP_NAME: - return "NIS+-domain-name"; - case DH6OPT_BCMCS_SERVER_D: - return "BCMCS-domain-name"; - case DH6OPT_BCMCS_SERVER_A: - return "BCMCS-server"; - case DH6OPT_GEOCONF_CIVIC: - return "Geoconf-Civic"; - case DH6OPT_REMOTE_ID: - return "Remote-ID"; - case DH6OPT_SUBSCRIBER_ID: - return "Subscriber-ID"; - case DH6OPT_CLIENT_FQDN: - return "Client-FQDN"; - case DH6OPT_PANA_AGENT: - return "PANA-agent"; - case DH6OPT_NEW_POSIX_TIMEZONE: - return "POSIX-timezone"; - case DH6OPT_NEW_TZDB_TIMEZONE: - return "POSIX-tz-database"; - case DH6OPT_ERO: - return "Echo-request-option"; - case DH6OPT_LQ_QUERY: - return "Lease-query"; - case DH6OPT_CLIENT_DATA: - return "LQ-client-data"; - case DH6OPT_CLT_TIME: - return "Clt-time"; - case DH6OPT_LQ_RELAY_DATA: - return "LQ-relay-data"; - case DH6OPT_LQ_CLIENT_LINK: - return "LQ-client-link"; - case DH6OPT_NTP_SERVER: - return "NTP-server"; - case DH6OPT_AFTR_NAME: - return "AFTR-Name"; - default: - snprintf(genstr, sizeof(genstr), "opt_%d", type); - return(genstr); - } -} - -static const char * -dhcp6stcode(int code) -{ - static char genstr[sizeof("code255") + 1]; /* XXX thread unsafe */ - - if (code > 255) - return "INVALID code"; - - switch(code) { - case DH6OPT_STCODE_SUCCESS: - return "success"; - case DH6OPT_STCODE_UNSPECFAIL: - return "unspec failure"; - case DH6OPT_STCODE_NOADDRAVAIL: - return "no addresses"; - case DH6OPT_STCODE_NOBINDING: - return "no binding"; - case DH6OPT_STCODE_NOTONLINK: - return "not on-link"; - case DH6OPT_STCODE_USEMULTICAST: - return "use multicast"; - case DH6OPT_STCODE_NOPREFIXAVAIL: - return "no prefixes"; - case DH6OPT_STCODE_UNKNOWNQUERYTYPE: - return "unknown query type"; - case DH6OPT_STCODE_MALFORMEDQUERY: - return "malformed query"; - case DH6OPT_STCODE_NOTCONFIGURED: - return "not configured"; - case DH6OPT_STCODE_NOTALLOWED: - return "not allowed"; - default: - snprintf(genstr, sizeof(genstr), "code%d", code); - return(genstr); - } + return code > 255 ? "INVALID code" : tok2str(dh6opt_stcode_str, "code%u", code); } static void @@ -335,27 +283,32 @@ dhcp6opt_print(netdissect_options *ndo, const struct dhcp6opt *dh6o; const u_char *tp; size_t i; - u_int16_t opttype; + uint16_t opttype; size_t optlen; - u_int8_t auth_proto; + 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_int16_t subopt_code; - u_int16_t subopt_len; + uint16_t subopt_code; + uint16_t subopt_len; + uint8_t dh6_reconf_type; + uint8_t dh6_lq_query_type; if (cp == ep) return; while (cp < ep) { if (ep < cp + sizeof(*dh6o)) goto trunc; - dh6o = (struct dhcp6opt *)cp; + dh6o = (const struct dhcp6opt *)cp; ND_TCHECK(*dh6o); - optlen = EXTRACT_16BITS(&dh6o->dh6opt_len); + optlen = EXTRACT_BE_U_2(&dh6o->dh6opt_len); if (ep < cp + sizeof(*dh6o) + optlen) goto trunc; - opttype = EXTRACT_16BITS(&dh6o->dh6opt_type); - ND_PRINT((ndo, " (%s", dhcp6opt_name(opttype))); + opttype = EXTRACT_BE_U_2(&dh6o->dh6opt_type); + ND_PRINT((ndo, " (%s", tok2str(dh6opt_str, "opt_%u", opttype))); + ND_TCHECK2(*(cp + sizeof(*dh6o)), optlen); switch (opttype) { case DH6OPT_CLIENTID: case DH6OPT_SERVERID: @@ -364,15 +317,15 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); - switch (EXTRACT_16BITS(tp)) { + tp = (const u_char *)(dh6o + 1); + switch (EXTRACT_BE_U_2(tp)) { case 1: if (optlen >= 2 + 6) { ND_PRINT((ndo, " hwaddr/time type %u time %u ", - EXTRACT_16BITS(&tp[2]), - EXTRACT_32BITS(&tp[4]))); + EXTRACT_BE_U_2(tp + 2), + EXTRACT_BE_U_4(tp + 4))); for (i = 8; i < optlen; i++) - ND_PRINT((ndo, "%02x", tp[i])); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i))); /*(*/ ND_PRINT((ndo, ")")); } else { @@ -384,7 +337,7 @@ dhcp6opt_print(netdissect_options *ndo, if (optlen >= 2 + 8) { ND_PRINT((ndo, " vid ")); for (i = 2; i < 2 + 8; i++) - ND_PRINT((ndo, "%02x", tp[i])); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i))); /*(*/ ND_PRINT((ndo, ")")); } else { @@ -395,9 +348,9 @@ dhcp6opt_print(netdissect_options *ndo, case 3: if (optlen >= 2 + 2) { ND_PRINT((ndo, " hwaddr type %u ", - EXTRACT_16BITS(&tp[2]))); + EXTRACT_BE_U_2(tp + 2))); for (i = 4; i < optlen; i++) - ND_PRINT((ndo, "%02x", tp[i])); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i))); /*(*/ ND_PRINT((ndo, ")")); } else { @@ -406,7 +359,7 @@ dhcp6opt_print(netdissect_options *ndo, } break; default: - ND_PRINT((ndo, " type %d)", EXTRACT_16BITS(tp))); + ND_PRINT((ndo, " type %d)", EXTRACT_BE_U_2(tp))); break; } break; @@ -416,11 +369,11 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); - ND_PRINT((ndo, " %s", ip6addr_string(&tp[0]))); + tp = (const u_char *)(dh6o + 1); + ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp))); ND_PRINT((ndo, " pltime:%u vltime:%u", - EXTRACT_32BITS(&tp[16]), - EXTRACT_32BITS(&tp[20]))); + EXTRACT_BE_U_4(tp + 16), + EXTRACT_BE_U_4(tp + 20))); if (optlen > 24) { /* there are sub-options */ dhcp6opt_print(ndo, tp + 24, tp + optlen); @@ -433,10 +386,10 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); + tp = (const u_char *)(dh6o + 1); for (i = 0; i < optlen; i += 2) { ND_PRINT((ndo, " %s", - dhcp6opt_name(EXTRACT_16BITS(&tp[i])))); + tok2str(dh6opt_str, "opt_%u", EXTRACT_BE_U_2(tp + i)))); } ND_PRINT((ndo, ")")); break; @@ -445,20 +398,20 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); - ND_PRINT((ndo, " %d)", *tp)); + tp = (const u_char *)(dh6o + 1); + ND_PRINT((ndo, " %d)", EXTRACT_U_1(tp))); break; case DH6OPT_ELAPSED_TIME: if (optlen != 2) { ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); - ND_PRINT((ndo, " %d)", EXTRACT_16BITS(tp))); + tp = (const u_char *)(dh6o + 1); + ND_PRINT((ndo, " %d)", EXTRACT_BE_U_2(tp))); break; case DH6OPT_RELAY_MSG: ND_PRINT((ndo, " (")); - tp = (u_char *)(dh6o + 1); + tp = (const u_char *)(dh6o + 1); dhcp6_print(ndo, tp, optlen); ND_PRINT((ndo, ")")); break; @@ -467,8 +420,8 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); - auth_proto = *tp; + tp = (const u_char *)(dh6o + 1); + auth_proto = EXTRACT_U_1(tp); switch (auth_proto) { case DH6OPT_AUTHPROTO_DELAYED: ND_PRINT((ndo, " proto: delayed")); @@ -481,28 +434,30 @@ dhcp6opt_print(netdissect_options *ndo, break; } tp++; - switch (*tp) { + auth_alg = EXTRACT_U_1(tp); + switch (auth_alg) { case DH6OPT_AUTHALG_HMACMD5: /* XXX: may depend on the protocol */ ND_PRINT((ndo, ", alg: HMAC-MD5")); break; default: - ND_PRINT((ndo, ", alg: %d", *tp)); + ND_PRINT((ndo, ", alg: %d", auth_alg)); break; } tp++; - switch (*tp) { + auth_rdm = EXTRACT_U_1(tp); + switch (auth_rdm) { case DH6OPT_AUTHRDM_MONOCOUNTER: ND_PRINT((ndo, ", RDM: mono")); break; default: - ND_PRINT((ndo, ", RDM: %d", *tp)); + ND_PRINT((ndo, ", RDM: %d", auth_rdm)); break; } tp++; ND_PRINT((ndo, ", RD:")); for (i = 0; i < 4; i++, tp += 2) - ND_PRINT((ndo, " %04x", EXTRACT_16BITS(tp))); + ND_PRINT((ndo, " %04x", EXTRACT_BE_U_2(tp))); /* protocol dependent part */ authinfolen = optlen - 11; @@ -519,19 +474,19 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, ", realm: ")); } for (i = 0; i < authrealmlen; i++, tp++) - ND_PRINT((ndo, "%02x", *tp)); - ND_PRINT((ndo, ", key ID: %08x", EXTRACT_32BITS(tp))); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp))); + ND_PRINT((ndo, ", key ID: %08x", EXTRACT_BE_U_4(tp))); tp += 4; ND_PRINT((ndo, ", HMAC-MD5:")); for (i = 0; i < 4; i++, tp+= 4) - ND_PRINT((ndo, " %08x", EXTRACT_32BITS(tp))); + ND_PRINT((ndo, " %08x", EXTRACT_BE_U_4(tp))); break; case DH6OPT_AUTHPROTO_RECONFIG: if (authinfolen != 17) { ND_PRINT((ndo, " ??")); break; } - switch (*tp++) { + switch (EXTRACT_U_1(tp)) { case DH6OPT_AUTHRECONFIG_KEY: ND_PRINT((ndo, " reconfig-key")); break; @@ -542,9 +497,10 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " type: ??")); break; } + tp++; ND_PRINT((ndo, " value:")); for (i = 0; i < 4; i++, tp+= 4) - ND_PRINT((ndo, " %08x", EXTRACT_32BITS(tp))); + ND_PRINT((ndo, " %08x", EXTRACT_BE_U_4(tp))); break; default: ND_PRINT((ndo, " ??")); @@ -562,15 +518,20 @@ dhcp6opt_print(netdissect_options *ndo, * Since we cannot predict the encoding, print hex dump * at most 10 characters. */ - tp = (u_char *)(dh6o + 1); + tp = (const u_char *)(dh6o + 1); ND_PRINT((ndo, " ")); for (i = 0; i < optlen && i < 10; i++) - ND_PRINT((ndo, "%02x", tp[i])); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i))); ND_PRINT((ndo, "...)")); break; case DH6OPT_RECONF_MSG: - tp = (u_char *)(dh6o + 1); - switch (*tp) { + if (optlen != 1) { + ND_PRINT((ndo, " ?)")); + break; + } + tp = (const u_char *)(dh6o + 1); + dh6_reconf_type = EXTRACT_U_1(tp); + switch (dh6_reconf_type) { case DH6_RENEW: ND_PRINT((ndo, " for renew)")); break; @@ -578,7 +539,7 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " for inf-req)")); break; default: - ND_PRINT((ndo, " for ?\?\?(%02x))", *tp)); + ND_PRINT((ndo, " for ?\?\?(%02x))", dh6_reconf_type)); break; } break; @@ -597,16 +558,16 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); + tp = (const u_char *)(dh6o + 1); for (i = 0; i < optlen; i += 16) - ND_PRINT((ndo, " %s", ip6addr_string(&tp[i]))); + ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp + i))); ND_PRINT((ndo, ")")); break; case DH6OPT_SIP_SERVER_D: case DH6OPT_DOMAIN_LIST: - tp = (u_char *)(dh6o + 1); + tp = (const u_char *)(dh6o + 1); while (tp < cp + sizeof(*dh6o) + optlen) { - putchar(' '); + ND_PRINT((ndo, " ")); if ((tp = ns_nprint(ndo, tp, cp + sizeof(*dh6o) + optlen)) == NULL) goto trunc; } @@ -617,8 +578,8 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); - ND_PRINT((ndo, " %s)", dhcp6stcode(EXTRACT_16BITS(&tp[0])))); + tp = (const u_char *)(dh6o + 1); + ND_PRINT((ndo, " %s)", dhcp6stcode(EXTRACT_BE_U_2(tp)))); break; case DH6OPT_IA_NA: case DH6OPT_IA_PD: @@ -626,11 +587,11 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); + tp = (const u_char *)(dh6o + 1); ND_PRINT((ndo, " IAID:%u T1:%u T2:%u", - EXTRACT_32BITS(&tp[0]), - EXTRACT_32BITS(&tp[4]), - EXTRACT_32BITS(&tp[8]))); + EXTRACT_BE_U_4(tp), + EXTRACT_BE_U_4(tp + 4), + EXTRACT_BE_U_4(tp + 8))); if (optlen > 12) { /* there are sub-options */ dhcp6opt_print(ndo, tp + 12, tp + optlen); @@ -642,8 +603,8 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); - ND_PRINT((ndo, " IAID:%u", EXTRACT_32BITS(tp))); + tp = (const u_char *)(dh6o + 1); + ND_PRINT((ndo, " IAID:%u", EXTRACT_BE_U_4(tp))); if (optlen > 4) { /* there are sub-options */ dhcp6opt_print(ndo, tp + 4, tp + optlen); @@ -655,11 +616,11 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); - ND_PRINT((ndo, " %s/%d", ip6addr_string(&tp[9]), tp[8])); + tp = (const u_char *)(dh6o + 1); + ND_PRINT((ndo, " %s/%d", ip6addr_string(ndo, tp + 9), EXTRACT_U_1(tp + 8))); ND_PRINT((ndo, " pltime:%u vltime:%u", - EXTRACT_32BITS(&tp[0]), - EXTRACT_32BITS(&tp[4]))); + EXTRACT_BE_U_4(tp), + EXTRACT_BE_U_4(tp + 4))); if (optlen > 25) { /* there are sub-options */ dhcp6opt_print(ndo, tp + 25, tp + optlen); @@ -672,21 +633,21 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); - ND_PRINT((ndo, " %d)", EXTRACT_32BITS(tp))); + tp = (const u_char *)(dh6o + 1); + ND_PRINT((ndo, " %d)", EXTRACT_BE_U_4(tp))); break; case DH6OPT_REMOTE_ID: if (optlen < 4) { ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); - ND_PRINT((ndo, " %d ", EXTRACT_32BITS(tp))); + tp = (const u_char *)(dh6o + 1); + ND_PRINT((ndo, " %d ", EXTRACT_BE_U_4(tp))); /* * Print hex dump first 10 characters. */ for (i = 4; i < optlen && i < 14; i++) - ND_PRINT((ndo, "%02x", tp[i])); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i))); ND_PRINT((ndo, "...)")); break; case DH6OPT_LQ_QUERY: @@ -694,8 +655,9 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); - switch (*tp) { + tp = (const u_char *)(dh6o + 1); + dh6_lq_query_type = EXTRACT_U_1(tp); + switch (dh6_lq_query_type) { case 1: ND_PRINT((ndo, " by-address")); break; @@ -703,10 +665,10 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " by-clientID")); break; default: - ND_PRINT((ndo, " type_%d", (int)*tp)); + ND_PRINT((ndo, " type_%u", dh6_lq_query_type)); break; } - ND_PRINT((ndo, " %s", ip6addr_string(&tp[1]))); + ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp + 1))); if (optlen > 17) { /* there are query-options */ dhcp6opt_print(ndo, tp + 17, tp + optlen); @@ -714,7 +676,7 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, ")")); break; case DH6OPT_CLIENT_DATA: - tp = (u_char *)(dh6o + 1); + tp = (const u_char *)(dh6o + 1); if (optlen > 0) { /* there are encapsulated options */ dhcp6opt_print(ndo, tp, tp + optlen); @@ -726,13 +688,13 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); - ND_PRINT((ndo, " %s ", ip6addr_string(&tp[0]))); + tp = (const u_char *)(dh6o + 1); + ND_PRINT((ndo, " %s ", ip6addr_string(ndo, tp))); /* * Print hex dump first 10 characters. */ for (i = 16; i < optlen && i < 26; i++) - ND_PRINT((ndo, "%02x", tp[i])); + ND_PRINT((ndo, "%02x", EXTRACT_U_1(tp + i))); ND_PRINT((ndo, "...)")); break; case DH6OPT_NTP_SERVER: @@ -740,11 +702,11 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); + tp = (const u_char *)(dh6o + 1); while (tp < cp + sizeof(*dh6o) + optlen - 4) { - subopt_code = EXTRACT_16BITS(tp); + subopt_code = EXTRACT_BE_U_2(tp); tp += 2; - subopt_len = EXTRACT_16BITS(tp); + subopt_len = EXTRACT_BE_U_2(tp); tp += 2; if (tp + subopt_len > cp + sizeof(*dh6o) + optlen) goto trunc; @@ -756,10 +718,10 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?")); break; } - ND_PRINT((ndo, " %s", ip6addr_string(&tp[0]))); + ND_PRINT((ndo, " %s", ip6addr_string(ndo, tp))); break; case DH6OPT_NTP_SUBOPTION_SRV_FQDN: - putchar(' '); + ND_PRINT((ndo, " ")); if (ns_nprint(ndo, tp, tp + subopt_len) == NULL) goto trunc; break; @@ -776,17 +738,18 @@ dhcp6opt_print(netdissect_options *ndo, ND_PRINT((ndo, " ?)")); break; } - tp = (u_char *)(dh6o + 1); + tp = (const u_char *)(dh6o + 1); remain_len = optlen; ND_PRINT((ndo, " ")); /* Encoding is described in section 3.1 of RFC 1035 */ - while (remain_len && *tp) { - label_len = *tp++; + while (remain_len && EXTRACT_U_1(tp)) { + label_len = EXTRACT_U_1(tp); + tp++; if (label_len < remain_len - 1) { - ND_PRINT((ndo, "%.*s", label_len, tp)); + (void)fn_printn(ndo, tp, label_len, NULL); tp += label_len; remain_len -= (label_len + 1); - if(*tp) ND_PRINT((ndo, ".")); + if(EXTRACT_U_1(tp)) ND_PRINT((ndo, ".")); } else { ND_PRINT((ndo, " ?")); break; @@ -794,6 +757,19 @@ dhcp6opt_print(netdissect_options *ndo, } ND_PRINT((ndo, ")")); break; + case DH6OPT_NEW_POSIX_TIMEZONE: /* all three of these options */ + case DH6OPT_NEW_TZDB_TIMEZONE: /* are encoded similarly */ + case DH6OPT_MUDURL: /* although GMT might not work */ + if (optlen < 5) { + ND_PRINT((ndo, " ?)")); + break; + } + tp = (const u_char *)(dh6o + 1); + ND_PRINT((ndo, "=")); + (void)fn_printn(ndo, tp, (u_int)optlen, NULL); + ND_PRINT((ndo, ")")); + break; + default: ND_PRINT((ndo, ")")); break; @@ -814,92 +790,35 @@ void dhcp6_print(netdissect_options *ndo, const u_char *cp, u_int length) { - struct dhcp6 *dh6; - struct dhcp6_relay *dh6relay; + const struct dhcp6 *dh6; + const struct dhcp6_relay *dh6relay; const u_char *ep; - u_char *extp; + const u_char *extp; const char *name; ND_PRINT((ndo, "dhcp6")); - ep = (u_char *)ndo->ndo_snapend; + ep = (const u_char *)ndo->ndo_snapend; if (cp + length < ep) ep = cp + length; - dh6 = (struct dhcp6 *)cp; - dh6relay = (struct dhcp6_relay *)cp; + dh6 = (const struct dhcp6 *)cp; + dh6relay = (const struct dhcp6_relay *)cp; ND_TCHECK(dh6->dh6_xid); - switch (dh6->dh6_msgtype) { - case DH6_SOLICIT: - name = "solicit"; - break; - case DH6_ADVERTISE: - name = "advertise"; - break; - case DH6_REQUEST: - name = "request"; - break; - case DH6_CONFIRM: - name = "confirm"; - break; - case DH6_RENEW: - name = "renew"; - break; - case DH6_REBIND: - name = "rebind"; - break; - case DH6_REPLY: - name = "reply"; - break; - case DH6_RELEASE: - name = "release"; - break; - case DH6_DECLINE: - name = "decline"; - break; - case DH6_RECONFIGURE: - name = "reconfigure"; - break; - case DH6_INFORM_REQ: - name= "inf-req"; - break; - case DH6_RELAY_FORW: - name= "relay-fwd"; - break; - case DH6_RELAY_REPLY: - name= "relay-reply"; - break; - case DH6_LEASEQUERY: - name= "leasequery"; - break; - case DH6_LQ_REPLY: - name= "leasequery-reply"; - break; - default: - name = NULL; - break; - } + name = tok2str(dh6_msgtype_str, "msgtype-%u", dh6->dh6_msgtype); if (!ndo->ndo_vflag) { - if (name) - ND_PRINT((ndo, " %s", name)); - else if (dh6->dh6_msgtype != DH6_RELAY_FORW && - dh6->dh6_msgtype != DH6_RELAY_REPLY) { - ND_PRINT((ndo, " msgtype-%u", dh6->dh6_msgtype)); - } + ND_PRINT((ndo, " %s", name)); return; } /* XXX relay agent messages have to be handled differently */ - if (name) - ND_PRINT((ndo, " %s (", name)); /*)*/ - else - ND_PRINT((ndo, " msgtype-%u (", dh6->dh6_msgtype)); /*)*/ + ND_PRINT((ndo, " %s (", name)); /*)*/ if (dh6->dh6_msgtype != DH6_RELAY_FORW && dh6->dh6_msgtype != DH6_RELAY_REPLY) { - ND_PRINT((ndo, "xid=%x", EXTRACT_32BITS(&dh6->dh6_xid) & DH6_XIDMASK)); - extp = (u_char *)(dh6 + 1); + ND_PRINT((ndo, "xid=%x", EXTRACT_BE_U_4(&dh6->dh6_xid) & DH6_XIDMASK)); + extp = (const u_char *)(dh6 + 1); dhcp6opt_print(ndo, extp, ep); } else { /* relay messages */ struct in6_addr addr6; @@ -907,12 +826,12 @@ dhcp6_print(netdissect_options *ndo, ND_TCHECK(dh6relay->dh6relay_peeraddr); memcpy(&addr6, dh6relay->dh6relay_linkaddr, sizeof (addr6)); - ND_PRINT((ndo, "linkaddr=%s", ip6addr_string(&addr6))); + ND_PRINT((ndo, "linkaddr=%s", ip6addr_string(ndo, &addr6))); memcpy(&addr6, dh6relay->dh6relay_peeraddr, sizeof (addr6)); - ND_PRINT((ndo, " peeraddr=%s", ip6addr_string(&addr6))); + ND_PRINT((ndo, " peeraddr=%s", ip6addr_string(ndo, &addr6))); - dhcp6opt_print(ndo, (u_char *)(dh6relay + 1), ep); + dhcp6opt_print(ndo, (const u_char *)(dh6relay + 1), ep); } /*(*/ ND_PRINT((ndo, ")"));