/[magellan-source]/trunk/mkinitrd-magellan/busybox/libbb/xconnect.c

Diff of /trunk/mkinitrd-magellan/busybox/libbb/xconnect.c

Parent Directory | Revision Log | View Patch Patch

-revision 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 4
   *
   * Connect to host at port using address resolution from getaddrinfo
   *
+  * Licensed under GPLv2, see file LICENSE in this tarball for details.
   */
+ #include <sys/socket.h> /* netinet/in.h needs it */
  #include <netinet/in.h>
  #include <net/if.h>
+ #include <sys/un.h>
  #include "libbb.h"
  void FAST_FUNC setsockopt_reuseaddr(int fd)
-Line 22 
 int FAST_FUNC setsockopt_bindtodevice(in
+Line 25 
 int FAST_FUNC setsockopt_bindtodevice(in
  {
  	int r;
  	struct ifreq ifr;
- 	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+ 	strncpy_IFNAMSIZ(ifr.ifr_name, iface);
- 	/* Actually, ifr_name is at offset 0, and in practice
+ 	/* NB: passing (iface, strlen(iface) + 1) does not work!
+ 	 * (maybe it works on _some_ kernels, but not on 2.6.26)
+ 	 * Actually, ifr_name is at offset 0, and in practice
  	 * just giving char[IFNAMSIZ] instead of struct ifreq works too.
  	 * But just in case it's not true on some obscure arch... */
  	r = setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr));
-Line 32 
 int FAST_FUNC setsockopt_bindtodevice(in
+Line 37 
 int FAST_FUNC setsockopt_bindtodevice(in
  	return r;
  }
+ len_and_sockaddr* FAST_FUNC get_sock_lsa(int fd)
+ {
+ 	len_and_sockaddr lsa;
+ 	len_and_sockaddr *lsa_ptr;
+ 	lsa.len = LSA_SIZEOF_SA;
+ 	if (getsockname(fd, &lsa.u.sa, &lsa.len) != 0)
+ 		return NULL;
+ 	lsa_ptr = xzalloc(LSA_LEN_SIZE + lsa.len);
+ 	if (lsa.len > LSA_SIZEOF_SA) { /* rarely (if ever) happens */
+ 		lsa_ptr->len = lsa.len;
+ 		getsockname(fd, &lsa_ptr->u.sa, &lsa_ptr->len);
+ 	} else {
+ 		memcpy(lsa_ptr, &lsa, LSA_LEN_SIZE + lsa.len);
+ 	}
+ 	return lsa_ptr;
+ }
  void FAST_FUNC xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)
  {
-Line 40 
 void FAST_FUNC xconnect(int s, const str
+Line 63 
 void FAST_FUNC xconnect(int s, const str
  			close(s);
  		if (s_addr->sa_family == AF_INET)
  			bb_perror_msg_and_die("%s (%s)",
- 				"cannot connect to remote host",
+ 				"can't connect to remote host",
  				inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr));
- 		bb_perror_msg_and_die("cannot connect to remote host");
+ 		bb_perror_msg_and_die("can't connect to remote host");
  	}
  }
  /* Return 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
+  * If "port" is a name it is looked up in /etc/services,
-  * default_port */
+  * if it isnt found return default_port
+  */
  unsigned FAST_FUNC bb_lookup_port(const char *port, const char *protocol, unsigned default_port)
  {
  	unsigned port_nr = default_port;
-Line 134 
 void FAST_FUNC set_nport(len_and_sockadd
+Line 158 
 void FAST_FUNC set_nport(len_and_sockadd
   * port: if neither of above specifies port # */
  static len_and_sockaddr* str2sockaddr(
  		const char *host, int port,
- USE_FEATURE_IPV6(sa_family_t af,)
+ IF_FEATURE_IPV6(sa_family_t af,)
  		int ai_flags)
  {
+ IF_NOT_FEATURE_IPV6(sa_family_t af = AF_INET;)
  	int rc;
- 	len_and_sockaddr *r = NULL;
+ 	len_and_sockaddr *r;
  	struct addrinfo *result = NULL;
  	struct addrinfo *used_res;
  	const char *org_host = host; /* only for error msg */
  	const char *cp;
  	struct addrinfo hint;
+ 	if (ENABLE_FEATURE_UNIX_LOCAL && strncmp(host, "local:", 6) == 0) {
+ 		struct sockaddr_un *sun;
+ 		r = xzalloc(LSA_LEN_SIZE + sizeof(struct sockaddr_un));
+ 		r->len = sizeof(struct sockaddr_un);
+ 		r->u.sa.sa_family = AF_UNIX;
+ 		sun = (struct sockaddr_un *)&r->u.sa;
+ 		safe_strncpy(sun->sun_path, host + 6, sizeof(sun->sun_path));
+ 		return r;
+ 	}
+ 	r = NULL;
  	/* Ugly parsing of host:addr */
  	if (ENABLE_FEATURE_IPV6 && host[0] == '[') {
  		/* Even uglier parsing of [xx]:nn */
  		host++;
  		cp = strchr(host, ']');
- 		if (!cp || cp[1] != ':') { /* Malformed: must have [xx]:nn */
+ 		if (!cp || (cp[1] != ':' && cp[1] != '\0')) {
+ 			/* Malformed: must be [xx]:nn or [xx] */
  			bb_error_msg("bad address '%s'", org_host);
  			if (ai_flags & DIE_ON_ERROR)
  				xfunc_die();
-Line 165 
 USE_FEATURE_IPV6(sa_family_t af,)
+Line 204 
 USE_FEATURE_IPV6(sa_family_t af,)
  	}
  	if (cp) { /* points to ":" or "]:" */
  		int sz = cp - host + 1;
  		host = safe_strncpy(alloca(sz), host, sz);
- 		if (ENABLE_FEATURE_IPV6 && *cp != ':')
+ 		if (ENABLE_FEATURE_IPV6 && *cp != ':') {
  			cp++; /* skip ']' */
+ 			if (*cp == '\0') /* [xx] without port */
+ 				goto skip;
+ 		}
  		cp++; /* skip ':' */
  		port = bb_strtou(cp, NULL, 10);
  		if (errno || (unsigned)port > 0xffff) {
-Line 176 
 USE_FEATURE_IPV6(sa_family_t af,)
+Line 219 
 USE_FEATURE_IPV6(sa_family_t af,)
  				xfunc_die();
  			return NULL;
  		}
+  skip: ;
  	}
+ 	/* Next two if blocks allow to skip getaddrinfo()
+ 	 * in case host name is a numeric IP(v6) address.
+ 	 * getaddrinfo() initializes DNS resolution machinery,
+ 	 * scans network config and such - tens of syscalls.
+ 	 */
+ 	/* If we were not asked specifically for IPv6,
+ 	 * check whether this is a numeric IPv4 */
+ 	IF_FEATURE_IPV6(if(af != AF_INET6)) {
+ 		struct in_addr in4;
+ 		if (inet_aton(host, &in4) != 0) {
+ 			r = xzalloc(LSA_LEN_SIZE + sizeof(struct sockaddr_in));
+ 			r->len = sizeof(struct sockaddr_in);
+ 			r->u.sa.sa_family = AF_INET;
+ 			r->u.sin.sin_addr = in4;
+ 			goto set_port;
+ 		}
+ 	}
+ #if ENABLE_FEATURE_IPV6
+ 	/* If we were not asked specifically for IPv4,
+ 	 * check whether this is a numeric IPv6 */
+ 	if (af != AF_INET) {
+ 		struct in6_addr in6;
+ 		if (inet_pton(AF_INET6, host, &in6) > 0) {
+ 			r = xzalloc(LSA_LEN_SIZE + sizeof(struct sockaddr_in6));
+ 			r->len = sizeof(struct sockaddr_in6);
+ 			r->u.sa.sa_family = AF_INET6;
+ 			r->u.sin6.sin6_addr = in6;
+ 			goto set_port;
+ 		}
+ 	}
+ #endif
  	memset(&hint, 0 , sizeof(hint));
- #if !ENABLE_FEATURE_IPV6
- 	hint.ai_family = AF_INET; /* do not try to find IPv6 */
- #else
  	hint.ai_family = af;
- #endif
  	/* Needed. Or else we will get each address thrice (or more)
  	 * for each possible socket type (tcp,udp,raw...): */
  	hint.ai_socktype = SOCK_STREAM;
-Line 207 
 USE_FEATURE_IPV6(sa_family_t af,)
+Line 279 
 USE_FEATURE_IPV6(sa_family_t af,)
  		}
  	}
  #endif
- 	r = xmalloc(offsetof(len_and_sockaddr, u.sa) + used_res->ai_addrlen);
+ 	r = xmalloc(LSA_LEN_SIZE + used_res->ai_addrlen);
  	r->len = used_res->ai_addrlen;
  	memcpy(&r->u.sa, used_res->ai_addr, used_res->ai_addrlen);
+  set_port:
  	set_nport(r, htons(port));
   ret:
  	freeaddrinfo(result);
-Line 247 
 len_and_sockaddr* FAST_FUNC xdotted2sock
+Line 321 
 len_and_sockaddr* FAST_FUNC xdotted2sock
  }
  #undef xsocket_type
- int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, USE_FEATURE_IPV6(int family,) int sock_type)
+ int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, IF_FEATURE_IPV6(int family,) int sock_type)
  {
- 	SKIP_FEATURE_IPV6(enum { family = AF_INET };)
+ 	IF_NOT_FEATURE_IPV6(enum { family = AF_INET };)
  	len_and_sockaddr *lsa;
  	int fd;
  	int len;
-Line 272 
 int FAST_FUNC xsocket_type(len_and_socka
+Line 346 
 int FAST_FUNC xsocket_type(len_and_socka
  		len = sizeof(struct sockaddr_in6);
  	}
  #endif
- 	lsa = xzalloc(offsetof(len_and_sockaddr, u.sa) + len);
+ 	lsa = xzalloc(LSA_LEN_SIZE + len);
  	lsa->len = len;
  	lsa->u.sa.sa_family = family;
  	*lsap = lsa;
-Line 281 
 int FAST_FUNC xsocket_type(len_and_socka
+Line 355 
 int FAST_FUNC xsocket_type(len_and_socka
  int FAST_FUNC xsocket_stream(len_and_sockaddr **lsap)
  {
- 	return xsocket_type(lsap, USE_FEATURE_IPV6(AF_UNSPEC,) SOCK_STREAM);
+ 	return xsocket_type(lsap, IF_FEATURE_IPV6(AF_UNSPEC,) SOCK_STREAM);
  }
  static int create_and_bind_or_die(const char *bindaddr, int port, int sock_type)
-Line 294 
 static int create_and_bind_or_die(const
+Line 368 
 static int create_and_bind_or_die(const
  		/* user specified bind addr dictates family */
  		fd = xsocket(lsa->u.sa.sa_family, sock_type, 0);
  	} else {
- 		fd = xsocket_type(&lsa, USE_FEATURE_IPV6(AF_UNSPEC,) sock_type);
+ 		fd = xsocket_type(&lsa, IF_FEATURE_IPV6(AF_UNSPEC,) sock_type);
  		set_nport(lsa, htons(port));
  	}
  	setsockopt_reuseaddr(fd);
-Line 344 
 static char* FAST_FUNC sockaddr2str(cons
+Line 418 
 static char* FAST_FUNC sockaddr2str(cons
  	int rc;
  	socklen_t salen;
+ 	if (ENABLE_FEATURE_UNIX_LOCAL && sa->sa_family == AF_UNIX) {
+ 		struct sockaddr_un *sun = (struct sockaddr_un *)sa;
+ 		return xasprintf("local:%.*s",
+ 				(int) sizeof(sun->sun_path),
+ 				sun->sun_path);
+ 	}
  	salen = LSA_SIZEOF_SA;
  #if ENABLE_FEATURE_IPV6
  	if (sa->sa_family == AF_INET)

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984