[master] 26d26d3 Rename the acceptor field "name" to "endpoint"

Poul-Henning Kamp phk at FreeBSD.org
Sat Aug 12 23:08:16 CEST 2017


commit 26d26d309f4bf50cb98c9fdd1ad604e05c099174
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Aug 12 13:08:31 2017 +0000

    Rename the acceptor field "name" to "endpoint"

diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 1cb34f1..fc99491 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -358,7 +358,7 @@ vca_make_session(struct worker *wrk, void *arg)
 	VSL(SLT_Begin, sp->vxid, "sess 0 %s",
 	    wa->acceptlsock->transport->name);
 	VSL(SLT_SessOpen, sp->vxid, "%s %s %s %s %s %.6f %d",
-	    raddr, rport, wa->acceptlsock->name, laddr, lport,
+	    raddr, rport, wa->acceptlsock->endpoint, laddr, lport,
 	    sp->t_open, sp->fd);
 
 	WS_Release(wrk->aws, 0);
diff --git a/bin/varnishd/common/heritage.h b/bin/varnishd/common/heritage.h
index 3955690..987b072 100644
--- a/bin/varnishd/common/heritage.h
+++ b/bin/varnishd/common/heritage.h
@@ -38,7 +38,7 @@ struct listen_arg {
 	unsigned			magic;
 #define LISTEN_ARG_MAGIC		0xbb2fc333
 	VTAILQ_ENTRY(listen_arg)	list;
-	const char			*name;
+	const char			*endpoint;
 	VTAILQ_HEAD(,listen_sock)	socks;
 	const struct transport		*transport;
 };
@@ -49,7 +49,7 @@ struct listen_sock {
 	VTAILQ_ENTRY(listen_sock)	list;
 	VTAILQ_ENTRY(listen_sock)	arglist;
 	int				sock;
-	char				*name;
+	char				*endpoint;
 	struct suckaddr			*addr;
 	const struct transport		*transport;
 };
diff --git a/bin/varnishd/mgt/mgt_acceptor.c b/bin/varnishd/mgt/mgt_acceptor.c
index 38be706..83969b4 100644
--- a/bin/varnishd/mgt/mgt_acceptor.c
+++ b/bin/varnishd/mgt/mgt_acceptor.c
@@ -89,11 +89,11 @@ MAC_reopen_sockets(struct cli *cli)
 		if (cli == NULL)
 			MGT_Complain(C_ERR,
 			    "Could not reopen listen socket %s: %s",
-			    ls->name, strerror(fail));
+			    ls->endpoint, strerror(fail));
 		else
 			VCLI_Out(cli,
 			    "Could not reopen listen socket %s: %s\n",
-			    ls->name, strerror(fail));
+			    ls->endpoint, strerror(fail));
 	}
 }
 
@@ -113,26 +113,26 @@ mac_callback(void *priv, const struct suckaddr *sa)
 	VTAILQ_FOREACH(ls, &heritage.socks, list) {
 		if (!VSA_Compare(sa, ls->addr))
 			ARGV_ERR("-a arguments %s and %s have same address\n",
-			    ls->name, la->name);
+			    ls->endpoint, la->endpoint);
 	}
 	ALLOC_OBJ(ls, LISTEN_SOCK_MAGIC);
 	AN(ls);
 	ls->sock = -1;
 	ls->addr = VSA_Clone(sa);
 	AN(ls->addr);
-	ls->name = strdup(la->name);
-	AN(ls->name);
+	ls->endpoint = strdup(la->endpoint);
+	AN(ls->endpoint);
 	ls->transport = la->transport;
 	VJ_master(JAIL_MASTER_PRIVPORT);
 	fail = mac_opensocket(ls);
 	VJ_master(JAIL_MASTER_LOW);
 	if (fail) {
 		free(ls->addr);
-		free(ls->name);
+		free(ls->endpoint);
 		FREE_OBJ(ls);
 		if (fail != EAFNOSUPPORT)
 			ARGV_ERR("Could not get socket %s: %s\n",
-			    la->name, strerror(fail));
+			    la->endpoint, strerror(fail));
 		return(0);
 	}
 	if (VSA_Port(ls->addr) == 0) {
@@ -146,7 +146,7 @@ mac_callback(void *priv, const struct suckaddr *sa)
 		VTCP_myname(ls->sock, abuf, sizeof abuf,
 		    pbuf, sizeof pbuf);
 		bprintf(nbuf, "%s:%s", abuf, pbuf);
-		REPLACE(ls->name, nbuf);
+		REPLACE(ls->endpoint, nbuf);
 	}
 	VTAILQ_INSERT_TAIL(&la->socks, ls, arglist);
 	VTAILQ_INSERT_TAIL(&heritage.socks, ls, list);
@@ -172,7 +172,7 @@ MAC_Arg(const char *arg)
 	AN(la);
 	VTAILQ_INIT(&la->socks);
 	VTAILQ_INSERT_TAIL(&listen_args, la, list);
-	la->name = av[1];
+	la->endpoint = av[1];
 
 	if (av[2] == NULL) {
 		xp = XPORT_Find("http/1");



More information about the varnish-commit mailing list