remove leftover fallout from prefix class support
authorSteven Barth <steven@midlink.org>
Mon, 20 Apr 2015 17:07:45 +0000 (19:07 +0200)
committerSteven Barth <steven@midlink.org>
Mon, 20 Apr 2015 17:07:45 +0000 (19:07 +0200)
src/dhcpv6-ia.c
src/dhcpv6.h

index 7e8e535..132efdb 100644 (file)
@@ -60,7 +60,6 @@ void free_dhcpv6_assignment(struct dhcpv6_assignment *c)
 
        free(c->managed);
        free(c->hostname);
 
        free(c->managed);
        free(c->hostname);
-       free(c->classes);
        free(c);
 }
 
        free(c);
 }
 
@@ -133,7 +132,6 @@ int setup_dhcpv6_ia_interface(struct interface *iface, bool enable)
                                        a->hostname = strdup(lease->hostname);
                                }
                        } else {
                                        a->hostname = strdup(lease->hostname);
                                }
                        } else {
-                               free(a->classes);
                                free(a->hostname);
                                free(a);
                        }
                                free(a->hostname);
                                free(a);
                        }
index 44ce1d7..09aa6f1 100644 (file)
 #define DHCPV6_OPT_SOL_MAX_RT 82
 #define DHCPV6_OPT_INF_MAX_RT 83
 
 #define DHCPV6_OPT_SOL_MAX_RT 82
 #define DHCPV6_OPT_INF_MAX_RT 83
 
-#ifdef EXT_PREFIX_CLASS
-/* draft-bhandari-dhc-class-based-prefix, not yet standardized */
-#define DHCPV6_OPT_PREFIX_CLASS EXT_PREFIX_CLASS
-#endif
-
 #define DHCPV6_DUID_VENDOR 2
 
 #define DHCPV6_STATUS_OK 0
 #define DHCPV6_DUID_VENDOR 2
 
 #define DHCPV6_STATUS_OK 0
@@ -146,9 +141,6 @@ struct dhcpv6_assignment {
        struct sockaddr_in6 peer;
        time_t valid_until;
        time_t reconf_sent;
        struct sockaddr_in6 peer;
        time_t valid_until;
        time_t reconf_sent;
-       bool all_class;
-       uint8_t classes_cnt;
-       uint16_t *classes;
        int reconf_cnt;
        char *hostname;
        uint8_t key[16];
        int reconf_cnt;
        char *hostname;
        uint8_t key[16];