diff options
| author | Steven Barth <steven@midlink.org> | 2014-07-16 14:54:34 +0200 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2014-07-16 14:54:34 +0200 |
| commit | 3462b32b6e0e864acbe79e5c91b2c6a50742013f (patch) | |
| tree | 1303f11ecd1bff9dba4bddc64f4b79ebf10056a4 /src/config.c | |
| parent | 44a79aaa051e40e1c431048444552b8c7fe145b9 (diff) | |
Initial rewrite of NDP proxy
Diffstat (limited to 'src/config.c')
| -rw-r--r-- | src/config.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/config.c b/src/config.c index 068d1a7..35d8af7 100644 --- a/src/config.c +++ b/src/config.c @@ -42,7 +42,6 @@ enum { IFACE_ATTR_PD_CER, IFACE_ATTR_NDPROXY_ROUTING, IFACE_ATTR_NDPROXY_SLAVE, - IFACE_ATTR_NDPROXY_STATIC, IFACE_ATTR_MAX }; @@ -73,14 +72,12 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [IFACE_ATTR_RA_PREFERENCE] = { .name = "ra_preference", .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_NDPROXY_ROUTING] = { .name = "ndproxy_routing", .type = BLOBMSG_TYPE_BOOL }, [IFACE_ATTR_NDPROXY_SLAVE] = { .name = "ndproxy_slave", .type = BLOBMSG_TYPE_BOOL }, - [IFACE_ATTR_NDPROXY_STATIC] = { .name = "ndproxy_static", .type = BLOBMSG_TYPE_ARRAY }, }; static const struct uci_blob_param_info iface_attr_info[IFACE_ATTR_MAX] = { [IFACE_ATTR_UPSTREAM] = { .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_DNS] = { .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_DOMAIN] = { .type = BLOBMSG_TYPE_STRING }, - [IFACE_ATTR_NDPROXY_STATIC] = { .type = BLOBMSG_TYPE_STRING }, }; const struct uci_blob_param_list interface_attr_list = { @@ -151,7 +148,6 @@ static void clean_interface(struct interface *iface) free(iface->dns); free(iface->search); free(iface->upstream); - free(iface->static_ndp); free(iface->dhcpv4_dns); free(iface->dhcpv6_raw); free(iface->filter_class); @@ -519,27 +515,6 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr if ((c = tb[IFACE_ATTR_NDPROXY_SLAVE])) iface->external = blobmsg_get_bool(c); - if ((c = tb[IFACE_ATTR_NDPROXY_STATIC])) { - struct blob_attr *cur; - unsigned rem; - - blobmsg_for_each_attr(cur, c, rem) { - if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING || !blobmsg_check_attr(cur, NULL)) - continue; - - int len = blobmsg_data_len(cur); - iface->static_ndp = realloc(iface->static_ndp, iface->static_ndp_len + len); - if (!iface->static_ndp) - goto err; - - if (iface->static_ndp_len) - iface->static_ndp[iface->static_ndp_len - 1] = ' '; - - memcpy(&iface->static_ndp[iface->static_ndp_len], blobmsg_get_string(cur), len); - iface->static_ndp_len += len; - } - } - return 0; err: |