From: Masatake YAMATO <yamato@redhat.com>
Date: Fri, 3 Mar 2023 06:58:18 +0000 (+0900)
Subject: tests: (lsfd) add more cases for packet sockets
X-Git-Tag: v2.39-rc1~12^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=457764764782c941d3172f32e101fc5c982cce5d;p=thirdparty%2Futil-linux.git

tests: (lsfd) add more cases for packet sockets

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

diff --git a/tests/expected/lsfd/mkfds-mapped-packet-socket b/tests/expected/lsfd/mkfds-mapped-packet-socket
index 59bc863b95..7c1b5037d0 100644
--- a/tests/expected/lsfd/mkfds-mapped-packet-socket
+++ b/tests/expected/lsfd/mkfds-mapped-packet-socket
@@ -1,2 +1,8 @@
         PACKET
 SOCK.PROTONAME: 0
+type=raw protocol=all iface=lo       raw         PACKET           lo             all
+NAME,SOCK.TYPE,SOCK.PROTONAME,PACKET.IFACE,PACKET.PROTOCOL: 0
+        PACKET
+SOCK.PROTONAME: 0
+type=dgram protocol=all iface=lo     dgram         PACKET           lo             all
+NAME,SOCK.TYPE,SOCK.PROTONAME,PACKET.IFACE,PACKET.PROTOCOL: 0
diff --git a/tests/ts/lsfd/mkfds-mapped-packet-socket b/tests/ts/lsfd/mkfds-mapped-packet-socket
index 1ee61d5d97..6844e75e5a 100755
--- a/tests/ts/lsfd/mkfds-mapped-packet-socket
+++ b/tests/ts/lsfd/mkfds-mapped-packet-socket
@@ -33,20 +33,31 @@ PID=
 FD=3
 EXPR=
 INTERFACE=lo
+SOCKTYPE=
+ERR=
 
-{
-    coproc MKFDS { "$TS_HELPER_MKFDS" mapped-packet-socket $FD interface=${INTERFACE}; }
+for SOCKTYPE in RAW DGRAM; do
+    coproc MKFDS { "$TS_HELPER_MKFDS" mapped-packet-socket $FD \
+				      interface=${INTERFACE} socktype=${SOCKTYPE}; }
     if read -u ${MKFDS[0]} PID; then
 	EXPR='(ASSOC == "shm") and (STTYPE == "SOCK") and (MODE == "-w-")'
 	${TS_CMD_LSFD} -p "$PID" -n -o SOCK.PROTONAME -Q "${EXPR}"
 	echo 'SOCK.PROTONAME': $?
+
+	EXPR="(FD == $FD)"
+	${TS_CMD_LSFD} -p "$PID" -n -o NAME,SOCK.TYPE,SOCK.PROTONAME,PACKET.IFACE,PACKET.PROTOCOL -Q "${EXPR}"
+	echo 'NAME,SOCK.TYPE,SOCK.PROTONAME,PACKET.IFACE,PACKET.PROTOCOL': $?
+
 	kill -CONT ${PID}
     fi
-
     wait ${MKFDS_PID}
-} > $TS_OUTPUT 2>&1
+    ERR=$?
+    if [ $ERR != 0 ]; then
+	   break
+    fi
+done > $TS_OUTPUT 2>&1
 
-if [[ $? == "$ENOPROTOOPT" ]]; then
+if [[ "$ERR" == "$ENOPROTOOPT" ]]; then
     ts_skip "packet socket doesn't support attaching a buffer on this platform"
 fi