From c2ee3ea88d0ff02fe3bd03a34354fae87ada78a5 Mon Sep 17 00:00:00 2001
From: mmason <mmason>
Date: Wed, 24 Jan 2007 06:38:58 +0000
Subject: [PATCH] Changed bit checking method in sock_flags_num2str().

---
 tapset/ChangeLog  |  5 +++++
 tapset/socket.stp | 20 ++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/tapset/ChangeLog b/tapset/ChangeLog
index 54391bc35..ac8790210 100644
--- a/tapset/ChangeLog
+++ b/tapset/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-23  Mike Mason <mmlnx@us.ibm.com>
+
+	* socket.stp: Fixed bit checking method in sock_flags_num2str()
+	to match how it's done in the kernel.
+
 2007-01-23  Mike Mason <mmlnx@us.ibm.com>
 
 	* socket.stp: New sockets tapset.
diff --git a/tapset/socket.stp b/tapset/socket.stp
index 61eee6dc9..49eca2170 100644
--- a/tapset/socket.stp
+++ b/tapset/socket.stp
@@ -8,6 +8,7 @@
 
 %{
 #include <net/sock.h>
+#include <asm/bitops.h>
 %}
 
 #################
@@ -52,7 +53,7 @@ probe socket.send = socket.sendmsg.return,
  *
  * Variables:
  *  name      Name of this probe
- *  size      Size of message sent (in bytes) or
+ *  size      Size of message received (in bytes) or
  *            error code if success = 0
  *  protocol  Protocol value
  *  family    Protocol family value
@@ -511,13 +512,16 @@ function sock_flags_num2str:string (flags:long)
 	char str[60];
 
 	str[0] = '\0';
-
-	if (THIS->flags & SOCK_ASYNC_NOSPACE) strcat (str, "ASYNC_NOSPACE|");
-	if (THIS->flags & SOCK_ASYNC_WAITDATA) strcat (str, "ASYNC_WAITDATA|");
-	if (THIS->flags & SOCK_NOSPACE) strcat (str, "NOSPACE|");
-	if (THIS->flags & SOCK_PASSCRED) strcat (str, "PASSCRED|");
-	if (THIS->flags & SOCK_PASSSEC) strcat (str, "PASSSEC|");
-
+	if (test_bit (SOCK_ASYNC_NOSPACE, &THIS->flags))
+		strcat (str, "ASYNC_NOSPACE|");
+	if (test_bit (SOCK_ASYNC_WAITDATA, &THIS->flags))
+		strcat (str, "ASYNC_WAITDATA|");
+	if (test_bit (SOCK_NOSPACE, &THIS->flags))
+		strcat (str, "NOSPACE|");
+	if (test_bit (SOCK_PASSCRED, &THIS->flags))
+		strcat (str, "PASSCRED|");
+	if (test_bit (SOCK_PASSSEC, &THIS->flags))
+		strcat (str, "PASSSEC|");
 	if (str[0] != '\0') str[strlen(str)-1] = '\0';
 	strlcpy (THIS->__retvalue, str, MAXSTRINGLEN);
 %}
-- 
2.43.5