conntrackd: fix IPv6 address pattern

Hi

Please consider accepting the following patch that fixes an IPv6 address pattern in the lexical parser.

-Roman

commit 747bb23944cca2e6927f05f60fc6fba70e187ca0

Author: James Guthrie <[email protected]>
Date:   Tue Mar 19 15:12:35 2013 +0100

conntrackd: fix IPv6 address pattern

The conntrackd configuration allows for IPv6 addresses to be specified that should be ignored (connections for which should not be synchronised). The Conntrackd config accepts two forms of IPv6 address:
1: fe80::1
2: fe80:0:0:0:0:0:0:1

This patch fixes the lexical parser for form 2.

index bec2d81..b4d11d4 100644
@@ -44,8 +44,8 @@ ip4		{ip4_part}\.{ip4_part}\.{ip4_part}\.{ip4_part}{ip4_cidr}?
 hex_255		[0-9a-fA-F]{1,4}
 ip6_cidr	\/[0-1]*[0-9]*[0-9]+
 ip6_part	{hex_255}":"?
-ip6_form1	{ip6_part}{0,16}"::"{ip6_part}{0,16}
-ip6_form2	({hex_255}":"){16}{hex_255}
+ip6_form1	{ip6_part}{0,7}"::"{ip6_part}{0,7}
+ip6_form2	({hex_255}":"){0,7}{hex_255}
 ip6		{ip6_form1}{ip6_cidr}?|{ip6_form2}{ip6_cidr}?
 string		[a-zA-Z][a-zA-Z0-9\.\-]*
 persistent	[P|p][E|e][R|r][S|s][I|i][S|s][T|t][E|e][N|n][T|T]

Hi Roman,

Applied, thanks.

BTW, please, next time post your patch to netfilter-devel ML. That should help to make sure the patch hits mainstream.