Projects
openEuler:Mainline
util-linux
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 13
View file
_service:tar_scm:util-linux.spec
Changed
@@ -3,7 +3,7 @@ Name: util-linux Version: 2.39.1 -Release: 1 +Release: 2 Summary: A random collection of Linux utilities License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git @@ -21,6 +21,11 @@ Patch6000: 2.36-login-lastlog-create.patch Patch6001: backport-unshare-Move-implementation-of-keep-caps-option-to-l.patch Patch6002: backport-lib-caputils-fix-integer-handling-issues-coverity-sc.patch +Patch6003: backport-fadvise-test-dynamically-calculate-expected-test-val.patch +Patch6004: backport-fadvise-tests-factor-out-calls-to-fincore.patch +Patch6005: backport-fadvise-test-don-t-compare-fincore-page-counts.patch +Patch6006: backport-fadvise-test-test-with-64k-blocks.patch +Patch6007: backport-tests-lsfd-mkfds-alter-the-L4-ports-for-avo.patch Patch9000: SKIPPED-no-root-permissions-test.patch %ifarch sw_64 @@ -29,7 +34,7 @@ BuildRequires: audit-libs-devel >= 1.0.6 gettext-devel libselinux-devel ncurses-devel pam-devel zlib-devel popt-devel BuildRequires: libutempter-devel systemd-devel systemd libuser-devel libcap-ng-devel python3-devel gcc autoconf automake -BuildRequires: make readline-devel rubygem-asciidoctor po4a +BuildRequires: make readline-devel rubygem-asciidoctor po4a lsof Requires(post): coreutils Requires: pam >= 1.1.3-7, /etc/pam.d/system-auth audit-libs >= 1.0.6 @@ -395,6 +400,12 @@ %{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*} %changelog +* Mon Jul 31 2023 zhangyao <zhangyao108@huawei.com> - 2.39.1-2 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix fadvise test failed + * Wed Jul 19 2023 zhangyao <zhangyao108@huawei.com> - 2.39.1-1 - Type:bugfix - CVE:NA
View file
_service:tar_scm:backport-fadvise-test-don-t-compare-fincore-page-counts.patch
Added
@@ -0,0 +1,71 @@ +From 33980996d0b429fc59c40f8352633c0a21a0f96a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de> +Date: Sun, 21 May 2023 21:44:20 +0200 +Subject: PATCH fadvise: (test) don't compare fincore page counts +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +These depend on the machines pagesize and are therefore not a good +comparision. + +Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> +--- + tests/expected/fadvise/drop | 20 ++++++++++---------- + tests/ts/fadvise/drop | 2 +- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop +index f2360b56f..25f23e050 100644 +--- a/tests/expected/fadvise/drop ++++ b/tests/expected/fadvise/drop +@@ -1,23 +1,23 @@ +- RES PAGES SIZE FILE +- 32K 8 32K ddtest ++ RES SIZE FILE ++ 32K 32K ddtest + + whole file + status: 0 +-RES PAGES SIZE FILE +- 0B 0 32K ddtest ++RES SIZE FILE ++ 0B 32K ddtest + + offset: 8192 + status: 0 +-RES PAGES SIZE FILE +- 8K 2 32K ddtest ++RES SIZE FILE ++ 8K 32K ddtest + + length: 16384 + status: 0 +- RES PAGES SIZE FILE +- 16K 4 32K ddtest ++ RES SIZE FILE ++ 16K 32K ddtest + + offset: 8192, length: 16384 fd: 42 + status: 0 +- RES PAGES SIZE FILE +- 16K 4 32K ddtest ++ RES SIZE FILE ++ 16K 32K ddtest + +diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop +index 8869b7da4..6c4298e87 100755 +--- a/tests/ts/fadvise/drop ++++ b/tests/ts/fadvise/drop +@@ -29,7 +29,7 @@ create_file() { + } + + do_fincore() { +- "$TS_CMD_FINCORE" "$FILE" ++ "$TS_CMD_FINCORE" -o RES,SIZE,FILE "$FILE" + } + + { +-- +2.33.0 +
View file
_service:tar_scm:backport-fadvise-test-dynamically-calculate-expected-test-val.patch
Added
@@ -0,0 +1,58 @@ +From 8b36444f447949c3ab477f2c43b45a94c30ee7bf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de> +Date: Sun, 21 May 2023 21:42:14 +0200 +Subject: PATCH fadvise: (test) dynamically calculate expected test values +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> +--- + tests/ts/fadvise/drop | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop +index 7c7eee5dc..86c0d5b0a 100755 +--- a/tests/ts/fadvise/drop ++++ b/tests/ts/fadvise/drop +@@ -16,7 +16,7 @@ ts_check_prog "sleep" + ts_cd "$TS_OUTDIR" + + FILE="ddtest" +-BS=4k ++BS=4096 + COUNT=8 + + FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" +@@ -41,22 +41,22 @@ create_file() { + echo + + create_file +- echo "offset: 8192" +- "$TS_CMD_FADVISE" -o 8192 "$FILE" ++ echo "offset: $(( 2 * $BS ))" ++ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE" + echo status: $? + "$TS_CMD_FINCORE" "$FILE" + echo + + create_file +- echo "length: 16384" +- "$TS_CMD_FADVISE" -l 16384 "$FILE" ++ echo "length: $(( 4 * $BS ))" ++ "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE" + echo status: $? + "$TS_CMD_FINCORE" "$FILE" + echo + + create_file +- echo "offset: 8192, length: 16384 fd: 42" +- "$TS_CMD_FADVISE" -o 8192 -l 16384 --fd 42 42<"$FILE" ++ echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42" ++ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE" + echo status: $? + "$TS_CMD_FINCORE" "$FILE" + echo +-- +2.33.0 +
View file
_service:tar_scm:backport-fadvise-test-test-with-64k-blocks.patch
Added
@@ -0,0 +1,74 @@ +From c0f31b79f5d1c665cdc057fb32f4d161d28aa5b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de> +Date: Sun, 21 May 2023 21:45:10 +0200 +Subject: PATCH fadvise: (test) test with 64k blocks +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This will allow the tests to also pass on systems with 64k pagesizes. + +Closes #2249 +Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> +--- + tests/expected/fadvise/drop | 26 +++++++++++++------------- + tests/ts/fadvise/drop | 2 +- + 2 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop +index 25f23e050..e7bb26b6e 100644 +--- a/tests/expected/fadvise/drop ++++ b/tests/expected/fadvise/drop +@@ -1,23 +1,23 @@ +- RES SIZE FILE +- 32K 32K ddtest ++ RES SIZE FILE ++ 512K 512K ddtest + + whole file + status: 0 +-RES SIZE FILE +- 0B 32K ddtest ++RES SIZE FILE ++ 0B 512K ddtest + +-offset: 8192 ++offset: 131072 + status: 0 +-RES SIZE FILE +- 8K 32K ddtest ++ RES SIZE FILE ++ 128K 512K ddtest + +-length: 16384 ++length: 262144 + status: 0 +- RES SIZE FILE +- 16K 32K ddtest ++ RES SIZE FILE ++ 256K 512K ddtest + +-offset: 8192, length: 16384 fd: 42 ++offset: 131072, length: 262144 fd: 42 + status: 0 +- RES SIZE FILE +- 16K 32K ddtest ++ RES SIZE FILE ++ 256K 512K ddtest + +diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop +index 6c4298e87..45dcb9110 100755 +--- a/tests/ts/fadvise/drop ++++ b/tests/ts/fadvise/drop +@@ -16,7 +16,7 @@ ts_check_prog "sleep" + ts_cd "$TS_OUTDIR" + + FILE="ddtest" +-BS=4096 ++BS=65536 + COUNT=8 + + FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" +-- +2.33.0 +
View file
_service:tar_scm:backport-fadvise-tests-factor-out-calls-to-fincore.patch
Added
@@ -0,0 +1,69 @@ +From e5009e773fc801eca887dd43b721cd1b1aa327be Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de> +Date: Sun, 21 May 2023 21:43:38 +0200 +Subject: PATCH fadvise: (tests) factor out calls to "fincore" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This will make it easier to pass argument later. + +Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> +--- + tests/ts/fadvise/drop | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop +index 86c0d5b0a..8869b7da4 100755 +--- a/tests/ts/fadvise/drop ++++ b/tests/ts/fadvise/drop +@@ -28,37 +28,41 @@ create_file() { + dd if=/dev/zero of="$FILE" bs=$BS count=$COUNT conv=fsync >& /dev/null + } + ++do_fincore() { ++ "$TS_CMD_FINCORE" "$FILE" ++} ++ + { + create_file +- "$TS_CMD_FINCORE" "$FILE" ++ do_fincore + echo + + create_file + echo "whole file" + "$TS_CMD_FADVISE" "$FILE" + echo status: $? +- "$TS_CMD_FINCORE" "$FILE" ++ do_fincore + echo + + create_file + echo "offset: $(( 2 * $BS ))" + "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE" + echo status: $? +- "$TS_CMD_FINCORE" "$FILE" ++ do_fincore + echo + + create_file + echo "length: $(( 4 * $BS ))" + "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE" + echo status: $? +- "$TS_CMD_FINCORE" "$FILE" ++ do_fincore + echo + + create_file + echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42" + "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE" + echo status: $? +- "$TS_CMD_FINCORE" "$FILE" ++ do_fincore + echo + + rm "$FILE" +-- +2.33.0 +
View file
_service:tar_scm:backport-tests-lsfd-mkfds-alter-the-L4-ports-for-avo.patch
Added
@@ -0,0 +1,248 @@ +From a0015aa974410ab07de205d99bdcbb5eed8712d6 Mon Sep 17 00:00:00 2001 +From: zhangyao <zhangyao108@huawei.com> +Date: Thu, 3 Aug 2023 10:22:18 +0800 +Subject: PATCH + backport-tests-lsfd-mkfds-alter-the-L4-ports-for-avoiding-the-conflict-w + +--- + tests/expected/lsfd/mkfds-tcp | 6 +++--- + tests/expected/lsfd/mkfds-tcp6 | 6 +++--- + tests/expected/lsfd/mkfds-udp | 20 ++++++++++---------- + tests/expected/lsfd/mkfds-udp6 | 20 ++++++++++---------- + tests/ts/lsfd/mkfds-tcp | 4 ++-- + tests/ts/lsfd/mkfds-tcp6 | 4 ++-- + tests/ts/lsfd/mkfds-udp | 16 ++++++++-------- + tests/ts/lsfd/mkfds-udp6 | 16 ++++++++-------- + 8 files changed, 46 insertions(+), 46 deletions(-) + +diff --git a/tests/expected/lsfd/mkfds-tcp b/tests/expected/lsfd/mkfds-tcp +index dfec0ae..9aa0cc6 100644 +--- 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 26b6039..ccd47c4 100644 +--- 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 58ce260..e3c44f1 100644 +--- 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 e29797b..0e45b36 100644 +--- 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 e531a7b..e1ebbec 100755 +--- 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 "${MKFDS0}" 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 5f196da..0dd2426 100755 +--- a/tests/ts/lsfd/mkfds-tcp6 ++++ b/tests/ts/lsfd/mkfds-tcp6 +@@ -34,8 +34,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 "${MKFDS0}" 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 e6e1f1c..f202100 100755 +--- 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 "${MKFDS0}" 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 "${MKFDS0}" 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 "${MKFDS0}" 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; }
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2