/*
* Utility routines.
*
- * Connect to host at port using address resolusion from getaddrinfo
+ * Connect to host at port using address resolution from getaddrinfo
*
*/
* If "port" is a name it is looked up in /etc/services, if it isnt found return
* default_port
*/
-unsigned short bb_lookup_port(const char *port, unsigned short default_port)
+unsigned short bb_lookup_port(const char *port, const char *protocol, unsigned short default_port)
{
unsigned short port_nr = htons(default_port);
if (port) {
- char *endptr;
- long port_long = strtol(port, &endptr, 10);
+ char *endptr;
+ int old_errno;
+ long port_long;
+ /* Since this is a lib function, we're not allowed to reset errno to 0.
+ * Doing so could break an app that is deferring checking of errno. */
+ old_errno = errno;
+ errno = 0;
+ port_long = strtol(port, &endptr, 10);
if (errno != 0 || *endptr!='\0' || endptr==port || port_long < 0 || port_long > 65535) {
- struct servent *tserv = getservbyname(port, "tcp");
+ struct servent *tserv = getservbyname(port, protocol);
if (tserv) {
- port_nr = tserv->s_port;
- }
- } else {
+ port_nr = tserv->s_port;
+ }
+ } else {
port_nr = htons(port_long);
}
+ errno = old_errno;
}
return port_nr;
}
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)",
+ if (ENABLE_FEATURE_CLEAN_UP) close(s);
+ bb_perror_msg_and_die("Unable to connect to remote host (%s)",
inet_ntoa(s_addr->sin_addr));
}
return s;