[netfilter-cvslog] r6419 - trunk/libnfnetlink/src
laforge at netfilter.org
laforge at netfilter.org
Sun Jan 15 19:26:01 CET 2006
Author: laforge at netfilter.org
Date: 2006-01-15 19:26:00 +0100 (Sun, 15 Jan 2006)
New Revision: 6419
Modified:
trunk/libnfnetlink/src/libnfnetlink.c
Log:
fix some mistakes during Harald's recent changes (Pablo Neira)
Modified: trunk/libnfnetlink/src/libnfnetlink.c
===================================================================
--- trunk/libnfnetlink/src/libnfnetlink.c 2006-01-15 03:50:24 UTC (rev 6418)
+++ trunk/libnfnetlink/src/libnfnetlink.c 2006-01-15 18:26:00 UTC (rev 6419)
@@ -16,6 +16,10 @@
*
* 2006-01-14 Harald Welte <laforge at netfilter.org>:
* introduce nfnl_subsys_handle
+ *
+ * 2006-01-15 Pablo Neira Ayuso <pablo at 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);
More information about the netfilter-cvslog
mailing list