Move the beresp.backend.* variables to busyobj

bin/varnishd/cache/cache_vrt_var.c

@@ -261,30 +261,30 @@ BEREQ_TIMEOUT(between_bytes_timeout)
 /*--------------------------------------------------------------------*/
 
 const char *
-VRT_r_beresp_backend_name(const struct req *req)
+VRT_r_beresp_backend_name(const struct busyobj *bo)
 {
 
-	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
-	CHECK_OBJ_NOTNULL(req->busyobj->vbc, VBC_MAGIC);
-	return(req->busyobj->vbc->backend->vcl_name);
+	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
+	CHECK_OBJ_NOTNULL(bo->vbc, VBC_MAGIC);
+	return(bo->vbc->backend->vcl_name);
 }
 
 struct sockaddr_storage *
-VRT_r_beresp_backend_ip(const struct req *req)
+VRT_r_beresp_backend_ip(const struct busyobj *bo)
 {
 
-	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
-	CHECK_OBJ_NOTNULL(req->busyobj->vbc, VBC_MAGIC);
-	return(req->busyobj->vbc->addr);
+	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
+	CHECK_OBJ_NOTNULL(bo->vbc, VBC_MAGIC);
+	return(bo->vbc->addr);
 }
 
 long
-VRT_r_beresp_backend_port(const struct req *req)
+VRT_r_beresp_backend_port(const struct busyobj *bo)
 {
 
-	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
-	CHECK_OBJ_NOTNULL(req->busyobj->vbc, VBC_MAGIC);
-	return (VTCP_port(req->busyobj->vbc->addr));
+	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
+	CHECK_OBJ_NOTNULL(bo->vbc, VBC_MAGIC);
+	return (VTCP_port(bo->vbc->addr));
 }
 
 const char *

lib/libvcl/generate.py

@@ -373,19 +373,19 @@ sp_variables = (
 		'STRING',
 		( 'backend_response',),
 		( ),
-		'cR'
+		'cB'
 	),
 	('beresp.backend.ip',
 		'IP',
 		( 'backend_response',),
 		( ),
-		'cR'
+		'cB'
 	),
 	('beresp.backend.port',
 		'INT',
 		( 'backend_response',),
 		( ),
-		'cR'
+		'cB'
 	),
 	('beresp.storage',
 		'STRING',