* netifd - network interface daemon
* Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
* Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ * Copyright (C) 2018 Alexander Couzens <lynxis@fe80.eu>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h>
#include <arpa/inet.h>
struct vlist_tree iprules;
static bool iprules_flushed = false;
+static unsigned int iprules_counter[2];
enum {
RULE_INTERFACE_IN,
RULE_LOOKUP,
RULE_ACTION,
RULE_GOTO,
+ RULE_SUP_PREFIXLEN,
+ RULE_UIDRANGE,
+ RULE_DISABLED,
__RULE_MAX
};
[RULE_TOS] = { .name = "tos", .type = BLOBMSG_TYPE_INT32 },
[RULE_FWMARK] = { .name = "mark", .type = BLOBMSG_TYPE_STRING },
[RULE_LOOKUP] = { .name = "lookup", .type = BLOBMSG_TYPE_STRING },
+ [RULE_SUP_PREFIXLEN] = { .name = "suppress_prefixlength", .type = BLOBMSG_TYPE_INT32 },
+ [RULE_UIDRANGE] = { .name = "uidrange", .type = BLOBMSG_TYPE_STRING },
[RULE_ACTION] = { .name = "action", .type = BLOBMSG_TYPE_STRING },
[RULE_GOTO] = { .name = "goto", .type = BLOBMSG_TYPE_INT32 },
+ [RULE_DISABLED] = { .name = "disabled", .type = BLOBMSG_TYPE_BOOL },
};
-const struct config_param_list rule_attr_list = {
+const struct uci_blob_param_list rule_attr_list = {
.n_params = __RULE_MAX,
.params = rule_attr,
};
+/* interface based rules are dynamic. */
+static bool
+rule_ready(struct iprule *rule)
+{
+ if (rule->flags & IPRULE_OUT && !rule->out_dev[0])
+ return false;
+
+ if (rule->flags & IPRULE_IN && !rule->in_dev[0])
+ return false;
+
+ return true;
+}
static bool
iprule_parse_mark(const char *mark, struct iprule *rule)
return true;
}
+/* called on interface changes of the incoming interface */
+static void
+rule_in_cb(struct interface_user *dep, struct interface *iface, enum interface_event ev)
+{
+ struct iprule *rule = container_of(dep, struct iprule, in_iface_user);
+
+ switch (ev) {
+ case IFEV_UP:
+ if (!iface->l3_dev.dev)
+ break;
+
+ strcpy(rule->in_dev, iface->l3_dev.dev->ifname);
+ if (rule_ready(rule))
+ system_add_iprule(rule);
+ break;
+ case IFEV_DOWN:
+ case IFEV_UP_FAILED:
+ case IFEV_FREE:
+ if (rule_ready(rule))
+ system_del_iprule(rule);
+
+ rule->in_dev[0] = 0;
+ break;
+ default:
+ break;
+ }
+}
+
+/* called on interface changes of the outgoing interface */
+static void
+rule_out_cb(struct interface_user *dep, struct interface *iface, enum interface_event ev)
+{
+ struct iprule *rule = container_of(dep, struct iprule, out_iface_user);
+
+ switch (ev) {
+ case IFEV_UP:
+ if (!iface->l3_dev.dev)
+ break;
+
+ strcpy(rule->out_dev, iface->l3_dev.dev->ifname);
+ if (rule_ready(rule))
+ system_add_iprule(rule);
+ break;
+ case IFEV_DOWN:
+ case IFEV_UP_FAILED:
+ case IFEV_FREE:
+ if (rule_ready(rule))
+ system_del_iprule(rule);
+
+ rule->out_dev[0] = 0;
+ break;
+ default:
+ break;
+ }
+}
+
+/* called on all interface events */
+static void
+generic_interface_cb(struct interface_user *dep,
+ struct interface *iface, enum interface_event ev)
+{
+ struct iprule *rule;
+
+ if (ev != IFEV_CREATE)
+ return;
+
+ /* add new interfaces to rules */
+ vlist_for_each_element(&iprules, rule, node) {
+ if (rule_ready(rule))
+ continue;
+
+ if ((rule->flags & IPRULE_OUT) && !strcmp(rule->out_iface, iface->name))
+ interface_add_user(&rule->out_iface_user, iface);
+
+ if ((rule->flags & IPRULE_IN) && !strcmp(rule->in_iface, iface->name))
+ interface_add_user(&rule->in_iface_user, iface);
+ }
+}
+
+struct interface_user generic_listener = {
+ .cb = generic_interface_cb
+};
+
void
iprule_add(struct blob_attr *attr, bool v6)
{
- struct interface *iif = NULL, *oif = NULL;
struct blob_attr *tb[__RULE_MAX], *cur;
- struct interface *iface;
struct iprule *rule;
+ char *iface_name;
int af = v6 ? AF_INET6 : AF_INET;
blobmsg_parse(rule_attr, __RULE_MAX, tb, blobmsg_data(attr), blobmsg_data_len(attr));
+ if ((cur = tb[RULE_DISABLED]) != NULL && blobmsg_get_bool(cur))
+ return;
+
rule = calloc(1, sizeof(*rule));
if (!rule)
return;
rule->flags = v6 ? IPRULE_INET6 : IPRULE_INET4;
+ rule->order = iprules_counter[rule->flags]++;
if ((cur = tb[RULE_INVERT]) != NULL)
rule->invert = blobmsg_get_bool(cur);
if ((cur = tb[RULE_INTERFACE_IN]) != NULL) {
- iif = vlist_find(&interfaces, blobmsg_data(cur), iface, node);
-
- if (!iif || !iif->l3_dev.dev) {
- DPRINTF("Failed to resolve device of network: %s\n", (char *) blobmsg_data(cur));
- goto error;
- }
-
- memcpy(rule->in_dev, iif->l3_dev.dev->ifname, sizeof(rule->in_dev));
+ iface_name = calloc(1, strlen(blobmsg_data(cur)) + 1);
+ rule->in_iface = strcpy(iface_name, blobmsg_data(cur));
+ rule->in_iface_user.cb = &rule_in_cb;
rule->flags |= IPRULE_IN;
}
if ((cur = tb[RULE_INTERFACE_OUT]) != NULL) {
- oif = vlist_find(&interfaces, blobmsg_data(cur), iface, node);
-
- if (!oif || !oif->l3_dev.dev) {
- DPRINTF("Failed to resolve device of network: %s\n", (char *) blobmsg_data(cur));
- goto error;
- }
-
- memcpy(rule->out_dev, oif->l3_dev.dev->ifname, sizeof(rule->out_dev));
+ iface_name = calloc(1, strlen(blobmsg_data(cur)) + 1);
+ rule->out_iface = strcpy(iface_name, blobmsg_data(cur));
+ rule->out_iface_user.cb = &rule_out_cb;
rule->flags |= IPRULE_OUT;
}
if ((cur = tb[RULE_SRC]) != NULL) {
if (!parse_ip_and_netmask(af, blobmsg_data(cur), &rule->src_addr, &rule->src_mask)) {
- DPRINTF("Failed to parse rule source: %s\n", (char *) blobmsg_data(cur));
+ D(INTERFACE, "Failed to parse rule source: %s", (char *) blobmsg_data(cur));
goto error;
}
rule->flags |= IPRULE_SRC;
if ((cur = tb[RULE_DEST]) != NULL) {
if (!parse_ip_and_netmask(af, blobmsg_data(cur), &rule->dest_addr, &rule->dest_mask)) {
- DPRINTF("Failed to parse rule destination: %s\n", (char *) blobmsg_data(cur));
+ D(INTERFACE, "Failed to parse rule destination: %s", (char *) blobmsg_data(cur));
goto error;
}
rule->flags |= IPRULE_DEST;
if ((cur = tb[RULE_TOS]) != NULL) {
if ((rule->tos = blobmsg_get_u32(cur)) > 255) {
- DPRINTF("Invalid TOS value: %u\n", blobmsg_get_u32(cur));
+ D(INTERFACE, "Invalid TOS value: %u", blobmsg_get_u32(cur));
goto error;
}
rule->flags |= IPRULE_TOS;
if ((cur = tb[RULE_FWMARK]) != NULL) {
if (!iprule_parse_mark(blobmsg_data(cur), rule)) {
- DPRINTF("Failed to parse rule fwmark: %s\n", (char *) blobmsg_data(cur));
+ D(INTERFACE, "Failed to parse rule fwmark: %s", (char *) blobmsg_data(cur));
goto error;
}
/* flags set by iprule_parse_mark() */
if ((cur = tb[RULE_LOOKUP]) != NULL) {
if (!system_resolve_rt_table(blobmsg_data(cur), &rule->lookup)) {
- DPRINTF("Failed to parse rule lookup table: %s\n", (char *) blobmsg_data(cur));
+ D(INTERFACE, "Failed to parse rule lookup table: %s", (char *) blobmsg_data(cur));
goto error;
}
rule->flags |= IPRULE_LOOKUP;
}
+ if ((cur = tb[RULE_SUP_PREFIXLEN]) != NULL) {
+ rule->sup_prefixlen = blobmsg_get_u32(cur);
+ rule->flags |= IPRULE_SUP_PREFIXLEN;
+ }
+
+ if ((cur = tb[RULE_UIDRANGE]) != NULL) {
+ int ret = sscanf(blobmsg_get_string(cur), "%u-%u", &rule->uidrange_start, &rule->uidrange_end);
+
+ if (ret == 1)
+ rule->uidrange_end = rule->uidrange_start;
+ else if (ret != 2) {
+ D(INTERFACE, "Failed to parse UID range: %s", (char *) blobmsg_data(cur));
+ goto error;
+ }
+ rule->flags |= IPRULE_UIDRANGE;
+ }
+
if ((cur = tb[RULE_ACTION]) != NULL) {
if (!system_resolve_iprule_action(blobmsg_data(cur), &rule->action)) {
- DPRINTF("Failed to parse rule action: %s\n", (char *) blobmsg_data(cur));
+ D(INTERFACE, "Failed to parse rule action: %s", (char *) blobmsg_data(cur));
goto error;
}
rule->flags |= IPRULE_ACTION;
rule->flags |= IPRULE_GOTO;
}
- /* trigger flush of existing rules when adding first uci rule the first time */
- if (!iprules_flushed)
- {
- system_flush_iprules();
- iprules_flushed = true;
- }
-
- vlist_add(&iprules, &rule->node, &rule->flags);
+ vlist_add(&iprules, &rule->node, rule);
return;
error:
void
iprule_update_start(void)
{
+ if (!iprules_flushed) {
+ system_flush_iprules();
+ iprules_flushed = true;
+ }
+
+ iprules_counter[0] = 1;
+ iprules_counter[1] = 1;
vlist_update(&iprules);
}
static int
rule_cmp(const void *k1, const void *k2, void *ptr)
{
- return memcmp(k1, k2, sizeof(struct iprule)-offsetof(struct iprule, flags));
+ const struct iprule *r1 = k1, *r2 = k2;
+ int ret;
+
+ /* First compare the interface names */
+ if (r1->flags & IPRULE_IN || r2->flags & IPRULE_IN) {
+ char *str1 = r1->flags & IPRULE_IN ? r1->in_iface : "";
+ char *str2 = r2->flags & IPRULE_IN ? r2->in_iface : "";
+
+ ret = strcmp(str1, str2);
+ if (ret)
+ return ret;
+ }
+
+ if (r1->flags & IPRULE_OUT || r2->flags & IPRULE_OUT) {
+ char *str1 = r1->flags & IPRULE_OUT ? r1->out_iface : "";
+ char *str2 = r2->flags & IPRULE_OUT ? r2->out_iface : "";
+
+ ret = strcmp(str1, str2);
+ if (ret)
+ return ret;
+ }
+
+ /* Next compare everything after the flags field */
+ return memcmp(k1 + offsetof(struct iprule, flags),
+ k2 + offsetof(struct iprule, flags),
+ sizeof(struct iprule) - offsetof(struct iprule, flags));
+}
+
+static void deregister_interfaces(struct iprule *rule)
+{
+ if (rule->flags & IPRULE_IN && rule->in_iface_user.iface)
+ interface_remove_user(&rule->in_iface_user);
+
+ if (rule->flags & IPRULE_OUT && rule->out_iface_user.iface)
+ interface_remove_user(&rule->out_iface_user);
+}
+
+static void register_interfaces(struct iprule *rule)
+{
+ struct interface *iface, *tmp;
+
+ if (rule->flags & IPRULE_IN) {
+ tmp = vlist_find(&interfaces, rule->in_iface, iface, node);
+ if (tmp)
+ interface_add_user(&rule->in_iface_user, tmp);
+ }
+ if (rule->flags & IPRULE_OUT) {
+ tmp = vlist_find(&interfaces, rule->out_iface, iface, node);
+ if (tmp)
+ interface_add_user(&rule->out_iface_user, tmp);
+ }
}
static void
iprule_update_rule(struct vlist_tree *tree,
- struct vlist_node *node_new, struct vlist_node *node_old)
+ struct vlist_node *node_new, struct vlist_node *node_old)
{
struct iprule *rule_old, *rule_new;
rule_new = container_of(node_new, struct iprule, node);
if (node_old) {
- system_del_iprule(rule_old);
+ if (rule_ready(rule_old))
+ system_del_iprule(rule_old);
+
+ if (rule_old->flags & (IPRULE_IN | IPRULE_OUT))
+ deregister_interfaces(rule_old);
+
+ if (rule_old->in_iface)
+ free(rule_old->in_iface);
+
+ if (rule_old->out_iface)
+ free(rule_old->out_iface);
+
free(rule_old);
}
- if (node_new)
- system_add_iprule(rule_new);
+ if (node_new) {
+ /* interface based rules calls system_add_iprule over the event cb */
+ if (rule_new->flags & (IPRULE_IN | IPRULE_OUT)) {
+ register_interfaces(rule_new);
+ } else {
+ system_add_iprule(rule_new);
+ }
+ }
}
static void __init
iprule_init_list(void)
{
vlist_init(&iprules, rule_cmp, iprule_update_rule);
+ interface_add_user(&generic_listener, NULL);
}
projects / project / netifd.git / blobdiff