Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 373ac735 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: C99 initizalizers for NAT protocols 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 86e65da9

net/ipv4/netfilter/ip_nat_proto_icmp.c

+11 −9
Original line number Diff line number Diff line
@@ -106,16 +106,18 @@ icmp_print_range(char *buffer, const struct ip_nat_range *range) 
	else return 0;

}



struct ip_nat_protocol ip_nat_protocol_icmp

= { "ICMP", IPPROTO_ICMP, THIS_MODULE,

    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,

	.me			= THIS_MODULE,

	.manip_pkt		= icmp_manip_pkt,

	.in_range		= icmp_in_range,

	.unique_tuple		= icmp_unique_tuple,

	.print			= icmp_print,

	.print_range		= icmp_print_range,

#if defined(CONFIG_IP_NF_CONNTRACK_NETLINK) || \

    defined(CONFIG_IP_NF_CONNTRACK_NETLINK_MODULE)

    ip_nat_port_range_to_nfattr,

    ip_nat_port_nfattr_to_range,

	.range_to_nfattr	= ip_nat_port_range_to_nfattr,

	.nfattr_to_range	= ip_nat_port_nfattr_to_range,

#endif

};

net/ipv4/netfilter/ip_nat_proto_tcp.c

+11 −9
Original line number Diff line number Diff line
@@ -170,16 +170,18 @@ tcp_print_range(char *buffer, const struct ip_nat_range *range) 
	else return 0;

}



struct ip_nat_protocol ip_nat_protocol_tcp

= { "TCP", IPPROTO_TCP, THIS_MODULE,

    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,

	.me			= THIS_MODULE,

	.manip_pkt		= tcp_manip_pkt,

	.in_range		= tcp_in_range,

	.unique_tuple		= tcp_unique_tuple,

	.print			= tcp_print,

	.print_range		= tcp_print_range,

#if defined(CONFIG_IP_NF_CONNTRACK_NETLINK) || \

    defined(CONFIG_IP_NF_CONNTRACK_NETLINK_MODULE)

    ip_nat_port_range_to_nfattr,

    ip_nat_port_nfattr_to_range,

	.range_to_nfattr	= ip_nat_port_range_to_nfattr,

	.nfattr_to_range	= ip_nat_port_nfattr_to_range,

#endif

};

net/ipv4/netfilter/ip_nat_proto_udp.c

+11 −9
Original line number Diff line number Diff line
@@ -156,16 +156,18 @@ udp_print_range(char *buffer, const struct ip_nat_range *range) 
	else return 0;

}



struct ip_nat_protocol ip_nat_protocol_udp

= { "UDP", IPPROTO_UDP, THIS_MODULE,

    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,

	.me			= THIS_MODULE,

	.manip_pkt		= udp_manip_pkt,

	.in_range		= udp_in_range,

	.unique_tuple		= udp_unique_tuple,

	.print			= udp_print,

	.print_range		= udp_print_range,

#if defined(CONFIG_IP_NF_CONNTRACK_NETLINK) || \

    defined(CONFIG_IP_NF_CONNTRACK_NETLINK_MODULE)

    ip_nat_port_range_to_nfattr,

    ip_nat_port_nfattr_to_range,

	.range_to_nfattr	= ip_nat_port_range_to_nfattr,

	.nfattr_to_range	= ip_nat_port_nfattr_to_range,

#endif

};

net/ipv4/netfilter/ip_nat_proto_unknown.c

+7 −6
Original line number Diff line number Diff line
@@ -61,10 +61,11 @@ unknown_print_range(char *buffer, const struct ip_nat_range *range) 
}



struct ip_nat_protocol ip_nat_unknown_protocol = {

	"unknown", 0, THIS_MODULE,

	unknown_manip_pkt,

	unknown_in_range,

	unknown_unique_tuple,

	unknown_print,

	unknown_print_range

	.name			= "unknown",

	.me			= THIS_MODULE,

	.manip_pkt		= unknown_manip_pkt,

	.in_range		= unknown_in_range,

	.unique_tuple		= unknown_unique_tuple,

	.print			= unknown_print,

	.print_range		= unknown_print_range

};