Re: [PATCH] [LIBNFNETLINK] fixes

[Pablo Neira Ayuso <pablo@eurodev.net>]

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

Harald Welte wrote:
>>The patch attached fixes two issues in libnfnetlink:
>>
>>- subsys_id was not set in nfnl_subsys_open
>>- set nfnlh->local.nl_pid in nfnl_open since nfnl_talk checks that:
>>h->nlmsg_pid != nfnlh->local.nl_pid
> 
> unfortunately no patch attached...

:( sorry about that, patch attached.

>>Now the libnetfilter_conntrack test says OK again ;)
> 
> great. sorry for the breakage, but I hope you can appreciate the beauty
> of this new concept.  Being able to talk to all nfnetlink subsystems at
> the same time through one socket...

Sure, it's a nice rework. And it's really promising that now we can have
helpers in userspace, as Rusty dreamed in early stages :).

BTW, are we going to distribute the further application helpers
(implemented in userspace) separately or living somewhere in
libnetfilter_cthelper?

-- 
Pablo

[-- Attachment #2: x --]
[-- Type: text/plain, Size: 867 bytes --]

Index: src/libnfnetlink.c
===================================================================
--- src/libnfnetlink.c	(revision 6411)
+++ src/libnfnetlink.c	(working copy)
@@ -16,6 +16,10 @@
  *
  * 2006-01-14 Harald Welte <laforge@netfilter.org>:
  * 	introduce nfnl_subsys_handle
+ *
+ * 2006-01-15 Pablo Neira Ayuso <pablo@netfilter.org>:
+ * 	set missing subsys_id in nfnl_subsys_open
+ * 	set missing nfnlh->local.nl_pid in nfnl_open
  */
 
 #include <stdlib.h>
@@ -152,6 +156,10 @@
 		goto err_close;
 	}
 	nfnlh->seq = time(NULL);
+	/*
+	 * nfnl_talk checks: h->nlmsg_pid != nfnlh->local.nl_pid
+	 */
+	nfnlh->local.nl_pid = getpid();
 
 	return nfnlh;
 
@@ -196,6 +204,7 @@
 	ssh->nfnlh = nfnlh;
 	ssh->cb_count = cb_count;
 	ssh->subscriptions = subscriptions;
+	ssh->subsys_id = subsys_id;
 
 	if (recalc_rebind_subscriptions(nfnlh) < 0) {
 		free(ssh->cb);