Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
.info = iface_attr_info,
};
.info = iface_attr_info,
};
enum {
LEASE_ATTR_IP,
LEASE_ATTR_MAC,
enum {
LEASE_ATTR_IP,
LEASE_ATTR_MAC,
static const struct blobmsg_policy lease_attrs[LEASE_ATTR_MAX] = {
[LEASE_ATTR_IP] = { .name = "ip", .type = BLOBMSG_TYPE_STRING },
[LEASE_ATTR_MAC] = { .name = "mac", .type = BLOBMSG_TYPE_STRING },
static const struct blobmsg_policy lease_attrs[LEASE_ATTR_MAX] = {
[LEASE_ATTR_IP] = { .name = "ip", .type = BLOBMSG_TYPE_STRING },
[LEASE_ATTR_MAC] = { .name = "mac", .type = BLOBMSG_TYPE_STRING },
[LEASE_ATTR_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
};
[LEASE_ATTR_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
};
const struct uci_blob_param_list lease_attr_list = {
.n_params = LEASE_ATTR_MAX,
.params = lease_attrs,
};
const struct uci_blob_param_list lease_attr_list = {
.n_params = LEASE_ATTR_MAX,
.params = lease_attrs,
};
enum {
ODHCPD_ATTR_MAINDHCP,
ODHCPD_ATTR_LEASEFILE,
enum {
ODHCPD_ATTR_MAINDHCP,
ODHCPD_ATTR_LEASEFILE,
static const struct blobmsg_policy odhcpd_attrs[LEASE_ATTR_MAX] = {
[ODHCPD_ATTR_MAINDHCP] = { .name = "maindhcp", .type = BLOBMSG_TYPE_BOOL },
[ODHCPD_ATTR_LEASEFILE] = { .name = "leasefile", .type = BLOBMSG_TYPE_STRING },
[ODHCPD_ATTR_LEASETRIGGER] = { .name = "leasetrigger", .type = BLOBMSG_TYPE_STRING },
};
static const struct blobmsg_policy odhcpd_attrs[LEASE_ATTR_MAX] = {
[ODHCPD_ATTR_MAINDHCP] = { .name = "maindhcp", .type = BLOBMSG_TYPE_BOOL },
[ODHCPD_ATTR_LEASEFILE] = { .name = "leasefile", .type = BLOBMSG_TYPE_STRING },
[ODHCPD_ATTR_LEASETRIGGER] = { .name = "leasetrigger", .type = BLOBMSG_TYPE_STRING },
};
const struct uci_blob_param_list odhcpd_attr_list = {
.n_params = ODHCPD_ATTR_MAX,
.params = odhcpd_attrs,
const struct uci_blob_param_list odhcpd_attr_list = {
.n_params = ODHCPD_ATTR_MAX,
.params = odhcpd_attrs,
static void clean_interface(struct interface *iface)
{
free(iface->dns);
static void clean_interface(struct interface *iface)
{
free(iface->dns);
memset(&iface->ra, 0, sizeof(*iface) - offsetof(struct interface, ra));
}
memset(&iface->ra, 0, sizeof(*iface) - offsetof(struct interface, ra));
}
static void close_interface(struct interface *iface)
{
if (iface->head.next)
static void close_interface(struct interface *iface)
{
if (iface->head.next)
static int parse_mode(const char *mode)
{
static int parse_mode(const char *mode)
{
- if (!strcmp(mode, "disabled")) {
+ if (!strcmp(mode, "disabled"))
- } else if (!strcmp(mode, "server")) {
+ else if (!strcmp(mode, "server"))
- } else if (!strcmp(mode, "relay")) {
+ else if (!strcmp(mode, "relay"))
- } else if (!strcmp(mode, "hybrid")) {
+ else if (!strcmp(mode, "hybrid"))
static void set_config(struct uci_section *s)
{
struct blob_attr *tb[ODHCPD_ATTR_MAX], *c;
static void set_config(struct uci_section *s)
{
struct blob_attr *tb[ODHCPD_ATTR_MAX], *c;
int config_parse_interface(void *data, size_t len, const char *name, bool overwrite)
{
struct blob_attr *tb[IFACE_ATTR_MAX], *c;
int config_parse_interface(void *data, size_t len, const char *name, bool overwrite)
{
struct blob_attr *tb[IFACE_ATTR_MAX], *c;
goto err;
iface->dhcpv4_router[iface->dhcpv4_router_cnt - 1] = addr4;
goto err;
iface->dhcpv4_router[iface->dhcpv4_router_cnt - 1] = addr4;
goto err;
iface->dns[iface->dns_cnt - 1] = addr6;
goto err;
iface->dns[iface->dns_cnt - 1] = addr6;
{
blob_buf_init(&b, 0);
uci_to_blob(&b, s, &interface_attr_list);
{
blob_buf_init(&b, 0);
uci_to_blob(&b, s, &interface_attr_list);
return config_parse_interface(blob_data(b.head), blob_len(b.head), s->e.name, true);
}
return config_parse_interface(blob_data(b.head), blob_len(b.head), s->e.name, true);
}
void odhcpd_reload(void)
{
struct uci_context *uci = uci_alloc_context();
void odhcpd_reload(void)
{
struct uci_context *uci = uci_alloc_context();
while (!list_empty(&leases)) {
struct lease *l = list_first_entry(&leases, struct lease, head);
list_del(&l->head);
while (!list_empty(&leases)) {
struct lease *l = list_first_entry(&leases, struct lease, head);
list_del(&l->head);
bool any_dhcpv6_slave = false, any_ra_slave = false, any_ndp_slave = false;
bool any_dhcpv6_slave = false, any_ra_slave = false, any_ndp_slave = false;
list_for_each_entry(i, &interfaces, head) {
if (i->master)
continue;
list_for_each_entry(i, &interfaces, head) {
if (i->master)
continue;
- // Evaluate hybrid mode for master
+ /* Evaluate hybrid mode for master */
list_for_each_entry(i, &interfaces, head) {
if (!i->master)
continue;
list_for_each_entry(i, &interfaces, head) {
if (!i->master)
continue;
list_for_each_entry_safe(i, n, &interfaces, head) {
if (i->inuse) {
list_for_each_entry_safe(i, n, &interfaces, head) {
if (i->inuse) {
+ /* Resolve hybrid mode */
if (i->dhcpv6 == RELAYD_HYBRID)
i->dhcpv6 = (master && master->dhcpv6 == RELAYD_RELAY) ?
RELAYD_RELAY : RELAYD_SERVER;
if (i->dhcpv6 == RELAYD_HYBRID)
i->dhcpv6 = (master && master->dhcpv6 == RELAYD_RELAY) ?
RELAYD_RELAY : RELAYD_SERVER;
static void handle_signal(int signal)
{
char b[1] = {0};
static void handle_signal(int signal)
{
char b[1] = {0};
static void reload_cb(struct uloop_fd *u, _unused unsigned int events)
{
char b[512];
if (read(u->fd, b, sizeof(b)) < 0) {}
static void reload_cb(struct uloop_fd *u, _unused unsigned int events)
{
char b[512];
if (read(u->fd, b, sizeof(b)) < 0) {}
void odhcpd_run(void)
{
if (pipe2(reload_pipe, O_NONBLOCK | O_CLOEXEC) < 0) {}
void odhcpd_run(void)
{
if (pipe2(reload_pipe, O_NONBLOCK | O_CLOEXEC) < 0) {}
reload_fd.fd = reload_pipe[0];
uloop_fd_add(&reload_fd, ULOOP_READ);
reload_fd.fd = reload_pipe[0];
uloop_fd_add(&reload_fd, ULOOP_READ);