Remove dead options

diff --git a/dhcp-common.c b/dhcp-common.c
index 96b41c7bf8dbc26e67c043b319aa740af987880e..2a87361df669d1f679725df81bb4f1081c3eac51 100644 (file)
--- a/dhcp-common.c
+++ b/dhcp-common.c
@@ -393,22 +393,6 @@ print_option(char *s, ssize_t len, int type, int dl, const uint8_t *data,
                return 2;
        }
 
-       /* DHCPv6 status code */
-       if (type & SCODE && dl >= (int)sizeof(u16)) {
-               if (s) {
-                       memcpy(&u16, data, sizeof(u16));
-                       u16 = ntohs(u16);
-                       l = snprintf(s, len, "%d ", u16);
-                       len -= l;
-               } else
-                       l = 7;
-               data += sizeof(u16);
-               dl -= sizeof(u16);
-               if (dl)
-                       l += print_option(s, len, STRING, dl, data, ifname);
-               return l;
-       }
-
        if (!s) {
                if (type & UINT8)
                        l = 3;

diff --git a/dhcp-common.h b/dhcp-common.h
index 5ca678bc7cccf71449ac3d29805e46609dfdb420..05b68d0d9894e786cf58032e392044932272cdc5 100644 (file)
--- a/dhcp-common.h
+++ b/dhcp-common.h
@@ -47,21 +47,19 @@
 #define SINT32         (1 << 5)
 #define ADDRIPV4       (1 << 6)
 #define STRING         (1 << 7)
-#define PAIR           (1 << 8)
-#define ARRAY          (1 << 9)
-#define RFC3361                (1 << 10)
-#define RFC3397                (1 << 11)
-#define RFC3442                (1 << 12)
-#define RFC5969                (1 << 13)
-#define ADDRIPV6       (1 << 14)
-#define BINHEX         (1 << 15)
-#define SCODE          (1 << 16)
-#define FLAG           (1 << 17)
-#define NOREQ          (1 << 18)
-#define EMBED          (1 << 19)
-#define ENCAP          (1 << 20)
-#define INDEX          (1 << 21)
-#define OPTION         (1 << 22)
+#define ARRAY          (1 << 8)
+#define RFC3361                (1 << 9)
+#define RFC3397                (1 << 10)
+#define RFC3442                (1 << 11)
+#define RFC5969                (1 << 12)
+#define ADDRIPV6       (1 << 13)
+#define BINHEX         (1 << 14)
+#define FLAG           (1 << 15)
+#define NOREQ          (1 << 16)
+#define EMBED          (1 << 17)
+#define ENCAP          (1 << 18)
+#define INDEX          (1 << 19)
+#define OPTION         (1 << 20)
 
 struct dhcp_opt {
        uint16_t option;