#include <libiptc/libip6tc.h>
#include <xtables.h>
+#include <setjmp.h>
+
#include "options.h"
/* xtables interface */
-#if (XTABLES_VERSION_CODE == 10 || XTABLES_VERSION_CODE == 11)
+#if (XTABLES_VERSION_CODE >= 10)
# include "xtables-10.h"
#elif (XTABLES_VERSION_CODE == 5)
# include "xtables-5.h"
#include "iptables.h"
+#define XT_LOCK_NAME "/var/run/xtables.lock"
+static int xt_lock_fd = -1;
struct fw3_ipt_rule {
struct fw3_ipt_handle *h;
};
static struct option base_opts[] = {
- { .name = "match", .has_arg = 1, .val = 'm' },
- { .name = "jump", .has_arg = 1, .val = 'j' },
+ { .name = "match", .has_arg = 1, .val = 'm' },
+ { .name = "jump", .has_arg = 1, .val = 'j' },
+ { .name = "in-interface", .has_arg = 1, .val = 'i' },
+ { .name = "out-interface", .has_arg = 1, .val = 'o' },
+ { .name = "source", .has_arg = 1, .val = 's' },
+ { .name = "destination", .has_arg = 1, .val = 'd' },
{ NULL }
};
+
+static jmp_buf fw3_ipt_error_jmp;
+
+static __attribute__((noreturn))
+void fw3_ipt_error_handler(enum xtables_exittype status,
+ const char *fmt, ...)
+{
+ va_list args;
+
+ fprintf(stderr, " ! Exception: ");
+
+ va_start(args, fmt);
+ vfprintf(stderr, fmt, args);
+ va_end(args);
+
+ longjmp(fw3_ipt_error_jmp, status);
+}
+
static struct xtables_globals xtg = {
.option_offset = 0,
.program_version = "4",
.orig_opts = base_opts,
+ .exit_err = fw3_ipt_error_handler,
#if XTABLES_VERSION_CODE > 10
.compat_rev = xtables_compatible_revision,
#endif
.option_offset = 0,
.program_version = "6",
.orig_opts = base_opts,
+ .exit_err = fw3_ipt_error_handler,
#if XTABLES_VERSION_CODE > 10
.compat_rev = xtables_compatible_revision,
#endif
xtables_init();
+ while (!fw3_lock_path(&xt_lock_fd, XT_LOCK_NAME)) {
+ warn("Currently busy xtables.lock - wait 1 second");
+ sleep(1);
+ }
+
if (family == FW3_FAMILY_V6)
{
#ifndef DISABLE_IPV6
if (!h->handle)
{
free(h);
+ fw3_unlock_path(&xt_lock_fd, XT_LOCK_NAME);
return NULL;
}
void
fw3_ipt_close(struct fw3_ipt_handle *h)
{
+ fw3_unlock_path(&xt_lock_fd, XT_LOCK_NAME);
free(h);
}
if (sp->port_min == sp->port_max)
sprintf(buf, "%u", sp->port_min);
else
- sprintf(buf, "%u:%u", sp->port_min, sp->port_max);
+ snprintf(buf, sizeof(buf), "%u:%u", sp->port_min, sp->port_max);
fw3_ipt_rule_addarg(r, sp->invert, "--sport", buf);
}
if (dp->port_min == dp->port_max)
sprintf(buf, "%u", dp->port_min);
else
- sprintf(buf, "%u:%u", dp->port_min, dp->port_max);
+ snprintf(buf, sizeof(buf), "%u:%u", dp->port_min, dp->port_max);
fw3_ipt_rule_addarg(r, dp->invert, "--dport", buf);
}
if (icmp->code6_min == 0 && icmp->code6_max == 0xFF)
sprintf(buf, "%u", icmp->type6);
else
- sprintf(buf, "%u/%u", icmp->type6, icmp->code6_min);
+ snprintf(buf, sizeof(buf), "%u/%u", icmp->type6, icmp->code6_min);
fw3_ipt_rule_addarg(r, icmp->invert, "--icmpv6-type", buf);
}
if (icmp->code_min == 0 && icmp->code_max == 0xFF)
sprintf(buf, "%u", icmp->type);
else
- sprintf(buf, "%u/%u", icmp->type, icmp->code_min);
+ snprintf(buf, sizeof(buf), "%u/%u", icmp->type, icmp->code_min);
fw3_ipt_rule_addarg(r, icmp->invert, "--icmp-type", buf);
}
fw3_ipt_rule_addarg(r, false, buf, NULL);
}
+void
+fw3_ipt_rule_helper(struct fw3_ipt_rule *r, struct fw3_cthelpermatch *match)
+{
+ if (!match || !match->set || !match->ptr)
+ return;
+
+ fw3_ipt_rule_addarg(r, false, "-m", "helper");
+ fw3_ipt_rule_addarg(r, match->invert, "--helper", match->ptr->name);
+}
+
void
fw3_ipt_rule_time(struct fw3_ipt_rule *r, struct fw3_time *time)
{
fw3_ipt_rule_addarg(r, false, "-m", "time");
- if (time->utc)
- fw3_ipt_rule_addarg(r, false, "--utc", NULL);
+ if (!time->utc)
+ fw3_ipt_rule_addarg(r, false, "--kerneltz", NULL);
if (d1)
{
fw3_ipt_rule_addarg(r, mark->invert, "--mark", buf);
}
+void
+fw3_ipt_rule_dscp(struct fw3_ipt_rule *r, struct fw3_dscp *dscp)
+{
+ char buf[sizeof("0xFF\0")];
+
+ if (!dscp || !dscp->set)
+ return;
+
+ sprintf(buf, "0x%x", dscp->dscp);
+
+ fw3_ipt_rule_addarg(r, false, "-m", "dscp");
+ fw3_ipt_rule_addarg(r, dscp->invert, "--dscp", buf);
+}
+
void
fw3_ipt_rule_comment(struct fw3_ipt_rule *r, const char *fmt, ...)
{
p += SZ(ip6t_entry_match) + m->match->size;
}
- memset(p, 0xFF, SZ(ip6t_entry_target) + (r->target) ? r->target->userspacesize : 0);
+ memset(p, 0xFF, SZ(ip6t_entry_target) + (r->target ? r->target->userspacesize : 0));
}
else
#endif
p += SZ(ipt_entry_match) + m->match->size;
}
- memset(p, 0xFF, SZ(ipt_entry_target) + (r->target) ? r->target->userspacesize : 0);
+ memset(p, 0xFF, SZ(ipt_entry_target) + (r->target ? r->target->userspacesize : 0));
}
return mask;
struct xtables_target *et;
struct xtables_globals *g;
+ struct fw3_device dev;
+ struct fw3_address addr;
+
+ enum xtables_exittype status;
+
int i, optc;
bool inv = false;
char buf[32];
optind = 0;
opterr = 0;
+ status = setjmp(fw3_ipt_error_jmp);
+
+ if (status > 0)
+ {
+ info(" ! Skipping due to previous exception (code %u)", status);
+ goto free;
+ }
+
set_rule_tag(r);
- while ((optc = getopt_long(r->argc, r->argv, "-:m:j:", g->opts,
+ while ((optc = getopt_long(r->argc, r->argv, "-:m:j:i:o:s:d:", g->opts,
NULL)) != -1)
{
switch (optc)
break;
+ case 'i':
+ case 'o':
+ if (!fw3_parse_device(&dev, optarg, false) ||
+ dev.any || dev.invert || *dev.network)
+ {
+ warn("fw3_ipt_rule_append(): Bad argument '%s'", optarg);
+ goto free;
+ }
+
+ dev.invert = inv;
+ fw3_ipt_rule_in_out(r, (optc == 'i') ? &dev : NULL,
+ (optc == 'o') ? &dev : NULL);
+ break;
+
+ case 's':
+ case 'd':
+ if (!fw3_parse_address(&addr, optarg, false) ||
+ addr.range || addr.invert)
+ {
+ warn("fw3_ipt_rule_append(): Bad argument '%s'", optarg);
+ goto free;
+ }
+
+ addr.invert = inv;
+ fw3_ipt_rule_src_dest(r, (optc == 's') ? &addr : NULL,
+ (optc == 'd') ? &addr : NULL);
+ break;
+
case 1:
if ((optarg[0] == '!') && (optarg[1] == '\0'))
{
projects / project / firewall3.git / blobdiff