[master] cbfaf2810 Fix a typo and remove unused endpoint->ident members.

Poul-Henning Kamp phk at FreeBSD.org
Thu Jan 7 13:00:08 UTC 2021


commit cbfaf2810f8645eafb4807b88ec70666a3f26737
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Jan 7 08:21:19 2021 +0000

    Fix a typo and remove unused endpoint->ident members.

diff --git a/bin/varnishd/cache/cache_tcp_pool.c b/bin/varnishd/cache/cache_tcp_pool.c
index c2d60f794..6b1f4228a 100644
--- a/bin/varnishd/cache/cache_tcp_pool.c
+++ b/bin/varnishd/cache/cache_tcp_pool.c
@@ -848,7 +848,7 @@ VTP_panic(struct vsb *vsb, struct tcp_pool *tp)
 		VSB_printf(vsb, "port = %s,\n", p);
 	}
 	if (tp->ip6 && VSA_Sane(tp->ip6)) {
-		VTCP_name(tp->ip4, h, sizeof h, p, sizeof p);
+		VTCP_name(tp->ip6, h, sizeof h, p, sizeof p);
 		VSB_printf(vsb, "ipv6 = %s, ", h);
 		VSB_printf(vsb, "port = %s,\n", p);
 	}
diff --git a/include/vrt.h b/include/vrt.h
index 96bd70df6..fe888060e 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -390,8 +390,6 @@ struct vrt_endpoint {
 	VCL_IP				ipv4;
 	VCL_IP				ipv6;
 	const char			*uds_path;
-	const void			*ident;
-	int				ident_len;
 };
 
 #define VRT_BACKEND_FIELDS(rigid)				\


More information about the varnish-commit mailing list