Skip to content

D
Dnsmasq
Commit f1af2bb4 authored by Simon Kelley's avatar Simon Kelley
Browse files
Options

Big ugly refactor in rfc3315.c should be no behaviour changes.

parent 1b55190d
Show whitespace changes
Inline Side-by-side
Showing with 240 additions and 255 deletions
src/rfc3315.c
View file @ f1af2bb4
...@@ -24,7 +24,7 @@ struct state { ...@@ -24,7 +24,7 @@ struct state {
int clid_len, iaid, ia_type, interface, hostname_auth, lease_allocate; int clid_len, iaid, ia_type, interface, hostname_auth, lease_allocate;
char *client_hostname, *hostname, *domain, *send_domain; char *client_hostname, *hostname, *domain, *send_domain;
struct dhcp_context *context; struct dhcp_context *context;
struct in6_addr *link_address; struct in6_addr *link_address, *fallback;
unsigned int xid, fqdn_flags; unsigned int xid, fqdn_flags;
char *iface_name; char *iface_name;
void *packet_options, *end; void *packet_options, *end;
...@@ -36,15 +36,10 @@ struct state { ...@@ -36,15 +36,10 @@ struct state {
#endif #endif
}; };
static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid **relay_tagsp, struct dhcp_context *context, static int dhcp6_maybe_relay(struct state *state, void *inbuff, size_t sz, int is_unicast, time_t now);
int interface, char *iface_name, struct in6_addr *fallback, void *inbuff, size_t sz, int is_unicast, time_t now, static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_t sz, int is_unicast, time_t now);
unsigned char *mac, unsigned int mac_len, unsigned int mac_type);
static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dhcp_netid *tags, struct dhcp_context *context,
int interface, char *iface_name, struct in6_addr *fallback, void *inbuff, size_t sz, int is_unicast, time_t now,
unsigned int mac_len, unsigned int mac_type, unsigned char *mac);
static void log6_opts(int nest, unsigned int xid, void *start_opts, void *end_opts); static void log6_opts(int nest, unsigned int xid, void *start_opts, void *end_opts);
static void log6_packet(struct state *state, char *type, struct in6_addr *addr, char *string); static void log6_packet(struct state *state, char *type, struct in6_addr *addr, char *string);
static void *opt6_find (void *opts, void *end, unsigned int search, unsigned int minsize); static void *opt6_find (void *opts, void *end, unsigned int search, unsigned int minsize);
static void *opt6_next(void *opts, void *end); static void *opt6_next(void *opts, void *end);
static unsigned int opt6_uint(unsigned char *opt, int offset, int size); static unsigned int opt6_uint(unsigned char *opt, int offset, int size);
...@@ -55,14 +50,14 @@ static void end_ia(int t1cntr, unsigned int min_time, int do_fuzz); ...@@ -55,14 +50,14 @@ static void end_ia(int t1cntr, unsigned int min_time, int do_fuzz);
#ifdef OPTION6_PREFIX_CLASS #ifdef OPTION6_PREFIX_CLASS
static struct prefix_class *prefix_class_from_context(struct dhcp_context *context); static struct prefix_class *prefix_class_from_context(struct dhcp_context *context);
#endif #endif
static void mark_context_used(struct state *state, struct dhcp_context *context, struct in6_addr *addr); static void mark_context_used(struct state *state, struct in6_addr *addr);
static void mark_config_used(struct dhcp_context *context, struct in6_addr *addr); static void mark_config_used(struct dhcp_context *context, struct in6_addr *addr);
static int check_address(struct state *state, struct in6_addr *addr); static int check_address(struct state *state, struct in6_addr *addr);
static void add_address(struct state *state, struct dhcp_context *context, unsigned int lease_time, void *ia_option, static void add_address(struct state *state, struct dhcp_context *context, unsigned int lease_time, void *ia_option,
unsigned int *min_time, struct in6_addr *addr, time_t now); unsigned int *min_time, struct in6_addr *addr, time_t now);
static void update_leases(struct state *state, struct dhcp_context *context, struct in6_addr *addr, unsigned int lease_time, time_t now); static void update_leases(struct state *state, struct dhcp_context *context, struct in6_addr *addr, unsigned int lease_time, time_t now);
static int add_local_addrs(struct dhcp_context *context); static int add_local_addrs(struct dhcp_context *context);
static struct dhcp_netid *add_options(struct state *state, struct in6_addr *fallback, struct dhcp_context *context, int do_refresh); static struct dhcp_netid *add_options(struct state *state, int do_refresh);
static void calculate_times(struct dhcp_context *context, unsigned int *min_time, unsigned int *valid_timep, static void calculate_times(struct dhcp_context *context, unsigned int *min_time, unsigned int *valid_timep,
unsigned int *preferred_timep, unsigned int lease_time); unsigned int *preferred_timep, unsigned int lease_time);
...@@ -75,9 +70,9 @@ unsigned short dhcp6_reply(struct dhcp_context *context, int interface, char *if ...@@ -75,9 +70,9 @@ unsigned short dhcp6_reply(struct dhcp_context *context, int interface, char *if
struct in6_addr *fallback, size_t sz, int is_unicast, time_t now, struct in6_addr *fallback, size_t sz, int is_unicast, time_t now,
unsigned char *mac, unsigned int mac_len, unsigned int mac_type) unsigned char *mac, unsigned int mac_len, unsigned int mac_type)
{ {
struct dhcp_netid *relay_tags = NULL;
struct dhcp_vendor *vendor; struct dhcp_vendor *vendor;
int msg_type; int msg_type;
struct state state;
if (sz <= 4) if (sz <= 4)
return 0; return 0;
...@@ -89,19 +84,24 @@ unsigned short dhcp6_reply(struct dhcp_context *context, int interface, char *if ...@@ -89,19 +84,24 @@ unsigned short dhcp6_reply(struct dhcp_context *context, int interface, char *if
vendor->netid.next = &vendor->netid; vendor->netid.next = &vendor->netid;
save_counter(0); save_counter(0);
state.context = context;
state.interface = interface;
state.iface_name = iface_name;
state.fallback = fallback;
state.mac = mac;
state.mac_len = mac_len;
state.mac_type = mac_type;
state.tags = NULL;
state.link_address = NULL;
if (dhcp6_maybe_relay(NULL, &relay_tags, context, interface, iface_name, if (dhcp6_maybe_relay(&state, daemon->dhcp_packet.iov_base, sz, is_unicast, now))
fallback, daemon->dhcp_packet.iov_base, sz, is_unicast, now,
mac, mac_len, mac_type))
return msg_type == DHCP6RELAYFORW ? DHCPV6_SERVER_PORT : DHCPV6_CLIENT_PORT; return msg_type == DHCP6RELAYFORW ? DHCPV6_SERVER_PORT : DHCPV6_CLIENT_PORT;
return 0; return 0;
} }
/* This cost me blood to write, it will probably cost you blood to understand - srk. */ /* This cost me blood to write, it will probably cost you blood to understand - srk. */
static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid **relay_tagsp, struct dhcp_context *context, static int dhcp6_maybe_relay(struct state *state, void *inbuff, size_t sz, int is_unicast, time_t now)
int interface, char *iface_name, struct in6_addr *fallback, void *inbuff, size_t sz, int is_unicast, time_t now,
unsigned char *mac, unsigned int mac_len, unsigned int mac_type)
{ {
void *end = inbuff + sz; void *end = inbuff + sz;
void *opts = inbuff + 34; void *opts = inbuff + 34;
...@@ -118,28 +118,28 @@ static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid ** ...@@ -118,28 +118,28 @@ static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid **
address of the network on which we can allocate an address. address of the network on which we can allocate an address.
Recalculate the available contexts using that information. */ Recalculate the available contexts using that information. */
if (link_address) if (state->link_address)
{ {
struct dhcp_context *c; struct dhcp_context *c;
context = NULL; state->context = NULL;
if (!IN6_IS_ADDR_LOOPBACK(link_address) && if (!IN6_IS_ADDR_LOOPBACK(state->link_address) &&
!IN6_IS_ADDR_LINKLOCAL(link_address) && !IN6_IS_ADDR_LINKLOCAL(state->link_address) &&
!IN6_IS_ADDR_MULTICAST(link_address)) !IN6_IS_ADDR_MULTICAST(state->link_address))
for (c = daemon->dhcp6; c; c = c->next) for (c = daemon->dhcp6; c; c = c->next)
if ((c->flags & CONTEXT_DHCP) && if ((c->flags & CONTEXT_DHCP) &&
!(c->flags & (CONTEXT_TEMPLATE | CONTEXT_OLD)) && !(c->flags & (CONTEXT_TEMPLATE | CONTEXT_OLD)) &&
is_same_net6(link_address, &c->start6, c->prefix) && is_same_net6(state->link_address, &c->start6, c->prefix) &&
is_same_net6(link_address, &c->end6, c->prefix)) is_same_net6(state->link_address, &c->end6, c->prefix))
{ {
c->preferred = c->valid = 0xffffffff; c->preferred = c->valid = 0xffffffff;
c->current = context; c->current = state->context;
context = c; state->context = c;
} }
if (!context) if (!state->context)
{ {
inet_ntop(AF_INET6, link_address, daemon->addrbuff, ADDRSTRLEN); inet_ntop(AF_INET6, state->link_address, daemon->addrbuff, ADDRSTRLEN);
my_syslog(MS_DHCP | LOG_WARNING, my_syslog(MS_DHCP | LOG_WARNING,
_("no address range available for DHCPv6 request from relay at %s"), _("no address range available for DHCPv6 request from relay at %s"),
daemon->addrbuff); daemon->addrbuff);
...@@ -147,15 +147,14 @@ static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid ** ...@@ -147,15 +147,14 @@ static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid **
} }
} }
if (!context) if (!state->context)
{ {
my_syslog(MS_DHCP | LOG_WARNING, my_syslog(MS_DHCP | LOG_WARNING,
_("no address range available for DHCPv6 request via %s"), iface_name); _("no address range available for DHCPv6 request via %s"), state->iface_name);
return 0; return 0;
} }
return dhcp6_no_relay(msg_type, link_address, *relay_tagsp, context, interface, iface_name, fallback, inbuff, return dhcp6_no_relay(state, msg_type, inbuff, sz, is_unicast, now);
sz, is_unicast, now, mac_len, mac_type, mac);
} }
/* must have at least msg_type+hopcount+link_address+peer_address+minimal size option /* must have at least msg_type+hopcount+link_address+peer_address+minimal size option
...@@ -185,8 +184,8 @@ static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid ** ...@@ -185,8 +184,8 @@ static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid **
memcmp(vendor->data, opt6_ptr(opt, 0), vendor->len) == 0 && memcmp(vendor->data, opt6_ptr(opt, 0), vendor->len) == 0 &&
vendor->netid.next != &vendor->netid) vendor->netid.next != &vendor->netid)
{ {
vendor->netid.next = *relay_tagsp; vendor->netid.next = state->tags;
*relay_tagsp = &vendor->netid; state->tags = &vendor->netid;
break; break;
} }
} }
...@@ -194,9 +193,9 @@ static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid ** ...@@ -194,9 +193,9 @@ static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid **
/* RFC-6939 */ /* RFC-6939 */
if ((opt = opt6_find(opts, end, OPTION6_CLIENT_MAC, 3))) if ((opt = opt6_find(opts, end, OPTION6_CLIENT_MAC, 3)))
{ {
mac = opt6_ptr(opt, 2); state->mac = opt6_ptr(opt, 2);
mac_type = opt6_uint(opt, 0, 2); state->mac_type = opt6_uint(opt, 0, 2);
mac_len = opt6_len(opt) - 2; state->mac_len = opt6_len(opt) - 2;
} }
for (opt = opts; opt; opt = opt6_next(opt, end)) for (opt = opts; opt; opt = opt6_next(opt, end))
...@@ -204,14 +203,13 @@ static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid ** ...@@ -204,14 +203,13 @@ static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid **
int o = new_opt6(opt6_type(opt)); int o = new_opt6(opt6_type(opt));
if (opt6_type(opt) == OPTION6_RELAY_MSG) if (opt6_type(opt) == OPTION6_RELAY_MSG)
{ {
struct in6_addr link_address; struct in6_addr align;
/* the packet data is unaligned, copy to aligned storage */ /* the packet data is unaligned, copy to aligned storage */
memcpy(&link_address, inbuff + 2, IN6ADDRSZ); memcpy(&align, inbuff + 2, IN6ADDRSZ);
/* Not, zero is_unicast since that is now known to refer to the state->link_address = &align;
/* zero is_unicast since that is now known to refer to the
relayed packet, not the original sent by the client */ relayed packet, not the original sent by the client */
if (!dhcp6_maybe_relay(&link_address, relay_tagsp, context, interface, iface_name, fallback, if (!dhcp6_maybe_relay(state, opt6_ptr(opt, 0), opt6_len(opt), 0, now))
opt6_ptr(opt, 0), opt6_len(opt), 0, now,
mac, mac_len, mac_type))
return 0; return 0;
} }
else if (opt6_type(opt) != OPTION6_CLIENT_MAC) else if (opt6_type(opt) != OPTION6_CLIENT_MAC)
...@@ -222,9 +220,7 @@ static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid ** ...@@ -222,9 +220,7 @@ static int dhcp6_maybe_relay(struct in6_addr *link_address, struct dhcp_netid **
return 1; return 1;
} }
static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dhcp_netid *tags, struct dhcp_context *context, static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_t sz, int is_unicast, time_t now)
int interface, char *iface_name, struct in6_addr *fallback, void *inbuff, size_t sz, int is_unicast, time_t now,
unsigned int mac_len, unsigned int mac_type, unsigned char *mac)
{ {
void *opt; void *opt;
int i, o, o1, start_opts; int i, o, o1, start_opts;
...@@ -237,57 +233,48 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -237,57 +233,48 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
struct dhcp_context *context_tmp; struct dhcp_context *context_tmp;
struct dhcp_mac *mac_opt; struct dhcp_mac *mac_opt;
unsigned int ignore = 0; unsigned int ignore = 0;
struct state state;
#ifdef OPTION6_PREFIX_CLASS #ifdef OPTION6_PREFIX_CLASS
struct prefix_class *p; struct prefix_class *p;
int dump_all_prefix_classes = 0; int dump_all_prefix_classes = 0;
#endif #endif
state.packet_options = inbuff + 4; state->packet_options = inbuff + 4;
state.end = inbuff + sz; state->end = inbuff + sz;
state.clid = NULL; state->clid = NULL;
state.clid_len = 0; state->clid_len = 0;
state.lease_allocate = 0; state->lease_allocate = 0;
state.context_tags = NULL; state->context_tags = NULL;
state.tags = tags; state->domain = NULL;
state.link_address = link_address; state->send_domain = NULL;
state.interface = interface; state->hostname_auth = 0;
state.domain = NULL; state->hostname = NULL;
state.send_domain = NULL; state->client_hostname = NULL;
state.context = context; state->fqdn_flags = 0x01; /* default to send if we recieve no FQDN option */
state.hostname_auth = 0;
state.hostname = NULL;
state.client_hostname = NULL;
state.iface_name = iface_name;
state.fqdn_flags = 0x01; /* default to send if we recieve no FQDN option */
state.mac = mac;
state.mac_len = mac_len;
state.mac_type = mac_type;
#ifdef OPTION6_PREFIX_CLASS #ifdef OPTION6_PREFIX_CLASS
state.send_prefix_class = NULL; state->send_prefix_class = NULL;
#endif #endif
/* set tag with name == interface */ /* set tag with name == interface */
iface_id.net = iface_name; iface_id.net = state->iface_name;
iface_id.next = state.tags; iface_id.next = state->tags;
state.tags = &iface_id; state->tags = &iface_id;
/* set tag "dhcpv6" */ /* set tag "dhcpv6" */
v6_id.net = "dhcpv6"; v6_id.net = "dhcpv6";
v6_id.next = state.tags; v6_id.next = state->tags;
state.tags = &v6_id; state->tags = &v6_id;
/* copy over transaction-id, and save pointer to message type */ /* copy over transaction-id, and save pointer to message type */
if (!(outmsgtypep = put_opt6(inbuff, 4))) if (!(outmsgtypep = put_opt6(inbuff, 4)))
return 0; return 0;
start_opts = save_counter(-1); start_opts = save_counter(-1);
state.xid = outmsgtypep[3] | outmsgtypep[2] << 8 | outmsgtypep[1] << 16; state->xid = outmsgtypep[3] | outmsgtypep[2] << 8 | outmsgtypep[1] << 16;
/* We're going to be linking tags from all context we use. /* We're going to be linking tags from all context we use.
mark them as unused so we don't link one twice and break the list */ mark them as unused so we don't link one twice and break the list */
for (context_tmp = context; context_tmp; context_tmp = context_tmp->current) for (context_tmp = state->context; context_tmp; context_tmp = context_tmp->current)
{ {
context->netid.next = &context->netid; context_tmp->netid.next = &context_tmp->netid;
if (option_bool(OPT_LOG_OPTS)) if (option_bool(OPT_LOG_OPTS))
{ {
...@@ -295,19 +282,19 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -295,19 +282,19 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
inet_ntop(AF_INET6, &context_tmp->end6, daemon->dhcp_buff2, ADDRSTRLEN); inet_ntop(AF_INET6, &context_tmp->end6, daemon->dhcp_buff2, ADDRSTRLEN);
if (context_tmp->flags & (CONTEXT_STATIC)) if (context_tmp->flags & (CONTEXT_STATIC))
my_syslog(MS_DHCP | LOG_INFO, _("%u available DHCPv6 subnet: %s/%d"), my_syslog(MS_DHCP | LOG_INFO, _("%u available DHCPv6 subnet: %s/%d"),
state.xid, daemon->dhcp_buff, context_tmp->prefix); state->xid, daemon->dhcp_buff, context_tmp->prefix);
else else
my_syslog(MS_DHCP | LOG_INFO, _("%u available DHCP range: %s -- %s"), my_syslog(MS_DHCP | LOG_INFO, _("%u available DHCP range: %s -- %s"),
state.xid, daemon->dhcp_buff, daemon->dhcp_buff2); state->xid, daemon->dhcp_buff, daemon->dhcp_buff2);
} }
} }
if ((opt = opt6_find(state.packet_options, state.end, OPTION6_CLIENT_ID, 1))) if ((opt = opt6_find(state->packet_options, state->end, OPTION6_CLIENT_ID, 1)))
{ {
state.clid = opt6_ptr(opt, 0); state->clid = opt6_ptr(opt, 0);
state.clid_len = opt6_len(opt); state->clid_len = opt6_len(opt);
o = new_opt6(OPTION6_CLIENT_ID); o = new_opt6(OPTION6_CLIENT_ID);
put_opt6(state.clid, state.clid_len); put_opt6(state->clid, state->clid_len);
end_opt6(o); end_opt6(o);
} }
else if (msg_type != DHCP6IREQ) else if (msg_type != DHCP6IREQ)
...@@ -315,7 +302,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -315,7 +302,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
/* server-id must match except for SOLICIT and CONFIRM messages */ /* server-id must match except for SOLICIT and CONFIRM messages */
if (msg_type != DHCP6SOLICIT && msg_type != DHCP6CONFIRM && msg_type != DHCP6IREQ && if (msg_type != DHCP6SOLICIT && msg_type != DHCP6CONFIRM && msg_type != DHCP6IREQ &&
(!(opt = opt6_find(state.packet_options, state.end, OPTION6_SERVER_ID, 1)) || (!(opt = opt6_find(state->packet_options, state->end, OPTION6_SERVER_ID, 1)) ||
opt6_len(opt) != daemon->duid_len || opt6_len(opt) != daemon->duid_len ||
memcmp(opt6_ptr(opt, 0), daemon->duid, daemon->duid_len) != 0)) memcmp(opt6_ptr(opt, 0), daemon->duid, daemon->duid_len) != 0))
return 0; return 0;
...@@ -347,7 +334,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -347,7 +334,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
else else
continue; continue;
if ((opt = opt6_find(state.packet_options, state.end, mopt, 2))) if ((opt = opt6_find(state->packet_options, state->end, mopt, 2)))
{ {
void *enc_opt, *enc_end = opt6_ptr(opt, opt6_len(opt)); void *enc_opt, *enc_end = opt6_ptr(opt, opt6_len(opt));
int offset = 0; int offset = 0;
...@@ -367,15 +354,15 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -367,15 +354,15 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
for (i = 0; i <= (opt6_len(enc_opt) - vendor->len); i++) for (i = 0; i <= (opt6_len(enc_opt) - vendor->len); i++)
if (memcmp(vendor->data, opt6_ptr(enc_opt, i), vendor->len) == 0) if (memcmp(vendor->data, opt6_ptr(enc_opt, i), vendor->len) == 0)
{ {
vendor->netid.next = state.tags; vendor->netid.next = state->tags;
state.tags = &vendor->netid; state->tags = &vendor->netid;
break; break;
} }
} }
} }
if (option_bool(OPT_LOG_OPTS) && (opt = opt6_find(state.packet_options, state.end, OPTION6_VENDOR_CLASS, 4))) if (option_bool(OPT_LOG_OPTS) && (opt = opt6_find(state->packet_options, state->end, OPTION6_VENDOR_CLASS, 4)))
my_syslog(MS_DHCP | LOG_INFO, _("%u vendor class: %u"), state.xid, opt6_uint(opt, 0, 4)); my_syslog(MS_DHCP | LOG_INFO, _("%u vendor class: %u"), state->xid, opt6_uint(opt, 0, 4));
/* dhcp-match. If we have hex-and-wildcards, look for a left-anchored match. /* dhcp-match. If we have hex-and-wildcards, look for a left-anchored match.
Otherwise assume the option is an array, and look for a matching element. Otherwise assume the option is an array, and look for a matching element.
...@@ -387,9 +374,9 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -387,9 +374,9 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
if (opt_cfg->flags & DHOPT_RFC3925) if (opt_cfg->flags & DHOPT_RFC3925)
{ {
for (opt = opt6_find(state.packet_options, state.end, OPTION6_VENDOR_OPTS, 4); for (opt = opt6_find(state->packet_options, state->end, OPTION6_VENDOR_OPTS, 4);
opt; opt;
opt = opt6_find(opt6_next(opt, state.end), state.end, OPTION6_VENDOR_OPTS, 4)) opt = opt6_find(opt6_next(opt, state->end), state->end, OPTION6_VENDOR_OPTS, 4))
{ {
void *vopt; void *vopt;
void *vend = opt6_ptr(opt, opt6_len(opt)); void *vend = opt6_ptr(opt, opt6_len(opt));
...@@ -405,7 +392,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -405,7 +392,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
} }
else else
{ {
if (!(opt = opt6_find(state.packet_options, state.end, opt_cfg->opt, 1))) if (!(opt = opt6_find(state->packet_options, state->end, opt_cfg->opt, 1)))
continue; continue;
match = match_bytes(opt_cfg, opt6_ptr(opt, 0), opt6_len(opt)); match = match_bytes(opt_cfg, opt6_ptr(opt, 0), opt6_len(opt));
...@@ -413,41 +400,41 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -413,41 +400,41 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
if (match) if (match)
{ {
opt_cfg->netid->next = state.tags; opt_cfg->netid->next = state->tags;
state.tags = opt_cfg->netid; state->tags = opt_cfg->netid;
} }
} }
if (mac_len != 0) if (state->mac_len != 0)
{ {
if (option_bool(OPT_LOG_OPTS)) if (option_bool(OPT_LOG_OPTS))
{ {
print_mac(daemon->dhcp_buff, mac, mac_len); print_mac(daemon->dhcp_buff, state->mac, state->mac_len);
my_syslog(MS_DHCP | LOG_INFO, _("%u client MAC address: %s"), state.xid, daemon->dhcp_buff); my_syslog(MS_DHCP | LOG_INFO, _("%u client MAC address: %s"), state->xid, daemon->dhcp_buff);
} }
for (mac_opt = daemon->dhcp_macs; mac_opt; mac_opt = mac_opt->next) for (mac_opt = daemon->dhcp_macs; mac_opt; mac_opt = mac_opt->next)
if ((unsigned)mac_opt->hwaddr_len == mac_len && if ((unsigned)mac_opt->hwaddr_len == state->mac_len &&
((unsigned)mac_opt->hwaddr_type == mac_type || mac_opt->hwaddr_type == 0) && ((unsigned)mac_opt->hwaddr_type == state->mac_type || mac_opt->hwaddr_type == 0) &&
memcmp_masked(mac_opt->hwaddr, mac, mac_len, mac_opt->mask)) memcmp_masked(mac_opt->hwaddr, state->mac, state->mac_len, mac_opt->mask))
{ {
mac_opt->netid.next = state.tags; mac_opt->netid.next = state->tags;
state.tags = &mac_opt->netid; state->tags = &mac_opt->netid;
} }
} }
if ((opt = opt6_find(state.packet_options, state.end, OPTION6_FQDN, 1))) if ((opt = opt6_find(state->packet_options, state->end, OPTION6_FQDN, 1)))
{ {
/* RFC4704 refers */ /* RFC4704 refers */
int len = opt6_len(opt) - 1; int len = opt6_len(opt) - 1;
state.fqdn_flags = opt6_uint(opt, 0, 1); state->fqdn_flags = opt6_uint(opt, 0, 1);
/* Always force update, since the client has no way to do it itself. */ /* Always force update, since the client has no way to do it itself. */
if (!option_bool(OPT_FQDN_UPDATE) && !(state.fqdn_flags & 0x01)) if (!option_bool(OPT_FQDN_UPDATE) && !(state->fqdn_flags & 0x01))
state.fqdn_flags |= 0x03; state->fqdn_flags |= 0x03;
state.fqdn_flags &= ~0x04; state->fqdn_flags &= ~0x04;
if (len != 0 && len < 255) if (len != 0 && len < 255)
{ {
...@@ -469,36 +456,36 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -469,36 +456,36 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
if (legal_hostname(daemon->dhcp_buff)) if (legal_hostname(daemon->dhcp_buff))
{ {
state.client_hostname = daemon->dhcp_buff; state->client_hostname = daemon->dhcp_buff;
if (option_bool(OPT_LOG_OPTS)) if (option_bool(OPT_LOG_OPTS))
my_syslog(MS_DHCP | LOG_INFO, _("%u client provides name: %s"), state.xid, state.client_hostname); my_syslog(MS_DHCP | LOG_INFO, _("%u client provides name: %s"), state->xid, state->client_hostname);
} }
} }
} }
if (state.clid) if (state->clid)
{ {
config = find_config(daemon->dhcp_conf, context, state.clid, state.clid_len, mac, mac_len, mac_type, NULL); config = find_config(daemon->dhcp_conf, state->context, state->clid, state->clid_len, state->mac, state->mac_len, state->mac_type, NULL);
if (have_config(config, CONFIG_NAME)) if (have_config(config, CONFIG_NAME))
{ {
state.hostname = config->hostname; state->hostname = config->hostname;
state.domain = config->domain; state->domain = config->domain;
state.hostname_auth = 1; state->hostname_auth = 1;
} }
else if (state.client_hostname) else if (state->client_hostname)
{ {
state.domain = strip_hostname(state.client_hostname); state->domain = strip_hostname(state->client_hostname);
if (strlen(state.client_hostname) != 0) if (strlen(state->client_hostname) != 0)
{ {
state.hostname = state.client_hostname; state->hostname = state->client_hostname;
if (!config) if (!config)
{ {
/* Search again now we have a hostname. /* Search again now we have a hostname.
Only accept configs without CLID here, (it won't match) Only accept configs without CLID here, (it won't match)
to avoid impersonation by name. */ to avoid impersonation by name. */
struct dhcp_config *new = find_config(daemon->dhcp_conf, context, NULL, 0, NULL, 0, 0, state.hostname); struct dhcp_config *new = find_config(daemon->dhcp_conf, state->context, NULL, 0, NULL, 0, 0, state->hostname);
if (new && !have_config(new, CONFIG_CLID) && !new->hwaddr) if (new && !have_config(new, CONFIG_CLID) && !new->hwaddr)
config = new; config = new;
} }
...@@ -512,14 +499,14 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -512,14 +499,14 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
for (list = config->netid; list; list = list->next) for (list = config->netid; list; list = list->next)
{ {
list->list->next = state.tags; list->list->next = state->tags;
state.tags = list->list; state->tags = list->list;
} }
/* set "known" tag for known hosts */ /* set "known" tag for known hosts */
known_id.net = "known"; known_id.net = "known";
known_id.next = state.tags; known_id.next = state->tags;
state.tags = &known_id; state->tags = &known_id;
if (have_config(config, CONFIG_DISABLE)) if (have_config(config, CONFIG_DISABLE))
ignore = 1; ignore = 1;
...@@ -531,7 +518,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -531,7 +518,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
{ {
void *oro; void *oro;
if ((oro = opt6_find(state.packet_options, state.end, OPTION6_ORO, 0))) if ((oro = opt6_find(state->packet_options, state->end, OPTION6_ORO, 0)))
for (i = 0; i < opt6_len(oro) - 1; i += 2) for (i = 0; i < opt6_len(oro) - 1; i += 2)
if (opt6_uint(oro, i, 2) == OPTION6_PREFIX_CLASS) if (opt6_uint(oro, i, 2) == OPTION6_PREFIX_CLASS)
{ {
...@@ -544,13 +531,13 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -544,13 +531,13 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
Not done for SOLICIT as we add them one-at-time. */ Not done for SOLICIT as we add them one-at-time. */
for (p = daemon->prefix_classes; p ; p = p->next) for (p = daemon->prefix_classes; p ; p = p->next)
{ {
p->tag.next = state.tags; p->tag.next = state->tags;
state.tags = &p->tag; state->tags = &p->tag;
} }
} }
#endif #endif
tagif = run_tag_if(state.tags); tagif = run_tag_if(state->tags);
/* if all the netids in the ignore list are present, ignore this client */ /* if all the netids in the ignore list are present, ignore this client */
if (daemon->dhcp_ignore) if (daemon->dhcp_ignore)
...@@ -563,7 +550,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -563,7 +550,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
} }
/* if all the netids in the ignore_name list are present, ignore client-supplied name */ /* if all the netids in the ignore_name list are present, ignore client-supplied name */
if (!state.hostname_auth) if (!state->hostname_auth)
{ {
struct dhcp_netid_list *id_list; struct dhcp_netid_list *id_list;
...@@ -571,7 +558,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -571,7 +558,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
if ((!id_list->list) || match_netid(id_list->list, tagif, 0)) if ((!id_list->list) || match_netid(id_list->list, tagif, 0))
break; break;
if (id_list) if (id_list)
state.hostname = NULL; state->hostname = NULL;
} }
...@@ -590,15 +577,15 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -590,15 +577,15 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
*outmsgtypep = DHCP6ADVERTISE; *outmsgtypep = DHCP6ADVERTISE;
if (opt6_find(state.packet_options, state.end, OPTION6_RAPID_COMMIT, 0)) if (opt6_find(state->packet_options, state->end, OPTION6_RAPID_COMMIT, 0))
{ {
*outmsgtypep = DHCP6REPLY; *outmsgtypep = DHCP6REPLY;
state.lease_allocate = 1; state->lease_allocate = 1;
o = new_opt6(OPTION6_RAPID_COMMIT); o = new_opt6(OPTION6_RAPID_COMMIT);
end_opt6(o); end_opt6(o);
} }
log6_packet(&state, "DHCPSOLICIT", NULL, ignore ? _("ignored") : NULL); log6_packet(state, "DHCPSOLICIT", NULL, ignore ? _("ignored") : NULL);
request_no_address: request_no_address:
solicit_tags = tagif; solicit_tags = tagif;
...@@ -610,10 +597,10 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -610,10 +597,10 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
lease6_reset(); lease6_reset();
/* Can use configured address max once per prefix */ /* Can use configured address max once per prefix */
for (c = context; c; c = c->current) for (c = state->context; c; c = c->current)
c->flags &= ~CONTEXT_CONF_USED; c->flags &= ~CONTEXT_CONF_USED;
for (opt = state.packet_options; opt; opt = opt6_next(opt, state.end)) for (opt = state->packet_options; opt; opt = opt6_next(opt, state->end))
{ {
void *ia_option, *ia_end; void *ia_option, *ia_end;
unsigned int min_time = 0xffffffff; unsigned int min_time = 0xffffffff;
...@@ -627,15 +614,15 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -627,15 +614,15 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
struct in6_addr *req_addr; struct in6_addr *req_addr;
struct in6_addr addr; struct in6_addr addr;
if (!check_ia(&state, opt, &ia_end, &ia_option)) if (!check_ia(state, opt, &ia_end, &ia_option))
continue; continue;
/* reset USED bits in contexts - one address per prefix per IAID */ /* reset USED bits in contexts - one address per prefix per IAID */
for (c = context; c; c = c->current) for (c = state->context; c; c = c->current)
c->flags &= ~CONTEXT_USED; c->flags &= ~CONTEXT_USED;
#ifdef OPTION6_PREFIX_CLASS #ifdef OPTION6_PREFIX_CLASS
if (daemon->prefix_classes && state.ia_type == OPTION6_IA_NA) if (daemon->prefix_classes && state->ia_type == OPTION6_IA_NA)
{ {
void *prefix_opt; void *prefix_opt;
int prefix_class; int prefix_class;
...@@ -659,10 +646,10 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -659,10 +646,10 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
else else
{ {
/* add tag to list, and exclude undecorated dhcp-ranges */ /* add tag to list, and exclude undecorated dhcp-ranges */
p->tag.next = state.tags; p->tag.next = state->tags;
solicit_tags = run_tag_if(&p->tag); solicit_tags = run_tag_if(&p->tag);
plain_range = 0; plain_range = 0;
state.send_prefix_class = p; state->send_prefix_class = p;
} }
} }
else else
...@@ -678,103 +665,103 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -678,103 +665,103 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
if (p) if (p)
{ {
plain_range = 0; plain_range = 0;
state.send_prefix_class = p; state->send_prefix_class = p;
} }
} }
if (p && option_bool(OPT_LOG_OPTS)) if (p && option_bool(OPT_LOG_OPTS))
my_syslog(MS_DHCP | LOG_INFO, "%u prefix class %d tag:%s", state.xid, p->class, p->tag.net); my_syslog(MS_DHCP | LOG_INFO, "%u prefix class %d tag:%s", state->xid, p->class, p->tag.net);
} }
} }
#endif #endif
o = build_ia(&state, &t1cntr); o = build_ia(state, &t1cntr);
for (ia_counter = 0; ia_option; ia_counter++, ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24)) for (ia_counter = 0; ia_option; ia_counter++, ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24))
{ {
req_addr = opt6_ptr(ia_option, 0); req_addr = opt6_ptr(ia_option, 0);
if ((c = address6_valid(context, req_addr, solicit_tags, plain_range))) if ((c = address6_valid(state->context, req_addr, solicit_tags, plain_range)))
{ {
lease_time = c->lease_time; lease_time = c->lease_time;
/* If the client asks for an address on the same network as a configured address, /* If the client asks for an address on the same network as a configured address,
offer the configured address instead, to make moving to newly-configured offer the configured address instead, to make moving to newly-configured
addresses automatic. */ addresses automatic. */
if (!(c->flags & CONTEXT_CONF_USED) && config_valid(config, c, &addr) && check_address(&state, &addr)) if (!(c->flags & CONTEXT_CONF_USED) && config_valid(config, c, &addr) && check_address(state, &addr))
{ {
req_addr = &addr; req_addr = &addr;
mark_config_used(c, &addr); mark_config_used(c, &addr);
if (have_config(config, CONFIG_TIME)) if (have_config(config, CONFIG_TIME))
lease_time = config->lease_time; lease_time = config->lease_time;
} }
else if (!(c = address6_available(context, req_addr, solicit_tags, plain_range))) else if (!(c = address6_available(state->context, req_addr, solicit_tags, plain_range)))
continue; /* not an address we're allowed */ continue; /* not an address we're allowed */
else if (!check_address(&state, req_addr)) else if (!check_address(state, req_addr))
continue; /* address leased elsewhere */ continue; /* address leased elsewhere */
/* add address to output packet */ /* add address to output packet */
#ifdef OPTION6_PREFIX_CLASS #ifdef OPTION6_PREFIX_CLASS
if (dump_all_prefix_classes && state.ia_type == OPTION6_IA_NA) if (dump_all_prefix_classes && state->ia_type == OPTION6_IA_NA)
state.send_prefix_class = prefix_class_from_context(c); state->send_prefix_class = prefix_class_from_context(c);
#endif #endif
add_address(&state, c, lease_time, ia_option, &min_time, req_addr, now); add_address(state, c, lease_time, ia_option, &min_time, req_addr, now);
mark_context_used(&state, context, req_addr); mark_context_used(state, req_addr);
get_context_tag(&state, c); get_context_tag(state, c);
address_assigned = 1; address_assigned = 1;
} }
} }
/* Suggest configured address(es) */ /* Suggest configured address(es) */
for (c = context; c; c = c->current) for (c = state->context; c; c = c->current)
if (!(c->flags & CONTEXT_CONF_USED) && if (!(c->flags & CONTEXT_CONF_USED) &&
match_netid(c->filter, solicit_tags, plain_range) && match_netid(c->filter, solicit_tags, plain_range) &&
config_valid(config, c, &addr) && config_valid(config, c, &addr) &&
check_address(&state, &addr)) check_address(state, &addr))
{ {
mark_config_used(context, &addr); mark_config_used(state->context, &addr);
if (have_config(config, CONFIG_TIME)) if (have_config(config, CONFIG_TIME))
lease_time = config->lease_time; lease_time = config->lease_time;
else else
lease_time = c->lease_time; lease_time = c->lease_time;
/* add address to output packet */ /* add address to output packet */
#ifdef OPTION6_PREFIX_CLASS #ifdef OPTION6_PREFIX_CLASS
if (dump_all_prefix_classes && state.ia_type == OPTION6_IA_NA) if (dump_all_prefix_classes && state->ia_type == OPTION6_IA_NA)
state.send_prefix_class = prefix_class_from_context(c); state->send_prefix_class = prefix_class_from_context(c);
#endif #endif
add_address(&state, c, lease_time, NULL, &min_time, &addr, now); add_address(state, c, lease_time, NULL, &min_time, &addr, now);
mark_context_used(&state, context, &addr); mark_context_used(state, &addr);
get_context_tag(&state, c); get_context_tag(state, c);
address_assigned = 1; address_assigned = 1;
} }
/* return addresses for existing leases */ /* return addresses for existing leases */
ltmp = NULL; ltmp = NULL;
while ((ltmp = lease6_find_by_client(ltmp, state.ia_type == OPTION6_IA_NA ? LEASE_NA : LEASE_TA, state.clid, state.clid_len, state.iaid))) while ((ltmp = lease6_find_by_client(ltmp, state->ia_type == OPTION6_IA_NA ? LEASE_NA : LEASE_TA, state->clid, state->clid_len, state->iaid)))
{ {
req_addr = &ltmp->addr6; req_addr = &ltmp->addr6;
if ((c = address6_available(context, req_addr, solicit_tags, plain_range))) if ((c = address6_available(state->context, req_addr, solicit_tags, plain_range)))
{ {
#ifdef OPTION6_PREFIX_CLASS #ifdef OPTION6_PREFIX_CLASS
if (dump_all_prefix_classes && state.ia_type == OPTION6_IA_NA) if (dump_all_prefix_classes && state->ia_type == OPTION6_IA_NA)
state.send_prefix_class = prefix_class_from_context(c); state->send_prefix_class = prefix_class_from_context(c);
#endif #endif
add_address(&state, c, c->lease_time, NULL, &min_time, req_addr, now); add_address(state, c, c->lease_time, NULL, &min_time, req_addr, now);
mark_context_used(&state, context, req_addr); mark_context_used(state, req_addr);
get_context_tag(&state, c); get_context_tag(state, c);
address_assigned = 1; address_assigned = 1;
} }
} }
/* Return addresses for all valid contexts which don't yet have one */ /* Return addresses for all valid contexts which don't yet have one */
while ((c = address6_allocate(context, state.clid, state.clid_len, state.iaid, ia_counter, solicit_tags, plain_range, &addr))) while ((c = address6_allocate(state->context, state->clid, state->clid_len, state->iaid, ia_counter, solicit_tags, plain_range, &addr)))
{ {
#ifdef OPTION6_PREFIX_CLASS #ifdef OPTION6_PREFIX_CLASS
if (dump_all_prefix_classes && state.ia_type == OPTION6_IA_NA) if (dump_all_prefix_classes && state->ia_type == OPTION6_IA_NA)
state.send_prefix_class = prefix_class_from_context(c); state->send_prefix_class = prefix_class_from_context(c);
#endif #endif
add_address(&state, c, c->lease_time, NULL, &min_time, &addr, now); add_address(state, c, c->lease_time, NULL, &min_time, &addr, now);
mark_context_used(&state, context, &addr); mark_context_used(state, &addr);
get_context_tag(&state, c); get_context_tag(state, c);
address_assigned = 1; address_assigned = 1;
} }
...@@ -794,7 +781,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -794,7 +781,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
o = new_opt6(OPTION6_PREFERENCE); o = new_opt6(OPTION6_PREFERENCE);
put_opt6_char(option_bool(OPT_AUTHORITATIVE) ? 255 : 0); put_opt6_char(option_bool(OPT_AUTHORITATIVE) ? 255 : 0);
end_opt6(o); end_opt6(o);
tagif = add_options(&state, fallback, context, 0); tagif = add_options(state, 0);
} }
else else
{ {
...@@ -803,7 +790,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -803,7 +790,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
put_opt6_short(DHCP6NOADDRS); put_opt6_short(DHCP6NOADDRS);
put_opt6_string(_("no addresses available")); put_opt6_string(_("no addresses available"));
end_opt6(o1); end_opt6(o1);
log6_packet(&state, "DHCPADVERTISE", NULL, _("no addresses available")); log6_packet(state, "DHCPADVERTISE", NULL, _("no addresses available"));
} }
break; break;
...@@ -816,20 +803,20 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -816,20 +803,20 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
/* set reply message type */ /* set reply message type */
*outmsgtypep = DHCP6REPLY; *outmsgtypep = DHCP6REPLY;
state.lease_allocate = 1; state->lease_allocate = 1;
log6_packet(&state, "DHCPREQUEST", NULL, ignore ? _("ignored") : NULL); log6_packet(state, "DHCPREQUEST", NULL, ignore ? _("ignored") : NULL);
if (ignore) if (ignore)
return 0; return 0;
for (opt = state.packet_options; opt; opt = opt6_next(opt, state.end)) for (opt = state->packet_options; opt; opt = opt6_next(opt, state->end))
{ {
void *ia_option, *ia_end; void *ia_option, *ia_end;
unsigned int min_time = 0xffffffff; unsigned int min_time = 0xffffffff;
int t1cntr; int t1cntr;
if (!check_ia(&state, opt, &ia_end, &ia_option)) if (!check_ia(state, opt, &ia_end, &ia_option))
continue; continue;
if (!ia_option) if (!ia_option)
...@@ -840,7 +827,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -840,7 +827,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
goto request_no_address; goto request_no_address;
} }
o = build_ia(&state, &t1cntr); o = build_ia(state, &t1cntr);
for (; ia_option; ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24)) for (; ia_option; ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24))
{ {
...@@ -850,10 +837,10 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -850,10 +837,10 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
struct in6_addr addr; struct in6_addr addr;
int config_ok = 0; int config_ok = 0;
if ((c = address6_valid(context, req_addr, tagif, 1))) if ((c = address6_valid(state->context, req_addr, tagif, 1)))
config_ok = config_valid(config, c, &addr) && IN6_ARE_ADDR_EQUAL(&addr, req_addr); config_ok = config_valid(config, c, &addr) && IN6_ARE_ADDR_EQUAL(&addr, req_addr);
if ((dynamic = address6_available(context, req_addr, tagif, 1)) || c) if ((dynamic = address6_available(state->context, req_addr, tagif, 1)) || c)
{ {
if (!dynamic && !config_ok) if (!dynamic && !config_ok)
{ {
...@@ -863,7 +850,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -863,7 +850,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
put_opt6_string(_("address unavailable")); put_opt6_string(_("address unavailable"));
end_opt6(o1); end_opt6(o1);
} }
else if (!check_address(&state, req_addr)) else if (!check_address(state, req_addr))
{ {
/* Address leased to another DUID/IAID */ /* Address leased to another DUID/IAID */
o1 = new_opt6(OPTION6_STATUS_CODE); o1 = new_opt6(OPTION6_STATUS_CODE);
...@@ -882,11 +869,11 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -882,11 +869,11 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
lease_time = config->lease_time; lease_time = config->lease_time;
#ifdef OPTION6_PREFIX_CLASS #ifdef OPTION6_PREFIX_CLASS
if (dump_all_prefix_classes && state.ia_type == OPTION6_IA_NA) if (dump_all_prefix_classes && state->ia_type == OPTION6_IA_NA)
state.send_prefix_class = prefix_class_from_context(c); state->send_prefix_class = prefix_class_from_context(c);
#endif #endif
add_address(&state, dynamic, lease_time, ia_option, &min_time, req_addr, now); add_address(state, dynamic, lease_time, ia_option, &min_time, req_addr, now);
get_context_tag(&state, dynamic); get_context_tag(state, dynamic);
address_assigned = 1; address_assigned = 1;
} }
} }
...@@ -918,10 +905,10 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -918,10 +905,10 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
put_opt6_short(DHCP6NOADDRS); put_opt6_short(DHCP6NOADDRS);
put_opt6_string(_("no addresses available")); put_opt6_string(_("no addresses available"));
end_opt6(o1); end_opt6(o1);
log6_packet(&state, "DHCPREPLY", NULL, _("no addresses available")); log6_packet(state, "DHCPREPLY", NULL, _("no addresses available"));
} }
tagif = add_options(&state, fallback, context, 0); tagif = add_options(state, 0);
break; break;
} }
...@@ -931,18 +918,18 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -931,18 +918,18 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
/* set reply message type */ /* set reply message type */
*outmsgtypep = DHCP6REPLY; *outmsgtypep = DHCP6REPLY;
log6_packet(&state, "DHCPRENEW", NULL, NULL); log6_packet(state, "DHCPRENEW", NULL, NULL);
for (opt = state.packet_options; opt; opt = opt6_next(opt, state.end)) for (opt = state->packet_options; opt; opt = opt6_next(opt, state->end))
{ {
void *ia_option, *ia_end; void *ia_option, *ia_end;
unsigned int min_time = 0xffffffff; unsigned int min_time = 0xffffffff;
int t1cntr, iacntr; int t1cntr, iacntr;
if (!check_ia(&state, opt, &ia_end, &ia_option)) if (!check_ia(state, opt, &ia_end, &ia_option))
continue; continue;
o = build_ia(&state, &t1cntr); o = build_ia(state, &t1cntr);
iacntr = save_counter(-1); iacntr = save_counter(-1);
for (; ia_option; ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24)) for (; ia_option; ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24))
...@@ -954,9 +941,9 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -954,9 +941,9 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
char *message = NULL; char *message = NULL;
struct dhcp_context *this_context; struct dhcp_context *this_context;
if (!(lease = lease6_find(state.clid, state.clid_len, if (!(lease = lease6_find(state->clid, state->clid_len,
state.ia_type == OPTION6_IA_NA ? LEASE_NA : LEASE_TA, state->ia_type == OPTION6_IA_NA ? LEASE_NA : LEASE_TA,
state.iaid, req_addr))) state->iaid, req_addr)))
{ {
/* If the server cannot find a client entry for the IA the server /* If the server cannot find a client entry for the IA the server
returns the IA containing no addresses with a Status Code option set returns the IA containing no addresses with a Status Code option set
...@@ -964,7 +951,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -964,7 +951,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
save_counter(iacntr); save_counter(iacntr);
t1cntr = 0; t1cntr = 0;
log6_packet(&state, "DHCPREPLY", req_addr, _("lease not found")); log6_packet(state, "DHCPREPLY", req_addr, _("lease not found"));
o1 = new_opt6(OPTION6_STATUS_CODE); o1 = new_opt6(OPTION6_STATUS_CODE);
put_opt6_short(DHCP6NOBINDING); put_opt6_short(DHCP6NOBINDING);
...@@ -976,13 +963,13 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -976,13 +963,13 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
} }
if ((this_context = address6_available(context, req_addr, tagif, 1)) || if ((this_context = address6_available(state->context, req_addr, tagif, 1)) ||
(this_context = address6_valid(context, req_addr, tagif, 1))) (this_context = address6_valid(state->context, req_addr, tagif, 1)))
{ {
struct in6_addr addr; struct in6_addr addr;
unsigned int lease_time; unsigned int lease_time;
get_context_tag(&state, this_context); get_context_tag(state, this_context);
if (config_valid(config, this_context, &addr) && IN6_ARE_ADDR_EQUAL(&addr, req_addr) && have_config(config, CONFIG_TIME)) if (config_valid(config, this_context, &addr) && IN6_ARE_ADDR_EQUAL(&addr, req_addr) && have_config(config, CONFIG_TIME))
lease_time = config->lease_time; lease_time = config->lease_time;
...@@ -993,15 +980,15 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -993,15 +980,15 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
lease_set_expires(lease, valid_time, now); lease_set_expires(lease, valid_time, now);
/* Update MAC record in case it's new information. */ /* Update MAC record in case it's new information. */
if (mac_len != 0) if (state->mac_len != 0)
lease_set_hwaddr(lease, mac, state.clid, mac_len, mac_type, state.clid_len, now, 0); lease_set_hwaddr(lease, state->mac, state->clid, state->mac_len, state->mac_type, state->clid_len, now, 0);
if (state.ia_type == OPTION6_IA_NA && state.hostname) if (state->ia_type == OPTION6_IA_NA && state->hostname)
{ {
char *addr_domain = get_domain6(req_addr); char *addr_domain = get_domain6(req_addr);
if (!state.send_domain) if (!state->send_domain)
state.send_domain = addr_domain; state->send_domain = addr_domain;
lease_set_hostname(lease, state.hostname, state.hostname_auth, addr_domain, state.domain); lease_set_hostname(lease, state->hostname, state->hostname_auth, addr_domain, state->domain);
message = state.hostname; message = state->hostname;
} }
...@@ -1014,7 +1001,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -1014,7 +1001,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
message = _("address invalid"); message = _("address invalid");
} }
log6_packet(&state, "DHCPREPLY", req_addr, message); log6_packet(state, "DHCPREPLY", req_addr, message);
o1 = new_opt6(OPTION6_IAADDR); o1 = new_opt6(OPTION6_IAADDR);
put_opt6(req_addr, sizeof(*req_addr)); put_opt6(req_addr, sizeof(*req_addr));
...@@ -1027,7 +1014,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -1027,7 +1014,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
end_opt6(o); end_opt6(o);
} }
tagif = add_options(&state, fallback, context, 0); tagif = add_options(state, 0);
break; break;
} }
...@@ -1037,19 +1024,19 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -1037,19 +1024,19 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
/* set reply message type */ /* set reply message type */
*outmsgtypep = DHCP6REPLY; *outmsgtypep = DHCP6REPLY;
log6_packet(&state, "DHCPCONFIRM", NULL, NULL); log6_packet(state, "DHCPCONFIRM", NULL, NULL);
for (opt = state.packet_options; opt; opt = opt6_next(opt, state.end)) for (opt = state->packet_options; opt; opt = opt6_next(opt, state->end))
{ {
void *ia_option, *ia_end; void *ia_option, *ia_end;
for (check_ia(&state, opt, &ia_end, &ia_option); for (check_ia(state, opt, &ia_end, &ia_option);
ia_option; ia_option;
ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24)) ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24))
{ {
struct in6_addr *req_addr = opt6_ptr(ia_option, 0); struct in6_addr *req_addr = opt6_ptr(ia_option, 0);
if (!address6_available(context, req_addr, tagif, 1)) if (!address6_available(state->context, req_addr, tagif, 1))
{ {
o1 = new_opt6(OPTION6_STATUS_CODE); o1 = new_opt6(OPTION6_STATUS_CODE);
put_opt6_short(DHCP6NOTONLINK); put_opt6_short(DHCP6NOTONLINK);
...@@ -1058,7 +1045,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -1058,7 +1045,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
return 1; return 1;
} }
log6_packet(&state, "DHCPREPLY", req_addr, state.hostname); log6_packet(state, "DHCPREPLY", req_addr, state->hostname);
} }
} }
...@@ -1073,25 +1060,25 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -1073,25 +1060,25 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
{ {
/* We can't discriminate contexts based on address, as we don't know it. /* We can't discriminate contexts based on address, as we don't know it.
If there is only one possible context, we can use its tags */ If there is only one possible context, we can use its tags */
if (context && context->netid.net && !context->current) if (state->context && state->context->netid.net && !state->context->current)
{ {
context->netid.next = NULL; state->context->netid.next = NULL;
state.context_tags = &context->netid; state->context_tags = &state->context->netid;
} }
/* Similarly, we can't determine domain from address, but if the FQDN is /* Similarly, we can't determine domain from address, but if the FQDN is
given in --dhcp-host, we can use that, and failing that we can use the given in --dhcp-host, we can use that, and failing that we can use the
unqualified configured domain, if any. */ unqualified configured domain, if any. */
if (state.hostname_auth) if (state->hostname_auth)
state.send_domain = state.domain; state->send_domain = state->domain;
else else
state.send_domain = get_domain6(NULL); state->send_domain = get_domain6(NULL);
log6_packet(&state, "DHCPINFORMATION-REQUEST", NULL, ignore ? _("ignored") : state.hostname); log6_packet(state, "DHCPINFORMATION-REQUEST", NULL, ignore ? _("ignored") : state->hostname);
if (ignore) if (ignore)
return 0; return 0;
*outmsgtypep = DHCP6REPLY; *outmsgtypep = DHCP6REPLY;
tagif = add_options(&state, fallback, context, 1); tagif = add_options(state, 1);
break; break;
} }
...@@ -1101,29 +1088,29 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -1101,29 +1088,29 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
/* set reply message type */ /* set reply message type */
*outmsgtypep = DHCP6REPLY; *outmsgtypep = DHCP6REPLY;
log6_packet(&state, "DHCPRELEASE", NULL, NULL); log6_packet(state, "DHCPRELEASE", NULL, NULL);
for (opt = state.packet_options; opt; opt = opt6_next(opt, state.end)) for (opt = state->packet_options; opt; opt = opt6_next(opt, state->end))
{ {
void *ia_option, *ia_end; void *ia_option, *ia_end;
int made_ia = 0; int made_ia = 0;
for (check_ia(&state, opt, &ia_end, &ia_option); for (check_ia(state, opt, &ia_end, &ia_option);
ia_option; ia_option;
ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24)) ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24))
{ {
struct dhcp_lease *lease; struct dhcp_lease *lease;
if ((lease = lease6_find(state.clid, state.clid_len, state.ia_type == OPTION6_IA_NA ? LEASE_NA : LEASE_TA, if ((lease = lease6_find(state->clid, state->clid_len, state->ia_type == OPTION6_IA_NA ? LEASE_NA : LEASE_TA,
state.iaid, opt6_ptr(ia_option, 0)))) state->iaid, opt6_ptr(ia_option, 0))))
lease_prune(lease, now); lease_prune(lease, now);
else else
{ {
if (!made_ia) if (!made_ia)
{ {
o = new_opt6(state.ia_type); o = new_opt6(state->ia_type);
put_opt6_long(state.iaid); put_opt6_long(state->iaid);
if (state.ia_type == OPTION6_IA_NA) if (state->ia_type == OPTION6_IA_NA)
{ {
put_opt6_long(0); put_opt6_long(0);
put_opt6_long(0); put_opt6_long(0);
...@@ -1163,14 +1150,14 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -1163,14 +1150,14 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
/* set reply message type */ /* set reply message type */
*outmsgtypep = DHCP6REPLY; *outmsgtypep = DHCP6REPLY;
log6_packet(&state, "DHCPDECLINE", NULL, NULL); log6_packet(state, "DHCPDECLINE", NULL, NULL);
for (opt = state.packet_options; opt; opt = opt6_next(opt, state.end)) for (opt = state->packet_options; opt; opt = opt6_next(opt, state->end))
{ {
void *ia_option, *ia_end; void *ia_option, *ia_end;
int made_ia = 0; int made_ia = 0;
for (check_ia(&state, opt, &ia_end, &ia_option); for (check_ia(state, opt, &ia_end, &ia_option);
ia_option; ia_option;
ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24)) ia_option = opt6_find(opt6_next(ia_option, ia_end), ia_end, OPTION6_IAADDR, 24))
{ {
...@@ -1188,19 +1175,19 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -1188,19 +1175,19 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
} }
else else
/* make sure this host gets a different address next time. */ /* make sure this host gets a different address next time. */
for (; context; context = context->current) for (context_tmp = state->context; context_tmp; context_tmp = context_tmp->current)
context->addr_epoch++; context_tmp->addr_epoch++;
if ((lease = lease6_find(state.clid, state.clid_len, state.ia_type == OPTION6_IA_NA ? LEASE_NA : LEASE_TA, if ((lease = lease6_find(state->clid, state->clid_len, state->ia_type == OPTION6_IA_NA ? LEASE_NA : LEASE_TA,
state.iaid, opt6_ptr(ia_option, 0)))) state->iaid, opt6_ptr(ia_option, 0))))
lease_prune(lease, now); lease_prune(lease, now);
else else
{ {
if (!made_ia) if (!made_ia)
{ {
o = new_opt6(state.ia_type); o = new_opt6(state->ia_type);
put_opt6_long(state.iaid); put_opt6_long(state->iaid);
if (state.ia_type == OPTION6_IA_NA) if (state->ia_type == OPTION6_IA_NA)
{ {
put_opt6_long(0); put_opt6_long(0);
put_opt6_long(0); put_opt6_long(0);
...@@ -1232,17 +1219,14 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh ...@@ -1232,17 +1219,14 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
} }
log_tags(tagif, state.xid); log_tags(tagif, state->xid);
log6_opts(0, state.xid, daemon->outpacket.iov_base + start_opts, daemon->outpacket.iov_base + save_counter(-1)); log6_opts(0, state->xid, daemon->outpacket.iov_base + start_opts, daemon->outpacket.iov_base + save_counter(-1));
return 1; return 1;
} }
static struct dhcp_netid *add_options(struct state *state, static struct dhcp_netid *add_options(struct state *state, int do_refresh)
struct in6_addr *fallback,
struct dhcp_context *context,
int do_refresh)
{ {
void *oro; void *oro;
/* filter options based on tags, those we want get DHOPT_TAGOK bit set */ /* filter options based on tags, those we want get DHOPT_TAGOK bit set */
...@@ -1290,8 +1274,8 @@ static struct dhcp_netid *add_options(struct state *state, ...@@ -1290,8 +1274,8 @@ static struct dhcp_netid *add_options(struct state *state,
/* zero means "self" (but not in vendorclass options.) */ /* zero means "self" (but not in vendorclass options.) */
if (IN6_IS_ADDR_UNSPECIFIED(a)) if (IN6_IS_ADDR_UNSPECIFIED(a))
{ {
if (!add_local_addrs(context)) if (!add_local_addrs(state->context))
put_opt6(fallback, IN6ADDRSZ); put_opt6(state->fallback, IN6ADDRSZ);
} }
else else
put_opt6(a, IN6ADDRSZ); put_opt6(a, IN6ADDRSZ);
...@@ -1305,12 +1289,12 @@ static struct dhcp_netid *add_options(struct state *state, ...@@ -1305,12 +1289,12 @@ static struct dhcp_netid *add_options(struct state *state,
if (daemon->port == NAMESERVER_PORT && !done_dns) if (daemon->port == NAMESERVER_PORT && !done_dns)
{ {
o = new_opt6(OPTION6_DNS_SERVER); o = new_opt6(OPTION6_DNS_SERVER);
if (!add_local_addrs(context)) if (!add_local_addrs(state->context))
put_opt6(fallback, IN6ADDRSZ); put_opt6(state->fallback, IN6ADDRSZ);
end_opt6(o); end_opt6(o);
} }
if (context && !done_refresh) if (state->context && !done_refresh)
{ {
struct dhcp_context *c; struct dhcp_context *c;
unsigned int lease_time = 0xffffffff; unsigned int lease_time = 0xffffffff;
...@@ -1318,7 +1302,7 @@ static struct dhcp_netid *add_options(struct state *state, ...@@ -1318,7 +1302,7 @@ static struct dhcp_netid *add_options(struct state *state,
/* Find the smallest lease tie of all contexts, /* Find the smallest lease tie of all contexts,
subjext to the RFC-4242 stipulation that this must not subjext to the RFC-4242 stipulation that this must not
be less than 600. */ be less than 600. */
for (c = context; c; c = c->next) for (c = state->context; c; c = c->next)
if (c->lease_time < lease_time) if (c->lease_time < lease_time)
{ {
if (c->lease_time < 600) if (c->lease_time < 600)
...@@ -1620,17 +1604,18 @@ static void add_address(struct state *state, struct dhcp_context *context, unsig ...@@ -1620,17 +1604,18 @@ static void add_address(struct state *state, struct dhcp_context *context, unsig
} }
static void mark_context_used(struct state *state, struct dhcp_context *context, struct in6_addr *addr) static void mark_context_used(struct state *state, struct in6_addr *addr)
{ {
struct dhcp_context *context;
/* Mark that we have an address for this prefix. */ /* Mark that we have an address for this prefix. */
#ifdef OPTION6_PREFIX_CLASS #ifdef OPTION6_PREFIX_CLASS
for (; context; context = context->current) for (context = state->context; context; context = context->current)
if (is_same_net6(addr, &context->start6, context->prefix) && if (is_same_net6(addr, &context->start6, context->prefix) &&
(!state->send_prefix_class || state->send_prefix_class == prefix_class_from_context(context))) (!state->send_prefix_class || state->send_prefix_class == prefix_class_from_context(context)))
context->flags |= CONTEXT_USED; context->flags |= CONTEXT_USED;
#else #else
(void)state; /* warning */ for (context = state->context; context; context = context->current)
for (; context; context = context->current)
if (is_same_net6(addr, &context->start6, context->prefix)) if (is_same_net6(addr, &context->start6, context->prefix))
context->flags |= CONTEXT_USED; context->flags |= CONTEXT_USED;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment