From a57721d14642291696be4ffd5d8bb0915fbe861b Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 8 Jul 2019 16:02:56 -0700 Subject: bind/connect cleanup. Rename the existing xbind/xconnect to xbindany/xconnectany, to make room for new xbind/xconnect that are more like 'x' versions of the regular bind and connect. Move explicit bind/connect callers over to xbind/xconnect. Of the affected commands, only netcat is actually used by Android. It was the most recent patch to netcat that made the lack of a more traditional xbind/xconnect apparent. --- lib/lib.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/lib.h') diff --git a/lib/lib.h b/lib/lib.h index e354a82a..e744977f 100644 --- a/lib/lib.h +++ b/lib/lib.h @@ -348,8 +348,10 @@ int xsocket(int domain, int type, int protocol); void xsetsockopt(int fd, int level, int opt, void *val, socklen_t len); struct addrinfo *xgetaddrinfo(char *host, char *port, int family, int socktype, int protocol, int flags); -int xconnect(struct addrinfo *ai); -int xbind(struct addrinfo *ai); +void xbind(int fd, const struct sockaddr *sa, socklen_t len); +void xconnect(int fd, const struct sockaddr *sa, socklen_t len); +int xconnectany(struct addrinfo *ai); +int xbindany(struct addrinfo *ai); int xpoll(struct pollfd *fds, int nfds, int timeout); int pollinate(int in1, int in2, int out1, int out2, int timeout, int shutdown_timeout); char *ntop(struct sockaddr *sa); -- cgit v1.2.3