tests: (lsfd::mkfds-*) alter the L4 ports for avoiding the conflict with option-inet...

Close #2397

The conflict appears in parallel execution.
This change just mitigates the original issue.
An ideal solution is that finding unused ports if bind(2) is failed.

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

diff --git a/tests/expected/lsfd/mkfds-tcp b/tests/expected/lsfd/mkfds-tcp
index da973f423b4fed46527357fc843f8305930748c6..08b57351558b6880c324dc62043cab3147e7d9f9 100644 (file)
--- a/tests/expected/lsfd/mkfds-tcp
+++ b/tests/expected/lsfd/mkfds-tcp
@@ -1,4 +1,4 @@
-3 TCP SOCK state=listen laddr=127.0.0.1:34567                                 listen stream 1 127.0.0.1   0.0.0.0 127.0.0.1:34567 34567       0.0.0.0:0     0
-4 TCP SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567
-5 TCP SOCK state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567 127.0.0.1:23456 23456
+3 TCP SOCK state=listen laddr=127.0.0.1:56789                                 listen stream 1 127.0.0.1   0.0.0.0 127.0.0.1:56789 56789       0.0.0.0:0     0
+4 TCP SOCK state=established laddr=127.0.0.1:45678 raddr=127.0.0.1:56789 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:45678 45678 127.0.0.1:56789 56789
+5 TCP SOCK state=established laddr=127.0.0.1:56789 raddr=127.0.0.1:45678 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:56789 56789 127.0.0.1:45678 45678
 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT: 0

diff --git a/tests/expected/lsfd/mkfds-tcp6 b/tests/expected/lsfd/mkfds-tcp6
index d3be7dd04dd9004200adfb6e5b0d78dc0a71bfb7..c6e5ee226ce7d20fb687ee8db122661d3ab63ee4 100644 (file)
--- a/tests/expected/lsfd/mkfds-tcp6
+++ b/tests/expected/lsfd/mkfds-tcp6
@@ -1,4 +1,4 @@
-3 TCPv6 SOCK state=listen laddr=[::1]:34567                             listen stream 1 ::1  :: [::1]:34567 34567      [::]:0     0
-4 TCPv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established stream 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567
-5 TCPv6 SOCK state=established laddr=[::1]:34567 raddr=[::1]:23456 established stream 0 ::1 ::1 [::1]:34567 34567 [::1]:23456 23456
+3 TCPv6 SOCK state=listen laddr=[::1]:56789                             listen stream 1 ::1  :: [::1]:56789 56789      [::]:0     0
+4 TCPv6 SOCK state=established laddr=[::1]:45678 raddr=[::1]:56789 established stream 0 ::1 ::1 [::1]:45678 45678 [::1]:56789 56789
+5 TCPv6 SOCK state=established laddr=[::1]:56789 raddr=[::1]:45678 established stream 0 ::1 ::1 [::1]:56789 56789 [::1]:45678 45678
 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT: 0

diff --git a/tests/expected/lsfd/mkfds-udp b/tests/expected/lsfd/mkfds-udp
index a7a78379538383ca56ac762297bcf7f4ee7ae659..0595e3b922a54db165a7e83c1f4c8f0d2fb013b0 100644 (file)
--- a/tests/expected/lsfd/mkfds-udp
+++ b/tests/expected/lsfd/mkfds-udp
@@ -1,24 +1,24 @@
-3 UDP SOCK state=close laddr=127.0.0.1:34567                                   close dgram 0 127.0.0.1   0.0.0.0 127.0.0.1:34567 34567       0.0.0.0:0     0
-4 UDP SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567
+3 UDP SOCK state=close laddr=127.0.0.1:56789                                   close dgram 0 127.0.0.1   0.0.0.0 127.0.0.1:56789 56789       0.0.0.0:0     0
+4 UDP SOCK state=established laddr=127.0.0.1:45678 raddr=127.0.0.1:56789 established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:45678 45678 127.0.0.1:56789 56789
 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0
 3 UDP SOCK   0      
 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0
 NAME pattern match: OK
-4 UDP SOCK established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567
+4 UDP SOCK established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:56789 56789
 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.RADDR,UDP.RPORT: 0
 LADDR/LPORT pattern match: OK
-3 UDP SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0
-4 UDP SOCK state=close laddr=127.0.0.1:23456 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:23456 23456 0.0.0.0:0 0
+3 UDP SOCK state=close laddr=127.0.0.1:56789 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:56789 56789 0.0.0.0:0 0
+4 UDP SOCK state=close laddr=127.0.0.1:45678 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:45678 45678 0.0.0.0:0 0
 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0
-3 UDP-Lite SOCK state=close laddr=127.0.0.1:34567                                   close dgram 0 127.0.0.1   0.0.0.0 127.0.0.1:34567 34567       0.0.0.0:0     0
-4 UDP-Lite SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567
+3 UDP-Lite SOCK state=close laddr=127.0.0.1:56789                                   close dgram 0 127.0.0.1   0.0.0.0 127.0.0.1:56789 56789       0.0.0.0:0     0
+4 UDP-Lite SOCK state=established laddr=127.0.0.1:45678 raddr=127.0.0.1:56789 established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:45678 45678 127.0.0.1:56789 56789
 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0
 3 UDP-Lite SOCK   0      
 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0
 NAME pattern match: OK
-4 UDP-Lite SOCK established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567
+4 UDP-Lite SOCK established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:56789 56789
 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDPLite.RADDR,UDPLite.RPORT: 0
 LADDR/LPORT pattern match: OK
-3 UDP-Lite SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0    
-4 UDP-Lite SOCK state=close laddr=127.0.0.1:23456 close dgram 0 127.0.0.1 0.0.0.0    
+3 UDP-Lite SOCK state=close laddr=127.0.0.1:56789 close dgram 0 127.0.0.1 0.0.0.0    
+4 UDP-Lite SOCK state=close laddr=127.0.0.1:45678 close dgram 0 127.0.0.1 0.0.0.0    
 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0

diff --git a/tests/expected/lsfd/mkfds-udp6 b/tests/expected/lsfd/mkfds-udp6
index c7b1ba038bdac8d4b0301eb804127cd864e3f0c7..cbf44d047384f56b10c0564e8e6686346e431543 100644 (file)
--- a/tests/expected/lsfd/mkfds-udp6
+++ b/tests/expected/lsfd/mkfds-udp6
@@ -1,24 +1,24 @@
-3 UDPv6 SOCK state=close laddr=[::1]:34567                               close dgram 0 ::1  :: [::1]:34567 34567      [::]:0     0
-4 UDPv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established dgram 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567
+3 UDPv6 SOCK state=close laddr=[::1]:56789                               close dgram 0 ::1  :: [::1]:56789 56789      [::]:0     0
+4 UDPv6 SOCK state=established laddr=[::1]:45678 raddr=[::1]:56789 established dgram 0 ::1 ::1 [::1]:45678 45678 [::1]:56789 56789
 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0
 3 UDPv6 SOCK   0      
 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0
 NAME pattern match: OK
-4 UDPv6 SOCK established dgram 0 ::1 ::1 [::1]:34567 34567
+4 UDPv6 SOCK established dgram 0 ::1 ::1 [::1]:56789 56789
 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDP.RADDR,UDP.RPORT: 0
 LADDR/LPORT pattern match: OK
-3 UDPv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0
-4 UDPv6 SOCK state=close laddr=[::1]:23456 close dgram 0 ::1 :: [::1]:23456 23456 [::]:0 0
+3 UDPv6 SOCK state=close laddr=[::1]:56789 close dgram 0 ::1 :: [::1]:56789 56789 [::]:0 0
+4 UDPv6 SOCK state=close laddr=[::1]:45678 close dgram 0 ::1 :: [::1]:45678 45678 [::]:0 0
 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0
-3 UDPLITEv6 SOCK state=close laddr=[::1]:34567                               close dgram 0 ::1  :: [::1]:34567 34567      [::]:0     0
-4 UDPLITEv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established dgram 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567
+3 UDPLITEv6 SOCK state=close laddr=[::1]:56789                               close dgram 0 ::1  :: [::1]:56789 56789      [::]:0     0
+4 UDPLITEv6 SOCK state=established laddr=[::1]:45678 raddr=[::1]:56789 established dgram 0 ::1 ::1 [::1]:45678 45678 [::1]:56789 56789
 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0
 3 UDPLITEv6 SOCK   0      
 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0
 NAME pattern match: OK
-4 UDPLITEv6 SOCK established dgram 0 ::1 ::1 [::1]:34567 34567
+4 UDPLITEv6 SOCK established dgram 0 ::1 ::1 [::1]:56789 56789
 ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDPLite.RADDR,UDPLite.RPORT: 0
 LADDR/LPORT pattern match: OK
-3 UDPLITEv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0
-4 UDPLITEv6 SOCK state=close laddr=[::1]:23456 close dgram 0 ::1 :: [::1]:23456 23456 [::]:0 0
+3 UDPLITEv6 SOCK state=close laddr=[::1]:56789 close dgram 0 ::1 :: [::1]:56789 56789 [::]:0 0
+4 UDPLITEv6 SOCK state=close laddr=[::1]:45678 close dgram 0 ::1 :: [::1]:45678 45678 [::]:0 0
 ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0

diff --git a/tests/ts/lsfd/mkfds-tcp b/tests/ts/lsfd/mkfds-tcp
index e531a7b06bac51ea65a826bf87905a8d71f1b7ce..e1ebbec92fe763b81dbdbd39d17038cd01acb217 100755 (executable)
--- a/tests/ts/lsfd/mkfds-tcp
+++ b/tests/ts/lsfd/mkfds-tcp
@@ -34,8 +34,8 @@ EXPR='(TYPE == "TCP") and (FD >= 3) and (FD <= 5)'
 
 {
     coproc MKFDS { "$TS_HELPER_MKFDS" tcp $FDS $FDC $FDA \
-                                     server-port=34567 \
-                                     client-port=23456 ; }
+                                     server-port=56789 \
+                                     client-port=45678 ; }
     if read -r -u "${MKFDS[0]}" PID; then
        ${TS_CMD_LSFD} -n \
                       -o ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT \

diff --git a/tests/ts/lsfd/mkfds-tcp6 b/tests/ts/lsfd/mkfds-tcp6
index 7368bfa9fe172c9e6e4153a6a504ca1a72cac43a..609ef9887724cc8f0684bab497b7b93eecf4bb9a 100755 (executable)
--- a/tests/ts/lsfd/mkfds-tcp6
+++ b/tests/ts/lsfd/mkfds-tcp6
@@ -35,8 +35,8 @@ EXPR='(TYPE == "TCPv6") and (FD >= 3) and (FD <= 5)'
 
 {
     coproc MKFDS { "$TS_HELPER_MKFDS" tcp6 $FDS $FDC $FDA \
-                                     server-port=34567 \
-                                     client-port=23456 ; }
+                                     server-port=56789 \
+                                     client-port=45678 ; }
     if read -r -u "${MKFDS[0]}" PID; then
        ${TS_CMD_LSFD} -n \
                       -o ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT \

diff --git a/tests/ts/lsfd/mkfds-udp b/tests/ts/lsfd/mkfds-udp
index e6e1f1cef1f3e52121fae419054e97678a198597..f202100405bf1b689e24d0bdc60d0e1c6ac397dd 100755 (executable)
--- a/tests/ts/lsfd/mkfds-udp
+++ b/tests/ts/lsfd/mkfds-udp
@@ -51,8 +51,8 @@ LPORT=
 
 for lite in 0 1; do
     coproc MKFDS { "$TS_HELPER_MKFDS" udp $FDS $FDC \
-                                     server-port=34567 \
-                                     client-port=23456 \
+                                     server-port=56789 \
+                                     client-port=45678 \
                                      lite=$lite; }
     if read -r -u "${MKFDS[0]}" PID; then
        ${TS_CMD_LSFD} -n \
@@ -65,8 +65,8 @@ for lite in 0 1; do
     wait "${MKFDS_PID}"
 
     coproc MKFDS { "$TS_HELPER_MKFDS" udp $FDS $FDC \
-                                     server-port=34567 \
-                                     client-port=23456 \
+                                     server-port=56789 \
+                                     client-port=45678 \
                                      server-do-bind=no \
                                      lite=$lite; }
     if read -r -u "${MKFDS[0]}" PID; then
@@ -90,8 +90,8 @@ for lite in 0 1; do
     wait "${MKFDS_PID}"
 
     coproc MKFDS { "$TS_HELPER_MKFDS" udp $FDS $FDC \
-                                     server-port=34567 \
-                                     client-port=23456 \
+                                     server-port=56789 \
+                                     client-port=45678 \
                                      client-do-bind=no \
                                      lite=$lite; }
     if read -r -u "${MKFDS[0]}" PID; then
@@ -120,8 +120,8 @@ for lite in 0 1; do
     wait "${MKFDS_PID}"
 
     coproc MKFDS { "$TS_HELPER_MKFDS" udp $FDS $FDC \
-                                     server-port=34567 \
-                                     client-port=23456 \
+                                     server-port=56789 \
+                                     client-port=45678 \
                                      client-do-connect=no \
                                      lite=$lite; }
     if read -r -u "${MKFDS[0]}" PID; then

diff --git a/tests/ts/lsfd/mkfds-udp6 b/tests/ts/lsfd/mkfds-udp6
index 75381ba380de9c8e8ff3931ae5ec772bc8615fe2..eb8d3054e5aac873fdc92a7423c570cc050365bf 100755 (executable)
--- a/tests/ts/lsfd/mkfds-udp6
+++ b/tests/ts/lsfd/mkfds-udp6
@@ -52,8 +52,8 @@ LPORT=
 
 for lite in 0 1; do
     coproc MKFDS { "$TS_HELPER_MKFDS" udp6 $FDS $FDC \
-                                     server-port=34567 \
-                                     client-port=23456 \
+                                     server-port=56789 \
+                                     client-port=45678 \
                                      lite=$lite; }
     if read -r -u "${MKFDS[0]}" PID; then
        ${TS_CMD_LSFD} -n \
@@ -66,8 +66,8 @@ for lite in 0 1; do
     wait "${MKFDS_PID}"
 
     coproc MKFDS { "$TS_HELPER_MKFDS" udp6 $FDS $FDC \
-                                     server-port=34567 \
-                                     client-port=23456 \
+                                     server-port=56789 \
+                                     client-port=45678 \
                                      server-do-bind=no \
                                      lite=$lite; }
     if read -r -u "${MKFDS[0]}" PID; then
@@ -91,8 +91,8 @@ for lite in 0 1; do
     wait "${MKFDS_PID}"
 
     coproc MKFDS { "$TS_HELPER_MKFDS" udp6 $FDS $FDC \
-                                     server-port=34567 \
-                                     client-port=23456 \
+                                     server-port=56789 \
+                                     client-port=45678 \
                                      client-do-bind=no \
                                      lite=$lite; }
     if read -r -u "${MKFDS[0]}" PID; then
@@ -121,8 +121,8 @@ for lite in 0 1; do
     wait "${MKFDS_PID}"
 
     coproc MKFDS { "$TS_HELPER_MKFDS" udp6 $FDS $FDC \
-                                     server-port=34567 \
-                                     client-port=23456 \
+                                     server-port=56789 \
+                                     client-port=45678 \
                                      client-do-connect=no \
                                      lite=$lite; }
     if read -r -u "${MKFDS[0]}" PID; then