/*
* firewall3 - 3rd OpenWrt UCI firewall implementation
*
- * Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ * Copyright (C) 2013 Jo-Philipp Wich <jo@mein.io>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
{
for (i = 1, p = buf; i < 32; i++)
{
- if (hasbit(time->monthdays, i))
+ if (fw3_hasbit(time->monthdays, i))
{
if (p > buf)
*p++ = ',';
}
}
- fw3_ipt_rule_addarg(r, hasbit(time->monthdays, 0), "--monthdays", buf);
+ fw3_ipt_rule_addarg(r, fw3_hasbit(time->monthdays, 0), "--monthdays", buf);
}
if (time->weekdays & 0xFE)
{
for (i = 1, p = buf; i < 8; i++)
{
- if (hasbit(time->weekdays, i))
+ if (fw3_hasbit(time->weekdays, i))
{
if (p > buf)
*p++ = ',';
}
}
- fw3_ipt_rule_addarg(r, hasbit(time->weekdays, 0), "--weekdays", buf);
+ fw3_ipt_rule_addarg(r, fw3_hasbit(time->weekdays, 0), "--weekdays", buf);
}
}
if (e->ipv6.flags & IP6T_F_PROTO)
{
- if (e->ipv6.flags & XT_INV_PROTO)
+ if (e->ipv6.invflags & XT_INV_PROTO)
printf(" !");
pname = get_protoname(container_of(e, struct fw3_ipt_rule, e6));
if (e->ipv6.iniface[0])
{
- if (e->ipv6.flags & IP6T_INV_VIA_IN)
+ if (e->ipv6.invflags & IP6T_INV_VIA_IN)
printf(" !");
printf(" -i %s", e->ipv6.iniface);
if (e->ipv6.outiface[0])
{
- if (e->ipv6.flags & IP6T_INV_VIA_OUT)
+ if (e->ipv6.invflags & IP6T_INV_VIA_OUT)
printf(" !");
printf(" -o %s", e->ipv6.outiface);
if (memcmp(&e->ipv6.src, &in6addr_any, sizeof(struct in6_addr)))
{
- if (e->ipv6.flags & IP6T_INV_SRCIP)
+ if (e->ipv6.invflags & IP6T_INV_SRCIP)
printf(" !");
printf(" -s %s/%s",
if (memcmp(&e->ipv6.dst, &in6addr_any, sizeof(struct in6_addr)))
{
- if (e->ipv6.flags & IP6T_INV_DSTIP)
+ if (e->ipv6.invflags & IP6T_INV_DSTIP)
printf(" !");
printf(" -d %s/%s",
if (e->ip.proto)
{
- if (e->ip.flags & XT_INV_PROTO)
+ if (e->ip.invflags & XT_INV_PROTO)
printf(" !");
pname = get_protoname(container_of(e, struct fw3_ipt_rule, e));
if (e->ip.iniface[0])
{
- if (e->ip.flags & IPT_INV_VIA_IN)
+ if (e->ip.invflags & IPT_INV_VIA_IN)
printf(" !");
printf(" -i %s", e->ip.iniface);
if (e->ip.outiface[0])
{
- if (e->ip.flags & IPT_INV_VIA_OUT)
+ if (e->ip.invflags & IPT_INV_VIA_OUT)
printf(" !");
printf(" -o %s", e->ip.outiface);
if (memcmp(&e->ip.src, &in_zero, sizeof(struct in_addr)))
{
- if (e->ip.flags & IPT_INV_SRCIP)
+ if (e->ip.invflags & IPT_INV_SRCIP)
printf(" !");
printf(" -s %s/%s",
if (memcmp(&e->ip.dst, &in_zero, sizeof(struct in_addr)))
{
- if (e->ip.flags & IPT_INV_DSTIP)
+ if (e->ip.invflags & IPT_INV_DSTIP)
printf(" !");
printf(" -d %s/%s",