* Re: [ANNOUNCE] Release of iptables-1.3.0rc1
2005-02-02 15:44 [ANNOUNCE] Release of iptables-1.3.0rc1 Phil Oester
@ 2005-02-02 16:04 ` Phil Oester
2005-02-02 19:20 ` Martin Josefsson
0 siblings, 1 reply; 3+ messages in thread
From: Phil Oester @ 2005-02-02 16:04 UTC (permalink / raw)
To: netfilter-devel
[-- Attachment #1: Type: text/plain, Size: 308 bytes --]
On Wed, Feb 02, 2005 at 07:44:49AM -0800, Phil Oester wrote:
> > The netfilter coreteam proudly presents:
> > iptables version 1.3.0rc1
>
> One note: the userspace side of multiport inversion has not yet
> been merged (while the kernel side has).
>
> Phil
Err...included again here for easy patching :)
[-- Attachment #2: patch-mport-ipt2 --]
[-- Type: text/plain, Size: 1940 bytes --]
diff -ru iptables-orig/extensions/libipt_multiport.c iptables-new/extensions/libipt_multiport.c
--- iptables-orig/extensions/libipt_multiport.c 2005-01-03 04:51:58.000000000 -0500
+++ iptables-new/extensions/libipt_multiport.c 2005-01-22 15:33:44.637388800 -0500
@@ -31,13 +31,13 @@
{
printf(
"multiport v%s options:\n"
-" --source-ports port[,port:port,port...]\n"
+" --source-ports [!] port[,port:port,port...]\n"
" --sports ...\n"
" match source port(s)\n"
-" --destination-ports port[,port:port,port...]\n"
+" --destination-ports [!] port[,port:port,port...]\n"
" --dports ...\n"
" match destination port(s)\n"
-" --ports port[,port:port,port]\n"
+" --ports [!] port[,port:port,port]\n"
" match both source and destination port(s)\n",
IPTABLES_VERSION);
}
@@ -255,8 +255,7 @@
}
if (invert)
- exit_error(PARAMETER_PROBLEM,
- "multiport does not support invert");
+ multiinfo->invert = 1;
if (*flags)
exit_error(PARAMETER_PROBLEM,
@@ -362,6 +361,9 @@
break;
}
+ if (multiinfo->invert)
+ printf("! ");
+
for (i=0; i < multiinfo->count; i++) {
printf("%s", i ? "," : "");
print_port(multiinfo->ports[i], ip->proto, numeric);
@@ -422,6 +424,9 @@
break;
}
+ if (multiinfo->invert)
+ printf("! ");
+
for (i=0; i < multiinfo->count; i++) {
printf("%s", i ? "," : "");
print_port(multiinfo->ports[i], ip->proto, 1);
diff -ru iptables-orig/include/linux/netfilter_ipv4/ipt_multiport.h iptables-new/include/linux/netfilter_ipv4/ipt_multiport.h
--- iptables-orig/include/linux/netfilter_ipv4/ipt_multiport.h 2005-01-03 04:37:07.000000000 -0500
+++ iptables-new/include/linux/netfilter_ipv4/ipt_multiport.h 2005-01-22 15:30:21.372289792 -0500
@@ -24,5 +24,6 @@
u_int8_t count; /* Number of ports */
u_int16_t ports[IPT_MULTI_PORTS]; /* Ports */
u_int8_t pflags[IPT_MULTI_PORTS]; /* Port flags */
+ u_int8_t invert; /* Invert flag */
};
#endif /*_IPT_MULTIPORT_H*/
^ permalink raw reply [flat|nested] 3+ messages in thread