#include <libiptc/libip6tc.h>
#include <xtables.h>
+#include <setjmp.h>
+
#include "options.h"
/* xtables interface */
};
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
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)
{
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'))
{