Decode DHCPv6 AFTR-Name option (RFC6334)

diff --git a/print-dhcp6.c b/print-dhcp6.c
index a75da823815a48c3881af079272da615c699eed3..24b3f281347cfce20ae400aa7832b5fab455b598 100644 (file)
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -36,6 +36,7 @@
  *  RFC4075,
  *  RFC4242,
  *  RFC4280,
+ *  RFC6334,
  */
 
 #ifndef lint
@@ -170,6 +171,7 @@ struct dhcp6_relay {
 #define DH6OPT_CLT_TIME 46
 #define DH6OPT_LQ_RELAY_DATA 47
 #define DH6OPT_LQ_CLIENT_LINK 48
+#define DH6OPT_AFTR_NAME 64
 
 struct dhcp6opt {
        u_int16_t dh6opt_type;
@@ -278,6 +280,8 @@ dhcp6opt_name(int type)
                return "LQ-relay-data";
        case DH6OPT_LQ_CLIENT_LINK:
                return "LQ-client-link";
+       case DH6OPT_AFTR_NAME:
+               return "AFTR-Name";
        default:
                snprintf(genstr, sizeof(genstr), "opt_%d", type);
                return(genstr);
@@ -712,6 +716,30 @@ dhcp6opt_print(const u_char *cp, const u_char *ep)
                                printf("%02x", tp[i]);
                        printf("...)");
                        break;
+               case DH6OPT_AFTR_NAME:
+                       if (optlen < 3) {
+                               printf(" ?)");
+                               break;
+                       }
+                       tp = (u_char *)(dh6o + 1);
+                       int remain_len = optlen;
+                       printf(" ");
+                       /* Encoding is described in section 3.1 of RFC 1035 */
+                       int label_len; /* Label length */
+                       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;