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

Commit b640bee6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://1984.lsi.us.es/nf-next 



Pablo Neira Ayuso says:

====================
This batch contains netfilter updates for you net-next tree, they are:

* The new connlabel extension for x_tables, that allows us to attach
  labels to each conntrack flow. The kernel implementation uses a
  bitmask and there's a file in user-space that maps the bits with the
  corresponding string for each existing label. By now, you can attach
  up to 128 overlapping labels. From Florian Westphal.

* A new round of improvements for the netns support for conntrack.
  Gao feng has moved many of the initialization code of each module
  of the netns init path. He also made several code refactoring, that
  code looks cleaner to me now.

* Added documentation for all possible tweaks for nf_conntrack via
  sysctl, from Jiri Pirko.

* Cisco 7941/7945 IP phone support for our SIP conntrack helper,
  from Kevin Cernekee.

* Missing header file in the snmp helper, from Stephen Hemminger.

* Finally, a couple of fixes to resolve minor issues with these
  changes, from myself.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 93b9c1dd 5f9f946b

Documentation/networking/nf_conntrack-sysctl.txt

0 → 100644
+176 −0
Original line number Diff line number Diff line 
/proc/sys/net/netfilter/nf_conntrack_* Variables:



nf_conntrack_acct - BOOLEAN

	0 - disabled (default)

	not 0 - enabled



	Enable connection tracking flow accounting. 64-bit byte and packet

	counters per flow are added.



nf_conntrack_buckets - INTEGER (read-only)

	Size of hash table. If not specified as parameter during module

	loading, the default size is calculated by dividing total memory

	by 16384 to determine the number of buckets but the hash table will

	never have fewer than 32 or more than 16384 buckets.



nf_conntrack_checksum - BOOLEAN

	0 - disabled

	not 0 - enabled (default)



	Verify checksum of incoming packets. Packets with bad checksums are

	in INVALID state. If this is enabled, such packets will not be

	considered for connection tracking.



nf_conntrack_count - INTEGER (read-only)

	Number of currently allocated flow entries.



nf_conntrack_events - BOOLEAN

	0 - disabled

	not 0 - enabled (default)



	If this option is enabled, the connection tracking code will

	provide userspace with connection tracking events via ctnetlink.



nf_conntrack_events_retry_timeout - INTEGER (seconds)

	default 15



	This option is only relevant when "reliable connection tracking

	events" are used.  Normally, ctnetlink is "lossy", that is,

	events are normally dropped when userspace listeners can't keep up.



	Userspace can request "reliable event mode".  When this mode is

	active, the conntrack will only be destroyed after the event was

	delivered.  If event delivery fails, the kernel periodically

	re-tries to send the event to userspace.



	This is the maximum interval the kernel should use when re-trying

	to deliver the destroy event.



	A higher number means there will be fewer delivery retries and it

	will take longer for a backlog to be processed.



nf_conntrack_expect_max - INTEGER

	Maximum size of expectation table.  Default value is

	nf_conntrack_buckets / 256. Minimum is 1.



nf_conntrack_frag6_high_thresh - INTEGER

	default 262144



	Maximum memory used to reassemble IPv6 fragments.  When

	nf_conntrack_frag6_high_thresh bytes of memory is allocated for this

	purpose, the fragment handler will toss packets until

	nf_conntrack_frag6_low_thresh is reached.



nf_conntrack_frag6_low_thresh - INTEGER

	default 196608



	See nf_conntrack_frag6_low_thresh



nf_conntrack_frag6_timeout - INTEGER (seconds)

	default 60



	Time to keep an IPv6 fragment in memory.



nf_conntrack_generic_timeout - INTEGER (seconds)

	default 600



	Default for generic timeout.  This refers to layer 4 unknown/unsupported

	protocols.



nf_conntrack_helper - BOOLEAN

	0 - disabled

	not 0 - enabled (default)



	Enable automatic conntrack helper assignment.



nf_conntrack_icmp_timeout - INTEGER (seconds)

	default 30



	Default for ICMP timeout.



nf_conntrack_icmpv6_timeout - INTEGER (seconds)

	default 30



	Default for ICMP6 timeout.



nf_conntrack_log_invalid - INTEGER

	0   - disable (default)

	1   - log ICMP packets

	6   - log TCP packets

	17  - log UDP packets

	33  - log DCCP packets

	41  - log ICMPv6 packets

	136 - log UDPLITE packets

	255 - log packets of any protocol



	Log invalid packets of a type specified by value.



nf_conntrack_max - INTEGER

	Size of connection tracking table.  Default value is

	nf_conntrack_buckets value * 4.



nf_conntrack_tcp_be_liberal - BOOLEAN

	0 - disabled (default)

	not 0 - enabled



	Be conservative in what you do, be liberal in what you accept from others.

	If it's non-zero, we mark only out of window RST segments as INVALID.



nf_conntrack_tcp_loose - BOOLEAN

	0 - disabled

	not 0 - enabled (default)



	If it is set to zero, we disable picking up already established

	connections.



nf_conntrack_tcp_max_retrans - INTEGER

	default 3



	Maximum number of packets that can be retransmitted without

	received an (acceptable) ACK from the destination. If this number

	is reached, a shorter timer will be started.



nf_conntrack_tcp_timeout_close - INTEGER (seconds)

	default 10



nf_conntrack_tcp_timeout_close_wait - INTEGER (seconds)

	default 60



nf_conntrack_tcp_timeout_established - INTEGER (seconds)

	default 432000 (5 days)



nf_conntrack_tcp_timeout_fin_wait - INTEGER (seconds)

	default 120



nf_conntrack_tcp_timeout_last_ack - INTEGER (seconds)

	default 30



nf_conntrack_tcp_timeout_max_retrans - INTEGER (seconds)

	default 300



nf_conntrack_tcp_timeout_syn_recv - INTEGER (seconds)

	default 60



nf_conntrack_tcp_timeout_syn_sent - INTEGER (seconds)

	default 120



nf_conntrack_tcp_timeout_time_wait - INTEGER (seconds)

	default 120



nf_conntrack_tcp_timeout_unacknowledged - INTEGER (seconds)

	default 300



nf_conntrack_timestamp - BOOLEAN

	0 - disabled (default)

	not 0 - enabled



	Enable connection tracking flow timestamping.



nf_conntrack_udp_timeout - INTEGER (seconds)

	default 30



nf_conntrack_udp_timeout_stream2 - INTEGER (seconds)

	default 180



	This extended timeout will be used in case there is an UDP stream

	detected.

include/linux/netfilter/nf_conntrack_sip.h

+3 −0
Original line number Diff line number Diff line
@@ -4,12 +4,15 @@ 


#include <net/netfilter/nf_conntrack_expect.h>



#include <linux/types.h>



#define SIP_PORT	5060

#define SIP_TIMEOUT	3600



struct nf_ct_sip_master {

	unsigned int	register_cseq;

	unsigned int	invite_cseq;

	__be16		forced_dport;

};



enum sip_expectation_classes {

include/net/netfilter/nf_conntrack_acct.h

+4 −2
Original line number Diff line number Diff line
@@ -57,7 +57,9 @@ static inline void nf_ct_set_acct(struct net *net, bool enable) 
	net->ct.sysctl_acct = enable;

}



extern int nf_conntrack_acct_init(struct net *net);

extern void nf_conntrack_acct_fini(struct net *net);

extern int nf_conntrack_acct_pernet_init(struct net *net);

extern void nf_conntrack_acct_pernet_fini(struct net *net);



extern int nf_conntrack_acct_init(void);

extern void nf_conntrack_acct_fini(void);

#endif /* _NF_CONNTRACK_ACCT_H */

include/net/netfilter/nf_conntrack_core.h

+11 −4
Original line number Diff line number Diff line
@@ -25,12 +25,19 @@ extern unsigned int nf_conntrack_in(struct net *net, 
				    unsigned int hooknum,

				    struct sk_buff *skb);



extern int nf_conntrack_init(struct net *net);

extern void nf_conntrack_cleanup(struct net *net);

extern int nf_conntrack_init_net(struct net *net);

extern void nf_conntrack_cleanup_net(struct net *net);



extern int nf_conntrack_proto_init(struct net *net);

extern void nf_conntrack_proto_fini(struct net *net);

extern int nf_conntrack_proto_pernet_init(struct net *net);

extern void nf_conntrack_proto_pernet_fini(struct net *net);



extern int nf_conntrack_proto_init(void);

extern void nf_conntrack_proto_fini(void);



extern int nf_conntrack_init_start(void);

extern void nf_conntrack_cleanup_start(void);



extern void nf_conntrack_init_end(void);

extern void nf_conntrack_cleanup_end(void);



extern bool

include/net/netfilter/nf_conntrack_ecache.h

+15 −4
Original line number Diff line number Diff line
@@ -207,9 +207,11 @@ nf_ct_expect_event(enum ip_conntrack_expect_events event, 
	nf_ct_expect_event_report(event, exp, 0, 0);

}



extern int nf_conntrack_ecache_init(struct net *net);

extern void nf_conntrack_ecache_fini(struct net *net);

extern int nf_conntrack_ecache_pernet_init(struct net *net);

extern void nf_conntrack_ecache_pernet_fini(struct net *net);



extern int nf_conntrack_ecache_init(void);

extern void nf_conntrack_ecache_fini(void);

#else /* CONFIG_NF_CONNTRACK_EVENTS */



static inline void nf_conntrack_event_cache(enum ip_conntrack_events event,
@@ -232,12 +234,21 @@ static inline void nf_ct_expect_event_report(enum ip_conntrack_expect_events e, 
 					     u32 portid,

 					     int report) {}



static inline int nf_conntrack_ecache_init(struct net *net)

static inline int nf_conntrack_ecache_pernet_init(struct net *net)

{

	return 0;

}



static inline void nf_conntrack_ecache_fini(struct net *net)

static inline void nf_conntrack_ecache_pernet_fini(struct net *net)

{

}



static inline int nf_conntrack_ecache_init(void)

{

	return 0;

}



static inline void nf_conntrack_ecache_fini(void)

{

}

#endif /* CONFIG_NF_CONNTRACK_EVENTS */