/*
* firewall3 - 3rd OpenWrt UCI firewall implementation
*
- * Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ * Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
"MARK",
"DNAT",
"SNAT",
+ "MASQUERADE",
"ACCEPT",
"REJECT",
bool
fw3_parse_int(void *ptr, const char *val, bool is_list)
{
- int n = strtol(val, NULL, 0);
+ char *e;
+ int n = strtol(val, &e, 0);
- if (errno == ERANGE || errno == EINVAL)
+ if (e == val || *e)
return false;
*((int *)ptr) = n;
fw3_parse_target(void *ptr, const char *val, bool is_list)
{
return parse_enum(ptr, val, &fw3_flag_names[FW3_FLAG_ACCEPT],
- FW3_FLAG_ACCEPT, FW3_FLAG_SNAT);
+ FW3_FLAG_ACCEPT, FW3_FLAG_MASQUERADE);
}
bool
fw3_parse_network(void *ptr, const char *val, bool is_list)
{
struct fw3_device dev = { };
- struct fw3_address *addr;
- struct list_head *addr_list;
+ struct fw3_address *addr, *tmp;
+ LIST_HEAD(addr_list);
if (!fw3_parse_address(ptr, val, is_list))
{
if (!fw3_parse_device(&dev, val, false))
return false;
- addr_list = fw3_ubus_address(dev.name);
-
- if (addr_list)
+ fw3_ubus_address(&addr_list, dev.name);
+ list_for_each_entry(addr, &addr_list, list)
{
- list_for_each_entry(addr, addr_list, list)
- {
- addr->invert = dev.invert;
- addr->resolved = true;
+ addr->invert = dev.invert;
+ addr->resolved = true;
+ }
- if (!put_value(ptr, addr, sizeof(*addr), is_list))
- break;
- }
+ if (is_list)
+ {
+ list_splice_tail(&addr_list, ptr);
+ }
+ else if (!list_empty(&addr_list))
+ {
+ memcpy(ptr, list_first_entry(&addr_list, typeof(*addr), list),
+ sizeof(*addr));
- fw3_free_list(addr_list);
+ list_for_each_entry_safe(addr, tmp, &addr_list, list)
+ free(addr);
}
}
return true;
}
+bool
+fw3_parse_direction(void *ptr, const char *val, bool is_list)
+{
+ bool *is_out = ptr;
+ bool valid = true;
-void
+ if (!strcmp(val, "in") || !strcmp(val, "ingress"))
+ *is_out = false;
+ else if (!strcmp(val, "out") || !strcmp(val, "egress"))
+ *is_out = true;
+ else
+ valid = false;
+
+ return valid;
+}
+
+
+bool
fw3_parse_options(void *s, const struct fw3_option *opts,
struct uci_section *section)
{
struct uci_option *o;
const struct fw3_option *opt;
struct list_head *dest;
+ bool valid = true;
uci_foreach_element(§ion->options, e)
{
if (!opt->elem_size)
{
warn_elem(e, "must not be a list");
+ valid = false;
}
else
{
if (!opt->parse(dest, l->name, true))
{
warn_elem(e, "has invalid value '%s'", l->name);
+ valid = false;
continue;
}
}
if (!opt->elem_size)
{
if (!opt->parse((char *)s + opt->offset, o->v.string, false))
+ {
warn_elem(e, "has invalid value '%s'", o->v.string);
+ valid = false;
+ }
}
else
{
if (!opt->parse(dest, p, true))
{
warn_elem(e, "has invalid value '%s'", p);
+ valid = false;
continue;
}
}
if (!known)
warn_elem(e, "is unknown");
}
+
+ return valid;
+}
+
+
+bool
+fw3_parse_blob_options(void *s, const struct fw3_option *opts,
+ struct blob_attr *a)
+{
+ char *p, *v, buf[16];
+ bool known;
+ unsigned rem, erem;
+ struct blob_attr *o, *e;
+ const struct fw3_option *opt;
+ struct list_head *dest;
+ bool valid = true;
+
+ blobmsg_for_each_attr(o, a, rem)
+ {
+ known = false;
+
+ for (opt = opts; opt->name; opt++)
+ {
+ if (!opt->parse)
+ continue;
+
+ if (strcmp(opt->name, blobmsg_name(o)))
+ continue;
+
+ if (blobmsg_type(o) == BLOBMSG_TYPE_ARRAY)
+ {
+ if (!opt->elem_size)
+ {
+ fprintf(stderr, "%s must not be a list\n", opt->name);
+ valid = false;
+ }
+ else
+ {
+ dest = (struct list_head *)((char *)s + opt->offset);
+
+ blobmsg_for_each_attr(e, o, erem)
+ {
+ if (blobmsg_type(e) == BLOBMSG_TYPE_INT32) {
+ snprintf(buf, sizeof(buf), "%d", blobmsg_get_u32(e));
+ v = buf;
+ } else {
+ v = blobmsg_get_string(e);
+ }
+
+ if (!opt->parse(dest, v, true))
+ {
+ fprintf(stderr, "%s has invalid value '%s'\n", opt->name, v);
+ valid = false;
+ continue;
+ }
+ }
+ }
+ }
+ else
+ {
+ if (blobmsg_type(o) == BLOBMSG_TYPE_INT32) {
+ snprintf(buf, sizeof(buf), "%d", blobmsg_get_u32(o));
+ v = buf;
+ } else {
+ v = blobmsg_get_string(o);
+ }
+
+ if (!v)
+ continue;
+
+ if (!opt->elem_size)
+ {
+ if (!opt->parse((char *)s + opt->offset, v, false))
+ {
+ fprintf(stderr, "%s has invalid value '%s'\n", opt->name, v);
+ valid = false;
+ }
+ }
+ else
+ {
+ dest = (struct list_head *)((char *)s + opt->offset);
+
+ for (p = strtok(v, " \t"); p != NULL; p = strtok(NULL, " \t"))
+ {
+ if (!opt->parse(dest, p, true))
+ {
+ fprintf(stderr, "%s has invalid value '%s'\n", opt->name, p);
+ valid = false;
+ continue;
+ }
+ }
+ }
+ }
+
+ known = true;
+ break;
+ }
+
+ if (!known)
+ fprintf(stderr, "%s is unknown\n", blobmsg_name(o));
+ }
+
+ return valid;
}