Pablo Neira Ayuso
a992ca2a04
netfilter: nf_conntrack_tstamp: add flow-based timestamp extension ...
This patch adds flow-based timestamping for conntracks. This
conntrack extension is disabled by default. Basically, we use
two 64-bits variables to store the creation timestamp once the
conntrack has been confirmed and the other to store the deletion
time. This extension is disabled by default, to enable it, you
have to:
echo 1 > /proc/sys/net/netfilter/nf_conntrack_timestamp
This patch allows to save memory for user-space flow-based
loogers such as ulogd2. In short, ulogd2 does not need to
keep a hashtable with the conntrack in user-space to know
when they were created and destroyed, instead we use the
kernel timestamp. If we want to have a sane IPFIX implementation
in user-space, this nanosecs resolution timestamps are also
useful. Other custom user-space applications can benefit from
this via libnetfilter_conntrack.
This patch modifies the /proc output to display the delta time
in seconds since the flow start. You can also obtain the
flow-start date by means of the conntrack-tools.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
2011-01-19 16:00:07 +01:00
9p: Add datasync to client side TFSYNC/RFSYNC for dotl
2010-10-28 09:08:49 -05:00
Bluetooth: Fix __hci_request synchronization for hci_open_dev
2010-12-22 22:58:07 -02:00
include/net/caif/cfctrl.h: Remove unnecessary semicolons
2010-11-15 11:07:16 -08:00
net: return operator cleanup
2010-09-23 14:33:39 -07:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
netfilter: nf_conntrack_tstamp: add flow-based timestamp extension
2011-01-19 16:00:07 +01:00
netfilter: nf_conntrack_tstamp: add flow-based timestamp extension
2011-01-19 16:00:07 +01:00
Phonet: 'connect' socket implementation for Pipe controller
2010-10-13 14:40:34 -07:00
sctp: kill unused macros in head file
2010-11-29 09:41:12 -08:00
net/sched: add ACT_CSUM action to update packets checksums
2010-08-20 01:42:59 -07:00
pkt_sched: gen_kill_estimator() rcu fixes
2010-06-11 18:37:08 -07:00
net: kill unused macros from head file
2010-12-02 13:27:33 -08:00
af_unix: limit recursion level
2010-11-29 09:45:15 -08:00
arp: remove unnecessary export of arp_broken_ops
2010-09-29 19:45:35 -07:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
cfg80211: Separate available antennas for RX and TX
2010-12-20 14:46:58 -05:00
Merge commit 'v2.6.36-rc7' into core/rcu
2010-10-07 09:43:45 +02:00
net_dcb: add application notifiers
2010-12-31 10:47:46 -08:00
dcbnl: adding DCBX feature flags get-set
2010-12-31 10:50:54 -08:00
net: avoid limits overflow
2010-11-10 12:12:00 -08:00
decnet: RCU conversion and get rid of dev_base_lock
2010-11-08 13:50:08 -08:00
decnet: Remove unused FIB metric macros.
2010-03-27 19:23:46 -07:00
net: use __packed annotation
2010-06-03 03:21:52 -07:00
ipv4: Make rt->fl.iif tests lest obscure.
2010-11-11 17:07:48 -08:00
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
2011-01-14 14:12:37 +01:00
net: Abstract default MTU metric calculation behind an accessor.
2010-12-14 13:01:14 -08:00
fib_rules: __rcu annotates ctarget
2010-10-27 11:37:32 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-12-26 22:37:05 -08:00
net/802: add __rcu annotations
2010-10-25 13:09:44 -07:00
genetlink: introduce pre_doit/post_doit hooks
2010-10-05 13:35:30 -04:00
PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)
2010-08-21 23:05:39 -07:00
ipv4: raw: move struct raw_sock and raw_sk() to include/net/raw.h
2010-04-13 14:49:31 -07:00
ipv6: mcast: RCU conversion
2010-11-24 11:16:42 -08:00
ipv6: Create inet6_csk_route_req().
2010-12-02 10:59:22 -08:00
inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()
2010-07-12 20:21:46 -07:00
net: kill unused macros
2010-12-19 21:59:35 -08:00
net: return operator cleanup
2010-09-23 14:33:39 -07:00
fragment: add fast path for in-order fragments
2010-06-30 13:44:29 -07:00
tproxy: fix hash locking issue when using port redirection in __inet_inherit_port()
2010-10-21 13:06:43 +02:00
net: optimize INET input path further
2010-12-09 20:05:58 -08:00
net: optimize INET input path further
2010-12-09 20:05:58 -08:00
inetpeer: Fix incorrect comment about inetpeer struct size.
2010-12-01 17:29:08 -08:00
ipv4: Don't pre-seed hoplimit metric.
2010-12-12 22:08:17 -08:00
ipv6: Add infrastructure to bind inet_peer objects to routes.
2010-11-30 12:27:11 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-12-20 13:24:14 -08:00
tunnels: add _rcu annotations
2010-10-25 13:09:45 -07:00
netfilter: fix Kconfig dependencies
2011-01-14 13:36:42 +01:00
IPVS: netns, trash handling
2011-01-13 10:30:28 +09:00
percpu: add __percpu sparse annotations to net
2010-02-16 23:05:38 -08:00
tunnels: add __rcu annotations
2010-10-27 11:37:32 -07:00
net: return operator cleanup
2010-09-23 14:33:39 -07:00
net: use __packed annotation
2010-06-03 03:21:52 -07:00
include/net/iw_handler.h: Use SIOCIWFIRST not SIOCSIWCOMMIT in comment
2010-03-31 14:49:12 -04:00
lib80211: remove unused host_build_iv option
2010-07-26 15:09:04 -04:00
mac80211: implement hardware offload for remain-on-channel
2011-01-05 16:07:12 -05:00
net: use __packed annotation
2010-06-03 03:21:52 -07:00
ipv6 mcast: Introduce include/net/mld.h for MLD definitions.
2010-04-23 13:35:55 +09:00
net: kill unused macros from head file
2010-12-02 13:27:33 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-11-19 13:13:47 -08:00
IPVS: netns, add basic init per netns.
2011-01-13 10:30:26 +09:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
netlink: let nlmsg and nla functions take pointer-to-const args
2010-11-16 09:52:32 -08:00
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
net: Fix range checks in tcf_valid_offset().
2010-12-21 12:43:16 -08:00
net: Define accessors to manipulate QDISC_STATE_RUNNING
2010-06-02 03:23:51 -07:00
net: add __rcu annotations to protocol
2010-10-27 11:37:31 -07:00
include/net/raw.h: Convert raw_seq_private macro to inline
2010-09-08 13:42:22 -07:00
cfg80211: Fix regulatory bug with multiple cards and delays
2010-11-22 15:48:51 -05:00
ipv4: Flush per-ns routing cache more sanely.
2010-12-20 10:37:19 -08:00
rtnl: make link af-specific updates atomic
2010-11-27 22:56:08 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-12-20 13:24:14 -08:00
scm: lower SCM_MAX_FD
2010-11-24 11:16:43 -08:00
net: kill unused macros from head file
2010-12-02 13:27:33 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-12-17 12:27:22 -08:00
TCP: increase default initial receive window.
2010-12-20 21:33:00 -08:00
timewait_sock: Create and use getpeer op.
2010-12-01 18:09:13 -08:00
IPv6: Add dontfrag argument to relevant functions
2010-04-23 23:35:28 -07:00
net: avoid limits overflow
2010-11-10 12:12:00 -08:00
X25 remove bkl in subscription ioctls
2010-11-28 11:12:20 -08:00
X25: Add if_x25.h and x25 to device identifiers
2010-04-22 16:12:36 -07:00
xfrm: Add Traffic Flow Confidentiality padding XFRM attribute
2010-12-10 14:43:58 -08:00
a992ca2a04