From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RDNS_NONE,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id AFF7E100D0; Wed, 24 Mar 2021 18:25:16 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id A95E810120; Wed, 24 Mar 2021 18:25:04 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id B6591100BA; Wed, 24 Mar 2021 18:25:02 +0000 (UTC) Received: from wout4-smtp.messagingengine.com (unknown [64.147.123.20]) by atuin.qyliss.net (Postfix) with ESMTPS id DF1281011A for ; Wed, 24 Mar 2021 18:24:58 +0000 (UTC) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id D8B1311EA for ; Wed, 24 Mar 2021 14:24:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Wed, 24 Mar 2021 14:24:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=h1YydwVYnOJgEAQw/3ZvqrJ6ar z/P9SiDdZVESg2QYI=; b=OAAAJ06wHmja9zo64zq8HtBQ3OLLF61LK3rNmqgzBP p8QQVuWUEWZi0kX+5EjohtORkDPJIjFSIi9DXo6Am73r85dw5F9nTG5AcoMHs1VE 9us+4J7utl0dt93ruKLQmlN8x1H0pMDOaNIpV94/HSDl9OC3pZjjE1uDgXvf7LIA JCyLyAqcSRj+wXNE+AXvYjAfZv3tOKEoQd8UsgL+D7vgJPeiABmXx25oc/XLHG3o zSFaOwfRLoCthF7gLUryVoQYeMBbg8srl406l0WGAmLZ6YqNg3z//xWzE3oHSUbq dulvfVZ4SnXsW98XAz1vCVJLUgkGsQPPAmbNHdUbChyA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=h1YydwVYnOJgEAQw/ 3ZvqrJ6arz/P9SiDdZVESg2QYI=; b=Bz6FGWVQB8Kv/Ssq9+YvfGRxOey54dzLS NKSOOufDjbxZ44+3pCcbvQZT/8/um8Yt8PsLZPnoKfdsD1CKa2BYScW07YItz8ws V375gL3tzqYBF3DgG7t17+FUSLABHNh+3Y65x5b4qztz3futaFLmva+r9mcAoPG9 fcvBdciyl5utp9gAZfUfMxCNjRNPwAz/lQK3PFOb+TjRoZViWkXtIJLFcTho3ygN dHNBefcAcOtrBkOYHjOIaWFnwmXQzioQWeYvJk7DtOAb2hZRrZdm+yfdw+l/CUhK AAsqSYdGy4+vfkRTJaH1B++09+yWZ4c6IQmfA8u4bYeEtmIABg7NA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudegkedgudduudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpeetlhihshhsrgcutfhoshhsuceohhhisegrlhihshhsrgdrihhs qeenucggtffrrghtthgvrhhnpeevheehgfduhffhgeeugfeutdekvdelteehtdeuueeihf ekfeehteehvddtgfdtgeenucffohhmrghinhephihprdhtohenucfkphepkeegrddukeeg rddvvdekrddukeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpehqhihlihhsshesgidvvddtrdhqhihlihhsshdrnhgvth X-ME-Proxy: Received: from x220.qyliss.net (p54b8e412.dip0.t-ipconnect.de [84.184.228.18]) by mail.messagingengine.com (Postfix) with ESMTPA id 135E5108005C for ; Wed, 24 Mar 2021 14:24:41 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 5C4F2259A; Wed, 24 Mar 2021 18:24:39 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH ucspi-vsock] vsockclient: allow null application Date: Wed, 24 Mar 2021 18:24:33 +0000 Message-Id: <20210324182433.19110-1-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: KO7CG6HXO2NKYIPSARS4PPA5OW3CAJ7T X-Message-ID-Hash: KO7CG6HXO2NKYIPSARS4PPA5OW3CAJ7T X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: I found myself running vsockclient 2 1024 true in a situation where it just mattered that a connection was made, and no data needed to be exchanged of it. That I found myself doing this is quite a strong indicator that the program to exec into should be optional. UCSPI-1996[1] doesn't specify what should happen if no application is provided, so I think this is a reasonable interpretation. I'm not sure if I feel the same for vsockserver(d), so I haven't made the corresponding change there. I'll wait to see if there's ever a need for it. [1]: https://cr.yp.to/proto/ucspi.txt --- vsockclient.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vsockclient.c b/vsockclient.c index 934cfa0..456810d 100644 --- a/vsockclient.c +++ b/vsockclient.c @@ -41,11 +41,9 @@ int main(int argc, char *argv[]) } } - // Check there are enough positional arguments (two for the - // address and at least one to exec into). - if (optind > argc - 3) + // Find the address (cid and port) to connect to. + if (optind > argc - 2) ex_usage(); - if (getu32(argv[optind++], 0, UINT32_MAX, &rcid)) ex_usage(); if (getu32(argv[optind++], 0, UINT32_MAX, &rport)) @@ -69,6 +67,11 @@ int main(int argc, char *argv[]) "connect to %" PRIu32 ":%" PRIu32 " failed", rcid, rport); ilog("connected to %" PRIu32 ":%" PRIu32 "!", rcid, rport); + // If we have nothing to exec into, we're done. (Sometimes + // just connecting on its own is enough.) + if (optind == argc) + return 0; + // Set up the file descriptors to the well-known UCSPI numbers. if (dup2(fd, 6) == -1) diee(EX_OSERR, "dup2"); -- 2.30.0