*/
#include "options.h"
+#include "ubus.h"
-const char *fw3_flag_names[FW3_DEFAULT_DROP_INVALID + 1] = {
+
+static bool
+put_value(void *ptr, void *val, int elem_size, bool is_list)
+{
+ void *copy;
+
+ if (is_list)
+ {
+ copy = malloc(elem_size);
+
+ if (!copy)
+ return false;
+
+ memcpy(copy, val, elem_size);
+ list_add_tail((struct list_head *)copy, (struct list_head *)ptr);
+ return true;
+ }
+
+ memcpy(ptr, val, elem_size);
+ return false;
+}
+
+static bool
+parse_enum(void *ptr, const char *val, const char **values, int min, int max)
+{
+ int i, l = strlen(val);
+
+ if (l > 0)
+ {
+ for (i = 0; i <= (max - min); i++)
+ {
+ if (!strncasecmp(val, values[i], l))
+ {
+ *((int *)ptr) = min + i;
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
+
+const char *fw3_flag_names[__FW3_FLAG_MAX] = {
"filter",
"nat",
"mangle",
"REJECT",
"DROP",
"NOTRACK",
+ "MARK",
"DNAT",
"SNAT",
+
+ "ACCEPT",
+ "REJECT",
+ "DROP",
+};
+
+static const char *limit_units[] = {
+ "second",
+ "minute",
+ "hour",
+ "day",
+};
+
+const char *fw3_ipset_method_names[__FW3_IPSET_METHOD_MAX] = {
+ "(bug)",
+ "bitmap",
+ "hash",
+ "list",
+};
+
+const char *fw3_ipset_type_names[__FW3_IPSET_TYPE_MAX] = {
+ "(bug)",
+ "ip",
+ "port",
+ "mac",
+ "net",
+ "set",
+};
+
+static const char *weekdays[] = {
+ "monday",
+ "tuesday",
+ "wednesday",
+ "thursday",
+ "friday",
+ "saturday",
+ "sunday",
};
+static const char *include_types[] = {
+ "script",
+ "restore",
+};
+
+static const char *reflection_sources[] = {
+ "internal",
+ "external",
+};
+
+
bool
-fw3_parse_bool(void *ptr, const char *val)
+fw3_parse_bool(void *ptr, const char *val, bool is_list)
{
if (!strcmp(val, "true") || !strcmp(val, "yes") || !strcmp(val, "1"))
*((bool *)ptr) = true;
}
bool
-fw3_parse_int(void *ptr, const char *val)
+fw3_parse_int(void *ptr, const char *val, bool is_list)
{
- int n = strtol(val, NULL, 10);
+ int n = strtol(val, NULL, 0);
if (errno == ERANGE || errno == EINVAL)
return false;
}
bool
-fw3_parse_string(void *ptr, const char *val)
+fw3_parse_string(void *ptr, const char *val, bool is_list)
{
*((char **)ptr) = (char *)val;
return true;
}
bool
-fw3_parse_target(void *ptr, const char *val)
+fw3_parse_target(void *ptr, const char *val, bool is_list)
{
- if (!strcmp(val, "ACCEPT"))
- {
- *((enum fw3_target *)ptr) = FW3_TARGET_ACCEPT;
- return true;
- }
- else if (!strcmp(val, "REJECT"))
- {
- *((enum fw3_target *)ptr) = FW3_TARGET_REJECT;
- return true;
- }
- else if (!strcmp(val, "DROP"))
- {
- *((enum fw3_target *)ptr) = FW3_TARGET_DROP;
- return true;
- }
- else if (!strcmp(val, "NOTRACK"))
- {
- *((enum fw3_target *)ptr) = FW3_TARGET_NOTRACK;
- return true;
- }
- else if (!strcmp(val, "DNAT"))
- {
- *((enum fw3_target *)ptr) = FW3_TARGET_DNAT;
- return true;
- }
- else if (!strcmp(val, "SNAT"))
- {
- *((enum fw3_target *)ptr) = FW3_TARGET_SNAT;
- return true;
- }
-
- return false;
+ return parse_enum(ptr, val, &fw3_flag_names[FW3_FLAG_ACCEPT],
+ FW3_FLAG_ACCEPT, FW3_FLAG_SNAT);
}
bool
-fw3_parse_limit(void *ptr, const char *val)
+fw3_parse_limit(void *ptr, const char *val, bool is_list)
{
struct fw3_limit *limit = ptr;
enum fw3_limit_unit u = FW3_LIMIT_UNIT_SECOND;
if (!strlen(e))
return false;
- if (!strncmp(e, "second", strlen(e)))
- u = FW3_LIMIT_UNIT_SECOND;
- else if (!strncmp(e, "minute", strlen(e)))
- u = FW3_LIMIT_UNIT_MINUTE;
- else if (!strncmp(e, "hour", strlen(e)))
- u = FW3_LIMIT_UNIT_HOUR;
- else if (!strncmp(e, "day", strlen(e)))
- u = FW3_LIMIT_UNIT_DAY;
- else
+ if (!parse_enum(&u, e, limit_units, 0, FW3_LIMIT_UNIT_DAY))
return false;
limit->rate = n;
}
bool
-fw3_parse_device(void *ptr, const char *val)
+fw3_parse_device(void *ptr, const char *val, bool is_list)
{
- struct fw3_device *dev = ptr;
+ char *p;
+ struct fw3_device dev = { };
if (*val == '*')
{
- dev->set = true;
- dev->any = true;
+ dev.set = true;
+ dev.any = true;
+ put_value(ptr, &dev, sizeof(dev), is_list);
return true;
}
if (*val == '!')
{
- dev->invert = true;
+ dev.invert = true;
while (isspace(*++val));
}
+ if ((p = strchr(val, '@')) != NULL)
+ {
+ *p++ = 0;
+ snprintf(dev.network, sizeof(dev.network), "%s", p);
+ }
+
if (*val)
- snprintf(dev->name, sizeof(dev->name), "%s", val);
+ snprintf(dev.name, sizeof(dev.name), "%s", val);
else
return false;
- dev->set = true;
+ dev.set = true;
+ put_value(ptr, &dev, sizeof(dev), is_list);
return true;
}
bool
-fw3_parse_address(void *ptr, const char *val)
+fw3_parse_address(void *ptr, const char *val, bool is_list)
{
- struct fw3_address *addr = ptr;
+ struct fw3_address addr = { };
struct in_addr v4;
struct in6_addr v6;
char *p, *s, *e;
if (*val == '!')
{
- addr->invert = true;
+ addr.invert = true;
while (isspace(*++val));
}
}
}
}
+ else if ((p = strchr(s, '-')) != NULL)
+ {
+ *p++ = 0;
+
+ if (inet_pton(AF_INET6, p, &v6))
+ {
+ addr.family = FW3_FAMILY_V6;
+ addr.address2.v6 = v6;
+ addr.range = true;
+ }
+ else if (inet_pton(AF_INET, p, &v4))
+ {
+ addr.family = FW3_FAMILY_V4;
+ addr.address2.v4 = v4;
+ addr.range = true;
+ }
+ else
+ {
+ free(s);
+ return false;
+ }
+ }
if (inet_pton(AF_INET6, s, &v6))
{
- addr->family = FW3_FAMILY_V6;
- addr->address.v6 = v6;
- addr->mask = (m >= 0) ? m : 128;
+ addr.family = FW3_FAMILY_V6;
+ addr.address.v6 = v6;
+ addr.mask = (m >= 0) ? m : 128;
}
else if (inet_pton(AF_INET, s, &v4))
{
- addr->family = FW3_FAMILY_V4;
- addr->address.v4 = v4;
- addr->mask = (m >= 0) ? m : 32;
+ addr.family = FW3_FAMILY_V4;
+ addr.address.v4 = v4;
+ addr.mask = (m >= 0) ? m : 32;
}
else
{
}
free(s);
- addr->set = true;
+ addr.set = true;
+ put_value(ptr, &addr, sizeof(addr), is_list);
return true;
}
bool
-fw3_parse_mac(void *ptr, const char *val)
+fw3_parse_network(void *ptr, const char *val, bool is_list)
{
- struct fw3_mac *addr = ptr;
+ struct fw3_device dev = { };
+ struct fw3_address *addr;
+ struct 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)
+ {
+ list_for_each_entry(addr, addr_list, list)
+ {
+ addr->invert = dev.invert;
+
+ if (!put_value(ptr, addr, sizeof(*addr), is_list))
+ break;
+ }
+
+ fw3_ubus_address_free(addr_list);
+ }
+ }
+
+ return true;
+}
+
+bool
+fw3_parse_mac(void *ptr, const char *val, bool is_list)
+{
+ struct fw3_mac addr = { };
struct ether_addr *mac;
if (*val == '!')
{
- addr->invert = true;
+ addr.invert = true;
while (isspace(*++val));
}
if ((mac = ether_aton(val)) != NULL)
{
- addr->mac = *mac;
- addr->set = true;
+ addr.mac = *mac;
+ addr.set = true;
+
+ put_value(ptr, &addr, sizeof(addr), is_list);
return true;
}
}
bool
-fw3_parse_port(void *ptr, const char *val)
+fw3_parse_port(void *ptr, const char *val, bool is_list)
{
- struct fw3_port *range = ptr;
+ struct fw3_port range = { };
uint16_t n;
uint16_t m;
char *p;
if (*val == '!')
{
- range->invert = true;
+ range.invert = true;
while (isspace(*++val));
}
if (errno == ERANGE || errno == EINVAL || m < n)
return false;
- range->port_min = n;
- range->port_max = m;
+ range.port_min = n;
+ range.port_max = m;
}
else
{
- range->port_min = n;
- range->port_max = n;
+ range.port_min = n;
+ range.port_max = n;
}
- range->set = true;
+ range.set = true;
+ put_value(ptr, &range, sizeof(range), is_list);
return true;
}
bool
-fw3_parse_family(void *ptr, const char *val)
+fw3_parse_family(void *ptr, const char *val, bool is_list)
{
if (!strcmp(val, "any"))
*((enum fw3_family *)ptr) = FW3_FAMILY_ANY;
}
bool
-fw3_parse_icmptype(void *ptr, const char *val)
+fw3_parse_icmptype(void *ptr, const char *val, bool is_list)
{
- struct fw3_icmptype *icmp = ptr;
+ struct fw3_icmptype icmp = { };
bool v4 = false;
bool v6 = false;
char *p;
{
if (!strcmp(val, fw3_icmptype_list_v4[i].name))
{
- icmp->type = fw3_icmptype_list_v4[i].type;
- icmp->code_min = fw3_icmptype_list_v4[i].code_min;
- icmp->code_max = fw3_icmptype_list_v4[i].code_max;
+ icmp.type = fw3_icmptype_list_v4[i].type;
+ icmp.code_min = fw3_icmptype_list_v4[i].code_min;
+ icmp.code_max = fw3_icmptype_list_v4[i].code_max;
v4 = true;
break;
{
if (!strcmp(val, fw3_icmptype_list_v6[i].name))
{
- icmp->type6 = fw3_icmptype_list_v6[i].type;
- icmp->code6_min = fw3_icmptype_list_v6[i].code_min;
- icmp->code6_max = fw3_icmptype_list_v6[i].code_max;
+ icmp.type6 = fw3_icmptype_list_v6[i].type;
+ icmp.code6_min = fw3_icmptype_list_v6[i].code_min;
+ icmp.code6_max = fw3_icmptype_list_v6[i].code_max;
v6 = true;
break;
if ((p == val) || (*p != '/' && *p != 0) || (i > 0xFF))
return false;
- icmp->type = i;
+ icmp.type = i;
if (*p == '/')
{
if ((p == val) || (*p != 0) || (i > 0xFF))
return false;
- icmp->code_min = i;
- icmp->code_max = i;
+ icmp.code_min = i;
+ icmp.code_max = i;
}
else
{
- icmp->code_min = 0;
- icmp->code_max = 0xFF;
+ icmp.code_min = 0;
+ icmp.code_max = 0xFF;
}
- icmp->type6 = icmp->type;
- icmp->code6_min = icmp->code_max;
- icmp->code6_max = icmp->code_max;
+ icmp.type6 = icmp.type;
+ icmp.code6_min = icmp.code_max;
+ icmp.code6_max = icmp.code_max;
v4 = true;
v6 = true;
}
- icmp->family = (v4 && v6) ? FW3_FAMILY_ANY
- : (v6 ? FW3_FAMILY_V6 : FW3_FAMILY_V4);
+ icmp.family = (v4 && v6) ? FW3_FAMILY_ANY
+ : (v6 ? FW3_FAMILY_V6 : FW3_FAMILY_V4);
+ put_value(ptr, &icmp, sizeof(icmp), is_list);
return true;
}
bool
-fw3_parse_protocol(void *ptr, const char *val)
+fw3_parse_protocol(void *ptr, const char *val, bool is_list)
{
- struct fw3_protocol *proto = ptr;
+ struct fw3_protocol proto = { };
struct protoent *ent;
if (*val == '!')
{
- proto->invert = true;
+ proto.invert = true;
while (isspace(*++val));
}
if (!strcmp(val, "all"))
{
- proto->any = true;
+ proto.any = true;
+ put_value(ptr, &proto, sizeof(proto), is_list);
return true;
}
else if (!strcmp(val, "icmpv6"))
{
val = "ipv6-icmp";
}
+ else if (!strcmp(val, "tcpudp"))
+ {
+ proto.protocol = 6;
+ if (put_value(ptr, &proto, sizeof(proto), is_list))
+ {
+ proto.protocol = 17;
+ put_value(ptr, &proto, sizeof(proto), is_list);
+ }
+
+ return true;
+ }
ent = getprotobyname(val);
if (ent)
{
- proto->protocol = ent->p_proto;
+ proto.protocol = ent->p_proto;
+ put_value(ptr, &proto, sizeof(proto), is_list);
return true;
}
- proto->protocol = strtoul(val, NULL, 10);
- return (errno != ERANGE && errno != EINVAL);
+ proto.protocol = strtoul(val, NULL, 10);
+
+ if (errno == ERANGE || errno == EINVAL)
+ return false;
+
+ put_value(ptr, &proto, sizeof(proto), is_list);
+ return true;
}
bool
-fw3_parse_ipset_method(void *ptr, const char *val)
+fw3_parse_ipset_method(void *ptr, const char *val, bool is_list)
{
- if (!strncmp(val, "bitmap", strlen(val)))
- {
- *((enum fw3_ipset_method *)ptr) = FW3_IPSET_METHOD_BITMAP;
- return true;
- }
- else if (!strncmp(val, "hash", strlen(val)))
- {
- *((enum fw3_ipset_method *)ptr) = FW3_IPSET_METHOD_HASH;
- return true;
- }
- else if (!strncmp(val, "list", strlen(val)))
- {
- *((enum fw3_ipset_method *)ptr) = FW3_IPSET_METHOD_LIST;
- return true;
- }
-
- return false;
+ return parse_enum(ptr, val, &fw3_ipset_method_names[FW3_IPSET_METHOD_BITMAP],
+ FW3_IPSET_METHOD_BITMAP, FW3_IPSET_METHOD_LIST);
}
bool
-fw3_parse_ipset_datatype(void *ptr, const char *val)
+fw3_parse_ipset_datatype(void *ptr, const char *val, bool is_list)
{
- struct fw3_ipset_datatype *type = ptr;
+ struct fw3_ipset_datatype type = { };
if (!strncmp(val, "dest_", 5))
{
val += 5;
- type->dest = true;
+ type.dest = true;
}
else if (!strncmp(val, "dst_", 4))
{
val += 4;
- type->dest = true;
+ type.dest = true;
}
else if (!strncmp(val, "src_", 4))
{
val += 4;
- type->dest = false;
+ type.dest = false;
}
- if (!strncmp(val, "ip", strlen(val)))
+ if (parse_enum(&type.type, val, &fw3_ipset_type_names[FW3_IPSET_TYPE_IP],
+ FW3_IPSET_TYPE_IP, FW3_IPSET_TYPE_SET))
{
- type->type = FW3_IPSET_TYPE_IP;
+ put_value(ptr, &type, sizeof(type), is_list);
return true;
}
- else if (!strncmp(val, "port", strlen(val)))
+
+ return false;
+}
+
+bool
+fw3_parse_date(void *ptr, const char *val, bool is_list)
+{
+ unsigned int year = 1970, mon = 1, day = 1, hour = 0, min = 0, sec = 0;
+ struct tm tm = { 0 };
+ char *p;
+
+ year = strtoul(val, &p, 10);
+ if ((*p != '-' && *p) || year < 1970 || year > 2038)
+ goto fail;
+ else if (!*p)
+ goto ret;
+
+ mon = strtoul(++p, &p, 10);
+ if ((*p != '-' && *p) || mon > 12)
+ goto fail;
+ else if (!*p)
+ goto ret;
+
+ day = strtoul(++p, &p, 10);
+ if ((*p != 'T' && *p) || day > 31)
+ goto fail;
+ else if (!*p)
+ goto ret;
+
+ hour = strtoul(++p, &p, 10);
+ if ((*p != ':' && *p) || hour > 23)
+ goto fail;
+ else if (!*p)
+ goto ret;
+
+ min = strtoul(++p, &p, 10);
+ if ((*p != ':' && *p) || min > 59)
+ goto fail;
+ else if (!*p)
+ goto ret;
+
+ sec = strtoul(++p, &p, 10);
+ if (*p || sec > 59)
+ goto fail;
+
+ret:
+ tm.tm_year = year - 1900;
+ tm.tm_mon = mon - 1;
+ tm.tm_mday = day;
+ tm.tm_hour = hour;
+ tm.tm_min = min;
+ tm.tm_sec = sec;
+
+ if (mktime(&tm) >= 0)
{
- type->type = FW3_IPSET_TYPE_PORT;
+ *((struct tm *)ptr) = tm;
return true;
}
- else if (!strncmp(val, "mac", strlen(val)))
+
+fail:
+ return false;
+}
+
+bool
+fw3_parse_time(void *ptr, const char *val, bool is_list)
+{
+ unsigned int hour = 0, min = 0, sec = 0;
+ char *p;
+
+ hour = strtoul(val, &p, 10);
+ if (*p != ':' || hour > 23)
+ goto fail;
+
+ min = strtoul(++p, &p, 10);
+ if ((*p != ':' && *p) || min > 59)
+ goto fail;
+ else if (!*p)
+ goto ret;
+
+ sec = strtoul(++p, &p, 10);
+ if (*p || sec > 59)
+ goto fail;
+
+ret:
+ *((int *)ptr) = 60 * 60 * hour + 60 * min + sec;
+ return true;
+
+fail:
+ return false;
+}
+
+bool
+fw3_parse_weekdays(void *ptr, const char *val, bool is_list)
+{
+ unsigned int w = 0;
+ char *p, *s;
+
+ if (*val == '!')
+ {
+ setbit(*(uint8_t *)ptr, 0);
+ while (isspace(*++val));
+ }
+
+ if (!(s = strdup(val)))
+ return false;
+
+ for (p = strtok(s, " \t"); p; p = strtok(NULL, " \t"))
{
- type->type = FW3_IPSET_TYPE_MAC;
- return true;
+ if (!parse_enum(&w, p, weekdays, 1, 7))
+ {
+ w = strtoul(p, &p, 10);
+
+ if (*p || w < 1 || w > 7)
+ {
+ free(s);
+ return false;
+ }
+ }
+
+ setbit(*(uint8_t *)ptr, w);
}
- else if (!strncmp(val, "net", strlen(val)))
+
+ free(s);
+ return true;
+}
+
+bool
+fw3_parse_monthdays(void *ptr, const char *val, bool is_list)
+{
+ unsigned int d;
+ char *p, *s;
+
+ if (*val == '!')
{
- type->type = FW3_IPSET_TYPE_NET;
- return true;
+ setbit(*(uint32_t *)ptr, 0);
+ while (isspace(*++val));
}
- else if (!strncmp(val, "set", strlen(val)))
+
+ if (!(s = strdup(val)))
+ return false;
+
+ for (p = strtok(s, " \t"); p; p = strtok(NULL, " \t"))
{
- type->type = FW3_IPSET_TYPE_SET;
- return true;
+ d = strtoul(p, &p, 10);
+
+ if (*p || d < 1 || d > 31)
+ {
+ free(s);
+ return false;
+ }
+
+ setbit(*(uint32_t *)ptr, d);
}
- return false;
+ free(s);
+ return true;
+}
+
+bool
+fw3_parse_include_type(void *ptr, const char *val, bool is_list)
+{
+ return parse_enum(ptr, val, include_types,
+ FW3_INC_TYPE_SCRIPT, FW3_INC_TYPE_RESTORE);
+}
+
+bool
+fw3_parse_reflection_source(void *ptr, const char *val, bool is_list)
+{
+ return parse_enum(ptr, val, reflection_sources,
+ FW3_REFLECTION_INTERNAL, FW3_REFLECTION_EXTERNAL);
+}
+
+bool
+fw3_parse_mark(void *ptr, const char *val, bool is_list)
+{
+ uint32_t n;
+ char *s, *e;
+ struct fw3_mark *m = ptr;
+
+ if (*val == '!')
+ {
+ m->invert = true;
+ while (isspace(*++val));
+ }
+
+ if ((s = strchr(val, '/')) != NULL)
+ *s++ = 0;
+
+ n = strtoul(val, &e, 0);
+
+ if (e == val || *e)
+ return false;
+
+ m->mark = n;
+ m->mask = 0xFFFFFFFF;
+
+ if (s)
+ {
+ n = strtoul(s, &e, 0);
+
+ if (e == s || *e)
+ return false;
+
+ m->mask = n;
+ }
+
+ m->set = true;
+ return true;
}
void
-fw3_parse_options(void *s,
- struct fw3_option *opts, int n,
+fw3_parse_options(void *s, const struct fw3_option *opts,
struct uci_section *section)
{
- int i;
- char *p;
+ char *p, *v;
bool known;
struct uci_element *e, *l;
struct uci_option *o;
- struct fw3_option *opt;
- struct list_head *item;
+ const struct fw3_option *opt;
struct list_head *dest;
uci_foreach_element(§ion->options, e)
o = uci_to_option(e);
known = false;
- for (i = 0; i < n; i++)
+ for (opt = opts; opt->name; opt++)
{
- opt = &opts[i];
-
- if (!opt->parse || !opt->name)
+ if (!opt->parse)
continue;
if (strcmp(opt->name, e->name))
}
else
{
+ dest = (struct list_head *)((char *)s + opt->offset);
+
uci_foreach_element(&o->v.list, l)
{
if (!l->name)
continue;
- item = malloc(opt->elem_size);
-
- if (!item)
- continue;
-
- memset(item, 0, opt->elem_size);
-
- if (!opt->parse(item, l->name))
+ if (!opt->parse(dest, l->name, true))
{
warn_elem(e, "has invalid value '%s'", l->name);
- free(item);
continue;
}
-
- dest = (struct list_head *)((char *)s + opt->offset);
- list_add_tail(item, dest);
}
}
}
else
{
- if (!o->v.string)
+ v = o->v.string;
+
+ if (!v)
continue;
if (!opt->elem_size)
{
- if (!opt->parse((char *)s + opt->offset, o->v.string))
+ if (!opt->parse((char *)s + opt->offset, o->v.string, false))
warn_elem(e, "has invalid value '%s'", o->v.string);
}
else
{
- for (p = strtok(o->v.string, " \t");
- p != NULL;
- p = strtok(NULL, " \t"))
- {
- item = malloc(opt->elem_size);
+ dest = (struct list_head *)((char *)s + opt->offset);
- if (!item)
- continue;
-
- memset(item, 0, opt->elem_size);
-
- if (!opt->parse(item, p))
+ for (p = strtok(v, " \t"); p != NULL; p = strtok(NULL, " \t"))
+ {
+ if (!opt->parse(dest, p, true))
{
warn_elem(e, "has invalid value '%s'", p);
- free(item);
continue;
}
-
- dest = (struct list_head *)((char *)s + opt->offset);
- list_add_tail(item, dest);
}
}
}
fw3_pr(" %s-o %s", out->invert ? "! " : "", out->name);
}
+const char *
+fw3_address_to_string(struct fw3_address *address, bool allow_invert)
+{
+ char *p, ip[INET6_ADDRSTRLEN];
+ static char buf[INET6_ADDRSTRLEN * 2 + 2];
+
+ p = buf;
+
+ if (address->invert && allow_invert)
+ p += sprintf(p, "!");
+
+ inet_ntop(address->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
+ &address->address.v4, ip, sizeof(ip));
+
+ p += sprintf(p, "%s", ip);
+
+ if (address->range)
+ {
+ inet_ntop(address->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
+ &address->address2.v4, ip, sizeof(ip));
+
+ p += sprintf(p, "-%s", ip);
+ }
+ else
+ {
+ p += sprintf(p, "/%u", address->mask);
+ }
+
+ return buf;
+}
+
void
fw3_format_src_dest(struct fw3_address *src, struct fw3_address *dest)
{
- char s[INET6_ADDRSTRLEN];
+ if ((src && src->range) || (dest && dest->range))
+ fw3_pr(" -m iprange");
if (src && src->set)
{
- inet_ntop(src->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
- &src->address.v4, s, sizeof(s));
-
- fw3_pr(" %s-s %s/%u", src->invert ? "! " : "", s, src->mask);
+ fw3_pr(" %s%s %s", src->invert ? "! " : "",
+ src->range ? "--src-range" : "-s",
+ fw3_address_to_string(src, false));
}
if (dest && dest->set)
{
- inet_ntop(dest->family == FW3_FAMILY_V4 ? AF_INET : AF_INET6,
- &dest->address.v4, s, sizeof(s));
-
- fw3_pr(" %s-d %s/%u", dest->invert ? "! " : "", s, dest->mask);
+ fw3_pr(" %s%s %s", dest->invert ? "! " : "",
+ dest->range ? "--dst-range" : "-d",
+ fw3_address_to_string(dest, false));
}
}
if (!limit)
return;
- const char *units[] = {
- [FW3_LIMIT_UNIT_SECOND] = "second",
- [FW3_LIMIT_UNIT_MINUTE] = "minute",
- [FW3_LIMIT_UNIT_HOUR] = "hour",
- [FW3_LIMIT_UNIT_DAY] = "day",
- };
-
if (limit->rate > 0)
{
fw3_pr(" -m limit %s--limit %u/%s",
- limit->invert ? "! " : "", limit->rate, units[limit->unit]);
+ limit->invert ? "! " : "",
+ limit->rate, limit_units[limit->unit]);
if (limit->burst > 0)
fw3_pr(" --limit-burst %u", limit->burst);
if (!ipset)
return;
- if (ipset->external && *ipset->external)
- name = ipset->external;
- else
- name = ipset->name;
+ name = ipset->external ? ipset->external : ipset->name;
fw3_pr(" -m set %s--match-set %s", invert ? "! " : "", name);
}
void
+fw3_format_time(struct fw3_time *time)
+{
+ int i;
+ struct tm empty = { 0 };
+ char buf[sizeof("9999-99-99T23:59:59\0")];
+ bool d1 = memcmp(&time->datestart, &empty, sizeof(empty));
+ bool d2 = memcmp(&time->datestop, &empty, sizeof(empty));
+ bool first;
+
+ if (!d1 && !d2 && !time->timestart && !time->timestop &&
+ !(time->monthdays & 0xFFFFFFFE) && !(time->weekdays & 0xFE))
+ {
+ return;
+ }
+
+ fw3_pr(" -m time");
+
+ if (time->utc)
+ fw3_pr(" --utc");
+
+ if (d1)
+ {
+ strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%S", &time->datestart);
+ fw3_pr(" --datestart %s", buf);
+ }
+
+ if (d2)
+ {
+ strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%S", &time->datestop);
+ fw3_pr(" --datestop %s", buf);
+ }
+
+ if (time->timestart)
+ {
+ fw3_pr(" --timestart %02d:%02d:%02d",
+ time->timestart / 3600,
+ time->timestart % 3600 / 60,
+ time->timestart % 60);
+ }
+
+ if (time->timestop)
+ {
+ fw3_pr(" --timestop %02d:%02d:%02d",
+ time->timestop / 3600,
+ time->timestop % 3600 / 60,
+ time->timestop % 60);
+ }
+
+ if (time->monthdays & 0xFFFFFFFE)
+ {
+ fw3_pr(" %s--monthdays", hasbit(time->monthdays, 0) ? "! " : "");
+
+ for (i = 1, first = true; i < 32; i++)
+ {
+ if (hasbit(time->monthdays, i))
+ {
+ fw3_pr("%c%u", first ? ' ' : ',', i);
+ first = false;
+ }
+ }
+ }
+
+ if (time->weekdays & 0xFE)
+ {
+ fw3_pr(" %s--weekdays", hasbit(time->weekdays, 0) ? "! " : "");
+
+ for (i = 1, first = true; i < 8; i++)
+ {
+ if (hasbit(time->weekdays, i))
+ {
+ fw3_pr("%c%u", first ? ' ' : ',', i);
+ first = false;
+ }
+ }
+ }
+}
+
+void
+fw3_format_mark(struct fw3_mark *mark)
+{
+ if (!mark->set)
+ return;
+
+ fw3_pr(" -m mark %s--mark 0x%x", mark->invert ? "! " : "", mark->mark);
+
+ if (mark->mask < 0xFFFFFFFF)
+ fw3_pr("/0x%x", mark->mask);
+}
+
+void
__fw3_format_comment(const char *comment, ...)
{
va_list ap;
projects / project / firewall3.git / blobdiff