From: Masatake YAMATO <yamato@redhat.com>
Date: Fri, 23 Sep 2022 19:23:27 +0000 (+0900)
Subject: tests: (lsfd) add a case testing UNIX-STREAM sockets
X-Git-Tag: v2.39-rc1~505^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eca0c148c9114c70622419bee6cf648e43c841f9;p=thirdparty%2Futil-linux.git

tests: (lsfd) add a case testing UNIX-STREAM sockets

This tests STTYPE, NAME, SOCKSTATE, SOCKTYPE, and UNIX.PATH columns.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---

diff --git a/tests/expected/lsfd/mkfds-unix-stream b/tests/expected/lsfd/mkfds-unix-stream
new file mode 100644
index 0000000000..5628e78e11
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-unix-stream
@@ -0,0 +1,12 @@
+    3   SOCK state=listen path=test_mkfds-unix-stream       listen   stream test_mkfds-unix-stream
+    4   SOCK state=connected                             connected   stream 
+    5   SOCK state=connected path=test_mkfds-unix-stream connected   stream test_mkfds-unix-stream
+ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,UNIX.PATH: 0
+    3   SOCK state=listen path=@test_mkfds-unix-stream-abs       listen   stream @test_mkfds-unix-stream-abs
+    4   SOCK state=connected                                  connected   stream 
+    5   SOCK state=connected path=@test_mkfds-unix-stream-abs connected   stream @test_mkfds-unix-stream-abs
+(abs) ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,UNIX.PATH: 0
+    3   SOCK state=listen path=test_mkfds-unix-stream-shutdown       listen   stream test_mkfds-unix-stream-shutdown
+    4   SOCK state=connected                                      connected   stream 
+    5   SOCK state=connected path=test_mkfds-unix-stream-shutdown connected   stream test_mkfds-unix-stream-shutdown
+(shutdown) ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,UNIX.PATH: 0
diff --git a/tests/helpers/test_mkfds.c b/tests/helpers/test_mkfds.c
index 07d37905e4..077aa49a45 100644
--- a/tests/helpers/test_mkfds.c
+++ b/tests/helpers/test_mkfds.c
@@ -805,7 +805,7 @@ static void *make_unix_stream(const struct factory *factory, struct fdesc fdescs
 	struct arg client_shutdown = decode_arg("client-shutdown", factory->params, argc, argv);
 	int iclient_shutdown = ARG_INTEGER(client_shutdown);
 
-	int ssd, csd, asd;	/* server, client, accepted socket descriptor */
+	int ssd, csd, asd;	/* server, client, and accepted socket descriptors */
 	struct sockaddr_un un;
 	size_t un_len = sizeof(un);
 
diff --git a/tests/ts/lsfd/mkfds-unix-stream b/tests/ts/lsfd/mkfds-unix-stream
new file mode 100755
index 0000000000..2f2bfd76a5
--- /dev/null
+++ b/tests/ts/lsfd/mkfds-unix-stream
@@ -0,0 +1,78 @@
+#!/bin/bash
+#
+# Copyright (C) 2022 Masatake YAMATO <yamato@redhat.com>
+#
+# This file is part of util-linux.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+TS_TOPDIR="${0%/*}/../.."
+TS_DESC="UNIX stream sockets"
+
+. "$TS_TOPDIR"/functions.sh
+ts_init "$*"
+
+ts_check_test_command "$TS_CMD_LSFD"
+ts_check_test_command "$TS_HELPER_MKFDS"
+
+ts_cd "$TS_OUTDIR"
+
+PID=
+FDS=3
+FDC=4
+FDA=5
+EXPR='(((TYPE == "UNIX-STREAM") or (TYPE == "UNIX")) and (FD >= 3) and (FD <= 5))'
+
+{
+    # TYPE is not tested here; AF_UNIX+SOCK_STREAM socket type was changed from "UNIX"
+    # to "UNIX-STREAM" at a time in Linux kernel development history.
+    coproc MKFDS { "$TS_HELPER_MKFDS" unix-stream $FDS $FDC $FDA \
+				      path=test_mkfds-unix-stream ; }
+    if read -r -u "${MKFDS[0]}" PID; then
+	${TS_CMD_LSFD} -n \
+		       -o ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,UNIX.PATH \
+		       -p "${PID}" -Q "${EXPR}"
+	echo 'ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,UNIX.PATH': $?
+
+	kill -CONT "${PID}"
+	wait "${MKFDS_PID}"
+    fi
+
+    coproc MKFDS { "$TS_HELPER_MKFDS" unix-stream $FDS $FDC $FDA \
+				      path=test_mkfds-unix-stream-abs \
+				      abstract=true ; }
+    if read -r -u "${MKFDS[0]}" PID; then
+	${TS_CMD_LSFD} -n \
+		       -o ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,UNIX.PATH \
+		       -p "${PID}" -Q "${EXPR}"
+	echo '(abs) ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,UNIX.PATH': $?
+
+	kill -CONT "${PID}"
+	wait "${MKFDS_PID}"
+    fi
+
+    coproc MKFDS { "$TS_HELPER_MKFDS" unix-stream $FDS $FDC $FDA \
+				      path=test_mkfds-unix-stream-shutdown \
+				      server-shutdown=3 \
+				      client-shutdown=3 ; }
+    if read -r -u "${MKFDS[0]}" PID; then
+	${TS_CMD_LSFD} -n \
+		       -o ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,UNIX.PATH \
+		       -p "${PID}" -Q "${EXPR}"
+	echo '(shutdown) ASSOC,STTYPE,NAME,SOCKSTATE,SOCKTYPE,UNIX.PATH': $?
+	# Surprisingly, the socket status doesn't change at all.
+
+	kill -CONT "${PID}"
+	wait "${MKFDS_PID}"
+    fi
+} > "$TS_OUTPUT" 2>&1
+
+ts_finalize