ROUTE --tee target extension (Patrick Schaaf)

diff --git a/extensions/libip6t_ROUTE.c b/extensions/libip6t_ROUTE.c
index 71dada8a68a11224b5760ae8475db836a6ec3e33..94a9180e38fa725b45ba6e35d7b56cecc58dcf46 100644 (file)
--- a/extensions/libip6t_ROUTE.c
+++ b/extensions/libip6t_ROUTE.c
@@ -1,6 +1,6 @@
 /* Shared library add-on to iptables to add ROUTE v6 target support.
  * Author : Cedric de Launois, <delaunois@info.ucl.ac.be>
- * v 1.0 2003/06/24
+ * v 1.1 2004/11/23
  */
 
 #include <stdio.h>
@@ -15,6 +15,11 @@
 #include <linux/netfilter_ipv6/ip6_tables.h>
 #include <linux/netfilter_ipv6/ip6t_ROUTE.h>
 
+/* compile IP6T_ROUTE_TEE support even if kernel headers are unpatched */
+#ifndef IP6T_ROUTE_TEE
+#define IP6T_ROUTE_TEE         0x02
+#endif
+
 /* Function which prints out usage message. */
 static void
 help(void)
@@ -23,9 +28,13 @@ help(void)
 "ROUTE target v%s options:\n"
 "    --oif   \tifname \t\tRoute the packet through `ifname' network interface\n"
 "    --gw    \tip     \t\tRoute the packet via this gateway\n"
-"    --continue\t     \t\tRoute the packet and continue traversing the rules.\n"
+"    --continue\t     \t\tRoute packet and continue traversing the\n"
+"            \t       \t\trules. Not valid with --iif or --tee.\n"
+"    --tee\t  \t\tDuplicate packet, route the duplicate,\n"
+"            \t       \t\tcontinue traversing with original packet.\n"
+"            \t       \t\tNot valid with --iif or --continue.\n"
 "\n",
-"1.0");
+"1.1");
 }
 
 static struct option opts[] = {
@@ -33,6 +42,7 @@ static struct option opts[] = {
        { "iif", 1, 0, '2' },
        { "gw", 1, 0, '3' },
        { "continue", 0, 0, '4' },
+       { "tee", 0, 0, '5' },
        { 0 }
 };
 
@@ -57,6 +67,7 @@ init(struct ip6t_entry_target *t, unsigned int *nfcache)
 #define IP6T_ROUTE_OPT_IIF      0x02
 #define IP6T_ROUTE_OPT_GW       0x04
 #define IP6T_ROUTE_OPT_CONTINUE 0x08
+#define IP6T_ROUTE_OPT_TEE      0x10
 
 /* Function which parses command options; returns true if it
    ate an option */
@@ -114,12 +125,28 @@ parse(int c, char **argv, int invert, unsigned int *flags,
                if (*flags & IP6T_ROUTE_OPT_CONTINUE)
                        exit_error(PARAMETER_PROBLEM,
                                   "Can't specify --continue twice");
+               if (*flags & IP6T_ROUTE_OPT_TEE)
+                       exit_error(PARAMETER_PROBLEM,
+                                  "Can't specify --continue AND --tee");
 
                route_info->flags |= IP6T_ROUTE_CONTINUE;
                *flags |= IP6T_ROUTE_OPT_CONTINUE;
 
                break;
 
+       case '5':
+               if (*flags & IP6T_ROUTE_OPT_TEE)
+                       exit_error(PARAMETER_PROBLEM,
+                                  "Can't specify --tee twice");
+               if (*flags & IP6T_ROUTE_OPT_CONTINUE)
+                       exit_error(PARAMETER_PROBLEM,
+                                  "Can't specify --tee AND --continue");
+
+               route_info->flags |= IP6T_ROUTE_TEE;
+               *flags |= IP6T_ROUTE_OPT_TEE;
+
+               break;
+
        default:
                return 0;
        }
@@ -162,6 +189,9 @@ print(const struct ip6t_ip6 *ip,
        if (route_info->flags & IP6T_ROUTE_CONTINUE)
                printf("continue");
 
+       if (route_info->flags & IP6T_ROUTE_TEE)
+               printf("tee");
+
 }
 
 
@@ -184,6 +214,9 @@ static void save(const struct ip6t_ip6 *ip,
 
        if (route_info->flags & IP6T_ROUTE_CONTINUE)
                printf("--continue ");
+
+       if (route_info->flags & IP6T_ROUTE_TEE)
+               printf("--tee ");
 }
 
 

diff --git a/extensions/libip6t_ROUTE.man b/extensions/libip6t_ROUTE.man
index 145d748d9cfeaddc6dbc5d73a122b8aa3e494508..e3ad12b578132083efc81cd263f7e9cb296bb183 100644 (file)
--- a/extensions/libip6t_ROUTE.man
+++ b/extensions/libip6t_ROUTE.man
@@ -9,4 +9,7 @@ Route the packet through `ifname' network interface
 Route the packet via this gateway
 .TP
 .BI "--continue "
-Behave like a non-terminating target and continue traversing the rules
+Behave like a non-terminating target and continue traversing the rules. Not valid in combination with `--tee'
+.TP
+.BI "--tee "
+Make a copy of the packet, and route that copy to the given destination. For the original, uncopied packet, behave like a non-terminating target and continue traversing the rules.  Not valid in combination with `--continue'

diff --git a/extensions/libipt_ROUTE.c b/extensions/libipt_ROUTE.c
index 1cb3e8924bf25450de3a52443aff0bdca921b44f..b14abdbe2c9f8542ca90f2b33612a0e0a0c416d4 100644 (file)
--- a/extensions/libipt_ROUTE.c
+++ b/extensions/libipt_ROUTE.c
@@ -1,6 +1,6 @@
 /* Shared library add-on to iptables to add ROUTE target support.
  * Author : Cedric de Launois, <delaunois@info.ucl.ac.be>
- * v 1.8 2003/06/24
+ * v 1.11 2004/11/23
  */
 
 #include <stdio.h>
@@ -15,19 +15,27 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_ROUTE.h>
 
+/* compile IPT_ROUTE_TEE support even if kernel headers are unpatched */
+#ifndef IPT_ROUTE_TEE
+#define IPT_ROUTE_TEE          0x02
+#endif
+
 /* Function which prints out usage message. */
 static void
 help(void)
 {
        printf(
 "ROUTE target v%s options:\n"
-"    --oif   \tifname \t\tRoute the packet through `ifname' network interface\n"
-"    --iif   \tifname \t\tChange the packet's incoming interface to `ifname'\n"
-"    --gw    \tip     \t\tRoute the packet via this gateway\n"
-"    --continue\t     \t\tRoute the packet and continue traversing the\n"
-"            \t       \t\trules. Not valid with --iif.\n"
+"    --oif   \tifname \t\tRoute packet through `ifname' network interface\n"
+"    --iif   \tifname \t\tChange packet's incoming interface to `ifname'\n"
+"    --gw    \tip     \t\tRoute packet via this gateway `ip'\n"
+"    --continue\t     \t\tRoute packet and continue traversing the\n"
+"            \t       \t\trules. Not valid with --iif or --tee.\n"
+"    --tee\t  \t\tDuplicate packet, route the duplicate,\n"
+"            \t       \t\tcontinue traversing with original packet.\n"
+"            \t       \t\tNot valid with --iif or --continue.\n"
 "\n",
-"1.8");
+"1.11");
 }
 
 static struct option opts[] = {
@@ -35,6 +43,7 @@ static struct option opts[] = {
        { "iif", 1, 0, '2' },
        { "gw", 1, 0, '3' },
        { "continue", 0, 0, '4' },
+       { "tee", 0, 0, '5' },
        { 0 }
 };
 
@@ -56,6 +65,7 @@ init(struct ipt_entry_target *t, unsigned int *nfcache)
 #define IPT_ROUTE_OPT_IIF      0x02
 #define IPT_ROUTE_OPT_GW       0x04
 #define IPT_ROUTE_OPT_CONTINUE 0x08
+#define IPT_ROUTE_OPT_TEE      0x10
 
 /* Function which parses command options; returns true if it
    ate an option */
@@ -134,12 +144,28 @@ parse(int c, char **argv, int invert, unsigned int *flags,
                if (*flags & IPT_ROUTE_OPT_CONTINUE)
                        exit_error(PARAMETER_PROBLEM,
                                   "Can't specify --continue twice");
+               if (*flags & IPT_ROUTE_OPT_TEE)
+                       exit_error(PARAMETER_PROBLEM,
+                                  "Can't specify --continue AND --tee");
 
                route_info->flags |= IPT_ROUTE_CONTINUE;
                *flags |= IPT_ROUTE_OPT_CONTINUE;
 
                break;
 
+       case '5':
+               if (*flags & IPT_ROUTE_OPT_TEE)
+                       exit_error(PARAMETER_PROBLEM,
+                                  "Can't specify --tee twice");
+               if (*flags & IPT_ROUTE_OPT_CONTINUE)
+                       exit_error(PARAMETER_PROBLEM,
+                                  "Can't specify --tee AND --continue");
+
+               route_info->flags |= IPT_ROUTE_TEE;
+               *flags |= IPT_ROUTE_OPT_TEE;
+
+               break;
+
        default:
                return 0;
        }
@@ -155,7 +181,7 @@ final_check(unsigned int flags)
                exit_error(PARAMETER_PROBLEM,
                           "ROUTE target: oif, iif or gw option required");
 
-       if ((flags & IPT_ROUTE_OPT_CONTINUE) && (flags & IPT_ROUTE_OPT_IIF))
+       if ((flags & (IPT_ROUTE_OPT_CONTINUE|IPT_ROUTE_OPT_TEE)) && (flags & IPT_ROUTE_OPT_IIF))
                exit_error(PARAMETER_PROBLEM,
                           "ROUTE target: can't continue traversing the rules with iif option");
 }
@@ -186,6 +212,9 @@ print(const struct ipt_ip *ip,
        if (route_info->flags & IPT_ROUTE_CONTINUE)
                printf("continue");
 
+       if (route_info->flags & IPT_ROUTE_TEE)
+               printf("tee");
+
 }
 
 
@@ -208,6 +237,9 @@ static void save(const struct ipt_ip *ip,
 
        if (route_info->flags & IPT_ROUTE_CONTINUE)
                printf("--continue ");
+
+       if (route_info->flags & IPT_ROUTE_TEE)
+               printf("--tee ");
 }
 
 

diff --git a/extensions/libipt_ROUTE.man b/extensions/libipt_ROUTE.man
index dae1cb5fdc87497ef49d6761c484c8e42492c97f..8a36e8e019d8a9ca0e4cab23c72bc9cece8f44ac 100644 (file)
--- a/extensions/libipt_ROUTE.man
+++ b/extensions/libipt_ROUTE.man
@@ -12,4 +12,7 @@ Change the packet's incoming interface to `ifname'
 Route the packet via this gateway
 .TP
 .BI "--continue "
-Behave like a non-terminating target and continue traversing the rules.  Not valid in combination with `--iif'
+Behave like a non-terminating target and continue traversing the rules.  Not valid in combination with `--iif' or `--tee'
+.TP
+.BI "--tee "
+Make a copy of the packet, and route that copy to the given destination. For the original, uncopied packet, behave like a non-terminating target and continue traversing the rules.  Not valid in combination with `--iif' or `--continue'