Implement the label syntax in varnishd -f

Author: dridi

bin/varnishd/mgt/mgt_main.c

@@ -440,7 +440,8 @@ mgt_f_arg(struct f_arg *fa)
 	if (p != NULL) {
 		q = memchr(fa->farg, ',', p - fa->farg);
 		if (q != NULL) {
-			fa->label = strndup(q, p - q);
+			/* Off by one to avoid the comma */
+			fa->label = strndup(q + 1, p - q - 1);
 			AN(fa->label);
 		}
 		else

bin/varnishd/mgt/mgt_vcl.c

@@ -370,11 +370,15 @@ mgt_new_vcl(struct cli *cli, const char *vclname, const char *vclsrc,
 
 /*--------------------------------------------------------------------*/
 
+static void __match_proto__(cli_func_t)
+mcf_vcl_label(struct cli *cli, const char * const *av, void *priv);
+
 int
 mgt_vcl_startup(struct cli *cli, const char *vclsrc, const char *vclname,
     const char *vcllabel, const char *origin, int C_flag)
 {
 	char buf[20];
+	const char *av[5];
 	static int n = 0;
 
 	AN(vclsrc);
@@ -387,8 +391,15 @@ mgt_vcl_startup(struct cli *cli, const char *vclsrc, const char *vclname,
 		return (-1);
 	mgt_new_vcl(cli, vclname, vclsrc, origin, NULL, C_flag);
 	active_vcl = mcf_vcl_byname(vclname);
-	if (active_vcl != NULL && vcllabel != NULL)
-		INCOMPL();
+	if (active_vcl != NULL && vcllabel != NULL) {
+		/* XXX: not sure what goes in av */
+		av[0] = NULL;
+		av[1] = NULL;
+		av[2] = vcllabel;
+		av[3] = vclname;
+		av[4] = NULL;
+		mcf_vcl_label(cli, av, NULL);
+	}
 	return (0);
 }
 

bin/varnishtest/tests/a00009.vtc

@@ -134,3 +134,25 @@ shell -err -expect "Error: Cannot load two VCLs with the same name." {
 	exec varnishd -n ${tmpdir}/v0 -F -a :0 -l2m,3m -f boot=${tmpdir}/ok1 \
 	    -f ${tmpdir}/ok2
 }
+
+# Test an -f option with a VCL name and label
+
+process p5 {
+	exec varnishd -n ${tmpdir}/v0 -F -a :0 -l2m,3m -f ok1,lbl=${tmpdir}/ok1
+} -log -start
+
+delay 1
+shell -match "ok1 .1 label." {varnishadm -n ${tmpdir}/v0 vcl.list}
+shell -match "lbl -> ok1"    {varnishadm -n ${tmpdir}/v0 vcl.list}
+
+process p5 -stop -wait
+
+# Test an -f option with an invalid VCL name or label
+
+shell -err -expect "Illegal character in VCL name ('!')" {
+	exec varnishd -n ${tmpdir}/v0 -F -a :0 -l2m,3m -f !!!,lbl=${tmpdir}/ok1
+}
+
+shell -err -expect "Illegal character in VCL name ('!')" {
+	exec varnishd -n ${tmpdir}/v0 -F -a :0 -l2m,3m -f ok1,!!!=${tmpdir}/ok1
+}