---- iptables-1.3.6.orig/extensions.orig/.IMQ-test6 Thu Jan 1 01:00:00 1970\r
-+++ iptables-1.3.6/extensions/.IMQ-test6 Mon Jun 16 10:12:47 2003\r
-@@ -0,0 +1,3 @@\r
-+#!/bin/sh\r
-+# True if IMQ target patch is applied.\r
-+[ -f $KERNEL_DIR/net/ipv6/netfilter/ip6t_IMQ.c ] && echo IMQ\r
---- iptables-1.3.6.orig/extensions.orig/libip6t_IMQ.c Thu Jan 1 01:00:00 1970\r
-+++ iptables-1.3.6/extensions/libip6t_IMQ.c Mon Jun 16 10:12:47 2003\r
-@@ -0,0 +1,101 @@\r
-+/* Shared library add-on to iptables to add IMQ target support. */\r
-+#include <stdio.h>\r
-+#include <string.h>\r
-+#include <stdlib.h>\r
-+#include <getopt.h>\r
-+\r
-+#include <ip6tables.h>\r
-+#include <linux/netfilter_ipv6/ip6_tables.h>\r
-+#include <linux/netfilter_ipv6/ip6t_IMQ.h>\r
-+\r
-+/* Function which prints out usage message. */\r
-+static void\r
-+help(void)\r
-+{\r
-+ printf(\r
-+"IMQ target v%s options:\n"\r
-+" --todev <N> enqueue to imq<N>, defaults to 0\n", \r
-+IPTABLES_VERSION);\r
-+}\r
-+\r
-+static struct option opts[] = {\r
-+ { "todev", 1, 0, '1' },\r
-+ { 0 }\r
-+};\r
-+\r
-+/* Initialize the target. */\r
-+static void\r
-+init(struct ip6t_entry_target *t, unsigned int *nfcache)\r
-+{\r
-+ struct ip6t_imq_info *mr = (struct ip6t_imq_info*)t->data;\r
-+\r
-+ mr->todev = 0;\r
-+ *nfcache |= NFC_UNKNOWN;\r
-+}\r
-+\r
-+/* Function which parses command options; returns true if it\r
-+ ate an option */\r
-+static int\r
-+parse(int c, char **argv, int invert, unsigned int *flags,\r
-+ const struct ip6t_entry *entry,\r
-+ struct ip6t_entry_target **target)\r
-+{\r
-+ struct ip6t_imq_info *mr = (struct ip6t_imq_info*)(*target)->data;\r
-+ \r
-+ switch(c) {\r
-+ case '1':\r
-+ if (check_inverse(optarg, &invert, NULL, 0))\r
-+ exit_error(PARAMETER_PROBLEM,\r
-+ "Unexpected `!' after --todev");\r
-+ mr->todev=atoi(optarg);\r
-+ break;\r
-+ default:\r
-+ return 0;\r
-+ }\r
-+ return 1;\r
-+}\r
-+\r
-+static void\r
-+final_check(unsigned int flags)\r
-+{\r
-+}\r
-+\r
-+/* Prints out the targinfo. */\r
-+static void\r
-+print(const struct ip6t_ip6 *ip,\r
-+ const struct ip6t_entry_target *target,\r
-+ int numeric)\r
-+{\r
-+ struct ip6t_imq_info *mr = (struct ip6t_imq_info*)target->data;\r
-+\r
-+ printf("IMQ: todev %u ", mr->todev);\r
-+}\r
-+\r
-+/* Saves the union ipt_targinfo in parsable form to stdout. */\r
-+static void\r
-+save(const struct ip6t_ip6 *ip, const struct ip6t_entry_target *target)\r
-+{\r
-+ struct ip6t_imq_info *mr = (struct ip6t_imq_info*)target->data;\r
-+\r
-+ printf("--todev %u", mr->todev);\r
-+}\r
-+\r
-+static struct ip6tables_target imq = {\r
-+ .next = NULL,\r
-+ .name = "IMQ",\r
-+ .version = IPTABLES_VERSION,\r
-+ .size = IP6T_ALIGN(sizeof(struct ip6t_imq_info)),\r
-+ .userspacesize = IP6T_ALIGN(sizeof(struct ip6t_imq_info)),\r
-+ .help = &help,\r
-+ .init = &init,\r
-+ .parse = &parse,\r
-+ .final_check = &final_check,\r
-+ .print = &print,\r
-+ .save = &save,\r
-+ .extra_opts = opts\r
-+};\r
-+\r
-+static __attribute__((constructor)) void _init(void)\r
-+{\r
-+ register_target6(&imq);\r
-+}\r
---- iptables-1.3.6.orig/extensions.orig/.IMQ-test Thu Jan 1 01:00:00 1970\r
-+++ iptables-1.3.6/extensions/.IMQ-test Mon Jun 16 10:12:47 2003\r
-@@ -0,0 +1,3 @@\r
-+#!/bin/sh\r
-+# True if IMQ target patch is applied.\r
-+[ -f $KERNEL_DIR/net/ipv4/netfilter/ipt_IMQ.c ] && echo IMQ\r
---- iptables-1.3.6.orig/extensions.orig/libipt_IMQ.c Thu Jan 1 01:00:00 1970\r
-+++ iptables-1.3.6/extensions/libipt_IMQ.c Mon Jun 16 10:12:47 2003\r
-@@ -0,0 +1,101 @@\r
-+/* Shared library add-on to iptables to add IMQ target support. */\r
-+#include <stdio.h>\r
-+#include <string.h>\r
-+#include <stdlib.h>\r
-+#include <getopt.h>\r
-+\r
-+#include <iptables.h>\r
-+#include <linux/netfilter_ipv4/ip_tables.h>\r
-+#include <linux/netfilter_ipv4/ipt_IMQ.h>\r
-+\r
-+/* Function which prints out usage message. */\r
-+static void\r
-+help(void)\r
-+{\r
-+ printf(\r
-+"IMQ target v%s options:\n"\r
-+" --todev <N> enqueue to imq<N>, defaults to 0\n", \r
-+IPTABLES_VERSION);\r
-+}\r
-+\r
-+static struct option opts[] = {\r
-+ { "todev", 1, 0, '1' },\r
-+ { 0 }\r
-+};\r
-+\r
-+/* Initialize the target. */\r
-+static void\r
-+init(struct ipt_entry_target *t, unsigned int *nfcache)\r
-+{\r
-+ struct ipt_imq_info *mr = (struct ipt_imq_info*)t->data;\r
-+\r
-+ mr->todev = 0;\r
-+ *nfcache |= NFC_UNKNOWN;\r
-+}\r
-+\r
-+/* Function which parses command options; returns true if it\r
-+ ate an option */\r
-+static int\r
-+parse(int c, char **argv, int invert, unsigned int *flags,\r
-+ const struct ipt_entry *entry,\r
-+ struct ipt_entry_target **target)\r
-+{\r
-+ struct ipt_imq_info *mr = (struct ipt_imq_info*)(*target)->data;\r
-+ \r
-+ switch(c) {\r
-+ case '1':\r
-+ if (check_inverse(optarg, &invert, NULL, 0))\r
-+ exit_error(PARAMETER_PROBLEM,\r
-+ "Unexpected `!' after --todev");\r
-+ mr->todev=atoi(optarg);\r
-+ break;\r
-+ default:\r
-+ return 0;\r
-+ }\r
-+ return 1;\r
-+}\r
-+\r
-+static void\r
-+final_check(unsigned int flags)\r
-+{\r
-+}\r
-+\r
-+/* Prints out the targinfo. */\r
-+static void\r
-+print(const struct ipt_ip *ip,\r
-+ const struct ipt_entry_target *target,\r
-+ int numeric)\r
-+{\r
-+ struct ipt_imq_info *mr = (struct ipt_imq_info*)target->data;\r
-+\r
-+ printf("IMQ: todev %u ", mr->todev);\r
-+}\r
-+\r
-+/* Saves the union ipt_targinfo in parsable form to stdout. */\r
-+static void\r
-+save(const struct ipt_ip *ip, const struct ipt_entry_target *target)\r
-+{\r
-+ struct ipt_imq_info *mr = (struct ipt_imq_info*)target->data;\r
-+\r
-+ printf("--todev %u", mr->todev);\r
-+}\r
-+\r
-+static struct iptables_target imq = {\r
-+ .next = NULL,\r
-+ .name = "IMQ",\r
-+ .version = IPTABLES_VERSION,\r
-+ .size = IPT_ALIGN(sizeof(struct ipt_imq_info)),\r
-+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_imq_info)),\r
-+ .help = &help,\r
-+ .init = &init,\r
-+ .parse = &parse,\r
-+ .final_check = &final_check,\r
-+ .print = &print,\r
-+ .save = &save,\r
-+ .extra_opts = opts\r
-+};\r
-+\r
-+static __attribute__((constructor)) void _init(void)\r
-+{\r
-+ register_target(&imq);\r
-+}\r
-\r
+--- userspace/extensions.orig/.IMQ-test6 Thu Jan 1 01:00:00 1970
++++ userspace/extensions/.IMQ-test6 Mon Jun 16 10:12:47 2003
+@@ -0,0 +1,3 @@
++#!/bin/sh
++# True if IMQ target patch is applied.
++[ -f $KERNEL_DIR/net/ipv6/netfilter/ip6t_IMQ.c ] && echo IMQ
+--- userspace/extensions.orig/libip6t_IMQ.c Thu Jan 1 01:00:00 1970
++++ userspace/extensions/libip6t_IMQ.c Mon Jun 16 10:12:47 2003
+@@ -0,0 +1,101 @@
++/* Shared library add-on to iptables to add IMQ target support. */
++#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_IMQ.h>
++
++/* Function which prints out usage message. */
++static void
++help(void)
++{
++ printf(
++"IMQ target v%s options:\n"
++" --todev <N> enqueue to imq<N>, defaults to 0\n",
++IPTABLES_VERSION);
++}
++
++static struct option opts[] = {
++ { "todev", 1, 0, '1' },
++ { 0 }
++};
++
++/* Initialize the target. */
++static void
++init(struct ip6t_entry_target *t, unsigned int *nfcache)
++{
++ struct ip6t_imq_info *mr = (struct ip6t_imq_info*)t->data;
++
++ mr->todev = 0;
++ *nfcache |= NFC_UNKNOWN;
++}
++
++/* Function which parses command options; returns true if it
++ ate an option */
++static int
++parse(int c, char **argv, int invert, unsigned int *flags,
++ const struct ip6t_entry *entry,
++ struct ip6t_entry_target **target)
++{
++ struct ip6t_imq_info *mr = (struct ip6t_imq_info*)(*target)->data;
++
++ switch(c) {
++ case '1':
++ if (check_inverse(optarg, &invert, NULL, 0))
++ exit_error(PARAMETER_PROBLEM,
++ "Unexpected `!' after --todev");
++ mr->todev=atoi(optarg);
++ break;
++ default:
++ return 0;
++ }
++ return 1;
++}
++
++static void
++final_check(unsigned int flags)
++{
++}
++
++/* Prints out the targinfo. */
++static void
++print(const struct ip6t_ip6 *ip,
++ const struct ip6t_entry_target *target,
++ int numeric)
++{
++ struct ip6t_imq_info *mr = (struct ip6t_imq_info*)target->data;
++
++ printf("IMQ: todev %u ", mr->todev);
++}
++
++/* Saves the union ipt_targinfo in parsable form to stdout. */
++static void
++save(const struct ip6t_ip6 *ip, const struct ip6t_entry_target *target)
++{
++ struct ip6t_imq_info *mr = (struct ip6t_imq_info*)target->data;
++
++ printf("--todev %u", mr->todev);
++}
++
++static struct ip6tables_target imq = {
++ .next = NULL,
++ .name = "IMQ",
++ .version = IPTABLES_VERSION,
++ .size = IP6T_ALIGN(sizeof(struct ip6t_imq_info)),
++ .userspacesize = IP6T_ALIGN(sizeof(struct ip6t_imq_info)),
++ .help = &help,
++ .init = &init,
++ .parse = &parse,
++ .final_check = &final_check,
++ .print = &print,
++ .save = &save,
++ .extra_opts = opts
++};
++
++void _init(void)
++{
++ register_target6(&imq);
++}
+--- userspace/extensions.orig/.IMQ-test Thu Jan 1 01:00:00 1970
++++ userspace/extensions/.IMQ-test Mon Jun 16 10:12:47 2003
+@@ -0,0 +1,3 @@
++#!/bin/sh
++# True if IMQ target patch is applied.
++[ -f $KERNEL_DIR/net/ipv4/netfilter/ipt_IMQ.c ] && echo IMQ
+--- userspace/extensions.orig/libipt_IMQ.c Thu Jan 1 01:00:00 1970
++++ userspace/extensions/libipt_IMQ.c Mon Jun 16 10:12:47 2003
+@@ -0,0 +1,101 @@
++/* Shared library add-on to iptables to add IMQ target support. */
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#include <getopt.h>
++
++#include <iptables.h>
++#include <linux/netfilter_ipv4/ip_tables.h>
++#include <linux/netfilter_ipv4/ipt_IMQ.h>
++
++/* Function which prints out usage message. */
++static void
++help(void)
++{
++ printf(
++"IMQ target v%s options:\n"
++" --todev <N> enqueue to imq<N>, defaults to 0\n",
++IPTABLES_VERSION);
++}
++
++static struct option opts[] = {
++ { "todev", 1, 0, '1' },
++ { 0 }
++};
++
++/* Initialize the target. */
++static void
++init(struct ipt_entry_target *t, unsigned int *nfcache)
++{
++ struct ipt_imq_info *mr = (struct ipt_imq_info*)t->data;
++
++ mr->todev = 0;
++ *nfcache |= NFC_UNKNOWN;
++}
++
++/* Function which parses command options; returns true if it
++ ate an option */
++static int
++parse(int c, char **argv, int invert, unsigned int *flags,
++ const struct ipt_entry *entry,
++ struct ipt_entry_target **target)
++{
++ struct ipt_imq_info *mr = (struct ipt_imq_info*)(*target)->data;
++
++ switch(c) {
++ case '1':
++ if (check_inverse(optarg, &invert, NULL, 0))
++ exit_error(PARAMETER_PROBLEM,
++ "Unexpected `!' after --todev");
++ mr->todev=atoi(optarg);
++ break;
++ default:
++ return 0;
++ }
++ return 1;
++}
++
++static void
++final_check(unsigned int flags)
++{
++}
++
++/* Prints out the targinfo. */
++static void
++print(const struct ipt_ip *ip,
++ const struct ipt_entry_target *target,
++ int numeric)
++{
++ struct ipt_imq_info *mr = (struct ipt_imq_info*)target->data;
++
++ printf("IMQ: todev %u ", mr->todev);
++}
++
++/* Saves the union ipt_targinfo in parsable form to stdout. */
++static void
++save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
++{
++ struct ipt_imq_info *mr = (struct ipt_imq_info*)target->data;
++
++ printf("--todev %u", mr->todev);
++}
++
++static struct iptables_target imq = {
++ .next = NULL,
++ .name = "IMQ",
++ .version = IPTABLES_VERSION,
++ .size = IPT_ALIGN(sizeof(struct ipt_imq_info)),
++ .userspacesize = IPT_ALIGN(sizeof(struct ipt_imq_info)),
++ .help = &help,
++ .init = &init,
++ .parse = &parse,
++ .final_check = &final_check,
++ .print = &print,
++ .save = &save,
++ .extra_opts = opts
++};
++
++void _init(void)
++{
++ register_target(&imq);
++}
projects / people / teissler / ipfire-2.x.git / commitdiff
