Skip to content

L
linux
Commit 231ae668 authored by Art Haas's avatar Art Haas Committed by David Woodhouse
Browse files
Options

[NETFILTER]: C99 initializers in ip_conntrack_standalone.c

parent 20fbc075
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 49 deletions
net/ipv4/netfilter/ip_conntrack_standalone.c
View file @ 231ae668
...@@ -299,66 +299,151 @@ extern unsigned long ip_ct_generic_timeout; ...@@ -299,66 +299,151 @@ extern unsigned long ip_ct_generic_timeout;
static struct ctl_table_header *ip_ct_sysctl_header; static struct ctl_table_header *ip_ct_sysctl_header;
static ctl_table ip_ct_sysctl_table[] = { static ctl_table ip_ct_sysctl_table[] = {
{NET_IPV4_NF_CONNTRACK_MAX, "ip_conntrack_max", {
&ip_conntrack_max, sizeof(int), 0644, NULL, .ctl_name = NET_IPV4_NF_CONNTRACK_MAX,
&proc_dointvec}, .procname = "ip_conntrack_max",
{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT, "ip_conntrack_tcp_timeout_syn_sent", .data = &ip_conntrack_max,
&ip_ct_tcp_timeout_syn_sent, sizeof(unsigned int), 0644, NULL, .maxlen = sizeof(int),
&proc_dointvec_jiffies}, .mode = 0644,
{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV, "ip_conntrack_tcp_timeout_syn_recv", .proc_handler = &proc_dointvec,
&ip_ct_tcp_timeout_syn_recv, sizeof(unsigned int), 0644, NULL, },
&proc_dointvec_jiffies}, {
{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED, "ip_conntrack_tcp_timeout_established", .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT,
&ip_ct_tcp_timeout_established, sizeof(unsigned int), 0644, NULL, .procname = "ip_conntrack_tcp_timeout_syn_sent",
&proc_dointvec_jiffies}, .data = &ip_ct_tcp_timeout_syn_sent,
{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT, "ip_conntrack_tcp_timeout_fin_wait", .maxlen = sizeof(unsigned int),
&ip_ct_tcp_timeout_fin_wait, sizeof(unsigned int), 0644, NULL, .mode = 0644,
&proc_dointvec_jiffies}, .proc_handler = &proc_dointvec_jiffies,
{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT, "ip_conntrack_tcp_timeout_close_wait", },
&ip_ct_tcp_timeout_close_wait, sizeof(unsigned int), 0644, NULL, {
&proc_dointvec_jiffies}, .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV,
{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK, "ip_conntrack_tcp_timeout_last_ack", .procname = "ip_conntrack_tcp_timeout_syn_recv",
&ip_ct_tcp_timeout_last_ack, sizeof(unsigned int), 0644, NULL, .data = &ip_ct_tcp_timeout_syn_recv,
&proc_dointvec_jiffies}, .maxlen = sizeof(unsigned int),
{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT, "ip_conntrack_tcp_timeout_time_wait", .mode = 0644,
&ip_ct_tcp_timeout_time_wait, sizeof(unsigned int), 0644, NULL, .proc_handler = &proc_dointvec_jiffies,
&proc_dointvec_jiffies}, },
{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE, "ip_conntrack_tcp_timeout_close", {
&ip_ct_tcp_timeout_close, sizeof(unsigned int), 0644, NULL, .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED,
&proc_dointvec_jiffies}, .procname = "ip_conntrack_tcp_timeout_established",
{NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT, "ip_conntrack_udp_timeout", .data = &ip_ct_tcp_timeout_established,
&ip_ct_udp_timeout, sizeof(unsigned int), 0644, NULL, .maxlen = sizeof(unsigned int),
&proc_dointvec_jiffies}, .mode = 0644,
{NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM, "ip_conntrack_udp_timeout_stream", .proc_handler = &proc_dointvec_jiffies,
&ip_ct_udp_timeout_stream, sizeof(unsigned int), 0644, NULL, },
&proc_dointvec_jiffies}, {
{NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT, "ip_conntrack_icmp_timeout", .ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT,
&ip_ct_icmp_timeout, sizeof(unsigned int), 0644, NULL, .procname = "ip_conntrack_tcp_timeout_fin_wait",
&proc_dointvec_jiffies}, .data = &ip_ct_tcp_timeout_fin_wait,
{NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT, "ip_conntrack_generic_timeout", .maxlen = sizeof(unsigned int),
&ip_ct_generic_timeout, sizeof(unsigned int), 0644, NULL, .mode = 0644,
&proc_dointvec_jiffies}, .proc_handler = &proc_dointvec_jiffies,
{0} },
{
.ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT,
.procname = "ip_conntrack_tcp_timeout_close_wait",
.data = &ip_ct_tcp_timeout_close_wait,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = &proc_dointvec_jiffies,
},
{
.ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK,
.procname = "ip_conntrack_tcp_timeout_last_ack",
.data = &ip_ct_tcp_timeout_last_ack,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = &proc_dointvec_jiffies,
},
{
.ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT,
.procname = "ip_conntrack_tcp_timeout_time_wait",
.data = &ip_ct_tcp_timeout_time_wait,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = &proc_dointvec_jiffies,
},
{
.ctl_name = NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE,
.procname = "ip_conntrack_tcp_timeout_close",
.data = &ip_ct_tcp_timeout_close,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = &proc_dointvec_jiffies,
},
{
.ctl_name = NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT,
.procname = "ip_conntrack_udp_timeout",
.data = &ip_ct_udp_timeout,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = &proc_dointvec_jiffies,
},
{
.ctl_name = NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM,
.procname = "ip_conntrack_udp_timeout_stream",
.data = &ip_ct_udp_timeout_stream,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = &proc_dointvec_jiffies,
},
{
.ctl_name = NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT,
.procname = "ip_conntrack_icmp_timeout",
.data = &ip_ct_icmp_timeout,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = &proc_dointvec_jiffies,
},
{
.ctl_name = NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT,
.procname = "ip_conntrack_generic_timeout",
.data = &ip_ct_generic_timeout,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = &proc_dointvec_jiffies,
},
{ .ctl_name = 0 }
}; };
#define NET_IP_CONNTRACK_MAX 2089 #define NET_IP_CONNTRACK_MAX 2089
static ctl_table ip_ct_netfilter_table[] = { static ctl_table ip_ct_netfilter_table[] = {
{NET_IPV4_NETFILTER, "netfilter", NULL, 0, 0555, ip_ct_sysctl_table, 0, 0, 0, 0, 0}, {
{NET_IP_CONNTRACK_MAX, "ip_conntrack_max", .ctl_name = NET_IPV4_NETFILTER,
&ip_conntrack_max, sizeof(int), 0644, NULL, .procname = "netfilter",
&proc_dointvec}, .mode = 0555,
{0} .child = ip_ct_sysctl_table,
},
{
.ctl_name = NET_IP_CONNTRACK_MAX,
.procname = "ip_conntrack_max",
.data = &ip_conntrack_max,
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = &proc_dointvec
},
{ .ctl_name = 0 }
}; };
static ctl_table ip_ct_ipv4_table[] = { static ctl_table ip_ct_ipv4_table[] = {
{NET_IPV4, "ipv4", NULL, 0, 0555, ip_ct_netfilter_table, 0, 0, 0, 0, 0}, {
{0} .ctl_name = NET_IPV4,
.procname = "ipv4",
.mode = 0555,
.child = ip_ct_netfilter_table,
},
{ .ctl_name = 0 }
}; };
static ctl_table ip_ct_net_table[] = { static ctl_table ip_ct_net_table[] = {
{CTL_NET, "net", NULL, 0, 0555, ip_ct_ipv4_table, 0, 0, 0, 0, 0}, {
{0} .ctl_name = CTL_NET,
.procname = "net",
.mode = 0555,
.child = ip_ct_ipv4_table,
},
{ .ctl_name = 0 }
}; };
#endif #endif
static int init_or_cleanup(int init) static int init_or_cleanup(int init)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7