From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 2071738449C0 for ; Wed, 10 Apr 2024 16:54:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2071738449C0 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2071738449C0 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712768067; cv=none; b=wXMS8ZbQRYvwFXW5cFrQH7EFreLxyWejF5P6LVWCT7mD9EhLMw+uoggiimBZHl+ltAtltvvgg6XyanLfeWnrRbtykCQHX++CUbbU9pff9vzigPAW9cpy1OE7eT0nRoRKVOTIqDebWaCY58M5YGvjw/Qb3rVAiiUlGpiXKBzclNA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712768067; c=relaxed/simple; bh=/3v7BxJHU1nMr2NZFFsN+xSNJQso8l8ZxScSNgeW/Xc=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=pDqxEesiJrmAvTFfep8TKXsLI0AFsPUZJIIekKdJZfwVC4dhjduPRMegYCkOHZpvEyzL0Qn2VTaVp16KfWQVOEWbw5zxFzk63q8sQ1ihmRQ33uEFTyo/dkgilrfmxHbSmTL3wDXA49YJKPm6TViQ8XMqvP+FtAnrnE+nx9ga0Qo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712768051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=IvBGHVNAUHHKHYYmSK5gnxAwAUwpQ9cbb+4FcDB0bdY=; b=cjBpTTOKg3G1ouTkHlfLYgR7XzKplsRGyEULeb3gnCMgXULczSwhx4g9mYGmJxtorC0sqm x+ZnuwzzPiHToNGzFRgM/XUHb0fbe3QelWtQWQne0LB0gqVU3xwKcBXoAAgV5fcLkHy83Z XuTv44lJCQmSwG9sZsxaBqTcuKfj33U= Received: from mail-oo1-f72.google.com (mail-oo1-f72.google.com [209.85.161.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-522-9MMHoGd7NGuhDHoL-03LHQ-1; Wed, 10 Apr 2024 12:14:06 -0400 X-MC-Unique: 9MMHoGd7NGuhDHoL-03LHQ-1 Received: by mail-oo1-f72.google.com with SMTP id 006d021491bc7-5a7ba13c414so5562631eaf.0 for ; Wed, 10 Apr 2024 09:14:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712765645; x=1713370445; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IvBGHVNAUHHKHYYmSK5gnxAwAUwpQ9cbb+4FcDB0bdY=; b=nRABRzLiI2AARv0aAxpg9IXuA480MbbcSk7PwNyUyZ3mY7WxHCwx2T2gAEIgremaVh 9AN3PSBxn+YyWQoXY8UAdmhlyYHKqAWJiRNEZYPBxuade01Dlhy02uS2dLiFKxOepmig S187ayV7WDoKSQNBtQonoDKE/gkw0Zfqg6820QTVKDaaG9Nez3X22HL/yLG17ZkDoTB4 FMl2pWSBHt3yoKoQ5VtmhqMq6lNWUtLjatwMM8VcIAA4Iy365IqL3SxbJGC+QzmYpQf2 ZLnsYo6e15H7E3ixQ9EvCwyH19i7Pzb4pRlkI00Z3Gf8y7DhqEpfyffkQY1h+O+WSKNY 0zAg== X-Gm-Message-State: AOJu0YxRZ44U3H0SRGQjpi6xY8/dxPRVzzmWOFkiAFGZH94IR82YgNMA 0eEZCgNCYqIRPR5D8Cr42JJybcGqjdlzJc64gqgDLhGHe0GATThKZJQJA9THMrSjm8yXKdZWYSb sL6JWsoz+IZTKhrmHDQazD9WtmsyVIWudHVXaAzOPbWjGbesSLoWH58cuRk7CZUb5VW1muwzKps yBUFEYHtdOnzAQ4ZPQEDl7HBH0rlrSgVrK X-Received: by 2002:a05:6820:1b10:b0:5aa:4881:2ab2 with SMTP id bv16-20020a0568201b1000b005aa48812ab2mr4856233oob.4.1712765645387; Wed, 10 Apr 2024 09:14:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHGvgHCcHtwNTNOcqWUCzdnJ6+iHrBSPNlS9L5o+43adnqCZ9hT9tYYS0SliTr/hbXzIdShxKy2E8HSzifjNTA= X-Received: by 2002:a05:6820:1b10:b0:5aa:4881:2ab2 with SMTP id bv16-20020a0568201b1000b005aa48812ab2mr4856213oob.4.1712765645105; Wed, 10 Apr 2024 09:14:05 -0700 (PDT) MIME-Version: 1.0 References: <20240410160006.176758-1-skolosov@redhat.com> <20240410160006.176758-2-skolosov@redhat.com> In-Reply-To: <20240410160006.176758-2-skolosov@redhat.com> From: Arjun Shankar Date: Wed, 10 Apr 2024 18:13:53 +0200 Message-ID: Subject: Re: [PATCH v3 2/2] socket: Add new test for connect To: Sergey Kolosov Cc: libc-alpha@sourceware.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hi Sergey, > This commit adds a simple bind/accept/connect test for an IPv4 TCP > connection to a local process via the loopback interface. > --- > Changes from v2: fix some indentation issues. > --- Thanks. This looks good to me. Reviewed-by: Arjun Shankar I will push this along with the other patch in this series in a bit. > socket/Makefile | 1 + > socket/tst-connect.c | 113 +++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 114 insertions(+) > create mode 100644 socket/tst-connect.c > > diff --git a/socket/Makefile b/socket/Makefile > index 74ca5b8452..fc1bd0a260 100644 > --- a/socket/Makefile > +++ b/socket/Makefile > @@ -70,6 +70,7 @@ tests := \ > tst-accept4 \ > tst-cmsg_cloexec \ > tst-cmsghdr \ > + tst-connect \ > tst-sockopt \ > # tests > > diff --git a/socket/tst-connect.c b/socket/tst-connect.c > new file mode 100644 > index 0000000000..ec2fdd92c0 > --- /dev/null > +++ b/socket/tst-connect.c > @@ -0,0 +1,113 @@ > +/* Test the connect function. > + Copyright (C) 2024 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library 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 > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +static struct sockaddr_in server_address; > + > +int > +open_socket_inet_tcp (void) > +{ > + int fd = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); > + if (fd < 0) > + { > + if (errno == EAFNOSUPPORT) > + FAIL_UNSUPPORTED ("The host does not support IPv4"); > + else > + FAIL_EXIT1 ("socket (AF_INET, SOCK_STREAM, IPPROTO_TCP): %m\n"); > + } > + return fd; > +} > + > +static pid_t > +start_server (void) > +{ > + server_address.sin_family = AF_INET; > + server_address.sin_port = 0; > + server_address.sin_addr.s_addr = htonl (INADDR_LOOPBACK); > + > + int server_sock = open_socket_inet_tcp (); > + > + xbind (server_sock, (struct sockaddr *) &server_address, > + sizeof (server_address)); > + > + socklen_t sa_len = sizeof (server_address); > + xgetsockname (server_sock, (struct sockaddr *) &server_address, &sa_len); > + xlisten (server_sock, 5); > + > + pid_t my_pid = xfork (); > + if (my_pid > 0) > + { > + xclose (server_sock); > + return my_pid; > + } > + > + struct sockaddr_in client_address; > + socklen_t ca_len = sizeof (server_address); > + int client_sock = xaccept (server_sock, (struct sockaddr *) &client_address, > + &ca_len); > + printf ("socket accepted %d\n", client_sock); > + > + _exit (0); > +} > + > +static int > +do_test (void) > +{ > + pid_t serv_pid; > + struct sockaddr_in peer; > + socklen_t peer_len; > + > + serv_pid = start_server (); > + int client_sock = open_socket_inet_tcp (); > + xconnect (client_sock, (const struct sockaddr *) &server_address, > + sizeof (server_address)); > + > + /* A second connect with same arguments should fail with EISCONN. */ > + int result = connect (client_sock, > + (const struct sockaddr *) &server_address, > + sizeof (server_address)); > + if (result == 0 || errno != EISCONN) > + FAIL_EXIT1 ("Second connect (%d), should fail with EISCONN: %m", > + client_sock); > + > + peer_len = sizeof (peer); > + xgetpeername (client_sock, (struct sockaddr *) &peer, &peer_len); > + TEST_COMPARE (peer_len, sizeof (peer)); > + TEST_COMPARE (peer.sin_port, server_address.sin_port); > + TEST_COMPARE_BLOB (&peer.sin_addr, sizeof (peer.sin_addr), > + &server_address.sin_addr, > + sizeof (server_address.sin_addr)); > + > + int status; > + xwaitpid (serv_pid, &status, 0); > + TEST_COMPARE (status, 0); > + > + return 0; > +} > + > +#include > -- > 2.44.0 > -- Arjun Shankar he/him/his