summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2012-06-22 17:47:35 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2012-06-22 17:49:01 +0200
commit38444668368fa499c6f788ae259338d2a4c02324 (patch)
treed6431605ceafa8784a3cfa46597eb129b7b16e0e
parent34b4af44bd931b7fa46804faf1f60b53dafa1b73 (diff)
output: XML: display time for NFACCT
<obj><name>test</name><pkts>00000000000000000000</pkts><bytes>00000000000000000000</bytes><hour>17</hour><min>46</min><sec>47</sec><wday>6</wday><day>22</day><month>6</month><year>2012</year></obj> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--configure.ac2
-rw-r--r--output/ulogd_output_XML.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index e8a31ca..16b4bd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ AC_SUBST([regular_CFLAGS])
dnl Check for the right nfnetlink version
PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.0])
PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.0])
-PKG_CHECK_MODULES([LIBNETFILTER_ACCT], [libnetfilter_acct >= 1.0.0])
+PKG_CHECK_MODULES([LIBNETFILTER_ACCT], [libnetfilter_acct >= 1.0.1])
PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.0])
PKG_CHECK_MODULES([LIBNETFILTER_LOG], [libnetfilter_log >= 1.0.0])
diff --git a/output/ulogd_output_XML.c b/output/ulogd_output_XML.c
index 5215e28..2008772 100644
--- a/output/ulogd_output_XML.c
+++ b/output/ulogd_output_XML.c
@@ -121,7 +121,8 @@ xml_output_sum(struct ulogd_key *inp, char *buf, ssize_t size)
struct nfacct *nfacct = ikey_get_ptr(&inp[KEY_SUM]);
int tmp;
- tmp = nfacct_snprintf(buf, size, nfacct, NFACCT_SNPRINTF_T_XML, 0);
+ tmp = nfacct_snprintf(buf, size, nfacct, NFACCT_SNPRINTF_T_XML,
+ NFACCT_SNPRINTF_F_TIME);
if (tmp < 0 || tmp >= size)
return -1;