X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-static.c;h=3e33c3d872930d08b9e1bef907afa14c0db7507c;hp=4e7c0529c0b87340e0a612ee06dd104e5ed81134;hb=258b79f7a912abc84a3066c90266d8835597362e;hpb=20adacee2080e29cad3571da073d7fb4909230b1 diff --git a/proto-static.c b/proto-static.c index 4e7c052..3e33c3d 100644 --- a/proto-static.c +++ b/proto-static.c @@ -1,3 +1,16 @@ +/* + * netifd - network interface daemon + * Copyright (C) 2012 Felix Fietkau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ #include #include #include @@ -7,221 +20,89 @@ #include "netifd.h" #include "interface.h" +#include "interface-ip.h" #include "proto.h" +#include "system.h" -struct v4_addr { - struct in_addr addr; - unsigned int prefix; -}; +struct static_proto_state { + struct interface_proto_state proto; -struct v6_addr { - struct in6_addr addr; - unsigned int prefix; + struct blob_attr *config; }; -struct static_proto_state { - struct interface_proto_state proto; - - int n_v4; - struct v4_addr *v4; +static bool +static_proto_setup(struct static_proto_state *state) +{ + struct interface *iface = state->proto.iface; + struct device *dev = iface->main_dev.dev; - int n_v6; - struct v4_addr *v6; -}; + interface_set_l3_dev(iface, dev); + return proto_apply_static_ip_settings(state->proto.iface, state->config) == 0; +} static int static_handler(struct interface_proto_state *proto, enum interface_proto_cmd cmd, bool force) { - return 0; -} - -static void -static_free(struct interface_proto_state *proto) -{ struct static_proto_state *state; + int ret = 0; state = container_of(proto, struct static_proto_state, proto); - free(state); -} -struct interface_proto_state * -static_create_state(struct v4_addr *v4, int n_v4, struct v6_addr *v6, int n_v6) -{ - struct static_proto_state *state; - int v4_len = sizeof(struct v4_addr) * n_v4; - int v6_len = sizeof(struct v6_addr) * n_v6; - void *next; + switch (cmd) { + case PROTO_CMD_SETUP: + if (!static_proto_setup(state)) + return -1; - state = calloc(1, sizeof(*state) + v4_len + v6_len); - state->proto.free = static_free; - state->proto.handler = static_handler; - state->proto.flags = PROTO_FLAG_IMMEDIATE; - next = (void *) state + 1; - - if (n_v4) { - state->v4 = next; - memcpy(state->v4, v4, sizeof(*v4) * n_v4); - next = state->v4 + n_v4; + break; + case PROTO_CMD_TEARDOWN: + case PROTO_CMD_RENEW: + break; } - if (n_v6) { - state->v6 = next; - memcpy(state->v6, v6, sizeof(*v6) * n_v6); - } - - return &state->proto; -} - -static bool -split_netmask(char *str, unsigned int *netmask) -{ - char *delim, *err = NULL; - - delim = strchr(str, '/'); - if (delim) { - *(delim++) = 0; - - *netmask = strtoul(delim, &err, 10); - if (err && *err) - return false; - } - return true; + return ret; } -static int -parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask) -{ - char *astr = alloca(strlen(str) + 1); - - strcpy(astr, str); - if (!split_netmask(astr, netmask)) - return 0; - - if (af == AF_INET6) { - if (*netmask > 128) - return 0; - } else { - if (*netmask > 32) - return 0; - } - - return inet_pton(af, str, addr); -} - -static int -parse_v4(const char *str, struct v4_addr *v4, int netmask) +static void +static_free(struct interface_proto_state *proto) { - v4->prefix = netmask; - return parse_ip_and_netmask(AF_INET, str, &v4->addr, &v4->prefix); -} + struct static_proto_state *state; -static int -parse_v6(const char *str, struct v6_addr *v6, int netmask) -{ - v6->prefix = netmask; - return parse_ip_and_netmask(AF_INET6, str, &v6->addr, &v6->prefix); + state = container_of(proto, struct static_proto_state, proto); + free(state->config); + free(state); } -enum { - OPT_IPADDR, - OPT_IP6ADDR, - OPT_NETMASK, - OPT_GATEWAY, - OPT_DNS, - __OPT_MAX, -}; - -static const struct uci_parse_option opts[__OPT_MAX] = { - [OPT_IPADDR] = { .name = "ipaddr" }, - [OPT_IP6ADDR] = { .name = "ip6addr" }, - [OPT_NETMASK] = { .name = "netmask", .type = UCI_TYPE_STRING }, - [OPT_GATEWAY] = { .name = "gateway", .type = UCI_TYPE_STRING }, - [OPT_DNS] = { .name = "dns" }, -}; - -struct interface_proto_state * -static_attach(struct proto_handler *h, struct interface *iface, - struct uci_section *s) +static struct interface_proto_state * +static_attach(const struct proto_handler *h, struct interface *iface, + struct blob_attr *attr) { - struct uci_option *tb[__OPT_MAX]; - struct uci_element *e; - struct v4_addr *v4 = NULL; - struct v6_addr *v6 = NULL; - int n_v4 = 0, n_v6 = 0; - struct in_addr ina = {}; - const char *error = NULL; - int netmask = 32; - int i; - - uci_parse_section(s, opts, __OPT_MAX, tb); - - if (tb[OPT_NETMASK]) { - if (!inet_aton(tb[OPT_NETMASK]->v.string, &ina)) { - error = "INVALID_NETMASK"; - goto error; - } - - netmask = 32 - fls(~(ntohl(ina.s_addr))); - } - - if (tb[OPT_IPADDR]) { - if (tb[OPT_IPADDR]->type == UCI_TYPE_STRING) { - n_v4 = 1; - v4 = alloca(sizeof(*v4)); - if (!parse_v4(tb[OPT_IPADDR]->v.string, v4, netmask)) - goto invalid_addr; - } else { - uci_foreach_element(&tb[OPT_IPADDR]->v.list, e) - n_v4++; - - i = 0; - v4 = alloca(sizeof(*v4) * n_v4); - uci_foreach_element(&tb[OPT_IPADDR]->v.list, e) { - if (!parse_v4(e->name, &v4[i++], netmask)) - goto invalid_addr; - } - } - } - - if (tb[OPT_IP6ADDR]) { - if (tb[OPT_IP6ADDR]->type == UCI_TYPE_STRING) { - n_v6 = 1; - v6 = alloca(sizeof(*v6)); - v6->prefix = netmask; - if (!parse_v6(tb[OPT_IP6ADDR]->v.string, v6, netmask)) - goto invalid_addr; - } else { - uci_foreach_element(&tb[OPT_IP6ADDR]->v.list, e) - n_v6++; - - i = 0; - v6 = alloca(sizeof(*v6) * n_v6); - uci_foreach_element(&tb[OPT_IP6ADDR]->v.list, e) { - if (!parse_v6(e->name, &v6[i++], netmask)) - goto invalid_addr; - } - } - } + struct static_proto_state *state; + state = calloc(1, sizeof(*state)); + if (!state) + return NULL; - if (!n_v4 && !n_v6) { - error = "NO_ADDRESS"; + state->config = malloc(blob_pad_len(attr)); + if (!state->config) goto error; - } - return static_create_state(v4, n_v4, v6, n_v6); + memcpy(state->config, attr, blob_pad_len(attr)); + state->proto.free = static_free; + state->proto.cb = static_handler; -invalid_addr: - error = "INVALID_ADDRESS"; + return &state->proto; error: - interface_add_error(iface, "proto-static", error, NULL, 0); + free(state); return NULL; } static struct proto_handler static_proto = { .name = "static", + .flags = PROTO_FLAG_IMMEDIATE | + PROTO_FLAG_FORCE_LINK_DEFAULT, + .config_params = &proto_ip_attr, .attach = static_attach, };