From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: pablo@netfilter.org
Subject: [libnftnl PATCH 1/2] common: add wrapper to represent events
Date: Tue, 15 Apr 2014 11:40:30 +0200 [thread overview]
Message-ID: <20140415094030.23739.71580.stgit@nfdev.cica.es> (raw)
This patch adds a simple string wrapper to represent nf_tables events.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
include/libnftnl/common.h | 6 +++++
src/common.c | 59 +++++++++++++++++++++++++++++++++++++++++++++
src/libnftnl.map | 3 ++
3 files changed, 68 insertions(+)
diff --git a/include/libnftnl/common.h b/include/libnftnl/common.h
index f0c20f0..96f8155 100644
--- a/include/libnftnl/common.h
+++ b/include/libnftnl/common.h
@@ -2,6 +2,7 @@
#define _LIBNFTNL_COMMON_H_
#include <stdint.h>
+#include <stdio.h>
enum {
NFT_PARSE_EBADINPUT = 0,
@@ -30,4 +31,9 @@ struct nlmsghdr *nft_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family,
struct nft_parse_err *nft_parse_err_alloc(void);
void nft_parse_err_free(struct nft_parse_err *);
int nft_parse_perror(const char *str, struct nft_parse_err *err);
+int nft_event_snprintf(char *buf, size_t bufsiz, const char *content,
+ uint32_t format, uint32_t type);
+int nft_event_fprintf(FILE *fp, const char *content,
+ uint32_t format, uint32_t type);
+
#endif
diff --git a/src/common.c b/src/common.c
index 336d2b4..5ded0de 100644
--- a/src/common.c
+++ b/src/common.c
@@ -8,9 +8,11 @@
*/
#include <stdlib.h>
+#include <stdio.h>
#include <sys/socket.h>
#include <linux/netlink.h>
#include <linux/netfilter/nfnetlink.h>
+#include <linux/netfilter/nf_tables.h>
#include <libmnl/libmnl.h>
#include <libnftnl/common.h>
@@ -66,3 +68,60 @@ int nft_parse_perror(const char *str, struct nft_parse_err *err)
}
}
EXPORT_SYMBOL(nft_parse_perror);
+
+int nft_event_snprintf(char *buf, size_t bufsiz, const char *content,
+ uint32_t format, uint32_t type)
+{
+ const char *type_str = "unknown";
+ int ret;
+
+ switch (type) {
+ case NFT_MSG_NEWTABLE:
+ case NFT_MSG_NEWCHAIN:
+ case NFT_MSG_NEWSET:
+ case NFT_MSG_NEWRULE:
+ case NFT_MSG_NEWSETELEM:
+ type_str = "new";
+ break;
+ case NFT_MSG_DELTABLE:
+ case NFT_MSG_DELCHAIN:
+ case NFT_MSG_DELSET:
+ case NFT_MSG_DELRULE:
+ case NFT_MSG_DELSETELEM:
+ type_str = "destroy";
+ break;
+ }
+
+ switch (format) {
+ case NFT_OUTPUT_XML:
+ ret = snprintf(buf, bufsiz, "<event><type>%s</type>"
+ "<nftables>%s</nftables></event>",
+ type_str, content);
+ break;
+ case NFT_OUTPUT_JSON:
+ ret = snprintf(buf, bufsiz, "{event:{type:\"%s\","
+ "{\"nftables\":[\"%s\"]}}}",
+ type_str, content);
+ break;
+ default:
+ ret = snprintf(buf, bufsiz, "[%s] %s", type_str, content);
+ }
+
+ return ret;
+}
+EXPORT_SYMBOL(nft_event_snprintf);
+
+static int nft_event_do_snprintf(char *buf, size_t bufsiz, void *content,
+ uint32_t format, uint32_t type)
+{
+ return nft_event_snprintf(buf, bufsiz, (const char *)content,
+ format, type);
+}
+
+int nft_event_fprintf(FILE *fp, const char *content,
+ uint32_t format, uint32_t type)
+{
+ return nft_fprintf(fp, (void *)content, format, type,
+ nft_event_do_snprintf);
+}
+EXPORT_SYMBOL(nft_event_fprintf);
diff --git a/src/libnftnl.map b/src/libnftnl.map
index b11db67..18e58fa 100644
--- a/src/libnftnl.map
+++ b/src/libnftnl.map
@@ -205,4 +205,7 @@ LIBNFTNL_1.1 {
nft_rule_attr_get_data;
nft_set_attr_set_data;
nft_set_attr_get_data;
+
+ nft_event_snprintf;
+ nft_event_fprintf;
} LIBNFTNL_1.0;
next reply other threads:[~2014-04-15 9:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-15 9:40 Arturo Borrero Gonzalez [this message]
2014-04-15 9:40 ` [libnftnl PATCH 2/2] examples: nft-events: use new events wrappers Arturo Borrero Gonzalez
2014-04-15 9:51 ` [libnftnl PATCH 1/2] common: add wrapper to represent events Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140415094030.23739.71580.stgit@nfdev.cica.es \
--to=arturo.borrero.glez@gmail.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).