static struct option base_opts[] = {
{ .name = "match", .has_arg = 1, .val = 'm' },
{ .name = "jump", .has_arg = 1, .val = 'j' },
- { .name = "append", .has_arg = 1, .val = 'A' },
{ NULL }
};
}
void
-fw3_ipt_delete_chain(struct fw3_ipt_handle *h, const char *chain)
+fw3_ipt_flush_chain(struct fw3_ipt_handle *h, const char *chain)
{
if (fw3_pr_debug)
- {
debug(h, "-F %s\n", chain);
- debug(h, "-X %s\n", chain);
- }
#ifndef DISABLE_IPV6
if (h->family == FW3_FAMILY_V6)
- {
- if (ip6tc_flush_entries(chain, h->handle))
- ip6tc_delete_chain(chain, h->handle);
- }
+ ip6tc_flush_entries(chain, h->handle);
else
#endif
- {
- if (iptc_flush_entries(chain, h->handle))
- iptc_delete_chain(chain, h->handle);
- }
+ iptc_flush_entries(chain, h->handle);
}
-void
-fw3_ipt_delete_rules(struct fw3_ipt_handle *h, const char *target)
+static void
+delete_rules(struct fw3_ipt_handle *h, const char *target)
{
unsigned int num;
const struct ipt_entry *e;
}
void
+fw3_ipt_delete_chain(struct fw3_ipt_handle *h, const char *chain)
+{
+ delete_rules(h, chain);
+
+ if (fw3_pr_debug)
+ debug(h, "-X %s\n", chain);
+
+#ifndef DISABLE_IPV6
+ if (h->family == FW3_FAMILY_V6)
+ ip6tc_delete_chain(chain, h->handle);
+ else
+#endif
+ iptc_delete_chain(chain, h->handle);
+}
+
+void
fw3_ipt_create_chain(struct fw3_ipt_handle *h, const char *fmt, ...)
{
char buf[32];
{
rv = ip6tc_commit(h->handle);
if (!rv)
- fprintf(stderr, "ip6tc_commit(): %s\n", ip6tc_strerror(errno));
+ warn("ip6tc_commit(): %s", ip6tc_strerror(errno));
}
else
#endif
{
rv = iptc_commit(h->handle);
if (!rv)
- fprintf(stderr, "iptc_commit(): %s\n", iptc_strerror(errno));
+ warn("iptc_commit(): %s", iptc_strerror(errno));
}
+}
+void
+fw3_ipt_close(struct fw3_ipt_handle *h)
+{
if (h->libv)
{
while (h->libc > 0)
static void
ip4prefix2mask(int prefix, struct in_addr *mask)
{
- mask->s_addr = htonl(~((1 << (32 - prefix)) - 1));
+ if (prefix > 0)
+ mask->s_addr = htonl(~((1 << (32 - prefix)) - 1));
+ else
+ mask->s_addr = 0;
}
#ifndef DISABLE_IPV6
void
fw3_ipt_rule_mac(struct fw3_ipt_rule *r, struct fw3_mac *mac)
{
+ char buf[sizeof("ff:ff:ff:ff:ff:ff\0")];
+ uint8_t *addr = mac->mac.ether_addr_octet;
+
if (!mac)
return;
+ sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x",
+ addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+
fw3_ipt_rule_addarg(r, false, "-m", "mac");
- fw3_ipt_rule_addarg(r, mac->invert, "--mac-source", ether_ntoa(&mac->mac));
+ fw3_ipt_rule_addarg(r, mac->invert, "--mac-source", buf);
}
void
}
void
-fw3_ipt_rule_ipset(struct fw3_ipt_rule *r, struct fw3_ipset *ipset,
- bool invert)
+fw3_ipt_rule_ipset(struct fw3_ipt_rule *r, struct fw3_setmatch *match)
{
char buf[sizeof("dst,dst,dst\0")];
char *p = buf;
+ int i = 0;
+ struct fw3_ipset *set;
struct fw3_ipset_datatype *type;
- if (!ipset)
+ if (!match || !match->set || !match->ptr)
return;
- list_for_each_entry(type, &ipset->datatypes, list)
+ set = match->ptr;
+ list_for_each_entry(type, &set->datatypes, list)
{
+ if (i >= 3)
+ break;
+
if (p > buf)
*p++ = ',';
- p += sprintf(p, "%s", type->dest ? "dst" : "src");
+ p += sprintf(p, "%s", match->dir[i] ? match->dir[i] : type->dir);
+ i++;
}
fw3_ipt_rule_addarg(r, false, "-m", "set");
- fw3_ipt_rule_addarg(r, invert, "--match-set",
- ipset->external ? ipset->external : ipset->name);
+ fw3_ipt_rule_addarg(r, match->invert, "--match-set",
+ set->external ? set->external : set->name);
fw3_ipt_rule_addarg(r, false, buf, NULL);
}
}
static void
-rule_print(struct fw3_ipt_rule *r, const char *chain)
+rule_print(struct fw3_ipt_rule *r, const char *prefix, const char *chain)
{
- struct xtables_rule_match *rm;
- struct xtables_match *m;
- struct xtables_target *t;
-
- debug(r->h, "-A %s", chain);
+ debug(r->h, "%s %s", prefix, chain);
#ifndef DISABLE_IPV6
if (r->h->family == FW3_FAMILY_V6)
#endif
rule_print4(&r->e);
- for (rm = r->matches; rm; rm = rm->next)
- {
- m = rm->match;
- printf(" -m %s", fw3_xt_get_match_name(m));
-
- if (m->save)
- m->save(&r->e.ip, m->m);
- }
-
- if (r->target)
- {
- t = r->target;
- printf(" -j %s", fw3_xt_get_target_name(t));
-
- if (t->save)
- t->save(&r->e.ip, t->t);
- }
+ fw3_xt_print_matches(&r->e.ip, r->matches);
+ fw3_xt_print_target(&r->e.ip, r->target);
printf("\n");
}
}
if (optc == ':')
- fprintf(stderr, "parse_option(): option '%s' needs argument\n",
- r->argv[optind-1]);
+ warn("parse_option(): option '%s' needs argument", r->argv[optind-1]);
if (optc == '?')
- fprintf(stderr, "parse_option(): unknown option '%s'\n",
- r->argv[optind-1]);
+ warn("parse_option(): unknown option '%s'", r->argv[optind-1]);
return false;
}
r->argv[r->argc++] = fw3_strdup(v);
}
-void
-fw3_ipt_rule_append(struct fw3_ipt_rule *r, const char *fmt, ...)
+static unsigned char *
+rule_mask(struct fw3_ipt_rule *r)
{
size_t s;
+ unsigned char *p, *mask = NULL;
+ struct xtables_rule_match *m;
+
+#define SZ(x) XT_ALIGN(sizeof(struct x))
+
+#ifndef DISABLE_IPV6
+ if (r->h->family == FW3_FAMILY_V6)
+ {
+ s = SZ(ip6t_entry);
+
+ for (m = r->matches; m; m = m->next)
+ s += SZ(ip6t_entry_match) + m->match->size;
+
+ s += SZ(ip6t_entry_target) + r->target->size;
+
+ mask = fw3_alloc(s);
+ memset(mask, 0xFF, SZ(ip6t_entry));
+ p = mask + SZ(ip6t_entry);
+
+ for (m = r->matches; m; m = m->next)
+ {
+ memset(p, 0xFF, SZ(ip6t_entry_match) + m->match->userspacesize);
+ p += SZ(ip6t_entry_match) + m->match->size;
+ }
+
+ memset(p, 0xFF, SZ(ip6t_entry_target) + r->target->userspacesize);
+ }
+ else
+#endif
+ {
+ s = SZ(ipt_entry);
+
+ for (m = r->matches; m; m = m->next)
+ s += SZ(ipt_entry_match) + m->match->size;
+
+ s += SZ(ipt_entry_target) + r->target->size;
+
+ mask = fw3_alloc(s);
+ memset(mask, 0xFF, SZ(ipt_entry));
+ p = mask + SZ(ipt_entry);
+
+ for (m = r->matches; m; m = m->next)
+ {
+ memset(p, 0xFF, SZ(ipt_entry_match) + m->match->userspacesize);
+ p += SZ(ipt_entry_match) + m->match->size;
+ }
+
+ memset(p, 0xFF, SZ(ipt_entry_target) + r->target->userspacesize);
+ }
+
+ return mask;
+}
+
+static void *
+rule_build(struct fw3_ipt_rule *r)
+{
+ size_t s;
+ struct xtables_rule_match *m;
+
+#ifndef DISABLE_IPV6
+ if (r->h->family == FW3_FAMILY_V6)
+ {
+ struct ip6t_entry *e6;
+
+ s = XT_ALIGN(sizeof(struct ip6t_entry));
+
+ for (m = r->matches; m; m = m->next)
+ s += m->match->m->u.match_size;
+
+ e6 = fw3_alloc(s + r->target->t->u.target_size);
+
+ memcpy(e6, &r->e6, sizeof(struct ip6t_entry));
+
+ e6->target_offset = s;
+ e6->next_offset = s + r->target->t->u.target_size;
+
+ s = 0;
+
+ for (m = r->matches; m; m = m->next)
+ {
+ memcpy(e6->elems + s, m->match->m, m->match->m->u.match_size);
+ s += m->match->m->u.match_size;
+ }
+
+ memcpy(e6->elems + s, r->target->t, r->target->t->u.target_size);
+
+ return e6;
+ }
+ else
+#endif
+ {
+ struct ipt_entry *e;
+
+ s = XT_ALIGN(sizeof(struct ipt_entry));
+
+ for (m = r->matches; m; m = m->next)
+ s += m->match->m->u.match_size;
+
+ e = fw3_alloc(s + r->target->t->u.target_size);
+
+ memcpy(e, &r->e, sizeof(struct ipt_entry));
+
+ e->target_offset = s;
+ e->next_offset = s + r->target->t->u.target_size;
+
+ s = 0;
+
+ for (m = r->matches; m; m = m->next)
+ {
+ memcpy(e->elems + s, m->match->m, m->match->m->u.match_size);
+ s += m->match->m->u.match_size;
+ }
+
+ memcpy(e->elems + s, r->target->t, r->target->t->u.target_size);
+
+ return e;
+ }
+}
+
+void
+__fw3_ipt_rule_append(struct fw3_ipt_rule *r, bool repl, const char *fmt, ...)
+{
+ void *rule;
+ unsigned char *mask;
+
struct xtables_rule_match *m;
struct xtables_match *em;
struct xtables_target *et;
struct xtables_globals *g;
- struct ipt_entry *e;
int i, optc;
bool inv = false;
optind = 0;
opterr = 0;
- while ((optc = getopt_long(r->argc, r->argv, "m:j:", g->opts, NULL)) != -1)
+ while ((optc = getopt_long(r->argc, r->argv, "-:m:j:", g->opts,
+ NULL)) != -1)
{
switch (optc)
{
if (!em)
{
- fprintf(stderr, "fw3_ipt_rule_append(): Can't find match '%s'\n", optarg);
+ warn("fw3_ipt_rule_append(): Can't find match '%s'", optarg);
goto free;
}
if (!et)
{
- fprintf(stderr, "fw3_ipt_rule_append(): Can't find target '%s'\n", optarg);
+ warn("fw3_ipt_rule_append(): Can't find target '%s'", optarg);
goto free;
}
case 1:
if ((optarg[0] == '!') && (optarg[1] == '\0'))
{
+ optarg[0] = '\0';
inv = true;
continue;
}
- fprintf(stderr, "fw3_ipt_rule_append(): Bad argument '%s'\n", optarg);
- return;
+ warn("fw3_ipt_rule_append(): Bad argument '%s'", optarg);
+ goto free;
default:
if (parse_option(r, optc, inv))
if (r->target)
xtables_option_tfcall(r->target);
- if (fw3_pr_debug)
- rule_print(r, buf);
+ rule = rule_build(r);
#ifndef DISABLE_IPV6
if (r->h->family == FW3_FAMILY_V6)
{
- struct ip6t_entry *e6;
-
- s = XT_ALIGN(sizeof(struct ip6t_entry));
-
- for (m = r->matches; m; m = m->next)
- s += m->match->m->u.match_size;
-
- e6 = fw3_alloc(s + r->target->t->u.target_size);
-
- memcpy(e6, &r->e6, sizeof(struct ip6t_entry));
-
- e6->target_offset = s;
- e6->next_offset = s + r->target->t->u.target_size;
+ if (repl)
+ {
+ mask = rule_mask(r);
- s = 0;
+ while (ip6tc_delete_entry(buf, rule, mask, r->h->handle))
+ if (fw3_pr_debug)
+ rule_print(r, "-D", buf);
- for (m = r->matches; m; m = m->next)
- {
- memcpy(e6->elems + s, m->match->m, m->match->m->u.match_size);
- s += m->match->m->u.match_size;
+ free(mask);
}
- memcpy(e6->elems + s, r->target->t, r->target->t->u.target_size);
- ip6tc_append_entry(buf, e6, r->h->handle);
- free(e6);
+ if (fw3_pr_debug)
+ rule_print(r, "-A", buf);
+
+ if (!ip6tc_append_entry(buf, rule, r->h->handle))
+ warn("ip6tc_append_entry(): %s", ip6tc_strerror(errno));
}
else
#endif
{
- s = XT_ALIGN(sizeof(struct ipt_entry));
-
- for (m = r->matches; m; m = m->next)
- s += m->match->m->u.match_size;
-
- e = fw3_alloc(s + r->target->t->u.target_size);
-
- memcpy(e, &r->e, sizeof(struct ipt_entry));
-
- e->target_offset = s;
- e->next_offset = s + r->target->t->u.target_size;
+ if (repl)
+ {
+ mask = rule_mask(r);
- s = 0;
+ while (iptc_delete_entry(buf, rule, mask, r->h->handle))
+ if (fw3_pr_debug)
+ rule_print(r, "-D", buf);
- for (m = r->matches; m; m = m->next)
- {
- memcpy(e->elems + s, m->match->m, m->match->m->u.match_size);
- s += m->match->m->u.match_size;
+ free(mask);
}
- memcpy(e->elems + s, r->target->t, r->target->t->u.target_size);
+ if (fw3_pr_debug)
+ rule_print(r, "-A", buf);
- if (!iptc_append_entry(buf, e, r->h->handle))
- fprintf(stderr, "iptc_append_entry(): %s\n", iptc_strerror(errno));
-
- free(e);
+ if (!iptc_append_entry(buf, rule, r->h->handle))
+ warn("iptc_append_entry(): %s\n", iptc_strerror(errno));
}
+ free(rule);
+
free:
for (i = 1; i < r->argc; i++)
free(r->argv[i]);
projects / project / firewall3.git / blobdiff