From nobody Wed Sep 17 18:36:18 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CCDE311C20 for ; Fri, 12 Sep 2025 14:20:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757686848; cv=none; b=RTvXv22IUgLMCu0pVXxiLzuGM4JMiE2YZFsv6Bh53MOOfQht57Xd8V/tqw9uJaRbQhyeRodq+0vVRrje/ZTjVsH1dm3dt5wVDROpE5bp3VDZ7rU7DtHs42fCAf5kB3uIviM9iUsZMcSrc3o/J4U8S249dlpbT640Mh/6nU1DMvM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757686848; c=relaxed/simple; bh=FSmeiYgy7sMMXKU8zq/GyW3nKNSOEsJ6UV9HL0mgQKk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eRtWOlQHCensVxWNjHblmaoXLxKOlYjhVeRSmLo5Ci9IhkNU3u3345u4ryoRYJT4A+M7jKi8/X7Q0uZqjHsjQc3dCIXJNtVI/+hsgbwZubS8445zzFfNoJEhrjX2IfVHfmTZRXzapzyHzkGC611ahHOJVuos8p8QscvfbDWTn48= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ERDhcyGr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ERDhcyGr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A62FBC4CEFA; Fri, 12 Sep 2025 14:20:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757686848; bh=FSmeiYgy7sMMXKU8zq/GyW3nKNSOEsJ6UV9HL0mgQKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ERDhcyGrbDaTWvta7yf5kyECYEzFBGW249ZUzTiD8PWcfuUhM7ROIxNgweYCJsJ1a eA7unt3C+V7h7JjvhVTYCWJA4Zb59qXDljwjn2jANy8HCExVfuJC3Nlc24Nt3/5vEJ 8MYi1SxN8ge8uS15/T1TpuMzG777VDzFNvzsupZjNkexZ1WqjvNk/rocXJhAs79M/O zWRLPtQFGzBbTdv8nOxoMnToj6cGZopPI+NEK3I8il0eTHc2Ao3GeqbrGj3QOM5pgV L62OGP9emQgBkA8nqsRs6SpdHokhY5n0L9zDwqFtshP+FHO5/KTaEukQ1arqbwVcHu yUSxmQqVbYZUA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 4/9] selftests: mptcp: sockopt: rename pipefd to ipcfd Date: Fri, 12 Sep 2025 22:19:51 +0800 Message-ID: <9f9c9d888be62d21942aafc50ddd0eec1fba971d.1757686538.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Rename pipefd to ipcfd to better reflect its generalized purpose since it now handles both pipes and Unix domain sockets. This naming improves code clarity for IPC channel handling. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 96d636005cb2..776a017577ce 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -590,7 +590,7 @@ static void do_getsockopts(struct so_state *s, int fd, = size_t r, size_t w) do_getsockopt_mptcp_full_info(s, fd); } =20 -static void connect_one_server(int fd, int pipefd) +static void connect_one_server(int fd, int ipcfd) { char buf[4096], buf2[4096]; size_t len, i, total; @@ -615,9 +615,9 @@ static void connect_one_server(int fd, int pipefd) do_getsockopts(&s, fd, 0, 0); =20 /* un-block server */ - ret =3D read(pipefd, buf2, 4); + ret =3D read(ipcfd, buf2, 4); assert(ret =3D=3D 4); - close(pipefd); + close(ipcfd); =20 assert(strncmp(buf2, "xmit", 4) =3D=3D 0); =20 @@ -659,7 +659,7 @@ static void connect_one_server(int fd, int pipefd) close(fd); } =20 -static void process_one_client(int fd, int pipefd) +static void process_one_client(int fd, int ipcfd) { ssize_t ret, ret2, ret3; struct so_state s; @@ -668,7 +668,7 @@ static void process_one_client(int fd, int pipefd) memset(&s, 0, sizeof(s)); do_getsockopts(&s, fd, 0, 0); =20 - ret =3D write(pipefd, "xmit", 4); + ret =3D write(ipcfd, "xmit", 4); assert(ret =3D=3D 4); =20 ret =3D read(fd, buf, sizeof(buf)); @@ -726,7 +726,7 @@ static int xaccept(int s) return fd; } =20 -static int server(int pipefd) +static int server(int ipcfd) { int fd =3D -1, r; =20 @@ -742,13 +742,13 @@ static int server(int pipefd) break; } =20 - r =3D write(pipefd, "conn", 4); + r =3D write(ipcfd, "conn", 4); assert(r =3D=3D 4); =20 alarm(15); r =3D xaccept(fd); =20 - process_one_client(r, pipefd); + process_one_client(r, ipcfd); =20 close(fd); return 0; @@ -792,7 +792,7 @@ static void test_ip_tos_sockopt(int fd) xerror("expect socklen_t =3D=3D -1"); } =20 -static int client(int pipefd) +static int client(int ipcfd) { int fd =3D -1; =20 @@ -811,7 +811,7 @@ static int client(int pipefd) =20 test_ip_tos_sockopt(fd); =20 - connect_one_server(fd, pipefd); + connect_one_server(fd, ipcfd); =20 return 0; } @@ -858,35 +858,36 @@ int main(int argc, char *argv[]) { int e1, e2, wstatus; pid_t s, c, ret; - int pipefds[2]; + int ipcfds[2]; =20 parse_opts(argc, argv); =20 init_rng(); =20 - e1 =3D pipe(pipefds); + e1 =3D inq ? socketpair(AF_UNIX, SOCK_DGRAM, 0, ipcfds) : + pipe(ipcfds); if (e1 < 0) die_perror("pipe"); =20 s =3D xfork(); if (s =3D=3D 0) { - close(pipefds[0]); - ret =3D server(pipefds[1]); - close(pipefds[1]); + close(ipcfds[0]); + ret =3D server(ipcfds[1]); + close(ipcfds[1]); return ret; } =20 - close(pipefds[1]); + close(ipcfds[1]); =20 /* wait until server bound a socket */ - e1 =3D read(pipefds[0], &e1, 4); + e1 =3D read(ipcfds[0], &e1, 4); assert(e1 =3D=3D 4); =20 c =3D xfork(); if (c =3D=3D 0) - return client(pipefds[0]); + return client(ipcfds[0]); =20 - close(pipefds[0]); + close(ipcfds[0]); =20 ret =3D waitpid(s, &wstatus, 0); if (ret =3D=3D -1) --=20 2.48.1