[master] ce4894b Use the VTCP version of the text format buffer sizes.

[Poul-Henning Kamp]

commit ce4894b1d2b143fe46f9c81aeb512233891a565f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Mar 11 22:02:31 2015 +0000

    Use the VTCP version of the text format buffer sizes.

diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 940d0c0..b374dce 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -156,8 +156,8 @@ ses_vsl_socket(struct sess *sp, const char *lsockname)
 {
 	struct sockaddr_storage ss;
 	socklen_t sl;
-	char laddr[ADDR_BUFSIZE];
-	char lport[PORT_BUFSIZE];
+	char laddr[VTCP_ADDRBUFSIZE];
+	char lport[VTCP_PORTBUFSIZE];
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	AN(lsockname);
diff --git a/bin/varnishd/common/common.h b/bin/varnishd/common/common.h
index de8d60c..6a3e67f 100644
--- a/bin/varnishd/common/common.h
+++ b/bin/varnishd/common/common.h
@@ -76,16 +76,6 @@ struct cli;
  */
 #define __state_variable__(xxx)		/*lint -esym(838,xxx) */
 
-/**********************************************************************
- * NI_MAXHOST and less so NI_MAXSERV, are ridiculously large for numeric
- * representations of TCP/IP socket addresses, so we use our own.
- * <netinet/in6.h>::INET6_ADDRSTRLEN is 46
- */
-
-#define ADDR_BUFSIZE	48
-#define PORT_BUFSIZE	8
-
-
 /**********************************************************************/
 
 /* Name of transient storage */