From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ken-ichirou MATSUZAWA Subject: [PATCHv2 lnf-log] utils: nf-log: attaching a conntrack information Date: Thu, 15 Oct 2015 13:39:25 +0900 Message-ID: <20151015043925.GB18814@gmail.com> References: <1441731291-21342-1-git-send-email-pablo@netfilter.org> <20150909095042.GA11843@gmail.com> <20150910000615.GB5734@salvia> <20150911030530.GA7380@gmail.com> <20150911031535.GG7380@gmail.com> <20151012152630.GC21781@salvia> <20151015043544.GA18814@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netfilter-devel@vger.kernel.org To: Pablo Neira Ayuso Return-path: Received: from mail-pa0-f51.google.com ([209.85.220.51]:34922 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750849AbbJOEja (ORCPT ); Thu, 15 Oct 2015 00:39:30 -0400 Received: by pacao1 with SMTP id ao1so10342619pac.2 for ; Wed, 14 Oct 2015 21:39:29 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20151015043544.GA18814@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org List-ID: This patch enables nf-log in utils directory to show conntrack information if libnetfilter_conntrack exists. Signed-off-by: Ken-ichirou MATSUZAWA --- configure.ac | 5 +++ utils/Makefile.am | 3 ++ utils/nf-log.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 111 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ead9399..7d58f09 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,7 @@ AC_INIT([libnetfilter_log], [1.0.1]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax no-dist-gzip dist-bzip2 1.6]) @@ -31,6 +32,10 @@ AM_CONDITIONAL([BUILD_IPULOG], [test "x$with_ipulog" != xno]) dnl Dependencies PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41]) PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3]) +PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.2], + [AC_DEFINE([BUILD_NFCT], [1], [building nfct integration example]) HAVE_LNFCT=1], + [HAVE_LNFCT=0]) +AM_CONDITIONAL([BUILD_NFCT], [test "$HAVE_LNFCT" -eq 1]) dnl Output the makefile AC_CONFIG_FILES([Makefile src/Makefile include/Makefile diff --git a/utils/Makefile.am b/utils/Makefile.am index dfe5f34..baef81a 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -9,6 +9,9 @@ nfulnl_test_LDFLAGS = -dynamic nf_log_SOURCES = nf-log.c nf_log_LDADD = ../src/libnetfilter_log.la nf_log_LDFLAGS = -dynamic -lmnl +if BUILD_NFCT +nf_log_LDFLAGS += $(LIBNETFILTER_CONNTRACK_LIBS) +endif if BUILD_IPULOG check_PROGRAMS += ulog_test diff --git a/utils/nf-log.c b/utils/nf-log.c index 5f2a192..006d4b0 100644 --- a/utils/nf-log.c +++ b/utils/nf-log.c @@ -3,15 +3,109 @@ #include #include -#include +#include #include #include +#include "../config.h" +#ifdef BUILD_NFCT +#include +#include +#include +#endif + +#ifdef BUILD_NFCT +static int print_ctinfo(const struct nlattr *const attr) +{ + uint32_t ctinfo; + + if (attr == NULL) + return MNL_CB_OK; + + ctinfo = ntohl(mnl_attr_get_u32(attr)); + printf(" ip_conntrack_info:"); + + switch (CTINFO2DIR(ctinfo)) { + case IP_CT_DIR_ORIGINAL: + printf(" ORIGINAL /"); + break; + case IP_CT_DIR_REPLY: + printf(" REPLY /"); + break; + default: + printf(" unknown dir: %d\n", CTINFO2DIR(ctinfo)); + return MNL_CB_ERROR; + } + + switch (ctinfo) { + case IP_CT_ESTABLISHED: + case IP_CT_ESTABLISHED_REPLY: + printf(" ESTABLISHED\n"); + break; + case IP_CT_RELATED: + case IP_CT_RELATED_REPLY: + printf(" RELATED\n"); + break; + case IP_CT_NEW: + case IP_CT_NEW_REPLY: + printf(" NEW\n"); + break; + default: + printf(" unknown ctinfo: %d\n", ctinfo); + return MNL_CB_ERROR; + } + + return MNL_CB_OK; +} + +static int print_nfct(uint8_t family, + const struct nlattr *const info_attr, + const struct nlattr *const ct_attr) +{ + char buf[4096]; + struct nf_conntrack *ct = NULL; + + if (info_attr != NULL) + print_ctinfo(info_attr); + + if (ct_attr == NULL) + return MNL_CB_OK; + + ct = nfct_new(); + if (ct == NULL) { + perror("nfct_new"); + return MNL_CB_ERROR; + } + + if (nfct_payload_parse(mnl_attr_get_payload(ct_attr), + mnl_attr_get_payload_len(ct_attr), + family, ct) < 0) { + perror("nfct_payload_parse"); + nfct_destroy(ct); + return MNL_CB_ERROR; + } + + nfct_snprintf(buf, sizeof(buf), ct, 0, NFCT_O_DEFAULT, 0); + printf(" %s\n", buf); + nfct_destroy(ct); + + return MNL_CB_OK; +} +#else +static int print_nfct(uint8_t family, + const struct nlattr *const info_attr, + const struct nlattr *const ct_attr) +{ + return MNL_CB_OK; +} +#endif + static int log_cb(const struct nlmsghdr *nlh, void *data) { struct nlattr *attrs[NFULA_MAX + 1] = { NULL }; struct nfulnl_msg_packet_hdr *ph = NULL; + struct nfgenmsg *nfg; const char *prefix = NULL; uint32_t mark = 0; char buf[4096]; @@ -21,6 +115,8 @@ static int log_cb(const struct nlmsghdr *nlh, void *data) if (ret != MNL_CB_OK) return ret; + nfg = mnl_nlmsg_get_payload(nlh); + if (attrs[NFULA_PACKET_HDR]) ph = mnl_attr_get_payload(attrs[NFULA_PACKET_HDR]); if (attrs[NFULA_PREFIX]) @@ -38,6 +134,8 @@ static int log_cb(const struct nlmsghdr *nlh, void *data) return MNL_CB_ERROR; printf("%s (ret=%d)\n", buf, ret); + print_nfct(nfg->nfgen_family, attrs[NFULA_CT_INFO], attrs[NFULA_CT]); + return MNL_CB_OK; } @@ -108,6 +206,10 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } +#ifdef BUILD_NFCT + mnl_attr_put_u16(nlh, NFULA_CFG_FLAGS, htons(NFULNL_CFG_F_CONNTRACK)); +#endif + if (mnl_socket_sendto(nl, nlh, nlh->nlmsg_len) < 0) { perror("mnl_socket_sendto"); exit(EXIT_FAILURE); -- 2.1.4