| Message ID | 20240918232633.463861-1-dave@treblig.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | sockets: Remove deadcode | expand |
On Thu, Sep 19, 2024 at 12:26:33AM +0100, dave@treblig.org wrote: > From: "Dr. David Alan Gilbert" <dave@treblig.org> > > socket_remote_address hasn't been used since it was added in > 17c55decec ("sockets: add helpers for creating SocketAddress from a socket") > > inet_connect hasn't been used since 2017's > 8ecc2f9eab ("sheepdog: Use SocketAddress and socket_connect()") Excellent ! The more of sockets.h we can remove the better. > > Remove them. > > Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org> > --- > include/qemu/sockets.h | 16 ---------------- > util/qemu-sockets.c | 35 ----------------------------------- > 2 files changed, 51 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> and queued. With regards, Daniel
* Daniel P. Berrangé (berrange@redhat.com) wrote: > On Thu, Sep 19, 2024 at 12:26:33AM +0100, dave@treblig.org wrote: > > From: "Dr. David Alan Gilbert" <dave@treblig.org> > > > > socket_remote_address hasn't been used since it was added in > > 17c55decec ("sockets: add helpers for creating SocketAddress from a socket") > > > > inet_connect hasn't been used since 2017's > > 8ecc2f9eab ("sheepdog: Use SocketAddress and socket_connect()") > > Excellent ! The more of sockets.h we can remove the better. > > > > > Remove them. > > > > Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org> > > --- > > include/qemu/sockets.h | 16 ---------------- > > util/qemu-sockets.c | 35 ----------------------------------- > > 2 files changed, 51 deletions(-) > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > and queued. Hi Dan, Just checking, I noticed this one and the crypto patch haven't made it to master yet. Dave > > With regards, > Daniel > -- > |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| > |: https://libvirt.org -o- https://fstop138.berrange.com :| > |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| >
On Sat, Oct 19, 2024 at 12:02:01PM +0000, Dr. David Alan Gilbert wrote: > * Daniel P. Berrangé (berrange@redhat.com) wrote: > > On Thu, Sep 19, 2024 at 12:26:33AM +0100, dave@treblig.org wrote: > > > From: "Dr. David Alan Gilbert" <dave@treblig.org> > > > > > > socket_remote_address hasn't been used since it was added in > > > 17c55decec ("sockets: add helpers for creating SocketAddress from a socket") > > > > > > inet_connect hasn't been used since 2017's > > > 8ecc2f9eab ("sheepdog: Use SocketAddress and socket_connect()") > > > > Excellent ! The more of sockets.h we can remove the better. > > > > > > > > Remove them. > > > > > > Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org> > > > --- > > > include/qemu/sockets.h | 16 ---------------- > > > util/qemu-sockets.c | 35 ----------------------------------- > > > 2 files changed, 51 deletions(-) > > > > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > > > > and queued. > > Hi Dan, > Just checking, I noticed this one and the crypto patch haven't made > it to master yet. Yeah, sorry, I still have them in a pending queue. With regards, Daniel
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index d935fd80da..c562690d89 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -61,7 +61,6 @@ int socket_set_fast_reuse(int fd); int inet_ai_family_from_address(InetSocketAddress *addr, Error **errp); int inet_parse(InetSocketAddress *addr, const char *str, Error **errp); -int inet_connect(const char *str, Error **errp); int inet_connect_saddr(InetSocketAddress *saddr, Error **errp); NetworkAddressFamily inet_netfamily(int family); @@ -117,21 +116,6 @@ socket_sockaddr_to_address(struct sockaddr_storage *sa, */ SocketAddress *socket_local_address(int fd, Error **errp); -/** - * socket_remote_address: - * @fd: the socket file handle - * @errp: pointer to uninitialized error object - * - * Get the string representation of the remote socket - * address. A pointer to the allocated address information - * struct will be returned, which the caller is required to - * release with a call qapi_free_SocketAddress() when no - * longer required. - * - * Returns: the socket address struct, or NULL on error - */ -SocketAddress *socket_remote_address(int fd, Error **errp); - /** * socket_address_flatten: * @addr: the socket address to flatten diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 60c44b2b56..c1b162b056 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -707,26 +707,6 @@ int inet_parse(InetSocketAddress *addr, const char *str, Error **errp) } -/** - * Create a blocking socket and connect it to an address. - * - * @str: address string - * @errp: set in case of an error - * - * Returns -1 in case of error, file descriptor on success - **/ -int inet_connect(const char *str, Error **errp) -{ - int sock = -1; - InetSocketAddress *addr = g_new(InetSocketAddress, 1); - - if (!inet_parse(addr, str, errp)) { - sock = inet_connect_saddr(addr, errp); - } - qapi_free_InetSocketAddress(addr); - return sock; -} - #ifdef CONFIG_AF_VSOCK static bool vsock_parse_vaddr_to_sockaddr(const VsockSocketAddress *vaddr, struct sockaddr_vm *svm, @@ -1421,21 +1401,6 @@ SocketAddress *socket_local_address(int fd, Error **errp) } -SocketAddress *socket_remote_address(int fd, Error **errp) -{ - struct sockaddr_storage ss; - socklen_t sslen = sizeof(ss); - - if (getpeername(fd, (struct sockaddr *)&ss, &sslen) < 0) { - error_setg_errno(errp, errno, "%s", - "Unable to query remote socket address"); - return NULL; - } - - return socket_sockaddr_to_address(&ss, sslen, errp); -} - - SocketAddress *socket_address_flatten(SocketAddressLegacy *addr_legacy) { SocketAddress *addr;