packages: iptables/iptables.spec, iptables/iptables-imq.patch - imq updated...

zbyniu zbyniu at pld-linux.org
Fri May 1 14:57:01 CEST 2009


Author: zbyniu                       Date: Fri May  1 12:57:01 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- imq updated for 1.4.3

---- Files affected:
packages/iptables:
   iptables.spec (1.269 -> 1.270) , iptables-imq.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/iptables/iptables.spec
diff -u packages/iptables/iptables.spec:1.269 packages/iptables/iptables.spec:1.270
--- packages/iptables/iptables.spec:1.269	Mon Apr  6 16:55:44 2009
+++ packages/iptables/iptables.spec	Fri May  1 14:56:56 2009
@@ -269,7 +269,6 @@
 %attr(755,root,root) %{_libdir}/xtables/libip6t_hl.so
 %attr(755,root,root) %{_libdir}/xtables/libip6t_HL.so
 %attr(755,root,root) %{_libdir}/xtables/libip6t_icmp6.so
-%attr(755,root,root) %{_libdir}/xtables/libip6t_IMQ.so
 %attr(755,root,root) %{_libdir}/xtables/libip6t_ipv6header.so
 %attr(755,root,root) %{_libdir}/xtables/libip6t_LOG.so
 %attr(755,root,root) %{_libdir}/xtables/libip6t_mh.so
@@ -286,7 +285,6 @@
 %attr(755,root,root) %{_libdir}/xtables/libipt_ecn.so
 %attr(755,root,root) %{_libdir}/xtables/libipt_ECN.so
 %attr(755,root,root) %{_libdir}/xtables/libipt_icmp.so
-%attr(755,root,root) %{_libdir}/xtables/libipt_IMQ.so
 %attr(755,root,root) %{_libdir}/xtables/libipt_ipv4options.so
 %attr(755,root,root) %{_libdir}/xtables/libipt_IPV4OPTSSTRIP.so
 %attr(755,root,root) %{_libdir}/xtables/libipt_layer7.so
@@ -323,6 +321,7 @@
 %attr(755,root,root) %{_libdir}/xtables/libxt_esp.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_hashlimit.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_helper.so
+%attr(755,root,root) %{_libdir}/xtables/libxt_IMQ.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_iprange.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_length.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_limit.so
@@ -395,6 +394,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.270  2009/05/01 12:56:56  zbyniu
+- imq updated for 1.4.3
+
 Revision 1.269  2009/04/06 14:55:44  arekm
 - up to 1.4.3.2
 

================================================================
Index: packages/iptables/iptables-imq.patch
diff -u packages/iptables/iptables-imq.patch:1.3 packages/iptables/iptables-imq.patch:1.4
--- packages/iptables/iptables-imq.patch:1.3	Thu Mar 26 10:12:27 2009
+++ packages/iptables/iptables-imq.patch	Fri May  1 14:56:56 2009
@@ -1,25 +1,26 @@
---- iptables-1.4.0.orig/extensions.orig/.IMQ-test6	Thu Jan  1 01:00:00 1970
-+++ iptables-1.4.0/extensions/.IMQ-test6	Mon Jun 16 10:12:47 2003
+diff -Naurw iptables-1.4.1/extensions/.IMQ-testx iptables-1.4.1.imq/extensions/.IMQ-testx
+--- iptables-1.4.3/extensions/.IMQ-testx	1969-12-31 21:00:00.000000000 -0300
++++ iptables-1.4.3.imq/extensions/.IMQ-testx	2008-06-24 22:20:06.000000000 -0300
 @@ -0,0 +1,3 @@
 +#!/bin/sh
 +# True if IMQ target patch is applied.
-+[ -f $KERNEL_DIR/include/linux/netfilter_ipv6/ip6t_IMQ.h ] && echo IMQ
---- iptables-1.4.0.orig/extensions.orig/libip6t_IMQ.c	Thu Jan  1 01:00:00 1970
-+++ iptables-1.4.0/extensions/libip6t_IMQ.c	Mon Jun 16 10:12:47 2003
-@@ -0,0 +1,100 @@
++[ -f $KERNEL_DIR/include/linux/netfilter/xt_IMQ.h ] && echo IMQ
+diff -Naurw iptables-1.4.1/extensions/libxt_IMQ.c iptables-1.4.1.imq/extensions/libxt_IMQ.c
+--- iptables-1.4.3/extensions/libxt_IMQ.c	1969-12-31 21:00:00.000000000 -0300
++++ iptables-1.4.3.imq/extensions/libxt_IMQ.c	2008-06-24 22:31:02.000000000 -0300
+@@ -0,0 +1,103 @@
 +/* 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>
++#include <xtables.h>
++#include <linux/netfilter/x_tables.h>
++#include <linux/netfilter/xt_IMQ.h>
 +
 +/* Function which prints out usage message. */
-+static void
-+help(void)
++static void IMQ_help(void)
 +{
 +	printf(
 +"IMQ target v%s options:\n"
@@ -27,28 +28,25 @@
 +XTABLES_VERSION);
 +}
 +
-+static struct option opts[] = {
++static struct option IMQ_opts[] = {
 +	{ "todev", 1, 0, '1' },
 +	{ 0 }
 +};
 +
 +/* Initialize the target. */
-+static void
-+init(struct xt_entry_target *t)
++static void IMQ_init(struct xt_entry_target *t)
 +{
-+	struct ip6t_imq_info *mr = (struct ip6t_imq_info*)t->data;
++	struct xt_imq_info *mr = (struct xt_imq_info*)t->data;
 +
 +	mr->todev = 0;
 +}
 +
 +/* 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 void *entry,
-+      struct xt_entry_target **target)
++static int IMQ_parse(int c, char **argv, int invert, unsigned int *flags,
++      const void *entry, struct xt_entry_target **target)
 +{
-+	struct ip6t_imq_info *mr = (struct ip6t_imq_info*)(*target)->data;
++	struct xt_imq_info *mr = (struct xt_imq_info*)(*target)->data;
 +	
 +	switch(c) {
 +	case '1':
@@ -63,157 +61,66 @@
 +	return 1;
 +}
 +
-+static void
-+final_check(unsigned int flags)
-+{
-+}
-+
 +/* Prints out the targinfo. */
-+static void
-+print(const void *ip,
++static void IMQ_print(const void *ip,
 +      const struct xt_entry_target *target,
 +      int numeric)
 +{
-+	struct ip6t_imq_info *mr = (struct ip6t_imq_info*)target->data;
++	struct xt_imq_info *mr = (struct xt_imq_info*)target->data;
 +
 +	printf("IMQ: todev %u ", mr->todev);
 +}
 +
 +/* Saves the union ipt_targinfo in parsable form to stdout. */
-+static void
-+save(const void *ip, const struct xt_entry_target *target)
++static void IMQ_save(const void *ip, const struct xt_entry_target *target)
 +{
-+	struct ip6t_imq_info *mr = (struct ip6t_imq_info*)target->data;
++	struct xt_imq_info *mr = (struct xt_imq_info*)target->data;
 +
 +	printf("--todev %u", mr->todev);
 +}
 +
-+static struct xtables_target imq = {
-+	.next		= NULL,
++static struct xtables_target imq_target = {
 +	.name		= "IMQ",
 +	.version	= XTABLES_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
++	.family		= AF_INET,
++	.size		= XT_ALIGN(sizeof(struct xt_imq_info)),
++	.userspacesize	= XT_ALIGN(sizeof(struct xt_imq_info)),
++	.help		= IMQ_help,
++	.init		= IMQ_init,
++	.parse		= IMQ_parse,
++	.print		= IMQ_print,
++	.save		= IMQ_save,
++	.extra_opts	= IMQ_opts,
 +};
 +
-+__attribute__((constructor)) void _init(void)
-+{
-+	xtables_register_target(&imq);
-+}
---- iptables-1.4.0.orig/extensions.orig/.IMQ-test	Thu Jan  1 01:00:00 1970
-+++ iptables-1.4.0/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/include/linux/netfilter_ipv4/ipt_IMQ.h ] && echo IMQ
---- iptables-1.4.0.orig/extensions.orig/libipt_IMQ.c	Thu Jan  1 01:00:00 1970
-+++ iptables-1.4.0/extensions/libipt_IMQ.c	Mon Jun 16 10:12:47 2003
-@@ -0,0 +1,100 @@
-+/* 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", 
-+XTABLES_VERSION);
-+}
-+
-+static struct option opts[] = {
-+	{ "todev", 1, 0, '1' },
-+	{ 0 }
++static struct xtables_target imq_target6 = {
++	.name		= "IMQ",
++	.version	= XTABLES_VERSION,
++	.family		= AF_INET6,
++	.size		= XT_ALIGN(sizeof(struct xt_imq_info)),
++	.userspacesize	= XT_ALIGN(sizeof(struct xt_imq_info)),
++	.help		= IMQ_help,
++	.init		= IMQ_init,
++	.parse		= IMQ_parse,
++	.print		= IMQ_print,
++	.save		= IMQ_save,
++	.extra_opts	= IMQ_opts,
 +};
 +
-+/* Initialize the target. */
-+static void
-+init(struct xt_entry_target *t)
++void __attribute((constructor)) nf_ext_init(void)
 +{
-+	struct ipt_imq_info *mr = (struct ipt_imq_info*)t->data;
-+
-+	mr->todev = 0;
++	xtables_register_target(&imq_target);
++	xtables_register_target(&imq_target6);
 +}
+--- iptables-1.4.3/include/linux/netfilter/xt_IMQ.h	1970-01-01 02:00:00.000000000 +0200
++++ iptables-1.4.3.imq/include/linux/netfilter/xt_IMQ.h	2008-08-05 00:41:28.000000000 +0300
+@@ -0,0 +1,9 @@
++#ifndef _XT_IMQ_H
++#define _XT_IMQ_H
 +
-+/* 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 void *entry,
-+      struct xt_entry_target **target)
-+{
-+	struct ipt_imq_info *mr = (struct ipt_imq_info*)(*target)->data;
-+	
-+	switch(c) {
-+	case '1':
-+		if (xtables_check_inverse(optarg, &invert, NULL, 0))
-+			xtables_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 void *ip,
-+      const struct xt_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 void *ip, const struct xt_entry_target *target)
-+{
-+	struct ipt_imq_info *mr = (struct ipt_imq_info*)target->data;
-+
-+	printf("--todev %u", mr->todev);
-+}
-+
-+static struct xtables_target imq = {
-+	.next		= NULL,
-+	.name		= "IMQ",
-+	.version	= XTABLES_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
++struct xt_imq_info {
++	unsigned int todev;     /* target imq device */
 +};
 +
-+void _init(void)
-+{
-+	xtables_register_target(&imq);
-+}
-
++#endif /* _XT_IMQ_H */
++
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables.spec?r1=1.269&r2=1.270&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables-imq.patch?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list