[master] 7e01e2c Use VTCP_listen_on()

[Poul-Henning Kamp]

commit 7e01e2c00f8d7df937af2721d87eb374e825a3d8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Mar 12 00:30:03 2015 +0000

    Use VTCP_listen_on()

diff --git a/bin/varnishtest/vtc_server.c b/bin/varnishtest/vtc_server.c
index d34bfdb..4088b85 100644
--- a/bin/varnishtest/vtc_server.c
+++ b/bin/varnishtest/vtc_server.c
@@ -156,19 +156,17 @@ server_delete(struct server *s)
 static void
 server_start(struct server *s)
 {
-	int naddr;
+	const char *err;
 
 	CHECK_OBJ_NOTNULL(s, SERVER_MAGIC);
 	vtc_log(s->vl, 2, "Starting server");
 	if (s->sock < 0) {
-		naddr = VSS_resolve(s->listen, "0", &s->vss_addr);
-		if (naddr != 1)
+		s->sock = VTCP_listen_on(s->listen, "0", s->depth, &err);
+		if (err != NULL)
 			vtc_log(s->vl, 0,
-			    "Server s listen address not unique"
-			    " \"%s\" resolves to (%d) sockets",
-			    s->listen, naddr);
-		s->sock = VSS_listen(s->vss_addr[0], s->depth);
-		assert(s->sock >= 0);
+			    "Server s listen address cannot be resolved: %s",
+			    err);
+		assert(s->sock > 0);
 		VTCP_myname(s->sock, s->aaddr, sizeof s->aaddr,
 		    s->aport, sizeof s->aport);
 		macro_def(s->vl, s->name, "addr", "%s", s->aaddr);
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 1cae1d1..13d00e5 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -371,6 +371,7 @@ varnish_launch(struct varnish *v)
 	char abuf[128], pbuf[128];
 	struct pollfd fd[2];
 	enum VCLI_status_e u;
+	const char *err;
 	char *r;
 
 	v->vd = VSM_New();
@@ -378,7 +379,9 @@ varnish_launch(struct varnish *v)
 	/* Create listener socket */
 	nap = VSS_resolve("127.0.0.1", "0", &ap);
 	AN(nap);
-	v->cli_fd = VSS_listen(ap[0], 1);
+	v->cli_fd = VTCP_listen_on("127.0.0.1:0", NULL, 1, &err);
+	if (err != NULL)
+		vtc_log(v->vl, 0, "Create CLI listen socket failed: %s", err);
 	assert(v->cli_fd > 0);
 	VTCP_myname(v->cli_fd, abuf, sizeof abuf, pbuf, sizeof pbuf);