Move another 8 bytes from sess to req

bin/varnishd/cache/cache.h

@@ -617,6 +617,7 @@ struct req {
 	double			t_resp;
 
 	struct http_conn	htc[1];
+	char			*client_identity;
 
 };
 
@@ -646,7 +647,6 @@ struct sess {
 	/* formatted ascii client address */
 	char			addr[ADDR_BUFSIZE];
 	char			port[PORT_BUFSIZE];
-	char			*client_identity;
 
 	VTAILQ_ENTRY(sess)	poollist;
 	struct acct		acct_ses;

bin/varnishd/cache/cache_center.c

@@ -1498,7 +1498,7 @@ cnt_recv(struct sess *sp)
 	sp->req->disable_esi = 0;
 	sp->req->hash_always_miss = 0;
 	sp->req->hash_ignore_busy = 0;
-	sp->client_identity = NULL;
+	sp->req->client_identity = NULL;
 
 	http_CollectHdr(sp->http, H_Cache_Control);
 

bin/varnishd/cache/cache_dir_random.c

@@ -105,8 +105,8 @@ vdi_random_init_seed(const struct vdi_random *vs, const struct sess *sp)
 
 	switch (vs->criteria) {
 	case c_client:
-		if (sp->client_identity != NULL)
-			p = sp->client_identity;
+		if (sp->req->client_identity != NULL)
+			p = sp->req->client_identity;
 		else
 			p = sp->addr;
 		retval = vdi_random_sha(p, strlen(p));

bin/varnishd/cache/cache_vrt_var.c

@@ -209,8 +209,8 @@ const char * __match_proto__()
 VRT_r_client_identity(struct sess *sp)
 {
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	if (sp->client_identity != NULL)
-		return (sp->client_identity);
+	if (sp->req->client_identity != NULL)
+		return (sp->req->client_identity);
 	else
 		return (sp->addr);
 }
@@ -224,7 +224,7 @@ VRT_l_client_identity(struct sess *sp, const char *str, ...)
 	va_start(ap, str);
 	b = VRT_String(sp->http->ws, NULL, str, ap);
 	va_end(ap);
-	sp->client_identity = b;
+	sp->req->client_identity = b;
 }
 
 /*--------------------------------------------------------------------*/