From b63e826f5261a5108b8dd52081504c4639202189 Mon Sep 17 00:00:00 2001
From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Fri, 4 Aug 2006 07:20:49 +0000
Subject: [PATCH] Move cli_func_ping to common_cli

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@632 d4fa192b-c00b-0410-8231-f00ffab90ce4
---
 varnish-cache/bin/varnishd/cache_cli.c  | 18 ------------------
 varnish-cache/bin/varnishd/common_cli.c | 14 ++++++++++++++
 varnish-cache/bin/varnishd/common_cli.h |  2 ++
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/varnish-cache/bin/varnishd/cache_cli.c b/varnish-cache/bin/varnishd/cache_cli.c
index e864483c..40f35146 100644
--- a/varnish-cache/bin/varnishd/cache_cli.c
+++ b/varnish-cache/bin/varnishd/cache_cli.c
@@ -21,24 +21,6 @@
 
 /*--------------------------------------------------------------------*/
 
-static void
-cli_func_ping(struct cli *cli, char **av, void *priv)
-{
-	time_t t;
-
-	(void)priv;
-#if 0
-	arm_keepalive();
-#endif
-	if (av[2] != NULL) {
-		/* XXX: check clock skew is pointless here */
-	}
-	t = time(NULL);
-	cli_out(cli, "PONG %ld", t);
-}
-
-/*--------------------------------------------------------------------*/
-
 struct cli_proto CLI_cmds[] = {
 	{ CLI_PING,		cli_func_ping },
 #if 0
diff --git a/varnish-cache/bin/varnishd/common_cli.c b/varnish-cache/bin/varnishd/common_cli.c
index 2ff16d52..71f70c6d 100644
--- a/varnish-cache/bin/varnishd/common_cli.c
+++ b/varnish-cache/bin/varnishd/common_cli.c
@@ -11,6 +11,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <time.h>
 #include <signal.h>
 
 #include <sys/wait.h>
@@ -103,3 +104,16 @@ cli_readres(int fd, unsigned *status, char **ptr)
 		*ptr = p;
 	return (0);
 }
+
+/*--------------------------------------------------------------------*/
+
+void
+cli_func_ping(struct cli *cli, char **av, void *priv)
+{
+	time_t t;
+
+	(void)priv;
+	(void)av;
+	t = time(NULL);
+	cli_out(cli, "PONG %ld", t);
+}
diff --git a/varnish-cache/bin/varnishd/common_cli.h b/varnish-cache/bin/varnishd/common_cli.h
index fedeaaa8..8975c1d2 100644
--- a/varnish-cache/bin/varnishd/common_cli.h
+++ b/varnish-cache/bin/varnishd/common_cli.h
@@ -15,3 +15,5 @@ void cli_resume(struct cli *cli);
 int cli_writeres(int fd, struct cli *cli);
 int cli_readres(int fd, unsigned *status, char **ptr);
 extern struct cli_proto CLI_cmds[];
+
+cli_func_t cli_func_ping;
-- 
2.39.5