[netfilter-cvslog] r6730 - in trunk/iptables: . extensions include

kaber at netfilter.org kaber at netfilter.org
Thu Jan 11 10:08:22 CET 2007


Author: kaber at netfilter.org
Date: 2007-01-11 10:08:22 +0100 (Thu, 11 Jan 2007)
New Revision: 6730

Modified:
   trunk/iptables/extensions/libipt_multiport.c
   trunk/iptables/include/ip6tables.h
   trunk/iptables/include/iptables.h
   trunk/iptables/ip6tables.c
   trunk/iptables/iptables.c
Log:
Add UDPLITE multiport support


Modified: trunk/iptables/extensions/libipt_multiport.c
===================================================================
--- trunk/iptables/extensions/libipt_multiport.c	2007-01-11 08:48:17 UTC (rev 6729)
+++ trunk/iptables/extensions/libipt_multiport.c	2007-01-11 09:08:22 UTC (rev 6730)
@@ -59,6 +59,8 @@
 		return "tcp";
 	case IPPROTO_UDP:
 		return "udp";
+	case IPPROTO_UDPLITE:
+		return "udplite";
 	case IPPROTO_SCTP:
 		return "sctp";
 	case IPPROTO_DCCP:
@@ -141,16 +143,17 @@
 
 	if (entry->ip.invflags & IPT_INV_PROTO)
 		exit_error(PARAMETER_PROBLEM,
-			   "multiport only works with TCP or UDP");
+			   "multiport only works with TCP, UDP, UDPLITE, SCTP and DCCP");
 
 	if ((proto = proto_to_name(entry->ip.proto)) != NULL)
 		return proto;
 	else if (!entry->ip.proto)
 		exit_error(PARAMETER_PROBLEM,
-			   "multiport needs `-p tcp', `-p udp', `-p sctp' or `-p dccp'");
+			   "multiport needs `-p tcp', `-p udp', `-p udplite', "
+			   "`-p sctp' or `-p dccp'");
 	else
 		exit_error(PARAMETER_PROBLEM,
-			   "multiport only works with TCP, UDP, SCTP and DCCP");
+			   "multiport only works with TCP, UDP, UDPLITE, SCTP and DCCP");
 }
 
 /* Function which parses command options; returns true if it

Modified: trunk/iptables/include/ip6tables.h
===================================================================
--- trunk/iptables/include/ip6tables.h	2007-01-11 08:48:17 UTC (rev 6729)
+++ trunk/iptables/include/ip6tables.h	2007-01-11 09:08:22 UTC (rev 6730)
@@ -14,6 +14,9 @@
 #ifndef IPPROTO_DCCP
 #define IPPROTO_DCCP 33
 #endif
+#ifndef IPPROTO_UDPLITE
+#define IPPROTO_UDPLITE 136
+#endif
 
 #ifndef IP6T_SO_GET_REVISION_MATCH /* Old kernel source. */
 #define IP6T_SO_GET_REVISION_MATCH	68

Modified: trunk/iptables/include/iptables.h
===================================================================
--- trunk/iptables/include/iptables.h	2007-01-11 08:48:17 UTC (rev 6729)
+++ trunk/iptables/include/iptables.h	2007-01-11 09:08:22 UTC (rev 6730)
@@ -14,6 +14,9 @@
 #ifndef IPPROTO_DCCP
 #define IPPROTO_DCCP 33
 #endif
+#ifndef IPPROTO_UDPLITE
+#define IPPROTO_UDPLITE	136
+#endif
 
 #ifndef IPT_SO_GET_REVISION_MATCH /* Old kernel source. */
 #define IPT_SO_GET_REVISION_MATCH	(IPT_BASE_CTL + 2)

Modified: trunk/iptables/ip6tables.c
===================================================================
--- trunk/iptables/ip6tables.c	2007-01-11 08:48:17 UTC (rev 6729)
+++ trunk/iptables/ip6tables.c	2007-01-11 09:08:22 UTC (rev 6730)
@@ -223,6 +223,7 @@
 static const struct pprot chain_protos[] = {
 	{ "tcp", IPPROTO_TCP },
 	{ "udp", IPPROTO_UDP },
+	{ "udplite", IPPROTO_UDPLITE },
 	{ "icmpv6", IPPROTO_ICMPV6 },
 	{ "ipv6-icmp", IPPROTO_ICMPV6 },
 	{ "esp", IPPROTO_ESP },

Modified: trunk/iptables/iptables.c
===================================================================
--- trunk/iptables/iptables.c	2007-01-11 08:48:17 UTC (rev 6729)
+++ trunk/iptables/iptables.c	2007-01-11 09:08:22 UTC (rev 6730)
@@ -227,6 +227,7 @@
 static const struct pprot chain_protos[] = {
 	{ "tcp", IPPROTO_TCP },
 	{ "udp", IPPROTO_UDP },
+	{ "udplite", IPPROTO_UDPLITE },
 	{ "icmp", IPPROTO_ICMP },
 	{ "esp", IPPROTO_ESP },
 	{ "ah", IPPROTO_AH },




More information about the netfilter-cvslog mailing list