req: test our new ocstash's capability

Author: nigoroll

bin/varnishtest/tests/b00092.vtc

@@ -2,11 +2,11 @@ varnishtest "Use multiple objects for a single request"
 
 server s0 {
 	rxreq
-	txresp -hdr "method: O1_METHOD"
+	txresp -hdr "method: O1_METHOD" -hdr "bodypart: head,"
 	rxreq
-	txresp -hdr "url: /o2_url"
+	txresp -hdr "url: /o2_url" -hdr "bodypart: arms,"
 	rxreq
-	txresp -hdr "val: 3"
+	txresp -hdr "val: 3" -body "all the rest"
 } -start
 
 
@@ -25,14 +25,17 @@ varnish v1 -vcl+backend {
 		if (req.restarts == 0) {
 			set req.method = resp.http.method;
 			debug.log_strands("resp.http.method", resp.http.method);
+			debug.body_prefix(resp.http.bodypart);
 		} else if (req.restarts == 1) {
 			set req.url = resp.http.url;
 			debug.log_strands("resp.http.url", resp.http.url);
+			debug.body_prefix(resp.http.bodypart);
 		} else {
 			set resp.http.method = req.method;
 			set resp.http.url = req.url;
 			debug.log_strands("req.method", req.method);
 			debug.log_strands("req.url", req.url);
+			set resp.filters = "debug.body_prefix";
 			return (deliver);
 		}
 		return (restart);
@@ -45,4 +48,5 @@ client c1 {
 	expect resp.http.method == O1_METHOD
 	expect resp.http.url == /o2_url
 	expect resp.http.val == 3
+	expect resp.body == "head,arms,all the rest"
 } -run

vmod/vmod_debug.c

@@ -1358,3 +1358,32 @@ xyzzy_log_strands(VRT_CTX, VCL_STRING prefix, VCL_STRANDS subject, VCL_INT nn)
 		    ptr_where(ctx, p), p, n, p, strlen(p) > (unsigned)n ? "..." : "");
 	}
 }
+
+const void * const priv_task_id_bp = &priv_task_id_bp;
+
+VCL_VOID
+xyzzy_body_prefix(VRT_CTX, VCL_STRING s)
+{
+	struct xyzzy_bp_string *bps;
+	struct xyzzy_bp *bp;
+	struct vmod_priv *task;
+
+	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
+
+	task = VRT_priv_task(ctx, priv_task_id_bp);
+	AN(task);
+	bp = task->priv;
+	if (bp == NULL) {
+		bp = WS_Alloc(ctx->ws, (unsigned)sizeof *bp);
+		AN(bp);
+		task->priv = bp;
+		INIT_OBJ(bp, XYZZY_BP_MAGIC);
+		VSTAILQ_INIT(&bp->head);
+	}
+	CHECK_OBJ(bp, XYZZY_BP_MAGIC);
+
+	bps = WS_Alloc(ctx->ws, (unsigned)sizeof *bps);
+	AN(bps);
+	bps->s = s;
+	VSTAILQ_INSERT_TAIL(&bp->head, bps, list);
+}

vmod/vmod_debug.h

@@ -34,6 +34,20 @@ debug_add_filters(VRT_CTX);
 void
 debug_remove_filters(VRT_CTX);
 
+/* body_prefix vdp */
+struct xyzzy_bp_string {
+	VSTAILQ_ENTRY(xyzzy_bp_string)	list;
+	VCL_STRING			s;
+};
+
+struct xyzzy_bp {
+	unsigned			magic;
+#define XYZZY_BP_MAGIC			0x88db5d93
+	VSTAILQ_HEAD(,xyzzy_bp_string)	head;
+};
+
+extern const void * const priv_task_id_bp;
+
 /* vmod_debug_transport_reembarking_http1.c */
 void
 debug_transport_reembarking_http1_use(VRT_CTX);

vmod/vmod_debug.vcc

@@ -466,6 +466,10 @@ Example::
 
 	Debug		c prefix[0]: (ws) 0x7fe69ef80420 abcd...
 
+$Function VOID body_prefix(STRING)
+
+Add this string to the prefix sent by the body_prefix filter
+
 DEPRECATED
 ==========
 

vmod/vmod_debug_filters.c

@@ -667,6 +667,74 @@ static const struct vdp xyzzy_vdp_awshog = {
 	.init  = xyzzy_awshog_init
 };
 
+/**********************************************************************/
+
+static int v_matchproto_(vdp_init_f)
+xyzzy_vdp_body_prefix_init(VRT_CTX, struct vdp_ctx *vdc, void **priv)
+{
+	struct xyzzy_bp_string *bps;
+	struct xyzzy_bp *bp;
+	struct vmod_priv *task;
+	intmax_t l;
+
+	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
+	CHECK_OBJ_NOTNULL(vdc, VDP_CTX_MAGIC);
+	AN(vdc->clen);
+
+	task = VRT_priv_task_get(ctx, priv_task_id_bp);
+	if (task == NULL)
+		return (1);
+	CAST_OBJ_NOTNULL(bp, task->priv, XYZZY_BP_MAGIC);
+	AN(priv);
+	AZ(*priv);
+	*priv = bp;
+
+	if (*vdc->clen < 0)
+		return (0);
+
+	l = 0;
+	VSTAILQ_FOREACH(bps, &bp->head, list)
+		l += strlen(bps->s);
+	*vdc->clen += l;
+
+	return (0);
+}
+
+static int v_matchproto_(vdp_bytes_f)
+xyzzy_vdp_body_prefix_bytes(struct vdp_ctx *vdc, enum vdp_action act, void **priv,
+    const void *ptr, ssize_t len)
+{
+	struct xyzzy_bp_string *bps;
+	struct xyzzy_bp *bp;
+
+	AN(priv);
+	CAST_OBJ_NOTNULL(bp, *priv, XYZZY_BP_MAGIC);
+
+	while ((bps = VSTAILQ_FIRST(&bp->head)) != NULL) {
+		VSTAILQ_REMOVE_HEAD(&bp->head, list);
+		if (VDP_bytes(vdc, VDP_NULL, bps->s, strlen(bps->s)))
+			return (vdc->retval);
+	}
+
+	return (VDP_bytes(vdc, act, ptr, len));
+}
+
+static int v_matchproto_(vdp_fini_f)
+xyzzy_vdp_body_prefix_fini(struct vdp_ctx *vdc, void **priv)
+{
+	(void)vdc;
+	AN(priv);
+	*priv = NULL;
+	return (0);
+}
+
+static const struct vdp xyzzy_vdp_body_prefix = {
+	.name  = "debug.body_prefix",
+	.init  = xyzzy_vdp_body_prefix_init,
+	.bytes = xyzzy_vdp_body_prefix_bytes,
+	.fini = xyzzy_vdp_body_prefix_fini
+};
+
 void
 debug_add_filters(VRT_CTX)
 {
@@ -677,6 +745,7 @@ debug_add_filters(VRT_CTX)
 	AZ(VRT_AddFilter(ctx, NULL, &xyzzy_vdp_chksha256));
 	AZ(VRT_AddFilter(ctx, NULL, &xyzzy_vdp_chkcrc32));
 	AZ(VRT_AddFilter(ctx, NULL, &xyzzy_vdp_awshog));
+	AZ(VRT_AddFilter(ctx, NULL, &xyzzy_vdp_body_prefix));
 }
 
 void
@@ -689,4 +758,5 @@ debug_remove_filters(VRT_CTX)
 	VRT_RemoveFilter(ctx, NULL, &xyzzy_vdp_chksha256);
 	VRT_RemoveFilter(ctx, NULL, &xyzzy_vdp_chkcrc32);
 	VRT_RemoveFilter(ctx, NULL, &xyzzy_vdp_awshog);
+	VRT_RemoveFilter(ctx, NULL, &xyzzy_vdp_body_prefix);
 }