output: add new plugin XML to output logs in XML
Pablo Neira Ayuso
maintainerPATCH 1/1 output: add new plugin XML to output logs in XML
This patch adds XML that allows to log information in XML for ulogd2. It supports packet and flow-based accounting.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- input/flow/ulogd_inpflow_NFCT.c | 18 +++ input/packet/ulogd_inppkt_NFLOG.c | 9 + output/Makefile.am | 6 + output/ulogd_output_XML.c | 240 +++++++++++++++++++++++++++++++++++++ ulogd.conf.in | 11 ++ 5 files changed, 282 insertions(+), 2 deletions(-) create mode 100644 output/ulogd_output_XML.c
input/flow/ulogd_inpflow_NFCT.c +18 -0
@@ -64,6 +64,7 @@ struct nfct_pluginstance {struct ulogd_timer ov_timer;/* overrun retry timer */ struct hashtable *ct_active;int nlbufsiz;/* current netlink buffer size */ +struct nf_conntrack *ct; };#define HTABLE_SIZE (8192)
@@ -158,6 +159,7 @@ enum nfct_keys {NFCT_FLOW_END_USEC ,NFCT_OOB_FAMILY ,NFCT_OOB_PROTOCOL , + NFCT_CT, }; static struct ulogd_key nfct_okeys[] = {
@@ -379,6 +381,11 @@ static struct ulogd_key nfct_okeys[] = { .flags = ULOGD_RETF_NONE, .name = "oob.protocol", }, + { + .type = ULOGD_RET_RAW, + .flags = ULOGD_RETF_NONE, + .name = "ct", + }, }; static uint32_t
@@ -453,6 +460,8 @@ static int propagate_ct(struct ulogd_pluginstance *upi, struct ct_timestamp *ts) {struct ulogd_key *ret = upi->output.keys; +struct nfct_pluginstance *cpi = + (struct nfct_pluginstance *) upi->private;okey_set_u32 (&ret[NFCT_CT_EVENT ], type);okey_set_u8 (&ret[NFCT_OOB_FAMILY ],nfct_get_attr_u8 (ct,ATTR_L3PROTO ));
@@ -545,6 +554,8 @@ static int propagate_ct(struct ulogd_pluginstance *upi, ts->time[STOP].tv_usec); } } +memcpy (cpi->ct, ct,nfct_sizeof (ct)); +okey_set_ptr (&ret[NFCT_CT ], cpi->ct);ulogd_propagate_results (upi);
@@ -1006,6 +1017,10 @@ static int constructor_nfct_events(struct ulogd_pluginstance *upi)ulogd_register_fd (&cpi->nfct_fd); + cpi->ct =nfct_new (); +if (cpi->ct ==NULL ) + goto err_nfctobj; +if (usehash_ce (upi->config_kset).u.value !=0 ) {int family =AF_UNSPEC ;struct nfct_handle *h;
@@ -1071,6 +1086,8 @@ err_pgh: err_ovh:hashtable_destroy (cpi->ct_active); err_hashtable: +nfct_destroy (cpi->ct); +err_nfctobj:ulogd_unregister_fd (&cpi->nfct_fd);nfct_close (cpi->cth); err_cth:
@@ -1139,6 +1156,7 @@ static int destructor_nfct_events(struct ulogd_pluginstance *upi)if (rc <0 )return rc; +nfct_destroy (cpi->ct);if (usehash_ce (upi->config_kset).u.value !=0 ) {ulogd_del_timer (&cpi->ov_timer);
input/packet/ulogd_inppkt_NFLOG.c +8 -1
@@ -138,6 +138,7 @@ enum nflog_keys {NFLOG_KEY_RAW_TYPE ,NFLOG_KEY_RAW_MAC_SADDR ,NFLOG_KEY_RAW_MAC_ADDRLEN , + NFLOG_KEY_RAW, }; static struct ulogd_key output_keys[] = {
@@ -304,7 +305,11 @@ static struct ulogd_key output_keys[] = { .flags = ULOGD_RETF_NONE, .name = "raw.type", }, - + [NFLOG_KEY_RAW] = { + .type = ULOGD_RET_RAW, + .flags = ULOGD_RETF_NONE, + .name = "raw", + }, }; static inline int
@@ -390,6 +395,8 @@ interp_packet(struct ulogd_pluginstance *upi, u_int8_t pf_family,if (nflog_get_seq_global (ldata, &seq) ==0 )okey_set_u32 (&ret[NFLOG_KEY_OOB_SEQ_GLOBAL ], seq); +okey_set_ptr (&ret[NFLOG_KEY_RAW ], ldata); +ulogd_propagate_results (upi);return 0 ; }
output/Makefile.am +5 -1
@@ -5,7 +5,7 @@ SUBDIRS= pcap mysql pgsql sqlite3 dbi pkglib_LTLIBRARIES = ulogd_output_LOGEMU.la ulogd_output_SYSLOG.la \ ulogd_output_OPRINT.la ulogd_output_IPFIX.la \ - ulogd_output_NACCT.la + ulogd_output_NACCT.la ulogd_output_XML.la ulogd_output_LOGEMU_la_SOURCES = ulogd_output_LOGEMU.c ulogd_output_LOGEMU_la_LDFLAGS = -avoid-version -module
@@ -21,3 +21,7 @@ ulogd_output_IPFIX_la_LDFLAGS = -avoid-version -module ulogd_output_NACCT_la_SOURCES = ulogd_output_NACCT.c ulogd_output_NACCT_la_LDFLAGS = -avoid-version -module + +ulogd_output_XML_la_SOURCES = ulogd_output_XML.c +ulogd_output_XML_la_LDFLAGS = -avoid-version -module -lnetfilter_log \ + -lnetfilter_conntrack
output/ulogd_output_XML.c new file +240 -0
240 lines not on this page · raw message
ulogd.conf.in +11 -0
@@ -37,6 +37,7 @@ plugin="@libdir@/ulogd/ulogd_filter_PRINTFLOW.so" #plugin="@libdir@/ulogd/ulogd_filter_MARK.so" plugin="@libdir@/ulogd/ulogd_output_LOGEMU.so" plugin="@libdir@/ulogd/ulogd_output_SYSLOG.so" +plugin="@libdir@/ulogd/ulogd_output_XML.so" #plugin="@libdir@/ulogd/ulogd_output_OPRINT.so" #plugin="@libdir@/ulogd/ulogd_output_NACCT.so" #plugin="@libdir@/ulogd/ulogd_output_PCAP.so"
@@ -63,6 +64,12 @@ plugin="@libdir@/ulogd/ulogd_raw2packet_BASE.so" # this is a stack for flow-based logging via OPRINT #stack=ct1:NFCT,op1:OPRINT +# this is a stack for flow-based logging via XML +#stack=ct1:NFCT,xml1:XML + +# this is a stack for logging in XML +#stack=log1:NFLOG,xml1:XML + # this is a stack for NFLOG packet-based logging to PCAP #stack=log2:NFLOG,base1:BASE,pcap1:PCAP
@@ -146,6 +153,10 @@ sync=1 file="/var/log/ulogd_oprint.log" sync=1 +[xml1] +directory="/var/log/" +sync=1 + [pcap1] sync=1