[PATCH 0/3] ulogd2 update

[PATCH 0/3] ulogd2 update

[Eric Leblond]

Hi,

This set of patches updates ulogd2 ULOG plugin to current API and fix a
crash.

BR,
--
Eric Leblond
INL : http://www.inl.fr
NuFW, Now User Filtering Works (http://www.nufw.org)

[PATCH 1/3] ulogd2 update

[Eric Leblond]

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

Hi,

This patch synchronizes ULOG input plugin with current ulogd2 API.

BR
--
Eric Leblond
INL : http://www.inl.fr
NuFW, Now User Filtering Works (http://www.nufw.org)

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: ulogd2-sync-api.patch --]
[-- Type: text/x-patch; name="ulogd2-sync-api.patch", Size: 413 bytes --]

=== input/packet/ulogd_inppkt_ULOG.c
==================================================================
--- input/packet/ulogd_inppkt_ULOG.c	(revision 4622)
+++ input/packet/ulogd_inppkt_ULOG.c	(revision 4623)
@@ -234,6 +234,7 @@
 	ui->ulog_fd.fd = ipulog_get_fd(ui->libulog_h);
 	ui->ulog_fd.cb = &ulog_read_cb;
 	ui->ulog_fd.data = upi;
+	ui->ulog_fd.when = ULOGD_FD_READ;
 
 	ulogd_register_fd(&ui->ulog_fd);
 

[PATCH 2/3] ulogd2 update

[Eric Leblond]

[-- Attachment #1: Type: text/plain, Size: 180 bytes --]

Hi,

This patch fixes a crash in ULOG input plugin due to a free on invalid value.

BR,
--
Eric Leblond
INL : http://www.inl.fr
NuFW, Now User Filtering Works (http://www.nufw.org)

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: ulogd2-free-crash.patch --]
[-- Type: text/x-patch; name="ulogd2-free-crash.patch", Size: 557 bytes --]

=== input/packet/ulogd_inppkt_ULOG.c
==================================================================
--- input/packet/ulogd_inppkt_ULOG.c	(revision 4621)
+++ input/packet/ulogd_inppkt_ULOG.c	(revision 4622)
@@ -58,12 +58,12 @@
 static struct ulogd_key output_keys[] = {
 	{ 
 		.type = ULOGD_RET_STRING, 
-		.flags = ULOGD_RETF_FREE, 
+		.flags = ULOGD_RETF_NONE, 
 		.name = "raw.mac", 
 	},
 	{
 		.type = ULOGD_RET_RAW,
-		.flags = ULOGD_RETF_FREE,
+		.flags = ULOGD_RETF_NONE,
 		.name = "raw.pkt",
 		.ipfix = {
 			.vendor = IPFIX_VENDOR_NETFILTER,

[PATCH 3/3] ulogd2 update

[Eric Leblond]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

Hi,

This patch fixes a trivial typo in ULOG plugin code.

BR,
--
Eric Leblond
INL : http://www.inl.fr
NuFW, Now User Filtering Works (http://www.nufw.org)

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: ulogd2-typo.patch --]
[-- Type: text/x-patch; name="ulogd2-typo.patch", Size: 621 bytes --]

=== input/packet/ulogd_inppkt_ULOG.c
==================================================================
--- input/packet/ulogd_inppkt_ULOG.c	(revision 4623)
+++ input/packet/ulogd_inppkt_ULOG.c	(revision 4624)
@@ -13,7 +13,7 @@
 #define ULOGD_NLGROUP_DEFAULT	32
 #endif
 
-/* Size of the socket recevive memory.  Should be at least the same size as the
+/* Size of the socket receive memory.  Should be at least the same size as the
  * 'nlbufsiz' module loadtime parameter of ipt_ULOG.o
  * If you have _big_ in-kernel queues, you may have to increase this number.  (
  * --qthreshold 100 * 1500 bytes/packet = 150kB  */

Re: [PATCH 3/3] ulogd2 update

[Patrick McHardy]

Eric Leblond wrote:
> This patch fixes a trivial typo in ULOG plugin code.

All three patches applied, thanks Eric.