]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-dhcp6.c
More UNALIGNED_MEM{CPY,CMP} on IP addresses.
[tcpdump] / print-dhcp6.c
index 4ba6728caac3055f8e1dfcc8c08f68e07bcccff9..8a119ff5fb82e1297a5d84d7762a13d77ff3911b 100644 (file)
  */
 /*
  * RFC3315: DHCPv6
- * supported DHCPv6 options: 
- *  RFC3319,
- *  RFC3633,
- *  RFC3646,
- *  RFC3898,
- *  RFC4075,
- *  RFC4242,
- *  RFC4280,
+ * supported DHCPv6 options:
+ *  RFC3319: Session Initiation Protocol (SIP) Servers options,
+ *  RFC3633: IPv6 Prefix options,
+ *  RFC3646: DNS Configuration options,
+ *  RFC3898: Network Information Service (NIS) Configuration options,
+ *  RFC4075: Simple Network Time Protocol (SNTP) Configuration option,
+ *  RFC4242: Information Refresh Time option,
+ *  RFC4280: Broadcast and Multicast Control Servers options,
+ *  RFC5908: Network Time Protocol (NTP) Server Option for DHCPv6
+ *  RFC6334: Dual-Stack Lite option,
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.37 2008-02-06 10:26:09 guy Exp $";
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -57,7 +54,7 @@ static const char rcsid[] _U_ =
 #include "extract.h"
 
 /* lease duration */
-#define DHCP6_DURATITION_INFINITE 0xffffffff
+#define DHCP6_DURATION_INFINITE 0xffffffff
 
 /* Error Values */
 #define DH6ERR_FAILURE         16
@@ -145,15 +142,15 @@ struct dhcp6_relay {
 #define DH6OPT_RECONF_ACCEPT 20
 #define DH6OPT_SIP_SERVER_D 21
 #define DH6OPT_SIP_SERVER_A 22
-#define DH6OPT_DNS 23
-#define DH6OPT_DNSNAME 24
+#define DH6OPT_DNS_SERVERS 23
+#define DH6OPT_DOMAIN_LIST 24
 #define DH6OPT_IA_PD 25
 #define DH6OPT_IA_PD_PREFIX 26
 #define DH6OPT_NIS_SERVERS 27
 #define DH6OPT_NISP_SERVERS 28
 #define DH6OPT_NIS_NAME 29
 #define DH6OPT_NISP_NAME 30
-#define DH6OPT_NTP_SERVERS 31
+#define DH6OPT_SNTP_SERVERS 31
 #define DH6OPT_LIFETIME 32
 #define DH6OPT_BCMCS_SERVER_D 33
 #define DH6OPT_BCMCS_SERVER_A 34
@@ -170,6 +167,11 @@ struct dhcp6_relay {
 #define DH6OPT_CLT_TIME 46
 #define DH6OPT_LQ_RELAY_DATA 47
 #define DH6OPT_LQ_CLIENT_LINK 48
+#define DH6OPT_NTP_SERVER 56
+#  define DH6OPT_NTP_SUBOPTION_SRV_ADDR 1
+#  define DH6OPT_NTP_SUBOPTION_MC_ADDR 2
+#  define DH6OPT_NTP_SUBOPTION_SRV_FQDN 3
+#define DH6OPT_AFTR_NAME 64
 
 struct dhcp6opt {
        u_int16_t dh6opt_type;
@@ -183,13 +185,13 @@ dhcp6opt_name(int type)
        static char genstr[sizeof("opt_65535") + 1]; /* XXX thread unsafe */
 
        if (type > 65535)
-               return "INVALID option";
+               return "INVALID-option";
 
        switch(type) {
        case DH6OPT_CLIENTID:
-               return "client ID";
+               return "client-ID";
        case DH6OPT_SERVERID:
-               return "server ID";
+               return "server-ID";
        case DH6OPT_IA_NA:
                return "IA_NA";
        case DH6OPT_IA_TA:
@@ -197,87 +199,91 @@ dhcp6opt_name(int type)
        case DH6OPT_IA_ADDR:
                return "IA_ADDR";
        case DH6OPT_ORO:
-               return "option request";
+               return "option-request";
        case DH6OPT_PREFERENCE:
                return "preference";
        case DH6OPT_ELAPSED_TIME:
-               return "elapsed time";
+               return "elapsed-time";
        case DH6OPT_RELAY_MSG:
-               return "relay message";
+               return "relay-message";
        case DH6OPT_AUTH:
                return "authentication";
        case DH6OPT_UNICAST:
-               return "server unicast";
+               return "server-unicast";
        case DH6OPT_STATUS_CODE:
-               return "status code";
+               return "status-code";
        case DH6OPT_RAPID_COMMIT:
-               return "rapid commit";
+               return "rapid-commit";
        case DH6OPT_USER_CLASS:
-               return "user class";
+               return "user-class";
        case DH6OPT_VENDOR_CLASS:
-               return "vendor class";
+               return "vendor-class";
        case DH6OPT_VENDOR_OPTS:
-               return "vendor-specific info";
+               return "vendor-specific-info";
        case DH6OPT_INTERFACE_ID:
-               return "interface ID";
+               return "interface-ID";
        case DH6OPT_RECONF_MSG:
-               return "reconfigure message";
+               return "reconfigure-message";
        case DH6OPT_RECONF_ACCEPT:
-               return "reconfigure accept";
+               return "reconfigure-accept";
        case DH6OPT_SIP_SERVER_D:
-               return "SIP servers domain";
+               return "SIP-servers-domain";
        case DH6OPT_SIP_SERVER_A:
-               return "SIP servers address";
-       case DH6OPT_DNS:
-               return "DNS";
-       case DH6OPT_DNSNAME:
-               return "DNS name";
+               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_NTP_SERVERS:
-               return "NTP Server";
+               return "IA_PD-prefix";
+       case DH6OPT_SNTP_SERVERS:
+               return "SNTP-servers";
        case DH6OPT_LIFETIME:
                return "lifetime";
        case DH6OPT_NIS_SERVERS:
-               return "NIS server";
+               return "NIS-server";
        case DH6OPT_NISP_SERVERS:
-               return "NIS+ server";
+               return "NIS+-server";
        case DH6OPT_NIS_NAME:
-               return "NIS domain name";
+               return "NIS-domain-name";
        case DH6OPT_NISP_NAME:
-               return "NIS+ domain name";
+               return "NIS+-domain-name";
        case DH6OPT_BCMCS_SERVER_D:
-               return "BCMCS domain name";
+               return "BCMCS-domain-name";
        case DH6OPT_BCMCS_SERVER_A:
-               return "BCMCS server";
+               return "BCMCS-server";
        case DH6OPT_GEOCONF_CIVIC:
-               return "Geoconf Civic";
+               return "Geoconf-Civic";
        case DH6OPT_REMOTE_ID:
-               return "Remote ID";
+               return "Remote-ID";
        case DH6OPT_SUBSCRIBER_ID:
-               return "Subscriber ID";
+               return "Subscriber-ID";
        case DH6OPT_CLIENT_FQDN:
-               return "Client FQDN";
+               return "Client-FQDN";
        case DH6OPT_PANA_AGENT:
-               return "PANA agent";
+               return "PANA-agent";
        case DH6OPT_NEW_POSIX_TIMEZONE:
-               return "POSIX timezone";
+               return "POSIX-timezone";
        case DH6OPT_NEW_TZDB_TIMEZONE:
-               return "POSIX tz database";
+               return "POSIX-tz-database";
        case DH6OPT_ERO:
-               return "Echo request option";
+               return "Echo-request-option";
        case DH6OPT_LQ_QUERY:
-               return "Lease query";
+               return "Lease-query";
        case DH6OPT_CLIENT_DATA:
-               return "LQ client data";
+               return "LQ-client-data";
        case DH6OPT_CLT_TIME:
-               return "Clt time";
+               return "Clt-time";
        case DH6OPT_LQ_RELAY_DATA:
-               return "LQ relay data";
+               return "LQ-relay-data";
        case DH6OPT_LQ_CLIENT_LINK:
-               return "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);
@@ -324,13 +330,17 @@ dhcp6stcode(int code)
 static void
 dhcp6opt_print(const u_char *cp, const u_char *ep)
 {
-       struct dhcp6opt *dh6o;
-       u_char *tp;
+       const struct dhcp6opt *dh6o;
+       const u_char *tp;
        size_t i;
        u_int16_t opttype;
        size_t optlen;
        u_int8_t auth_proto;
        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;
 
        if (cp == ep)
                return;
@@ -338,6 +348,7 @@ dhcp6opt_print(const u_char *cp, const u_char *ep)
                if (ep < cp + sizeof(*dh6o))
                        goto trunc;
                dh6o = (struct dhcp6opt *)cp;
+               TCHECK(*dh6o);
                optlen = EXTRACT_16BITS(&dh6o->dh6opt_len);
                if (ep < cp + sizeof(*dh6o) + optlen)
                        goto trunc;
@@ -410,7 +421,7 @@ dhcp6opt_print(const u_char *cp, const u_char *ep)
                            EXTRACT_32BITS(&tp[20]));
                        if (optlen > 24) {
                                /* there are sub-options */
-                               dhcp6opt_print(tp + 24, tp + 24 + optlen);
+                               dhcp6opt_print(tp + 24, tp + optlen);
                        }
                        printf(")");
                        break;
@@ -573,8 +584,8 @@ dhcp6opt_print(const u_char *cp, const u_char *ep)
                        printf(")");
                        break;
                case DH6OPT_SIP_SERVER_A:
-               case DH6OPT_DNS:
-               case DH6OPT_NTP_SERVERS:
+               case DH6OPT_DNS_SERVERS:
+               case DH6OPT_SNTP_SERVERS:
                case DH6OPT_NIS_SERVERS:
                case DH6OPT_NISP_SERVERS:
                case DH6OPT_BCMCS_SERVER_A:
@@ -589,6 +600,16 @@ dhcp6opt_print(const u_char *cp, const u_char *ep)
                                printf(" %s", ip6addr_string(&tp[i]));
                        printf(")");
                        break;
+               case DH6OPT_SIP_SERVER_D:
+               case DH6OPT_DOMAIN_LIST:
+                       tp = (u_char *)(dh6o + 1);
+                       while (tp < cp + sizeof(*dh6o) + optlen) {
+                               putchar(' ');
+                               if ((tp = ns_nprint(tp, cp + sizeof(*dh6o) + optlen)) == NULL)
+                                       goto trunc;
+                       }
+                       printf(")");
+                       break;
                case DH6OPT_STATUS_CODE:
                        if (optlen < 2) {
                                printf(" ?)");
@@ -610,7 +631,7 @@ dhcp6opt_print(const u_char *cp, const u_char *ep)
                            EXTRACT_32BITS(&tp[8]));
                        if (optlen > 12) {
                                /* there are sub-options */
-                               dhcp6opt_print(tp + 12, tp + 12 + optlen);
+                               dhcp6opt_print(tp + 12, tp + optlen);
                        }
                        printf(")");
                        break;
@@ -623,7 +644,7 @@ dhcp6opt_print(const u_char *cp, const u_char *ep)
                        printf(" IAID:%u", EXTRACT_32BITS(tp));
                        if (optlen > 4) {
                                /* there are sub-options */
-                               dhcp6opt_print(tp + 4, tp + 4 + optlen);
+                               dhcp6opt_print(tp + 4, tp + optlen);
                        }
                        printf(")");
                        break;
@@ -639,7 +660,7 @@ dhcp6opt_print(const u_char *cp, const u_char *ep)
                            EXTRACT_32BITS(&tp[4]));
                        if (optlen > 25) {
                                /* there are sub-options */
-                               dhcp6opt_print(tp + 25, tp + 25 + optlen);
+                               dhcp6opt_print(tp + 25, tp + optlen);
                        }
                        printf(")");
                        break;
@@ -712,6 +733,65 @@ dhcp6opt_print(const u_char *cp, const u_char *ep)
                                printf("%02x", tp[i]);
                        printf("...)");
                        break;
+               case DH6OPT_NTP_SERVER:
+                       if (optlen < 4) {
+                               printf(" ?)");
+                               break;
+                       }
+                       tp = (u_char *)(dh6o + 1);
+                       while (tp < cp + sizeof(*dh6o) + optlen - 4) {
+                               subopt_code = EXTRACT_16BITS(tp);
+                               tp += 2;
+                               subopt_len = EXTRACT_16BITS(tp);
+                               tp += 2;
+                               if (tp + subopt_len > cp + sizeof(*dh6o) + optlen)
+                                       goto trunc;
+                               printf(" subopt:%d", subopt_code);
+                               switch (subopt_code) {
+                               case DH6OPT_NTP_SUBOPTION_SRV_ADDR:
+                               case DH6OPT_NTP_SUBOPTION_MC_ADDR:
+                                       if (subopt_len != 16) {
+                                               printf(" ?");
+                                               break;
+                                       }
+                                       printf(" %s", ip6addr_string(&tp[0]));
+                                       break;
+                               case DH6OPT_NTP_SUBOPTION_SRV_FQDN:
+                                       putchar(' ');
+                                       if (ns_nprint(tp, tp + subopt_len) == NULL)
+                                               goto trunc;
+                                       break;
+                               default:
+                                       printf(" ?");
+                                       break;
+                               }
+                               tp += subopt_len;
+                       }
+                       printf(")");
+                       break;
+               case DH6OPT_AFTR_NAME:
+                       if (optlen < 3) {
+                               printf(" ?)");
+                               break;
+                       }
+                       tp = (u_char *)(dh6o + 1);
+                       remain_len = optlen;
+                       printf(" ");
+                       /* Encoding is described in section 3.1 of RFC 1035 */
+                       while (remain_len && *tp) {
+                               label_len =  *tp++;
+                               if (label_len < remain_len - 1) {
+                                       printf("%.*s", label_len, tp);
+                                       tp += label_len;
+                                       remain_len -= (label_len + 1);
+                                       if(*tp) printf(".");
+                               } else {
+                                       printf(" ?");
+                                       break;
+                               }
+                       }
+                       printf(")");
+                       break;
                default:
                        printf(")");
                        break;