summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorGlenn L McGrath2003-12-20 01:47:18 +0000
committerGlenn L McGrath2003-12-20 01:47:18 +0000
commitffccf6eb5de311a3db8c3d7f7496e2f0cad69a23 (patch)
tree859f5849c30de6cb69bf6336af6d2228402f2395 /libbb
parent03d8091859f45a6bb5e3aadc110b279e789399f2 (diff)
downloadbusybox-ffccf6eb5de311a3db8c3d7f7496e2f0cad69a23.zip
busybox-ffccf6eb5de311a3db8c3d7f7496e2f0cad69a23.tar.gz
Change interface to bb_lookup_host, dont try and set port inside this
function as there is no gracefull way of handling failures. Rename bb_getport to bb_lookup_port, allow a default port to be specified so it always returns a correct value. Modify ftpgetput/rdate/wget to use the new interface. wget/rdate now use etc/services with a falback default value.
Diffstat (limited to 'libbb')
-rw-r--r--libbb/xconnect.c33
1 files changed, 15 insertions, 18 deletions
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 2cbc840..b3619fd 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -18,30 +18,31 @@
#include <arpa/inet.h>
#include "libbb.h"
-int bb_getport(const char *port)
+/* Return network byte ordered port number for a service.
+ * If "port" is a number use it as the port.
+ * 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)
{
- int port_nr;
+ unsigned short port_nr = htons(default_port);
+ if (port) {
char *endptr;
- struct servent *tserv;
+ long port_long = strtol(port, &endptr, 10);
- if (!port) {
- return -1;
- }
- port_nr=strtol(port, &endptr, 10);
- if (errno != 0 || *endptr!='\0' || endptr==port || port_nr < 1 || port_nr > 65536)
- {
- if (port_nr==0 && (tserv = getservbyname(port, "tcp")) != NULL) {
+ if (errno != 0 || *endptr!='\0' || endptr==port || port_long < 0 || port_long > 65535) {
+ struct servent *tserv = getservbyname(port, "tcp");
+ if (tserv) {
port_nr = tserv->s_port;
- } else {
- return -1;
}
} else {
- port_nr = htons(port_nr);
+ port_nr = htons(port_long);
+ }
}
return port_nr;
}
-void bb_lookup_host(struct sockaddr_in *s_in, const char *host, const char *port)
+void bb_lookup_host(struct sockaddr_in *s_in, const char *host)
{
struct hostent *he;
@@ -49,10 +50,6 @@ void bb_lookup_host(struct sockaddr_in *s_in, const char *host, const char *port
s_in->sin_family = AF_INET;
he = xgethostbyname(host);
memcpy(&(s_in->sin_addr), he->h_addr_list[0], he->h_length);
-
- if (port) {
- s_in->sin_port=bb_getport(port);
- }
}
int xconnect(struct sockaddr_in *s_addr)