r442 - trunk/varnish-cache/bin/varnishtester

[phk at projects.linpro.no]

Author: phk
Date: 2006-07-11 22:37:43 +0200 (Tue, 11 Jul 2006)
New Revision: 442

Modified:
   trunk/varnish-cache/bin/varnishtester/varnishtester.c
Log:
A vcl keyword for loading a new config


Modified: trunk/varnish-cache/bin/varnishtester/varnishtester.c
===================================================================
--- trunk/varnish-cache/bin/varnishtester/varnishtester.c	2006-07-11 19:29:16 UTC (rev 441)
+++ trunk/varnish-cache/bin/varnishtester/varnishtester.c	2006-07-11 20:37:43 UTC (rev 442)
@@ -194,6 +194,15 @@
 /*--------------------------------------------------------------------*/
 
 static void
+cli_write(const char *s)
+{
+
+	write(pipe1[1], s, strlen(s));
+}
+
+/*--------------------------------------------------------------------*/
+
+static void
 rd_pipe2(struct bufferevent *bev, void *arg)
 {
 	char *p;
@@ -275,7 +284,7 @@
 		fprintf(stderr, "No child running\n");
 		exit (2);
 	}
-	write(pipe1[1], "exit\r", 5);
+	cli_write("exit\n");
 	/* XXX: arm timeout */
 }
 
@@ -289,13 +298,42 @@
 		fprintf(stderr, "No child running\n");
 		exit (2);
 	}
-	write(pipe1[1], av[0], strlen(av[0]));
-	write(pipe1[1], "\n", 1);
+	cli_write(av[0]);
+	cli_write("\n");
 }
 
 /*--------------------------------------------------------------------*/
 
 static void
+cmd_vcl(char **av)
+{
+	char *p, buf[5];
+
+	if (child == 0) {
+		fprintf(stderr, "No child running\n");
+		exit (2);
+	}
+	if (av[0] == NULL || av[1] == NULL) {
+		fprintf(stderr, "usage: vcl $name $vcl\n");
+		exit (2);
+	}
+	cli_write("config.inline ");
+	cli_write(av[0]);
+	cli_write(" \"");
+	for (p = av[1]; *p; p++) {
+		if (*p < ' ' || *p == '"' || *p == '\\' || *p > '~') {
+			sprintf(buf, "\\%03o", *p);
+			cli_write(buf);
+		} else {
+			write(pipe1[1], p, 1);
+		}
+	}
+	cli_write("\"\n");
+}
+
+/*--------------------------------------------------------------------*/
+
+static void
 rd_cmd(struct bufferevent *bev, void *arg)
 {
 	char *p;
@@ -321,6 +359,8 @@
 		cmd_serve(av + 2);
 	else if (!strcmp(av[1], "cli"))
 		cmd_cli(av + 2);
+	else if (!strcmp(av[1], "vcl"))
+		cmd_vcl(av + 2);
 	else {
 		fprintf(stderr, "Unknown command \"%s\"\n", av[1]);
 		exit (2);