From: Alyssa Ross <hi@alyssa.is>
To: devel@spectrum-os.org
Subject: [PATCH ucspi-vsock 1/7] vsock: get cid and port instead of just cid
Date: Fri, 19 Mar 2021 02:56:43 +0000 [thread overview]
Message-ID: <20210319025648.17925-1-hi@alyssa.is> (raw)
In-Reply-To: <20210319025349.8839-2-hi@alyssa.is>
We can get both in the same system call, so we might as well, rather
than having two different functions that make the system call twice.
---
When we introduce vsockserverd, it will have to be able to figure out
both of these values for the socket it is given to be able to set
VSOCKLOCALCID and VSOCKLOCALPORT.
vsock.c | 9 ++++++---
vsock.h | 5 +++--
vsockserver.c | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/vsock.c b/vsock.c
index e6a173c..99945c3 100644
--- a/vsock.c
+++ b/vsock.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-or-later
-// SPDX-FileCopyrightText: 2020 Alyssa Ross <hi@alyssa.is>
+// SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is>
#define _GNU_SOURCE
@@ -62,7 +62,7 @@ int vsock_open(uint32_t cid, uint32_t port)
return fd;
}
-int vsock_get_port(int fd, uint32_t *port)
+int vsock_get_cid_and_port(int fd, uint32_t *cid, uint32_t *port)
{
struct sockaddr_vm addr;
socklen_t addrlen = sizeof addr;
@@ -70,7 +70,10 @@ int vsock_get_port(int fd, uint32_t *port)
if (getsockname(fd, (struct sockaddr *)&addr, &addrlen) == -1)
return -1;
- *port = addr.svm_port;
+ if (cid)
+ *cid = addr.svm_cid;
+ if (port)
+ *port = addr.svm_port;
return 0;
}
diff --git a/vsock.h b/vsock.h
index e7d66c9..e7ffd62 100644
--- a/vsock.h
+++ b/vsock.h
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-or-later
-// SPDX-FileCopyrightText: 2020 Alyssa Ross <hi@alyssa.is>
+// SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi@alyssa.is>
#include <stdint.h>
@@ -9,4 +9,5 @@ int vsock_accept(int sockfd, uint32_t *cid, uint32_t *port);
int vsock_connect(int fd, uint32_t cid, uint32_t port);
int vsock_open(uint32_t cid, uint32_t port);
-int vsock_get_port(int fd, uint32_t *port);
+// `cid' and `port' can be null.
+int vsock_get_cid_and_port(int fd, uint32_t *cid, uint32_t *port);
diff --git a/vsockserver.c b/vsockserver.c
index df9d334..58cd063 100644
--- a/vsockserver.c
+++ b/vsockserver.c
@@ -80,7 +80,7 @@ int main(int argc, char *argv[])
diee(EX_OSERR, "listen");
if (lport == VMADDR_PORT_ANY)
- if (vsock_get_port(fd, &lport) == -1)
+ if (vsock_get_cid_and_port(fd, NULL, &lport) == -1)
diee(EX_OSERR, "getsockname");
if (notify) {
--
2.30.0
next prev parent reply other threads:[~2021-03-19 2:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-19 3:23 Broken threading fix Alyssa Ross
2021-03-19 2:56 ` Alyssa Ross [this message]
2021-03-19 2:53 ` [PATCH ucspi-vsock 0/7] Extract vsockserver-socketbinder and vsockserverd Alyssa Ross
2021-03-19 3:19 ` Alyssa Ross
2021-03-19 2:56 ` [PATCH ucspi-vsock 2/7] vsock: check socket family before reading sockaddr Alyssa Ross
2021-03-19 2:56 ` [PATCH ucspi-vsock 3/7] vsockserver: switch to a non-blocking socket Alyssa Ross
2021-03-19 2:56 ` [PATCH ucspi-vsock 4/7] configure: create, to generate config.h Alyssa Ross
2021-03-19 2:56 ` [PATCH ucspi-vsock 5/7] log: add die function Alyssa Ross
2021-03-19 2:56 ` [PATCH ucspi-vsock 6/7] exec: add execzp() Alyssa Ross
2021-03-19 3:17 ` [PATCH ucspi-vsock 7/7] Extract vsockserver-socketbinder and vsockserverd Alyssa Ross
2021-03-19 3:39 ` Cole Helbling
2021-03-20 20:24 ` Alyssa Ross
2021-03-21 2:52 ` Cole Helbling
2021-03-21 14:33 ` Alyssa Ross
2021-03-21 14:38 ` Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210319025648.17925-1-hi@alyssa.is \
--to=hi@alyssa.is \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).