adjust to varnish-cache master changes

Ref fc04ea211f2769cdeb540115ed84ee8908a48cb8

src/node.c

@@ -551,10 +551,10 @@ subreq_fixup(struct node *node, struct req *req)
 	else
 		subreq->wrk = req->wrk;
 
-	if (subreq->topreq != NULL)
-		assert(subreq->topreq == req);
+	if (subreq->top->topreq != NULL)
+		assert(subreq->top->topreq == req);
 	else
-		subreq->topreq = req;
+		subreq->top->topreq = req;
 }
 
 /* ------------------------------------------------------------

src/vdp_pesi.c

@@ -304,7 +304,7 @@ vped_include(struct req *preq, const char *src, const char *host,
 
 	VSLdbg(preq, "vped_include: enter");
 	CHECK_OBJ_NOTNULL(preq, REQ_MAGIC);
-	CHECK_OBJ_NOTNULL(preq->topreq, REQ_MAGIC);
+	CHECK_OBJ_NOTNULL(preq->top, REQTOP_MAGIC);
 	sp = preq->sp;
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(pesi, PESI_MAGIC);
@@ -334,7 +334,7 @@ vped_include(struct req *preq, const char *src, const char *host,
 
 	req->esi_level = preq->esi_level + 1;
 
-	req->topreq = preq->topreq;
+	req->top = preq->top;
 
 	HTTP_Setup(req->http, req->ws, req->vsl, SLT_ReqMethod);
 	HTTP_Dup(req->http, preq->http0);
@@ -369,8 +369,8 @@ vped_include(struct req *preq, const char *src, const char *host,
 	req->req_body_status = REQ_BODY_NONE;
 
 	AZ(req->vcl);
-	if (req->topreq->vcl0)
-		req->vcl = req->topreq->vcl0;
+	if (req->top->vcl0)
+		req->vcl = req->top->vcl0;
 	else
 		req->vcl = preq->vcl;
 	VCL_Ref(req->vcl);