[netfilter-cvslog] r3503 - trunk/nfsim/core

[rusty at netfilter.org]

Author: rusty at netfilter.org
Date: 2004-12-24 01:21:24 +0100 (Fri, 24 Dec 2004)
New Revision: 3503

Modified:
   trunk/nfsim/core/core.c
Log:
Nicolas Bouliane:

The same bug happend into:
core/core.c:129:call_elem_hook()

        > hook IP_PRE_ROUTING -120 DROP
        > gen_ip IF=eth0 192.168.0.2 192.168.0.1 0 TCP 1 2 SYN
        rcv:eth0
        hook:NF_IP_PRE_ROUTING ip_conntrack NF_ACCEPT {IPv4 192.168.0.2
        hook:NF_IP_PRE_ROUTING ip_conntrack NF_ACCEPT {IPv4 192.168.0.2         
        hook:NF_IP_PRE_ROUTING iptable_mangle NF_ACCEPT {IPv4           
        Segmentation fault
        acidmen at skyon:~/coding/nfsim$

I took the initiative to fix it the same way you did :)



Modified: trunk/nfsim/core/core.c
===================================================================
--- trunk/nfsim/core/core.c	2004-12-23 12:00:29 UTC (rev 3502)
+++ trunk/nfsim/core/core.c	2004-12-24 00:21:24 UTC (rev 3503)
@@ -145,11 +145,13 @@
 	ret = ops->hook(hooknum, skb, in, out, okfn);
 	if (ret == NF_STOLEN)
 		nfsim_log(LOG_HOOK, "hook:%s %s %s",
-			  nf_hooknames[PF_INET][hooknum], ops->owner->name,
+			  nf_hooknames[PF_INET][hooknum],
+			  ops->owner ? ops->owner->name : "nfsim",
 			  nf_retval(ret));
 	else
 		nfsim_log(LOG_HOOK, "hook:%s %s %s%s",
-			  nf_hooknames[PF_INET][hooknum], ops->owner->name,
+			  nf_hooknames[PF_INET][hooknum],
+			  ops->owner ? ops->owner->name : "nfsim",
 			  nf_retval(ret), describe_packet(*skb));
 	return ret;
 }