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

rusty at netfilter.org rusty at netfilter.org
Wed Dec 22 03:54:48 CET 2004


Author: rusty at netfilter.org
Date: 2004-12-22 03:54:47 +0100 (Wed, 22 Dec 2004)
New Revision: 3485

Modified:
   trunk/nfsim/core/message.c
Log:
Use LOG_USERSPACE not LOG_ALWAYS for strace messages so they are not displayed with -q


Modified: trunk/nfsim/core/message.c
===================================================================
--- trunk/nfsim/core/message.c	2004-12-22 02:47:13 UTC (rev 3484)
+++ trunk/nfsim/core/message.c	2004-12-22 02:54:47 UTC (rev 3485)
@@ -267,7 +267,7 @@
 
 		case SYS_GETSOCKOPT:
 			if (strace)
-				nfsim_log(LOG_ALWAYS,
+				nfsim_log(LOG_USERSPACE,
 					  "strace: getsockopt(%s, %s,"
 					  " %p, %u)",
 					  protofamily(msg.args[0]),
@@ -278,7 +278,7 @@
 					msg.args[1], (char *)msg.args[2],
 					&msg.args[3]);
 			if (strace)
-				nfsim_log(LOG_ALWAYS,
+				nfsim_log(LOG_USERSPACE,
 					  "    getsockopt -> %s (len %i)",
 					  err(msg.retval), msg.args[3]);
 			write(sock[0], &msg, sizeof(msg));
@@ -286,7 +286,7 @@
 			break;
 		case SYS_SETSOCKOPT:
 			if (strace)
-				nfsim_log(LOG_ALWAYS,
+				nfsim_log(LOG_USERSPACE,
 						  "strace: setsockopt(%s, %s,"
 						  " %p, %u)",
 						  protofamily(msg.args[0]),
@@ -297,7 +297,7 @@
 					msg.args[1], (char *)msg.args[2],
 					msg.args[3]);
 			if (strace)
-				nfsim_log(LOG_ALWAYS, "    setsockopt -> %s",
+				nfsim_log(LOG_USERSPACE, "    setsockopt -> %s",
 					  err(msg.retval));
 			write(sock[0], &msg, sizeof(msg));
 			add_message(true, &msg, 0, NULL);
@@ -340,7 +340,7 @@
 
 	if (should_i_fail(__func__)) {
 		if (strace)
-			nfsim_log(LOG_ALWAYS,
+			nfsim_log(LOG_USERSPACE,
 				  "        copy_to_user(%p,%i) = -EFAULT\n",
 				  to, n);
 		return n;
@@ -361,7 +361,7 @@
 	msg->retval = 0;
 
 	if (strace)
-		nfsim_log(LOG_ALWAYS, "        copy_to_user(%p,%i)", to, n);
+		nfsim_log(LOG_USERSPACE, "        copy_to_user(%p,%i)", to, n);
 	memcpy((char *)msg + sizeof(struct nf_userspace_message), from, n);
 
 	send_userspace_message(msg);
@@ -376,7 +376,7 @@
 
 	if (should_i_fail(__func__)) {
 		if (strace)
-			nfsim_log(LOG_ALWAYS,
+			nfsim_log(LOG_USERSPACE,
 				  "        copy_from_user(%p,%i) = -EFAULT",
 				  to, n);
 		return n;
@@ -396,7 +396,7 @@
 	msg.retval = 0;
 	
 	if (strace)
-		nfsim_log(LOG_ALWAYS, "        copy_from_user(%p,%i)", to, n);
+		nfsim_log(LOG_USERSPACE, "        copy_from_user(%p,%i)", to, n);
 	send_userspace_message(&msg);
 
 	return 0;




More information about the netfilter-cvslog mailing list