Merge r5086: Add string representation of backend ipv4/ipv6 addresses to compiled VCL.

git-svn-id: http://www.varnish-cache.org/svn/branches/2.1@5310 d4fa192b-c00b-0410-8231-f00ffab90ce4

include/vrt.h

@@ -68,7 +68,10 @@ struct vrt_backend {
 	const char			*hosthdr;
 
 	const unsigned char		*ipv4_sockaddr;
+	const char			*ipv4_addr;
 	const unsigned char		*ipv6_sockaddr;
+	const char			*ipv6_addr;
+	const char			*port;
 
 	double				connect_timeout;
 	double				first_byte_timeout;

lib/libvcl/vcc_backend.c

@@ -90,6 +90,32 @@ CheckHostPort(const char *host, const char *port)
 	return (NULL);
 }
 
+static int
+emit_sockaddr(struct tokenlist *tl, void *sa, unsigned sal)
+{
+	unsigned len;
+	uint8_t *u;
+
+	AN(sa);
+	AN(sal);
+	assert(sal < 256);
+	Fh(tl, 0, "\nstatic const unsigned char sockaddr%u[%d] = {\n",
+	    tl->nsockaddr, sal + 1);
+	Fh(tl, 0, "    %3u, /* Length */\n",  sal);
+	u = sa;
+	for (len = 0; len <sal; len++) {
+		if ((len % 8) == 0)
+			Fh(tl, 0, "   ");
+		Fh(tl, 0, " %3u", u[len]);
+		if (len + 1 < sal)
+			Fh(tl, 0, ",");
+		if ((len % 8) == 7)
+			Fh(tl, 0, "\n");
+	}
+	Fh(tl, 0, "\n};\n");
+	return (tl->nsockaddr++);
+}
+
 /*--------------------------------------------------------------------
  * Struct sockaddr is not really designed to be a compile time
  * initialized data structure, so we encode it as a byte-string
@@ -101,9 +127,8 @@ Emit_Sockaddr(struct tokenlist *tl, const struct token *t_host,
     const char *port)
 {
 	struct addrinfo *res, *res0, *res1, hint;
-	int n4, n6, len, error, retval;
+	int n4, n6, error, retval, x;
 	const char *emit, *multiple;
-	unsigned char *u;
 	char hbuf[NI_MAXHOST];
 
 	AN(t_host->dec);
@@ -115,16 +140,17 @@ Emit_Sockaddr(struct tokenlist *tl, const struct token *t_host,
 	AZ(error);
 	n4 = n6 = 0;
 	multiple = NULL;
+
 	for (res = res0; res; res = res->ai_next) {
 		emit = NULL;
 		if (res->ai_family == PF_INET) {
 			if (n4++ == 0)
-				emit = "ipv4_sockaddr";
+				emit = "ipv4";
 			else
 				multiple = "IPv4";
 		} else if (res->ai_family == PF_INET6) {
 			if (n6++ == 0)
-				emit = "ipv6_sockaddr";
+				emit = "ipv6";
 			else
 				multiple = "IPv6";
 		} else
@@ -149,26 +175,22 @@ Emit_Sockaddr(struct tokenlist *tl, const struct token *t_host,
 			return;
 		}
 		AN(emit);
-		AN(res->ai_addr);
-		AN(res->ai_addrlen);
-		assert(res->ai_addrlen < 256);
-		Fh(tl, 0, "\nstatic const unsigned char sockaddr%u[%d] = {\n",
-		    tl->nsockaddr, res->ai_addrlen + 1);
-		Fh(tl, 0, "    %3u, /* Length */\n",  res->ai_addrlen);
-		u = (void*)res->ai_addr;
-		for (len = 0; len < res->ai_addrlen; len++) {
-			if ((len % 8) == 0)
-				Fh(tl, 0, "   ");
-			Fh(tl, 0, " %3u", u[len]);
-			if (len + 1 < res->ai_addrlen)
-				Fh(tl, 0, ",");
-			if ((len % 8) == 7)
-				Fh(tl, 0, "\n");
-		}
-		Fh(tl, 0, "\n};\n");
-		Fb(tl, 0, "\t.%s = sockaddr%u,\n", emit, tl->nsockaddr++);
+		x = emit_sockaddr(tl, res->ai_addr, res->ai_addrlen);
+		Fb(tl, 0, "\t.%s_sockaddr = sockaddr%u,\n", emit, x);
+		error = getnameinfo(res->ai_addr,
+		    res->ai_addrlen, hbuf, sizeof hbuf,
+		    NULL, 0, NI_NUMERICHOST);
+		AZ(error);
+		Fb(tl, 0, "\t.%s_addr = \"%s\",\n", emit, hbuf);
 		retval++;
 	}
+	if (res0 != NULL) {
+		error = getnameinfo(res0->ai_addr,
+		    res0->ai_addrlen, NULL, 0, hbuf, sizeof hbuf,
+		    NI_NUMERICSERV);
+		AZ(error);
+		Fb(tl, 0, "\t.port = \"%s\",\n", hbuf);
+	}
 	freeaddrinfo(res0);
 	if (retval == 0) {
 		vsb_printf(tl->sb,

lib/libvcl/vcc_fixed_token.c

@@ -246,9 +246,11 @@ vcl_output_lang_h(struct vsb *sb)
 	vsb_cat(sb, "\tconst char\t\t\t*vcl_name;\n\tconst char\t\t\t*ident");
 	vsb_cat(sb, ";\n\n\tconst char\t\t\t*hosthdr;\n");
 	vsb_cat(sb, "\n\tconst unsigned char\t\t*ipv4_sockaddr;\n");
+	vsb_cat(sb, "\tconst char\t\t\t*ipv4_addr;\n");
 	vsb_cat(sb, "\tconst unsigned char\t\t*ipv6_sockaddr;\n");
-	vsb_cat(sb, "\n\tdouble\t\t\t\tconnect_timeout;\n");
-	vsb_cat(sb, "\tdouble\t\t\t\tfirst_byte_timeout;\n");
+	vsb_cat(sb, "\tconst char\t\t\t*ipv6_addr;\n");
+	vsb_cat(sb, "\tconst char\t\t\t*port;\n\n\tdouble\t\t\t\tconnect_ti");
+	vsb_cat(sb, "meout;\n\tdouble\t\t\t\tfirst_byte_timeout;\n");
 	vsb_cat(sb, "\tdouble\t\t\t\tbetween_bytes_timeout;\n");
 	vsb_cat(sb, "\tunsigned\t\t\tmax_connections;\n");
 	vsb_cat(sb, "\tunsigned\t\t\tsaintmode_threshold;\n");