apply ipv6 hoplimit (hl match, HL target) patch (Maciej Soltysiak <solt@dns.toxicfilm...

diff --git a/extensions/libip6t_HL.c b/extensions/libip6t_HL.c
new file mode 100644 (file)
index 0000000..7c24915
--- /dev/null
+++ b/extensions/libip6t_HL.c
@@ -0,0 +1,164 @@
+/*
+ * IPv6 Hop Limit Target module
+ * Maciej Soltysiak <solt@dns.toxicfilms.tv>
+ * Based on HW's ttl target
+ * This program is distributed under the terms of GNU GPL
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <ip6tables.h>
+
+#include <linux/netfilter_ipv6/ip6_tables.h>
+#include <linux/netfilter_ipv6/ip6t_HL.h>
+
+#define IP6T_HL_USED   1
+
+static void init(struct ip6t_entry_target *t, unsigned int *nfcache) 
+{
+}
+
+static void help(void) 
+{
+       printf(
+"HL target v%s options\n"
+"  --hl-set value              Set HL to <value>\n"
+"  --hl-dec value              Decrement HL by <value>\n"
+"  --hl-inc value              Increment HL by <value>\n"
+, IPTABLES_VERSION);
+}
+
+static int parse(int c, char **argv, int invert, unsigned int *flags,
+               const struct ip6t_entry *entry,
+               struct ip6t_entry_target **target)
+{
+       struct ip6t_HL_info *info = (struct ip6t_HL_info *) (*target)->data;
+       u_int8_t value;
+
+       if (*flags & IP6T_HL_USED) {
+               exit_error(PARAMETER_PROBLEM, 
+                               "Can't specify HL option twice");
+       }
+
+       if (!optarg) 
+               exit_error(PARAMETER_PROBLEM, 
+                               "HL: You must specify a value");
+
+       if (check_inverse(optarg, &invert, NULL, 0))
+               exit_error(PARAMETER_PROBLEM,
+                               "HL: unexpected `!'");
+       
+       value = atoi(optarg);
+
+       switch (c) {
+
+               case '1':
+                       info->mode = IP6T_HL_SET;
+                       break;
+
+               case '2':
+                       if (value == 0) {
+                               exit_error(PARAMETER_PROBLEM,
+                                       "HL: decreasing by 0?");
+                       }
+
+                       info->mode = IP6T_HL_DEC;
+                       break;
+
+               case '3':
+                       if (value == 0) {
+                               exit_error(PARAMETER_PROBLEM,
+                                       "HL: increasing by 0?");
+                       }
+
+                       info->mode = IP6T_HL_INC;
+                       break;
+
+               default:
+                       return 0;
+
+       }
+       
+       info->hop_limit = value;
+       *flags |= IP6T_HL_USED;
+
+       return 1;
+}
+
+static void final_check(unsigned int flags)
+{
+       if (!(flags & IP6T_HL_USED))
+               exit_error(PARAMETER_PROBLEM,
+                               "HL: You must specify an action");
+}
+
+static void save(const struct ip6t_ip6 *ip,
+               const struct ip6t_entry_target *target)
+{
+       const struct ip6t_HL_info *info = 
+               (struct ip6t_HL_info *) target->data;
+
+       switch (info->mode) {
+               case IP6T_HL_SET:
+                       printf("--hl-set ");
+                       break;
+               case IP6T_HL_DEC:
+                       printf("--hl-dec ");
+                       break;
+
+               case IP6T_HL_INC:
+                       printf("--hl-inc ");
+                       break;
+       }
+       printf("%u ", info->hop_limit);
+}
+
+static void print(const struct ip6t_ip6 *ip,
+               const struct ip6t_entry_target *target, int numeric)
+{
+       const struct ip6t_HL_info *info =
+               (struct ip6t_HL_info *) target->data;
+
+       printf("HL ");
+       switch (info->mode) {
+               case IP6T_HL_SET:
+                       printf("set to ");
+                       break;
+               case IP6T_HL_DEC:
+                       printf("decrement by ");
+                       break;
+               case IP6T_HL_INC:
+                       printf("increment by ");
+                       break;
+       }
+       printf("%u ", info->hop_limit);
+}
+
+static struct option opts[] = {
+       { "hl-set", 1, 0, '1' },
+       { "hl-dec", 1, 0, '2' },
+       { "hl-inc", 1, 0, '3' },
+       { 0 }
+};
+
+static
+struct ip6tables_target HL = { NULL, 
+       "HL",
+       IPTABLES_VERSION,
+       IP6T_ALIGN(sizeof(struct ip6t_HL_info)),
+       IP6T_ALIGN(sizeof(struct ip6t_HL_info)),
+       &help,
+       &init,
+       &parse,
+       &final_check,
+       &print,
+       &save,
+       opts 
+};
+
+void _init(void)
+{
+       register_target6(&HL);
+}

diff --git a/extensions/libip6t_hl.c b/extensions/libip6t_hl.c
new file mode 100644 (file)
index 0000000..36f9331
--- /dev/null
+++ b/extensions/libip6t_hl.c
@@ -0,0 +1,177 @@
+/*
+ * IPv6 Hop Limit matching module
+ * Maciej Soltysiak <solt@dns.toxicfilms.tv>
+ * Based on HW's ttl match
+ * This program is released under the terms of GNU GPL
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <getopt.h>
+#include <ip6tables.h>
+
+#include <linux/netfilter_ipv6/ip6_tables.h>
+#include <linux/netfilter_ipv6/ip6t_hl.h>
+
+static void help(void) 
+{
+       printf(
+"HL match v%s options:\n"
+"  --hl-eq value       Match hop limit value\n"
+"  --hl-lt value       Match HL < value\n"
+"  --hl-gt value       Match HL > value\n"
+, IPTABLES_VERSION);
+}
+
+static void init(struct ip6t_entry_match *m, unsigned int *nfcache)
+{
+       /* caching not yet implemented */
+       *nfcache |= NFC_UNKNOWN;
+}
+
+static int parse(int c, char **argv, int invert, unsigned int *flags,
+               const struct ip6t_entry *entry, unsigned int *nfcache,
+               struct ip6t_entry_match **match)
+{
+       struct ip6t_hl_info *info = (struct ip6t_hl_info *) (*match)->data;
+       u_int8_t value;
+
+       check_inverse(optarg, &invert, &optind, 0);
+       value = atoi(argv[optind-1]);
+
+       if (*flags) 
+               exit_error(PARAMETER_PROBLEM, 
+                               "Can't specify HL option twice");
+
+       if (!optarg)
+               exit_error(PARAMETER_PROBLEM,
+                               "hl: You must specify a value");
+       switch (c) {
+               case '2':
+                       if (invert)
+                               info->mode = IP6T_HL_NE;
+                       else
+                               info->mode = IP6T_HL_EQ;
+
+                       /* is 0 allowed? */
+                       info->hop_limit = value;
+                       *flags = 1;
+
+                       break;
+               case '3':
+                       if (invert) 
+                               exit_error(PARAMETER_PROBLEM,
+                                               "hl: unexpected `!'");
+
+                       info->mode = IP6T_HL_LT;
+                       info->hop_limit = value;
+                       *flags = 1;
+
+                       break;
+               case '4':
+                       if (invert)
+                               exit_error(PARAMETER_PROBLEM,
+                                               "hl: unexpected `!'");
+
+                       info->mode = IP6T_HL_GT;
+                       info->hop_limit = value;
+                       *flags = 1;
+
+                       break;
+               default:
+                       return 0;
+
+       }
+
+       return 1;
+}
+
+static void final_check(unsigned int flags)
+{
+       if (!flags) 
+               exit_error(PARAMETER_PROBLEM,
+                       "HL match: You must specify one of "
+                       "`--hl-eq', `--hl-lt', `--hl-gt");
+}
+
+static void print(const struct ip6t_ip6 *ip, 
+               const struct ip6t_entry_match *match,
+               int numeric)
+{
+       const struct ip6t_hl_info *info = 
+               (struct ip6t_hl_info *) match->data;
+
+       printf("HL match ");
+       switch (info->mode) {
+               case IP6T_HL_EQ:
+                       printf("HL == ");
+                       break;
+               case IP6T_HL_NE:
+                       printf("HL != ");
+                       break;
+               case IP6T_HL_LT:
+                       printf("HL < ");
+                       break;
+               case IP6T_HL_GT:
+                       printf("HL > ");
+                       break;
+       }
+       printf("%u ", info->hop_limit);
+}
+
+static void save(const struct ip6t_ip6 *ip, 
+               const struct ip6t_entry_match *match)
+{
+       const struct ip6t_hl_info *info =
+               (struct ip6t_hl_info *) match->data;
+
+       switch (info->mode) {
+               case IP6T_HL_EQ:
+                       printf("--hl-eq ");
+                       break;
+               case IP6T_HL_NE:
+                       printf("! --hl-eq ");
+                       break;
+               case IP6T_HL_LT:
+                       printf("--hl-lt ");
+                       break;
+               case IP6T_HL_GT:
+                       printf("--hl-gt ");
+                       break;
+               default:
+                       /* error */
+                       break;
+       }
+       printf("%u ", info->hop_limit);
+}
+
+static struct option opts[] = {
+       { "hl", 1, 0, '2' },
+       { "hl-eq", 1, 0, '2'},
+       { "hl-lt", 1, 0, '3'},
+       { "hl-gt", 1, 0, '4'},
+       { 0 }
+};
+
+static
+struct ip6tables_match hl = {
+       NULL,
+       "hl",
+       IPTABLES_VERSION,
+       IP6T_ALIGN(sizeof(struct ip6t_hl_info)),
+       IP6T_ALIGN(sizeof(struct ip6t_hl_info)),
+       &help,
+       &init,
+       &parse,
+       &final_check,
+       &print,
+       &save,
+       opts
+};
+
+
+void _init(void) 
+{
+       register_match6(&hl);
+}

diff --git a/include/linux/netfilter_ipv6/ip6t_HL.h b/include/linux/netfilter_ipv6/ip6t_HL.h
new file mode 100644 (file)
index 0000000..afb7813
--- /dev/null
+++ b/include/linux/netfilter_ipv6/ip6t_HL.h
@@ -0,0 +1,22 @@
+/* Hop Limit modification module for ip6tables
+ * Maciej Soltysiak <solt@dns.toxicfilms.tv>
+ * Based on HW's TTL module */
+
+#ifndef _IP6T_HL_H
+#define _IP6T_HL_H
+
+enum {
+       IP6T_HL_SET = 0,
+       IP6T_HL_INC,
+       IP6T_HL_DEC
+};
+
+#define IP6T_HL_MAXMODE        IP6T_HL_DEC
+
+struct ip6t_HL_info {
+       u_int8_t        mode;
+       u_int8_t        hop_limit;
+};
+
+
+#endif

diff --git a/include/linux/netfilter_ipv6/ip6t_hl.h b/include/linux/netfilter_ipv6/ip6t_hl.h
new file mode 100644 (file)
index 0000000..5ef91b8
--- /dev/null
+++ b/include/linux/netfilter_ipv6/ip6t_hl.h
@@ -0,0 +1,22 @@
+/* ip6tables module for matching the Hop Limit value
+ * Maciej Soltysiak <solt@dns.toxicfilms.tv>
+ * Based on HW's ttl module */
+
+#ifndef _IP6T_HL_H
+#define _IP6T_HL_H
+
+enum {
+       IP6T_HL_EQ = 0,         /* equals */
+       IP6T_HL_NE,             /* not equals */
+       IP6T_HL_LT,             /* less than */
+       IP6T_HL_GT,             /* greater than */
+};
+
+
+struct ip6t_hl_info {
+       u_int8_t        mode;
+       u_int8_t        hop_limit;
+};
+
+
+#endif