update to new VCL_BLOB

Ref: https://github.com/varnishcache/varnish-cache/commit/5450550906d0809dfc21ae9d3a5b14446c1809d4

src/vmod_hoailona.c

@@ -71,7 +71,7 @@ struct vmod_hoailona_hosts {
 
 struct policyitem {
 	VSLIST_ENTRY(policyitem)	list;
-	struct vmod_hoailona_policy    	*policy;
+	struct vmod_hoailona_policy	*policy;
 };
 
 typedef VSLIST_HEAD(policyhead, policyitem) policyhead_t;
@@ -81,9 +81,11 @@ struct policy_task {
 #define VMOD_HOAILONA_POLICY_TASK_MAGIC 0x5fc90249
 	struct host			*host;
 	struct assignment		*assignment;
-	struct vmod_hoailona_policy    	*policy;
+	struct vmod_hoailona_policy	*policy;
 };
 
+#define BLOB_VMOD_HOAILONA_SECRET_TYPE	0xaa50e92c
+
 static inline void
 WS_Contains(struct ws * const restrict ws, const void * const restrict ptr,
             const size_t len)
@@ -136,11 +138,13 @@ VCL_VOID
 vmod_policy__init(VRT_CTX, struct vmod_hoailona_policy **policyp,
 		  const char *vcl_name, struct vmod_priv *init_task,
 		  VCL_ENUM policys, VCL_DURATION ttl, VCL_STRING description,
-		  VCL_BLOB secret, VCL_INT start_offset)
+		  VCL_BLOB secret_in, VCL_INT start_offset)
 {
 	struct vmod_hoailona_policy *policy;
 	policyhead_t *policyhead;
 	struct policyitem *item;
+	struct vrt_blob *secret;
+	unsigned char *spc;
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(ctx->ws, WS_MAGIC);
@@ -197,14 +201,20 @@ vmod_policy__init(VRT_CTX, struct vmod_hoailona_policy **policyp,
 		policy->description = strdup(description);
 	else
 		AZ(policy->description);
-	if (secret != NULL) {
-		policy->secret = malloc(sizeof(*secret));
-		AN(policy->secret);
-		policy->secret->len = secret->len;
-		policy->secret->priv = malloc(secret->len);
-		AN(policy->secret->priv);
-		memcpy(policy->secret->priv, secret->priv, secret->len);
-		policy->secret->free = NULL;
+	if (secret_in != NULL && secret_in->len > 0) {
+		AN(secret_in->blob);
+		spc = malloc(sizeof(*secret) + secret_in->len);
+		AN(spc);
+
+		secret = (void *)spc;
+		spc += sizeof(*secret);
+
+		memcpy(spc, secret_in->blob, secret_in->len);
+		secret->blob = spc;
+		secret->len = secret_in->len;
+		secret->type = BLOB_VMOD_HOAILONA_SECRET_TYPE;
+
+		policy->secret = secret;
 	}
 	else
 		AZ(policy->secret);
@@ -227,9 +237,8 @@ vmod_policy__fini(struct vmod_hoailona_policy **policyp)
 	if (policy->description != NULL)
 		free(policy->description);
 	if (policy->secret != NULL) {
-		AN(policy->secret->priv);
-		free(policy->secret->priv);
-		free(policy->secret);
+		// single allocation including blob
+		free(policy->freeptr);
 	}
 	FREE_OBJ(policy);
 }

src/vmod_hoailona.h

@@ -49,7 +49,10 @@ struct vmod_hoailona_policy {
 #define VMOD_HOAILONA_POLICY_MAGIC 0xf729cbfa
 	char			*vcl_name;
 	char			*description;
-	struct vmod_priv	*secret;
+	union {
+		VCL_BLOB	secret;
+		void		*freeptr;
+	};
 	VCL_DURATION		ttl;
 	enum policy_type	type;
 	VCL_INT			start_offset;