diff options
author | Eric Andersen <andersen@codepoet.org> | 2003-10-31 12:31:46 +0300 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2003-10-31 12:31:46 +0300 |
commit | e6dc439b3a3fa2a64f9e938ac4e5810025c04242 (patch) | |
tree | bacb9f48301189de134d9f8edc2f1f45c65086c5 /libbb | |
parent | 8179cf2b78a508a350c7497c1e234376f20f418f (diff) |
Rework wget, the xconnect interface, and its various clients
in order to fix the problems with round robin DNS reported
by Andrew Flegg:
http://busybox.net/lists/busybox/2003-October/009579.html
This removes the ipv6 specific xconnect dns lookups. I do
not see why that would need to be special cased for ipv6 as
was done, but that will just have to be tested.
So IPV6 people -- please test this change!
-Erik
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/safe_write.c | 2 | ||||
-rw-r--r-- | libbb/xconnect.c | 86 |
2 files changed, 38 insertions, 50 deletions
diff --git a/libbb/safe_write.c b/libbb/safe_write.c index dd35f35ae..0ac6c2d96 100644 --- a/libbb/safe_write.c +++ b/libbb/safe_write.c @@ -26,7 +26,7 @@ -ssize_t safe_write(int fd, void *buf, size_t count) +ssize_t safe_write(int fd, const void *buf, size_t count) { ssize_t n; diff --git a/libbb/xconnect.c b/libbb/xconnect.c index 2945d760f..27459791e 100644 --- a/libbb/xconnect.c +++ b/libbb/xconnect.c @@ -11,69 +11,57 @@ #include <stdlib.h> #include <sys/types.h> #include <sys/socket.h> +#include <errno.h> #include <netdb.h> +#include <sys/socket.h> #include <netinet/in.h> +#include <arpa/inet.h> #include "libbb.h" -int xconnect(const char *host, const char *port) +int bb_getport(char *port) { -#ifdef CONFIG_FEATURE_IPV6 - struct addrinfo hints; - struct addrinfo *res; - struct addrinfo *addr_info; - int error; - int s; + int port_nr; + char *endptr; + struct servent *tserv; - memset(&hints, 0, sizeof(hints)); - /* set-up hints structure */ - hints.ai_family = PF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - error = getaddrinfo(host, port, &hints, &res); - if (error||!res) - bb_perror_msg_and_die(gai_strerror(error)); - addr_info=res; - while (res) { - s=socket(res->ai_family, res->ai_socktype, res->ai_protocol); - if (s<0) - { - error=s; - res=res->ai_next; - continue; - } - /* try to connect() to res->ai_addr */ - error = connect(s, res->ai_addr, res->ai_addrlen); - if (error >= 0) - break; - close(s); - res=res->ai_next; + if (!port) { + return -1; } - freeaddrinfo(addr_info); - if (error < 0) + port_nr=strtol(port, &endptr, 10); + if (errno != 0 || *endptr!='\0' || endptr==port || port_nr < 1 || port_nr > 65536) { - bb_perror_msg_and_die("Unable to connect to remote host (%s)", host); + if (port_nr==0 && (tserv = getservbyname(port, "tcp")) != NULL) { + port_nr = tserv->s_port; + } else { + return -1; + } + } else { + port_nr = htons(port_nr); } - return s; -#else - struct sockaddr_in s_addr; - int s = socket(AF_INET, SOCK_STREAM, 0); - struct servent *tserv; - int port_nr=htons(atoi(port)); - struct hostent * he; - - if (port_nr==0 && (tserv = getservbyname(port, "tcp")) != NULL) - port_nr = tserv->s_port; + return port_nr; +} - memset(&s_addr, 0, sizeof(struct sockaddr_in)); - s_addr.sin_family = AF_INET; - s_addr.sin_port = port_nr; +void bb_lookup_host(struct sockaddr_in *s_in, char *host, char *port) +{ + struct hostent *he; + memset(s_in, 0, sizeof(struct sockaddr_in)); + s_in->sin_family = AF_INET; he = xgethostbyname(host); - memcpy(&s_addr.sin_addr, he->h_addr, sizeof s_addr.sin_addr); + memcpy(&(s_in->sin_addr), he->h_addr_list[0], he->h_length); - if (connect(s, (struct sockaddr *)&s_addr, sizeof s_addr) < 0) + if (port) { + s_in->sin_port=bb_getport(port); + } +} + +int xconnect(struct sockaddr_in *s_addr) +{ + int s = socket(AF_INET, SOCK_STREAM, 0); + if (connect(s, (struct sockaddr_in *)s_addr, sizeof(struct sockaddr_in)) < 0) { - bb_perror_msg_and_die("Unable to connect to remote host (%s)", host); + bb_perror_msg_and_die("Unable to connect to remote host (%s)", + inet_ntoa(s_addr->sin_addr)); } return s; -#endif } |