diff mbox series

[ulogd] XML: show both nflog packet and conntrack

Message ID 20211012111706.81484-1-chamas@h4.dion.ne.jp
State Accepted
Delegated to: Pablo Neira
Headers show
Series [ulogd] XML: show both nflog packet and conntrack | expand

Commit Message

Ken-ichirou MATSUZAWA Oct. 12, 2021, 11:17 a.m. UTC 
This patch enables to show "ct" as well as "raw" if output type is
ULOGD_DTYPE_RAW and "ct" input exists.

Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
---
 output/ulogd_output_XML.c | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

Comments

Pablo Neira Ayuso Nov. 23, 2021, 1:51 p.m. UTC | #1 
On Tue, Oct 12, 2021 at 08:17:07PM +0900, Ken-ichirou MATSUZAWA wrote:
> This patch enables to show "ct" as well as "raw" if output type is
> ULOGD_DTYPE_RAW and "ct" input exists.

Applied, thanks.

This is the patch I was referring to in my previous email.
diff mbox series

Patch

diff --git a/output/ulogd_output_XML.c b/output/ulogd_output_XML.c
index ea7ed96..44af596 100644
--- a/output/ulogd_output_XML.c
+++ b/output/ulogd_output_XML.c
@@ -109,7 +109,7 @@  xml_output_flow(struct ulogd_key *inp, char *buf, ssize_t size)
 	if (tmp < 0 || tmp >= size)
 		return -1;
 
-	return 0;
+	return tmp;
 #else
 	return -1;
 #endif
@@ -126,7 +126,7 @@  xml_output_packet(struct ulogd_key *inp, char *buf, ssize_t size)
 	if (tmp < 0 || tmp >= size)
 		return -1;
 
-	return 0;
+	return tmp;
 #else
 	return -1;
 #endif
@@ -143,7 +143,7 @@  xml_output_sum(struct ulogd_key *inp, char *buf, ssize_t size)
 						 NFACCT_SNPRINTF_F_TIME);
 	if (tmp < 0 || tmp >= size)
 		return -1;
-	return 0;
+	return tmp;
 #else
 	return -1;
 #endif
@@ -155,14 +155,25 @@  static int xml_output(struct ulogd_pluginstance *upi)
 	struct ulogd_key *inp = upi->input.keys;
 	struct xml_priv *opi = (struct xml_priv *) &upi->private;
 	static char buf[4096];
-	int ret = -1;
-
-	if (pp_is_valid(inp, KEY_CT))
-		ret = xml_output_flow(inp, buf, sizeof(buf));
-	else if (pp_is_valid(inp, KEY_PCKT))
-		ret = xml_output_packet(inp, buf, sizeof(buf));
-	else if (pp_is_valid(inp, KEY_SUM))
-		ret = xml_output_sum(inp, buf, sizeof(buf));
+	int ret = -1, tmp = 0;
+
+	if (pp_is_valid(inp, KEY_PCKT)) {
+		ret = xml_output_packet(inp, buf + tmp, sizeof(buf) - tmp);
+		if (ret < 0)
+			return ULOGD_IRET_ERR;
+		tmp += ret;
+	}
+	if (pp_is_valid(inp, KEY_CT)) {
+		ret = xml_output_flow(inp, buf + tmp, sizeof(buf) - tmp);
+		if (ret < 0)
+			return ULOGD_IRET_ERR;
+		tmp += ret;
+	}
+	if (pp_is_valid(inp, KEY_SUM)) {
+		ret = xml_output_sum(inp, buf + tmp, sizeof(buf) - tmp);
+		if (ret < 0)
+			return ULOGD_IRET_ERR;
+	}
 
 	if (ret < 0)
 		return ULOGD_IRET_ERR;