X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=net.c;h=c4f0312acd80e810ba619b35bead80bd8578df2a;hb=ac9cc8f21ddeb821134e657f509bb83cec8c1da4;hp=e1951e5e8d87501b1ef9096d3f3df64117e904f0;hpb=8af63afe0ce633fd488f0669614e2d08680f90bc;p=paraslash.git

diff --git a/net.c b/net.c
index e1951e5e..c4f0312a 100644
--- a/net.c
+++ b/net.c
@@ -18,6 +18,13 @@
 #include "list.h"
 #include "fd.h"
 
+/* Whether the given address conforms to the IPv4 address format. */
+static inline bool is_valid_ipv4_address(const char *address)
+{
+	struct in_addr test_it;
+	return inet_pton(AF_INET, address, &test_it) != 0;
+}
+
 /**
  * Parse and validate IPv4 address/netmask string.
  *
@@ -77,6 +84,13 @@ static bool is_v4_dot_quad(const char *address)
 	return result;
 }
 
+/* Whether a string conforms to IPv6 address format (RFC 4291). */
+static inline bool is_valid_ipv6_address(const char *address)
+{
+	struct in6_addr test_it;
+	return inet_pton(AF_INET6, address, &test_it) != 0;
+}
+
 /**
  * Perform basic syntax checking on the host-part of an URL:
  *
@@ -224,6 +238,10 @@ const char *stringify_port(int port, const char *transport)
 	return service;
 }
 
+#ifndef SOCK_DCCP
+#define SOCK_DCCP 6 /**< Linux socket type. */
+#endif
+
 /**
  * Determine the socket type for a given layer-4 protocol.
  *
@@ -273,7 +291,12 @@ struct pre_conn_opt {
 	struct list_head node;		/**< FIFO, as sockopt order matters. */
 };
 
-/** FIFO list of pre-connection socket options to be set */
+/**
+ * List of pre-connection socket options to be set.
+ *
+ * This list contains transport-layer independent encapsulation of socket
+ * options that need to be registered prior to setting up a connection.
+ */
 struct flowopts {
 	struct list_head sockopts;
 };
@@ -286,7 +309,7 @@ struct flowopts {
  */
 struct flowopts *flowopt_new(void)
 {
-	struct flowopts *new = para_malloc(sizeof(*new));
+	struct flowopts *new = alloc(sizeof(*new));
 
 	init_list_head(&new->sockopts);
 	return new;
@@ -307,7 +330,7 @@ struct flowopts *flowopt_new(void)
 void flowopt_add(struct flowopts *fo, int lev, int opt,
 		const char *name, const void *val, int len)
 {
-	struct pre_conn_opt *new = para_malloc(sizeof(*new));
+	struct pre_conn_opt *new = alloc(sizeof(*new));
 
 	new->sock_option = opt;
 	new->sock_level	 = lev;
@@ -317,7 +340,7 @@ void flowopt_add(struct flowopts *fo, int lev, int opt,
 		new->opt_val = NULL;
 		new->opt_len = 0;
 	} else {
-		new->opt_val = para_malloc(len);
+		new->opt_val = alloc(len);
 		new->opt_len = len;
 		memcpy(new->opt_val, val, len);
 	}
@@ -801,25 +824,21 @@ int recv_buffer(int fd, char *buf, size_t size)
  * Wrapper around the accept system call.
  *
  * \param fd The listening socket.
- * \param rfds An optional fd_set pointer.
  * \param addr Structure which is filled in with the address of the peer socket.
  * \param size Should contain the size of the structure pointed to by \a addr.
  * \param new_fd Result pointer.
  *
- * Accept incoming connections on \a addr, retry if interrupted. If \a rfds is
- * not \p NULL, return 0 if \a fd is not set in \a rfds without calling accept().
+ * Accept incoming connections on addr, retry if interrupted.
  *
  * \return Negative on errors, zero if no connections are present to be accepted,
  * one otherwise.
  *
  * \sa accept(2).
  */
-int para_accept(int fd, fd_set *rfds, void *addr, socklen_t size, int *new_fd)
+int para_accept(int fd, void *addr, socklen_t size, int *new_fd)
 {
 	int ret;
 
-	if (rfds && !FD_ISSET(fd, rfds))
-		return 0;
 	do
 		ret = accept(fd, (struct sockaddr *) addr, &size);
 	while (ret < 0 && errno == EINTR);
@@ -833,6 +852,10 @@ int para_accept(int fd, fd_set *rfds, void *addr, socklen_t size, int *new_fd)
 	return -ERRNO_TO_PARA_ERROR(errno);
 }
 
+#ifndef DCCP_SOCKOPT_AVAILABLE_CCIDS
+#define DCCP_SOCKOPT_AVAILABLE_CCIDS 12 /**< List of supported CCIDs. */
+#endif
+
 /**
  * Probe the list of DCCP CCIDs configured on this host.
  * \param ccid_array Pointer to return statically allocated array in.
@@ -865,6 +888,18 @@ int dccp_available_ccids(uint8_t **ccid_array)
 	return nccids;
 }
 
+/**
+ * The buffer size of the sun_path component of struct sockaddr_un.
+ *
+ * While glibc doesn't define UNIX_PATH_MAX, it documents it has being limited
+ * to 108 bytes. On NetBSD it is only 104 bytes though. We trust UNIX_PATH_MAX
+ * if it is defined and use the size of the ->sun_path member otherwise. This
+ * should be safe everywhere.
+ */
+#ifndef UNIX_PATH_MAX
+#define UNIX_PATH_MAX (sizeof(((struct sockaddr_un *)0)->sun_path))
+#endif
+
 /*
  * Prepare a structure for AF_UNIX socket addresses.
  *