[H.323 Helper 2/5]: Change helper definitions

[H.323 Helper 2/5]: Change helper definitions

[Jing Min Zhao]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="GB18030", Size: 133 bytes --]

Change helpers' structure definitions to meet some old compilers.

Signed-off-by: Jing Min Zhao <zhaojingmin@users.sourceforge.org>

[-- Attachment #2: patch2-helper-definition --]
[-- Type: application/octet-stream, Size: 1633 bytes --]

diff -pruN linux-2.6.17.orig/net/ipv4/netfilter/ip_conntrack_helper_h323.c linux-2.6.17/net/ipv4/netfilter/ip_conntrack_helper_h323.c
--- linux-2.6.17.orig/net/ipv4/netfilter/ip_conntrack_helper_h323.c	2006-06-08 14:19:49.000000000 -0400
+++ linux-2.6.17/net/ipv4/netfilter/ip_conntrack_helper_h323.c	2006-06-08 20:38:44.000000000 -0400
@@ -597,7 +597,7 @@ static struct ip_conntrack_helper ip_con
 	.max_expected = H323_RTP_CHANNEL_MAX * 4 + 2 /* T.120 */ ,
 	.timeout = 240,
 	.tuple = {.dst = {.protonum = IPPROTO_TCP}},
-	.mask = {.src = {.u = {0xFFFF}},
+	.mask = {.src = {.u = {.tcp = {.port = 0xFFFF}}},
 		 .dst = {.protonum = 0xFF}},
 	.help = h245_help
 };
@@ -1045,9 +1045,10 @@ static struct ip_conntrack_helper ip_con
 	.me = THIS_MODULE,
 	.max_expected = H323_RTP_CHANNEL_MAX * 4 + 4 /* T.120 and H.245 */ ,
 	.timeout = 240,
-	.tuple = {.src = {.u = {__constant_htons(Q931_PORT)}},
+	.tuple = {.src =
+		  {.u = {.tcp = {.port = __constant_htons(Q931_PORT)}}},
 		  .dst = {.protonum = IPPROTO_TCP}},
-	.mask = {.src = {.u = {0xFFFF}},
+	.mask = {.src = {.u = {.tcp = {.port = 0xFFFF}}},
 		 .dst = {.protonum = 0xFF}},
 	.help = q931_help
 };
@@ -1638,9 +1639,9 @@ static struct ip_conntrack_helper ip_con
 	.me = THIS_MODULE,
 	.max_expected = 32,
 	.timeout = 240,
-	.tuple = {.src = {.u = {__constant_htons(RAS_PORT)}},
+	.tuple = {.src = {.u = {.udp = {.port = __constant_htons(RAS_PORT)}}},
 		  .dst = {.protonum = IPPROTO_UDP}},
-	.mask = {.src = {.u = {0xFFFE}},
+	.mask = {.src = {.u = {.udp = {.port = 0xFFFE}}},
 		 .dst = {.protonum = 0xFF}},
 	.help = ras_help,
 };

Re: [H.323 Helper 2/5]: Change helper definitions

[Patrick McHardy]

Jing Min Zhao wrote:
> Change helpers' structure definitions to meet some old compilers.
> 
> Signed-off-by: Jing Min Zhao <zhaojingmin@users.sourceforge.org>

This seems to be for gcc-2.95, which isn't supported by the
kernel anymore.