X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=70d3ec0f2d1ad297a8249acb3bd0f1a1a0815eb9;hp=49026db0ec91a7b4a1d3d0917723720eb8d0ba30;hb=7d2c2777c3cc16ef50f580f5ff548d8ad6bb0c9b;hpb=fddf60223e26c1dc1e02b432652c4ca6a237c278

diff --git a/net.c b/net.c
index 49026db0..70d3ec0f 100644
--- a/net.c
+++ b/net.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -142,9 +142,9 @@ static bool host_string_ok(const char *host)
  * \param hostlen The maximum length of \a host.
  * \param port	  To return the port number (if any) of \a url.
  *
- * \return Pointer to \a host, or NULL if failed.
- * If NULL is returned, \a host and \a portnum are undefined. If no
- * port number was present in \a url, \a portnum is set to -1.
+ * \return Pointer to \a host, or \p NULL if failed.  If \p NULL is returned,
+ * \a host and \a port are undefined. If no port number was present in \a url,
+ * \a port is set to -1.
  *
  * \sa RFC 3986, 3.2.2/3.2.3
  */
@@ -168,16 +168,16 @@ char *parse_url(const char *url,
 		if (*o++ != ']' || (*o != '\0' && *o != ':'))
 			goto failed;
 	} else {
-		for (; (*c = *o == ':'? '\0' : *o); c++, o++)
-			if (c == end)
+		for (; (*c = *o == ':'? '\0' : *o); c++, o++) {
+			if (c == end && o[1])
 				goto failed;
+		}
 	}
 
 	if (*o == ':')
 		if (para_atoi32(++o, port) < 0 ||
 		    *port < 0 || *port > 0xffff)
 			goto failed;
-
 	if (host_string_ok(host))
 		return host;
 failed:
@@ -264,6 +264,12 @@ struct flowopts {
 	struct list_head sockopts;
 };
 
+/**
+ * Allocate and initialize a flowopt queue.
+ *
+ * \return A new structure to be passed to \ref flowopt_add(). It is
+ * automatically deallocated in \ref makesock().
+ */
 struct flowopts *flowopt_new(void)
 {
 	struct flowopts *new = para_malloc(sizeof(*new));
@@ -305,14 +311,6 @@ void flowopt_add(struct flowopts *fo, int lev, int opt,
 	list_add_tail(&new->node, &fo->sockopts);
 }
 
-void flowopt_add_bool(struct flowopts *fo, int lev, int opt,
-		const char *optname, bool on_or_off)
-{
-	int on = on_or_off;	/* kernel takes 'int' */
-
-	flowopt_add(fo, lev, opt, optname, &on, sizeof(on));
-}
-
 /** Set the entire bunch of pre-connection options at once. */
 static void flowopt_setopts(int sockfd, struct flowopts *fo)
 {
@@ -379,7 +377,6 @@ int makesock(unsigned l4type, bool passive,
 {
 	struct addrinfo *local = NULL, *src = NULL, *remote = NULL,
 		*dst = NULL, hints;
-	unsigned int	l3type = AF_UNSPEC;
 	int		rc, on = 1, sockfd = -1,
 			socktype = sock_type(l4type);
 	char port[6]; /* port number has at most 5 digits */
@@ -387,7 +384,7 @@ int makesock(unsigned l4type, bool passive,
 	sprintf(port, "%u", port_number);
 	/* Set up address hint structure */
 	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = l3type;
+	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = socktype;
 	/* 
 	 * getaddrinfo does not support SOCK_DCCP, so for the sake of lookup
@@ -398,9 +395,6 @@ int makesock(unsigned l4type, bool passive,
 
 	/* only use addresses available on the host */
 	hints.ai_flags = AI_ADDRCONFIG;
-	if (l3type == AF_INET6)
-		/* use v4-mapped-v6 if no v6 addresses found */
-		hints.ai_flags |= AI_V4MAPPED | AI_ALL;
 
 	if (passive && host == NULL)
 		hints.ai_flags |= AI_PASSIVE;
@@ -674,72 +668,19 @@ char *remote_name(int sockfd)
 
 /**
  * Extract IPv4 or IPv6-mapped-IPv4 address from sockaddr_storage.
- * \param ss Container of IPv4/6 address
- * \return Extracted IPv4 address (different from 0) or 0 if unsuccessful.
  *
- * \sa RFC 3493
+ * \param ss Container of IPv4/6 address.
+ * \param ia Extracted IPv4 address (different from 0) or 0 if unsuccessful.
+ *
+ * \sa RFC 3493.
  */
-struct in_addr extract_v4_addr(const struct sockaddr_storage *ss)
+void extract_v4_addr(const struct sockaddr_storage *ss, struct in_addr *ia)
 {
-	struct in_addr ia = {.s_addr = 0};
 	const struct sockaddr *sa = normalize_ip_address(ss);
 
+	memset(ia, 0, sizeof(*ia));
 	if (sa->sa_family == AF_INET)
-		ia = ((struct sockaddr_in *)sa)->sin_addr;
-	return ia;
-}
-
-/**
- * Send a binary buffer.
- *
- * \param fd The file descriptor.
- * \param buf The buffer to be sent.
- * \param len The length of \a buf.
- *
- * Send out the buffer and try to resend the remaining part in case of short
- * writes.
- *
- * \return Standard.
- */
-int send_bin_buffer(int fd, const char *buf, size_t len)
-{
-	if (!len)
-		PARA_CRIT_LOG("len == 0\n");
-	return write_all(fd, buf, &len);
-}
-
-/**
- * Send a \p NULL-terminated buffer.
- *
- * \param fd The file descriptor.
- * \param buf The null-terminated buffer to be send.
- *
- * This is equivalent to send_bin_buffer(fd, buf, strlen(buf)).
- *
- * \return Standard.
- */
-int send_buffer(int fd, const char *buf)
-{
-	return send_bin_buffer(fd, buf, strlen(buf));
-}
-
-/**
- * Send a buffer given by a format string.
- *
- * \param fd The file descriptor.
- * \param fmt A format string.
- *
- * \return Standard.
- */
-__printf_2_3 int send_va_buffer(int fd, const char *fmt, ...)
-{
-	char *msg;
-	int ret;
-
-	PARA_VSPRINTF(fmt, msg);
-	ret = send_buffer(fd, msg);
-	free(msg);
-	return ret;
+		*ia = ((struct sockaddr_in *)sa)->sin_addr;
 }
 
 /**
@@ -962,7 +903,7 @@ err:
 #ifndef HAVE_UCRED
 ssize_t send_cred_buffer(int sock, char *buf)
 {
-	return send_buffer(sock, buf);
+	return write_buffer(sock, buf);
 }
 int recv_cred_buffer(int fd, char *buf, size_t size)
 {