[master] 0f80514 Move the beresp.backend.* variables to busyobj

[Poul-Henning Kamp]

commit 0f80514b3485b8aad2bdc25bd7d26444e9b27d1c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Apr 23 08:27:41 2013 +0000

    Move the beresp.backend.* variables to busyobj

diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 8cc2d69..474fe95 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/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 *
diff --git a/lib/libvcl/generate.py b/lib/libvcl/generate.py
index c609b9b..c68d60f 100755
--- a/lib/libvcl/generate.py
+++ b/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',