Instead of relying on the nonstandard xt_id match, use the xt_comment match
to tag own rules. Any rule with a comment starting with "!fw3" is considered
to be firewall3 internal.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
iptc_delete_chain(chain, h->handle);
}
iptc_delete_chain(chain, h->handle);
}
-static int
-get_rule_id(const void *base, unsigned int start, unsigned int end)
+static bool
+has_rule_tag(const void *base, unsigned int start, unsigned int end)
unsigned int i;
const struct xt_entry_match *em;
unsigned int i;
const struct xt_entry_match *em;
- if (strcmp(em->u.user.name, "id"))
- continue;
-
- memcpy(&id, em->data, sizeof(id));
-
- if ((id & FW3_ID_MASK) != FW3_ID_MAGIC)
+ if (strcmp(em->u.user.name, "comment"))
- return (id & ~FW3_ID_MASK);
+ if (!memcmp(em->data, "!fw3", 4))
+ return true;
unsigned int num;
const struct ipt_entry *e;
bool found;
unsigned int num;
const struct ipt_entry *e;
bool found;
#ifndef DISABLE_IPV6
if (h->family == FW3_FAMILY_V6)
#ifndef DISABLE_IPV6
if (h->family == FW3_FAMILY_V6)
e6 != NULL;
num++, e6 = ip6tc_next_rule(e6, h->handle))
{
e6 != NULL;
num++, e6 = ip6tc_next_rule(e6, h->handle))
{
- id = get_rule_id(e6, sizeof(*e6), e6->target_offset);
-
- if (id >= 0)
+ if (has_rule_tag(e6, sizeof(*e6), e6->target_offset))
{
if (fw3_pr_debug)
debug(h, "-D %s %u\n", chain, num + 1);
{
if (fw3_pr_debug)
debug(h, "-D %s %u\n", chain, num + 1);
e != NULL;
num++, e = iptc_next_rule(e, h->handle))
{
e != NULL;
num++, e = iptc_next_rule(e, h->handle))
{
- id = get_rule_id(e, sizeof(*e), e->target_offset);
-
- if (id >= 0)
+ if (has_rule_tag(e, sizeof(*e), e->target_offset))
{
if (fw3_pr_debug)
debug(h, "-D %s %u\n", chain, num + 1);
{
if (fw3_pr_debug)
debug(h, "-D %s %u\n", chain, num + 1);
r = fw3_alloc(sizeof(*r));
r->h = h;
r = fw3_alloc(sizeof(*r));
r->h = h;
r->argv = fw3_alloc(sizeof(char *));
r->argv[r->argc++] = "fw3";
r->argv = fw3_alloc(sizeof(char *));
r->argv[r->argc++] = "fw3";
+static void
+set_rule_tag(struct fw3_ipt_rule *r)
+{
+ int i;
+ char *p, **tmp;
+ const char *tag = "!fw3";
+
+ for (i = 0; i < r->argc; i++)
+ if (!strcmp(r->argv[i], "--comment") && (i + 1) < r->argc)
+ if (asprintf(&p, "%s: %s", tag, r->argv[i + 1]) > 0)
+ {
+ free(r->argv[i + 1]);
+ r->argv[i + 1] = p;
+ return;
+ }
+
+ tmp = realloc(r->argv, (r->argc + 4) * sizeof(*r->argv));
+
+ if (tmp)
+ {
+ r->argv = tmp;
+ r->argv[r->argc++] = fw3_strdup("-m");
+ r->argv[r->argc++] = fw3_strdup("comment");
+ r->argv[r->argc++] = fw3_strdup("--comment");
+ r->argv[r->argc++] = fw3_strdup(tag);
+ }
+}
+
void
__fw3_ipt_rule_append(struct fw3_ipt_rule *r, bool repl, const char *fmt, ...)
{
void
__fw3_ipt_rule_append(struct fw3_ipt_rule *r, bool repl, const char *fmt, ...)
{
struct xtables_globals *g;
int i, optc;
struct xtables_globals *g;
int i, optc;
bool inv = false;
char buf[32];
va_list ap;
bool inv = false;
char buf[32];
va_list ap;
- if (r->id >= 0)
- {
- em = find_match(r, "id");
-
- if (!em)
- {
- warn("fw3_ipt_rule_append(): Can't find match '%s'", "id");
- goto free;
- }
-
- init_match(r, em, true);
-
- id = FW3_ID_MAGIC | (r->id & ~FW3_ID_MASK);
- memcpy(em->m->data, &id, sizeof(id));
-
- em->mflags = 1;
- }
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)
-#define FW3_ID_MAGIC 0x66773300 /* 'f' 'w' '3' */
-#define FW3_ID_MASK 0xffffff00
-
/* xtables interface */
#if (XTABLES_VERSION_CODE == 10 || XTABLES_VERSION_CODE == 11)
# include "xtables-10.h"
/* xtables interface */
#if (XTABLES_VERSION_CODE == 10 || XTABLES_VERSION_CODE == 11)
# include "xtables-10.h"
struct xtables_rule_match *matches;
struct xtables_target *target;
struct xtables_rule_match *matches;
struct xtables_target *target;