Rework and simplify listen sockets creation.

2 files changed, 52 insertions, 10 deletions

diff --git a/src/libutil/addr.c b/src/libutil/addr.c
index 3f5dd8e0e..1257fb98f 100644
--- a/src/libutil/addr.c
+++ b/src/libutil/addr.c
@@ -192,6 +192,46 @@ rspamd_inet_address_connect (rspamd_inet_addr_t *addr, gint type,
 	return fd;
 }
 
+int
+rspamd_inet_address_listen (rspamd_inet_addr_t *addr, gint type,
+		gboolean async)
+{
+	gint fd, r;
+	gint on = 1;
+
+	if (addr == NULL) {
+		return -1;
+	}
+
+	fd = rspamd_socket_create (addr->af, type, 0, async);
+	if (fd == -1) {
+		return -1;
+	}
+
+	setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (const void *)&on, sizeof (gint));
+	r = bind (fd, &addr->addr.sa, addr->slen);
+	if (r == -1) {
+		if (!async || errno != EINPROGRESS) {
+			close (fd);
+			msg_warn ("bind failed: %d, '%s'", errno,
+						strerror (errno));
+			return -1;
+		}
+	}
+
+	if (type != SOCK_DGRAM) {
+		r = listen (fd, -1);
+
+		if (r == -1) {
+			msg_warn ("listen failed: %d, '%s'", errno, strerror (errno));
+			close (fd);
+			return -1;
+		}
+	}
+
+	return fd;
+}
+
 gboolean
 rspamd_parse_host_port_priority_strv (gchar **tokens,
 	rspamd_inet_addr_t **addr,
@@ -216,19 +256,12 @@ rspamd_parse_host_port_priority_strv (gchar **tokens,
 
 	cur_tok = tokens[0];
 
-	if (strcmp (cur_tok, "*v6") == 0) {
-		hints.ai_family = AF_INET6;
+	if (strcmp (cur_tok, "*") == 0) {
 		hints.ai_flags |= AI_PASSIVE;
 		cur_tok = NULL;
 	}
-	else if (strcmp (cur_tok, "*v4") == 0) {
-		hints.ai_family = AF_INET;
-		hints.ai_flags |= AI_PASSIVE;
-		cur_tok = NULL;
-	}
-	else {
-		hints.ai_family = AF_UNSPEC;
-	}
+
+	hints.ai_family = AF_UNSPEC;
 
 	if (tokens[1] != NULL) {
 		/* Port part */
diff --git a/src/libutil/addr.h b/src/libutil/addr.h
index 16fe58a8d..c907d80c2 100644
--- a/src/libutil/addr.h
+++ b/src/libutil/addr.h
@@ -81,6 +81,15 @@ int rspamd_inet_address_connect (rspamd_inet_addr_t *addr, gint type,
 	gboolean async);
 
 /**
+ * Listen on a specified inet address
+ * @param addr
+ * @param type
+ * @param async
+ * @return
+ */
+int rspamd_inet_address_listen (rspamd_inet_addr_t *addr, gint type,
+	gboolean async);
+/**
  * Check whether specified ip is valid (not INADDR_ANY or INADDR_NONE) for ipv4 or ipv6
  * @param ptr pointer to struct in_addr or struct in6_addr
  * @param af address family (AF_INET or AF_INET6)