diff options
| author | Elliott Hughes <enh@google.com> | 2019-07-08 16:02:56 -0700 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2019-07-11 22:02:12 -0500 |
| commit | a57721d14642291696be4ffd5d8bb0915fbe861b (patch) | |
| tree | 11a18894601df31ce1eb9c46c5d1faaa59e2f9e8 /toys/pending/host.c | |
| parent | 34f095fcbf0829719f9a130a359ebf2a3e223ca0 (diff) | |
| download | toybox-a57721d14642291696be4ffd5d8bb0915fbe861b.tar.gz | |
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.
Diffstat (limited to 'toys/pending/host.c')
| -rw-r--r-- | toys/pending/host.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/toys/pending/host.c b/toys/pending/host.c index fa830a7d..fe0f23aa 100644 --- a/toys/pending/host.c +++ b/toys/pending/host.c @@ -121,9 +121,8 @@ void host_main(void) if ((ret = getaddrinfo(nsname, "53", &ns_hints, &ai)) < 0) error_exit("Error looking up server name: %s", gai_strerror(ret)); - int s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); - if (s < 0 || connect(s, ai->ai_addr, ai->ai_addrlen) < 0) - perror_exit("Socket error"); + int s = xsocket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); + xconnect(s, ai->ai_addr, ai->ai_addrlen); setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &(struct timeval){ .tv_sec = 5 }, sizeof(struct timeval)); printf("Using domain server %s:\n", nsname); |