src: add support for CTA_TIMESTAMP_EVENT
Florian Westphal
maintainerPATCH 1/2 src: add support for CTA_TIMESTAMP_EVENT
Allow libnetfilter_conntrack to parse CTA_TIMESTAMP_EVENT attribute. This will be included for all ctnetlink events if the kernel has commit
netfilter: conntrack: add conntrack event timestamp
and net.netfilter.nf_conntrack_timestamp sysctl is set to 1.
--- include/internal/object.h | 1 + .../libnetfilter_conntrack/libnetfilter_conntrack.h | 1 + .../libnetfilter_conntrack/linux_nfnetlink_conntrack.h | 1 + src/conntrack/getter.c | 6 ++++++ src/conntrack/parse_mnl.c | 10 ++++++++++ 5 files changed, 19 insertions(+)
include/internal/object.h +1 -0
@@ -201,6 +201,7 @@ struct nf_conntrack {struct nfct_bitmask *connlabels;struct nfct_bitmask *connlabels_mask; +uint64_t timestamp_event; };/*
include/libnetfilter_conntrack/libnetfilter_conntrack.h +1 -0
@@ -144,6 +144,7 @@ enum nf_conntrack_attr {ATTR_SYNPROXY_ISN =72 ,/* u32 bits */ ATTR_SYNPROXY_ITS ,/* u32 bits */ ATTR_SYNPROXY_TSOFF ,/* u32 bits */ +ATTR_TIMESTAMP_EVENT ,/* u64 bits */ ATTR_MAX };
include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +1 -0
@@ -60,6 +60,7 @@ enum ctattr_type {CTA_SYNPROXY ,CTA_FILTER ,CTA_STATUS_MASK , +CTA_TIMESTAMP_EVENT , __CTA_MAX };#define CTA_MAX (__CTA_MAX - 1)
src/conntrack/getter.c +6 -0
@@ -384,6 +384,11 @@ static const void *get_attr_synproxy_tsoff(const struct nf_conntrack *ct)return &ct->synproxy.tsoff; } +static const void *get_attr_timestamp_event (const struct nf_conntrack *ct) +{ +return &ct->timestamp_event; +} +const get_attr get_attr_array[ATTR_MAX ] = { [ATTR_ORIG_IPV4_SRC ] = get_attr_orig_ipv4_src, [ATTR_ORIG_IPV4_DST ] = get_attr_orig_ipv4_dst,
@@ -460,4 +465,5 @@ const get_attr get_attr_array[ATTR_MAX] = { [ATTR_SYNPROXY_ISN] = get_attr_synproxy_isn, [ATTR_SYNPROXY_ITS] = get_attr_synproxy_its, [ATTR_SYNPROXY_TSOFF] = get_attr_synproxy_tsoff, + [ATTR_TIMESTAMP_EVENT] = get_attr_timestamp_event, };
src/conntrack/parse_mnl.c +10 -0
@@ -897,6 +897,10 @@ nfct_parse_conntrack_attr_cb(const struct nlattr *attr, void *data)case CTA_NAT_DST :/* deprecated */ break ; +case CTA_TIMESTAMP_EVENT : +if (mnl_attr_validate (attr,MNL_TYPE_U64 ) <0 ) +abi_breakage (); +break ; } tb[type] = attr;return MNL_CB_OK ;
@@ -1029,6 +1033,12 @@ nfct_payload_parse(const void *payload, size_t payload_len,return -1 ; } +if (tb[CTA_TIMESTAMP_EVENT ]) { +set_bit (ATTR_TIMESTAMP_EVENT , ct->head.set); + ct->timestamp_event = +be64toh (mnl_attr_get_u64 (tb[CTA_TIMESTAMP_EVENT ])); + } +return 0 ; }
Signature · 1 line
2.45.2
Florian Westphal
maintainerPATCH 2/2 conntrack: prefer kernel-provided event timestamp if it is available
If kernel provided the event timestamp, then use it, else fall back to gettimeofday.
This needs a recent kernel with
netfilter: conntrack: add conntrack event timestamp
and net.netfilter.nf_conntrack_timestamp sysctl set to 1.
--- src/conntrack.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
src/conntrack.c +21 -3
@@ -1914,6 +1914,26 @@ static char *get_progname(uint32_t portid)return NULL ; } +static void event_print_timestamp (const struct nf_conntrack *ct) +{ +struct timeval tv; + +/* nfct_attr_is_set returns -1 if attr is unknown */ +if (nfct_attr_is_set (ct,ATTR_TIMESTAMP_EVENT ) >0 ) { +uint64_t event_ts =nfct_get_attr_u64 (ct,ATTR_TIMESTAMP_EVENT ); +static const uint64_t ns_per_s =1000000000ul ; +static const uint64_t ns_to_usec =1000ul ; + + tv.tv_sec = event_ts / ns_per_s; + + tv.tv_usec = (event_ts % ns_per_s) / ns_to_usec; + }else { +gettimeofday (&tv,NULL ); + } + +printf ("[%-.8ld.%-.6ld]\t" , tv.tv_sec, tv.tv_usec); +} +static int event_cb (const struct nlmsghdr *nlh,void *data) {struct nfgenmsg *nfh =mnl_nlmsg_get_payload (nlh);
@@ -1969,9 +1989,7 @@ static int event_cb(const struct nlmsghdr *nlh, void *data) op_flags =NFCT_OF_SHOW_LAYER3 ;if (output_mask & _O_TMS) {if (!(output_mask & _O_XML)) { -struct timeval tv; -gettimeofday (&tv,NULL ); -printf ("[%-.8ld.%-.6ld]\t" , tv.tv_sec, tv.tv_usec); +event_print_timestamp (ct); }else op_flags |=NFCT_OF_TIME ; }
Signature · 1 line
2.45.2
Re: [PATCH conntrack-tools 2/2] conntrack: prefer kernel-provided event timestamp if it is available
Quoted 9 lines · Florian Westphal
If kernel provided the event timestamp, then use it, else fall back to gettimeofday.
This needs a recent kernel with
netfilter: conntrack: add conntrack event timestampand net.netfilter.nf_conntrack_timestamp sysctl set to 1.
Signed-off-by Florian Westphal <[email protected]>
Quoted 8 lines · Florian Westphal
Allow
libnetfilter_conntrackto parseCTA_TIMESTAMP_EVENTattribute. This will be included for all ctnetlink events if the kernel has commitnetfilter: conntrack: add conntrack event timestamp
and net.netfilter.nf_conntrack_timestamp sysctl is set to 1.
Signed-off-by Florian Westphal <[email protected]>