socket: mark return code with RVAL_FD flag

* net.c (sys_socket): Set RVAL_FD flag in the return code.
* tests/net-yy-accept.awk: Update socket and bind regexps.
* tests/unix-yy-accept.awk: Likewise.
* tests/net-yy-connect.awk: Update socket and connect regexps.
* tests/unix-yy-connect.awk: Likewise.

diff --git a/net.c b/net.c
index 3306cbbb9749a5abbaa66e24655ecf46f7150deb..6b6f0424ddb8c49df2bd0bd2c798a8f78d6b9e98 100644 (file)
--- a/net.c
+++ b/net.c
@@ -662,7 +662,7 @@ SYS_FUNC(socket)
                break;
        }
 
-       return RVAL_DECODED;
+       return RVAL_DECODED | RVAL_FD;
 }
 
 SYS_FUNC(bind)

diff --git a/tests/net-yy-accept.awk b/tests/net-yy-accept.awk
index 354327723039a9b9f31630d3147577e0ccb1d746..1cf63b0421bd133046883902815107208f83afff 100644 (file)
--- a/tests/net-yy-accept.awk
+++ b/tests/net-yy-accept.awk
@@ -5,20 +5,21 @@ BEGIN {
   r_i = "[1-9][0-9]*"
   r_port = "[1-9][0-9][0-9][0-9]+"
   r_localhost = "127\\.0\\.0\\.1"
-  r_bind = "^bind\\(0<TCP:\\[(" r_i ")\\]>, \\{sa_family=AF_INET, sin_port=htons\\(0\\), sin_addr=inet_addr\\(\"" r_localhost "\"\\)\\}, " r_i "\\) += 0$"
+  r_socket = "^socket\\(PF_INET, SOCK_STREAM, IPPROTO_IP\\) += 0<TCP:\\[(" r_i ")\\]>$"
   r_getsockname = "^getsockname\\(0<TCP:\\[" r_localhost ":(" r_port ")\\]>, \\{sa_family=AF_INET, sin_port=htons\\((" r_port ")\\), sin_addr=inet_addr\\(\"" r_localhost "\"\\)\\}, \\[" r_i "\\]\\) += 0$"
 }
 
-NR == 1 && /^socket\(PF_INET, SOCK_STREAM, IPPROTO_IP\) += 0$/ {next}
-
-NR == 2 {
-  if (match($0, r_bind, a)) {
+NR == 1 {
+  if (match($0, r_socket, a)) {
     inode = a[1]
+    r_bind = "^bind\\(0<TCP:\\[" inode "\\]>, \\{sa_family=AF_INET, sin_port=htons\\(0\\), sin_addr=inet_addr\\(\"" r_localhost "\"\\)\\}, " r_i "\\) += 0$"
     r_listen = "^listen\\(0<TCP:\\[" inode "\\]>, 5\\) += 0$"
     next
   }
 }
 
+NR == 2 {if (r_bind != "" && match($0, r_bind)) next}
+
 NR == 3 {if (r_listen != "" && match($0, r_listen)) next}
 
 NR == 4 {

diff --git a/tests/net-yy-connect.awk b/tests/net-yy-connect.awk
index 67613666d03f9a501cfb76cbcabdaab17a7fb2b3..79e9ee085e0a4bca6e260ebf06e8a23e97abff18 100644 (file)
--- a/tests/net-yy-connect.awk
+++ b/tests/net-yy-connect.awk
@@ -5,13 +5,19 @@ BEGIN {
   r_i = "[1-9][0-9]*"
   r_port = "[1-9][0-9][0-9][0-9]+"
   r_localhost = "127\\.0\\.0\\.1"
-  r_connect = "^connect\\(0<TCP:\\[" r_i "\\]>, \\{sa_family=AF_INET, sin_port=htons\\((" r_port ")\\), sin_addr=inet_addr\\(\"" r_localhost "\"\\)\\}, " r_i ") += 0$"
+  r_socket = "^socket\\(PF_INET, SOCK_STREAM, IPPROTO_IP\\) += 0<TCP:\\[(" r_i ")\\]>$"
 }
 
-NR == 1 && /^socket\(PF_INET, SOCK_STREAM, IPPROTO_IP\) += 0$/ {next}
+NR == 1 {
+  if (match($0, r_socket, a)) {
+    inode = a[1]
+    r_connect = "^connect\\(0<TCP:\\[" inode "\\]>, \\{sa_family=AF_INET, sin_port=htons\\((" r_port ")\\), sin_addr=inet_addr\\(\"" r_localhost "\"\\)\\}, " r_i ") += 0$"
+    next
+  }
+}
 
 NR == 2 {
-  if (match($0, r_connect, a)) {
+  if (r_connect != "" && match($0, r_connect, a)) {
     port_r = a[1]
     r_send = "^send\\(0<TCP:\\[" r_localhost ":(" r_port ")->" r_localhost ":" port_r "\\]>, \"data\", 4, MSG_DONTROUTE\\) += 4$"
     r_sendto = "^sendto\\(0<TCP:\\[" r_localhost ":(" r_port ")->" r_localhost ":" port_r "\\]>, \"data\", 4, MSG_DONTROUTE, NULL, 0\\) += 4$"

diff --git a/tests/unix-yy-accept.awk b/tests/unix-yy-accept.awk
index 304c022901103b2983382c6bcb03d3433c31500b..4f34f51a02fe91d87842f4616b9efd64372a9a39 100644 (file)
--- a/tests/unix-yy-accept.awk
+++ b/tests/unix-yy-accept.awk
@@ -4,14 +4,13 @@ BEGIN {
 
   addrlen = length(addr) + 3
   r_i = "[1-9][0-9]*"
-  r_bind = "^bind\\(0<UNIX:\\[(" r_i ")\\]>, \\{sa_family=AF_(LOCAL|UNIX|FILE), sun_path=\"" addr "\"\\}, " addrlen "\\) += 0$"
+  r_socket = "^socket\\(PF_(LOCAL|UNIX|FILE), SOCK_STREAM, 0\\) += 0<UNIX:\\[(" r_i ")\\]>$"
 }
 
-NR == 1 && /^socket\(PF_(LOCAL|UNIX|FILE), SOCK_STREAM, 0\) += 0$/ {next}
-
-NR == 2 {
-  if (match($0, r_bind, a)) {
-    inode_listen = a[1]
+NR == 1 {
+  if (match($0, r_socket, a)) {
+    inode_listen = a[2]
+    r_bind = "^bind\\(0<UNIX:\\[" inode_listen "\\]>, \\{sa_family=AF_(LOCAL|UNIX|FILE), sun_path=\"" addr "\"\\}, " addrlen "\\) += 0$"
     r_listen = "^listen\\(0<UNIX:\\[" inode_listen ",\"" addr "\"\\]>, 5\\) += 0$"
     r_getsockname = "^getsockname\\(0<UNIX:\\[" inode_listen ",\"" addr "\"\\]>, \\{sa_family=AF_(LOCAL|UNIX|FILE), sun_path=\"" addr "\"\\}, \\[" addrlen "\\]\\) += 0$"
     r_accept = "^accept\\(0<UNIX:\\[" inode_listen ",\"" addr "\"\\]>, \\{sa_family=AF_(LOCAL|UNIX|FILE), NULL\\}, \\[2\\]\\) += 1<UNIX:\\[(" r_i ")->(" r_i "),\"" addr "\"\\]>"
@@ -19,6 +18,8 @@ NR == 2 {
   }
 }
 
+NR == 2 {if (r_bind != "" && match($0, r_bind)) next}
+
 NR == 3 {if (r_listen != "" && match($0, r_listen)) next}
 
 NR == 4 {if (r_getsockname != "" && match($0, r_getsockname)) next}

diff --git a/tests/unix-yy-connect.awk b/tests/unix-yy-connect.awk
index 4641d7839454f732898000da38df65ed121c7a37..b5bb901e1d33f43da2a50f09d17d078c08b9e594 100644 (file)
--- a/tests/unix-yy-connect.awk
+++ b/tests/unix-yy-connect.awk
@@ -4,17 +4,22 @@ BEGIN {
   addrlen = length(addr) + 3
 
   r_i = "[1-9][0-9]*"
+  r_socket = "^socket\\(PF_(LOCAL|UNIX|FILE), SOCK_STREAM, 0\\) += 1<UNIX:\\[(" r_i ")\\]>$"
   r_close_listen = "^close\\(0<UNIX:[" r_i ",\"" addr "\"]>\\) += 0$"
-  r_connect = "^connect\\(1<UNIX:\\[(" r_i ")\\]>, \\{sa_family=AF_(LOCAL|UNIX|FILE), sun_path=\"" addr "\"\\}, " addrlen "\\) += 0$"
 }
 
-NR == 1 && /^socket\(PF_(LOCAL|UNIX|FILE), SOCK_STREAM, 0\) += 1$/ {next}
+NR == 1 {
+  if (match($0, r_socket, a)) {
+    inode = a[2]
+    r_connect = "^connect\\(1<UNIX:\\[" inode "\\]>, \\{sa_family=AF_(LOCAL|UNIX|FILE), sun_path=\"" addr "\"\\}, " addrlen "\\) += 0$"
+    next
+  }
+}
 
 NR == 2 {if (match($0, r_close_listen)) next}
 
 NR == 3 {
-  if (match($0, r_connect, a)) {
-    inode = a[1]
+  if (r_connect != "" && match($0, r_connect)) {
     r_close_connected = "^close\\(1<UNIX:\\[(" r_i ")->" r_i "\\]>\\) += 0$"
     next
   }