Merge pull request #267 from n3ph/master

[project/luci.git] / contrib / fwd / src / fwd_xtables.c

diff --git a/contrib/fwd/src/fwd_xtables.c b/contrib/fwd/src/fwd_xtables.c
index dc9fab1..895715d 100644 (file)
--- a/contrib/fwd/src/fwd_xtables.c
+++ b/contrib/fwd/src/fwd_xtables.c
@@ -19,6 +19,7 @@
 
 #include "fwd.h"
 #include "fwd_xtables.h"
+#include "fwd_utils.h"
 
 
 /* Required by certain extensions like SNAT and DNAT */
@@ -82,6 +83,17 @@ struct fwd_xt_rule * fwd_xt_init_rule(struct iptc_handle *h)
        return NULL;
 }
 
+void fwd_xt_parse_frag(
+       struct fwd_xt_rule *r, int frag, int inv
+) {
+       if( frag )
+       {
+               r->entry->ip.flags |= IPT_F_FRAG;
+
+               if( inv )
+                       r->entry->ip.invflags |= IPT_INV_FRAG;
+       }
+}
 
 void fwd_xt_parse_proto(
        struct fwd_xt_rule *r, struct fwd_proto *p, int inv
@@ -118,7 +130,7 @@ void fwd_xt_parse_proto(
 }
 
 void fwd_xt_parse_in(
-       struct fwd_xt_rule *r, struct fwd_network_list *n, int inv
+       struct fwd_xt_rule *r, struct fwd_network *n, int inv
 ) {
        if( n != NULL )
        {
@@ -130,7 +142,7 @@ void fwd_xt_parse_in(
 }
 
 void fwd_xt_parse_out(
-       struct fwd_xt_rule *r, struct fwd_network_list *n, int inv
+       struct fwd_xt_rule *r, struct fwd_network *n, int inv
 ) {
        if( n != NULL )
        {
@@ -229,6 +241,7 @@ void __fwd_xt_parse_match(
                        }
 
                        m->parse(optc, opts, inv, &m->mflags, r->entry, &m->m);
+                       inv = 0;
                }
        }
 
@@ -303,6 +316,7 @@ void __fwd_xt_parse_target(
                        }
 
                        t->parse(optc, opts, inv, &t->tflags, r->entry, &t->t);
+                       inv = 0;
                }
        }
 
@@ -310,7 +324,7 @@ void __fwd_xt_parse_target(
 }
 
 
-int fwd_xt_exec_rule(struct fwd_xt_rule *r, const char *chain)
+static int fwd_xt_exec_rule(struct fwd_xt_rule *r, const char *chain, int pos)
 {
        size_t s;
        struct xtables_rule_match *m, *next;
@@ -342,7 +356,10 @@ int fwd_xt_exec_rule(struct fwd_xt_rule *r, const char *chain)
 
                memcpy(e->elems + s, r->target->t, r->target->t->u.target_size);
 
-               rv = iptc_append_entry(chain, e, r->iptc);
+               rv = (pos > -1)
+                       ? iptc_insert_entry(chain, e, (unsigned int) pos, r->iptc)
+                       : iptc_append_entry(chain, e, r->iptc)
+               ;
        }
        else
        {
@@ -381,3 +398,15 @@ int fwd_xt_exec_rule(struct fwd_xt_rule *r, const char *chain)
        return rv;
 }
 
+int fwd_xt_insert_rule(
+       struct fwd_xt_rule *r, const char *chain, unsigned int pos
+) {
+       return fwd_xt_exec_rule(r, chain, pos);
+}
+
+int fwd_xt_append_rule(
+       struct fwd_xt_rule *r, const char *chain
+) {
+       return fwd_xt_exec_rule(r, chain, -1);
+}
+