From 033ec6be245261cd5e53e5a01435afea71ef6230 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 3 Jul 2013 13:06:22 +0200 Subject: conntrack: api: add nfct_snprintf_labels nfct_snprintf doesn't print connlabels, as they're system specific and can easily generate lots of output. This adds a new helper function, nfct_snprintf_labels. It behaves like nfct_snprintf, except that the label names in the labelmap whose bits are contained in connlabel attribute bitset are added to the buffer. output looks like this: output looks like this: ... mark=0 use=1 labels=eth0-in,eth1-in or Signed-off-by: Florian Westphal --- include/internal/prototypes.h | 7 ++++--- include/libnetfilter_conntrack/libnetfilter_conntrack.h | 8 ++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/internal/prototypes.h b/include/internal/prototypes.h index 484deea..21aa7f3 100644 --- a/include/internal/prototypes.h +++ b/include/internal/prototypes.h @@ -9,12 +9,13 @@ void __build_tuple(struct nfnlhdr *req, size_t size, const struct __nfct_tuple * int __parse_message_type(const struct nlmsghdr *nlh); void __parse_conntrack(const struct nlmsghdr *nlh, struct nfattr *cda[], struct nf_conntrack *ct); void __parse_tuple(const struct nfattr *attr, struct __nfct_tuple *tuple, int dir, u_int32_t *set); -int __snprintf_conntrack(char *buf, unsigned int len, const struct nf_conntrack *ct, unsigned int type, unsigned int msg_output, unsigned int flags); +int __snprintf_conntrack(char *buf, unsigned int len, const struct nf_conntrack *ct, unsigned int type, unsigned int msg_output, unsigned int flags, struct nfct_labelmap *); int __snprintf_address(char *buf, unsigned int len, const struct __nfct_tuple *tuple, const char *src_tag, const char *dst_tag); int __snprintf_protocol(char *buf, unsigned int len, const struct nf_conntrack *ct); int __snprintf_proto(char *buf, unsigned int len, const struct __nfct_tuple *tuple); -int __snprintf_conntrack_default(char *buf, unsigned int len, const struct nf_conntrack *ct, const unsigned int msg_type, const unsigned int flags); -int __snprintf_conntrack_xml(char *buf, unsigned int len, const struct nf_conntrack *ct, const unsigned int msg_type, const unsigned int flags); +int __snprintf_conntrack_default(char *buf, unsigned int len, const struct nf_conntrack *ct, const unsigned int msg_type, const unsigned int flags, struct nfct_labelmap *); +int __snprintf_conntrack_xml(char *buf, unsigned int len, const struct nf_conntrack *ct, const unsigned int msg_type, const unsigned int flags, struct nfct_labelmap *); +int __snprintf_connlabels(char *buf, unsigned int len, struct nfct_labelmap *map, const struct nfct_bitmask *b, const char *fmt); enum __nfct_addr { __ADDR_SRC = 0, diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h index 39dc24c..d4542ba 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h @@ -398,6 +398,14 @@ extern int nfct_snprintf(char *buf, const unsigned int out_type, const unsigned int out_flags); +extern int nfct_snprintf_labels(char *buf, + unsigned int size, + const struct nf_conntrack *ct, + const unsigned int msg_type, + const unsigned int out_type, + const unsigned int out_flags, + struct nfct_labelmap *map); + /* comparison */ extern int nfct_compare(const struct nf_conntrack *ct1, const struct nf_conntrack *ct2); -- cgit v1.2.3