Skip to contentSkip to conversation

fixes

PATCH In review Pablo Neira Ayuso 3 participants 4 messages Jan 15, 2006 netfilter

lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/1 fixes

Hi Harald!

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

Now the libnetfilter_conntrack test says OK again ;)

cheers,
Pablo

Signature · 2 lines
The dawn of the fourth age of Linux firewalling is coming; a time of
great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris
#1 lore raw
Quoted 7 lines · Pablo Neira Ayuso

Hi Harald!

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...

Quoted 1 line

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...

Cheers,
Harald

Signature · 5 lines
- Harald Welte <[email protected]>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie
#2 lore raw
Quoted 7 lines · Harald Welte
Quoted 5 lines

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.

Quoted 5 lines
Quoted 1 line

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?

Signature · 1 line
Pablo
libnfnetlink.c +9 -0
Index: src/libnfnetlink.c
===================================================================
@@ -16,6 +16,10 @@
  *
  * 2006-01-14 Harald Welte <[email protected]>:
  * 	introduce nfnl_subsys_handle
+ *
+ * 2006-01-15 Pablo Neira Ayuso <[email protected]>:
+ * 	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);
#3 lore raw
Quoted 10 lines · Pablo Neira Ayuso
Quoted 7 lines · Harald Welte
Quoted 5 lines

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.

thanks, will review and apply.

Quoted 6 lines
Quoted 5 lines
Quoted 1 line

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...

Quoted 6 lines

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?

the helpers are applications (daemons) that link against libnetfilter_cthelper. They will not be themselves (apart from some example code) be in the library package.

We _might_ want to provide some addidional helper infrastructure, something more than libnetfilter_cthelper, but I don't have any precise plans yet. Something with a common handling for logging, config files, etc. might be neat. But anyway, that's optional and for later down the road.

The kernel bits, libnetfilter_queue, libnetfilter_conntrack and libnetfilter_cthelper is everything you technically need for writing an userspace helper.

Signature · 5 lines
- Harald Welte <[email protected]>                 http://netfilter.org/
============================================================================
  "Fragmentation is like classful addressing -- an interesting early
   architectural error that shows how much experimentation was going
   on while IP was being designed."                    -- Paul Vixie