Skip to contentSkip to conversation

use C99 structure initialization in nat helpers

PATCH Applied Pablo Neira 2 participants 4 messages Mar 6, 2005 – Mar 7, 2005

Subsystems (2)
Networking netfilter
lore
Share & tools
lore

Pablo Neira

author
#0 lore raw

PATCH 2/2 use C99 structure initialization in nat helpers

This patch makes nat helpers use c99 structure initialization. It applies on top of the previous patch.

--
Pablo

Use C99 structure initialization for nat protocols.
Status: trivial

Signed-off-by Pablo Neira Ayuso <[email protected]>
 ip_nat_proto_icmp.c    |   16 ++++++++--------
 ip_nat_proto_tcp.c     |   17 +++++++++--------
 ip_nat_proto_udp.c     |   16 ++++++++--------
 ip_nat_proto_unknown.c |   14 +++++++-------
 4 files changed, 32 insertions(+), 31 deletions(-)
net/ipv4/netfilter/ip_nat_proto_tcp.c renamed from net/ipv4/netfilter/ip_nat_proto_tcp.c.orig +9 -8
@@ -317,12 +317,13 @@ tcp_seq_adjust(struct sk_buff **pskb, 
 	return 1;
 }
 
-struct ip_nat_protocol ip_nat_protocol_tcp
-= { "TCP", IPPROTO_TCP,
-    tcp_manip_pkt,
-    tcp_in_range,
-    tcp_unique_tuple,
-    tcp_print,
-    tcp_print_range,
-    tcp_seq_adjust
+struct ip_nat_protocol ip_nat_protocol_tcp = {
+	.name		= "TCP",
+	.protonum	= IPPROTO_TCP,
+	.manip_pkt	= tcp_manip_pkt,
+	.in_range	= tcp_in_range,
+	.unique_tuple	= tcp_unique_tuple,
+	.print		= tcp_print,
+	.print_range	= tcp_print_range,
+	.adjust		= tcp_seq_adjust
 };
net/ipv4/netfilter/ip_nat_proto_udp.c renamed from net/ipv4/netfilter/ip_nat_proto_udp.c.orig +8 -8
@@ -155,12 +155,12 @@ udp_print_range(char *buffer, const stru
 	else return 0;
 }
 
-struct ip_nat_protocol ip_nat_protocol_udp
-= { "UDP", IPPROTO_UDP,
-    udp_manip_pkt,
-    udp_in_range,
-    udp_unique_tuple,
-    udp_print,
-    udp_print_range,
-    NULL
+struct ip_nat_protocol ip_nat_protocol_udp = {
+	.name		= "UDP",
+	.protonum	= IPPROTO_UDP,
+	.manip_pkt	= udp_manip_pkt,
+	.in_range	= udp_in_range,
+	.unique_tuple	= udp_unique_tuple,
+	.print		= udp_print,
+	.print_range	= udp_print_range
 };
net/ipv4/netfilter/ip_nat_proto_icmp.c renamed from net/ipv4/netfilter/ip_nat_proto_icmp.c.orig +8 -8
@@ -105,12 +105,12 @@ icmp_print_range(char *buffer, const str
 	else return 0;
 }
 
-struct ip_nat_protocol ip_nat_protocol_icmp
-= { "ICMP", IPPROTO_ICMP,
-    icmp_manip_pkt,
-    icmp_in_range,
-    icmp_unique_tuple,
-    icmp_print,
-    icmp_print_range,
-    NULL
+struct ip_nat_protocol ip_nat_protocol_icmp = {
+	.name		= "ICMP",
+	.protonum	= IPPROTO_ICMP,
+	.manip_pkt	= icmp_manip_pkt,
+	.in_range	= icmp_in_range,
+	.unique_tuple	= icmp_unique_tuple,
+	.print		= icmp_print,
+	.print_range	= icmp_print_range
 };
net/ipv4/netfilter/ip_nat_proto_unknown.c renamed from net/ipv4/netfilter/ip_nat_proto_unknown.c.orig +7 -7
@@ -61,11 +61,11 @@ unknown_print_range(char *buffer, const 
 }
 
 struct ip_nat_protocol ip_nat_unknown_protocol = {
-	"unknown", 0,
-	unknown_manip_pkt,
-	unknown_in_range,
-	unknown_unique_tuple,
-	unknown_print,
-	unknown_print_range,
-	NULL
+	.name		= "unknown",
+	.protonum	= 0,
+	.manip_pkt	= unknown_manip_pkt,
+	.in_range	= unknown_in_range,
+	.unique_tuple	= unknown_unique_tuple,
+	.print		= unknown_print,
+	.print_range	= unknown_print_range
 };
#1 lore raw
Quoted 1 line · Pablo Neira

This patch makes nat helpers use c99 structure initialization. It applies on top of the previous patch.

Thanks, but it doesn't apply without the previous patch. Hint: Send cleanups first in a series of patches :)

Regards
Patrick

author
#2 lore raw
Quoted 2 lines · Patrick McHardy

Thanks, but it doesn't apply without the previous patch. Hint: Send cleanups first in a series of patches :)

ACK, thanks patrick, attached the new patch.

--
Pablo

===== net/ipv4/netfilter/ip_nat_proto_icmp.c 1.8 vs edited =====

net/ipv4/netfilter/ip_nat_proto_icmp.c +8 -7
@@ -105,11 +105,12 @@
 	else return 0;
 }
 
-struct ip_nat_protocol ip_nat_protocol_icmp
-= { "ICMP", IPPROTO_ICMP,
-    icmp_manip_pkt,
-    icmp_in_range,
-    icmp_unique_tuple,
-    icmp_print,
-    icmp_print_range
+struct ip_nat_protocol ip_nat_protocol_icmp = {
+	.name		= "ICMP",
+	.protonum	= IPPROTO_ICMP,
+	.manip_pkt	= icmp_manip_pkt,
+	.in_range	= icmp_in_range,
+	.unique_tuple	= icmp_unique_tuple,
+	.print		= icmp_print,
+	.print_range	= icmp_print_range
 };

===== net/ipv4/netfilter/ip_nat_proto_tcp.c 1.11 vs edited =====

net/ipv4/netfilter/ip_nat_proto_tcp.c +8 -7
@@ -168,11 +168,12 @@
 	else return 0;
 }
 
-struct ip_nat_protocol ip_nat_protocol_tcp
-= { "TCP", IPPROTO_TCP,
-    tcp_manip_pkt,
-    tcp_in_range,
-    tcp_unique_tuple,
-    tcp_print,
-    tcp_print_range
+struct ip_nat_protocol ip_nat_protocol_tcp = {
+	.name		= "TCP",
+	.protonum	= IPPROTO_TCP,
+	.manip_pkt	= tcp_manip_pkt,
+	.in_range	= tcp_in_range,
+	.unique_tuple	= tcp_unique_tuple,
+	.print		= tcp_print,
+	.print_range	= tcp_print_range
 };

===== net/ipv4/netfilter/ip_nat_proto_udp.c 1.9 vs edited =====

net/ipv4/netfilter/ip_nat_proto_udp.c +8 -7
@@ -155,11 +155,12 @@
 	else return 0;
 }
 
-struct ip_nat_protocol ip_nat_protocol_udp
-= { "UDP", IPPROTO_UDP,
-    udp_manip_pkt,
-    udp_in_range,
-    udp_unique_tuple,
-    udp_print,
-    udp_print_range
+struct ip_nat_protocol ip_nat_protocol_udp = {
+	.name		= "UDP",
+	.protonum	= IPPROTO_UDP,
+	.manip_pkt	= udp_manip_pkt,
+	.in_range	= udp_in_range,
+	.unique_tuple	= udp_unique_tuple,
+	.print		= udp_print,
+	.print_range	= udp_print_range
 };

===== net/ipv4/netfilter/ip_nat_proto_unknown.c 1.7 vs edited =====

net/ipv4/netfilter/ip_nat_proto_unknown.c +7 -6
@@ -61,10 +61,11 @@
 }
 
 struct ip_nat_protocol ip_nat_unknown_protocol = {
-	"unknown", 0,
-	unknown_manip_pkt,
-	unknown_in_range,
-	unknown_unique_tuple,
-	unknown_print,
-	unknown_print_range
+	.name		= "unknown", 
+	.protonum	= 0,
+	.manip_pkt	= unknown_manip_pkt,
+	.in_range	= unknown_in_range,
+	.unique_tuple	= unknown_unique_tuple,
+	.print		= unknown_print,
+	.print_range	= unknown_print_range
 };
Applied
#3 lore raw
Quoted 1 line · Pablo Neira

attached the new patch.

Thanks, applied.

Regards
Patrick