From 15bf85c910e81bd1eb917db05b3f2703d103e8e8 Mon Sep 17 00:00:00 2001 From: Bjørn Mork Date: Sun, 5 Nov 2017 15:43:13 +0100 Subject: ripe-atlas-fw: imported version 4790 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bjørn Mork --- eperd/eooqd.c | 2 ++ eperd/eperd.c | 2 ++ eperd/httpget.c | 4 ++-- include/cmdtable.h | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/eperd/eooqd.c b/eperd/eooqd.c index 8f94614..db4d835 100644 --- a/eperd/eooqd.c +++ b/eperd/eooqd.c @@ -63,7 +63,9 @@ static struct builtin { "evntp", &ntp_ops }, { "evping", &ping_ops }, { "evtdig", &tdig_ops }, +#if ENABLE_EVSSLGETCERT { "evsslgetcert", &sslgetcert_ops }, +#endif { "evtraceroute", &traceroute_ops }, { NULL, NULL } }; diff --git a/eperd/eperd.c b/eperd/eperd.c index b126cce..6af4f69 100644 --- a/eperd/eperd.c +++ b/eperd/eperd.c @@ -923,7 +923,9 @@ static struct builtin { "evhttpget", &httpget_ops }, { "evntp", &ntp_ops }, { "evping", &ping_ops }, +#if ENABLE_EVSSLGETCERT { "evsslgetcert", &sslgetcert_ops }, +#endif { "evtdig", &tdig_ops }, { "evtraceroute", &traceroute_ops }, { "condmv", &condmv_ops }, diff --git a/eperd/httpget.c b/eperd/httpget.c index a7d6b8a..07a7cc3 100644 --- a/eperd/httpget.c +++ b/eperd/httpget.c @@ -965,8 +965,8 @@ static int get_input(struct hgstate *state) if (state->roffset != 0) add_str2(state, ","); snprintf(line, sizeof(line), - " { " DBQ(o) ":" DBQ(%d) - ", " DBQ(t) ": %f }", state->roffset, t); + " { " DBQ(o) ": %d, " + DBQ(t) ": %f }", state->roffset, t); add_str2(state, line); state->report_roffset= 0; } diff --git a/include/cmdtable.h b/include/cmdtable.h index ee84b3a..4df3b0f 100644 --- a/include/cmdtable.h +++ b/include/cmdtable.h @@ -30,6 +30,8 @@ static struct builtin { "ping", ping_main }, { "sslgetcert", sslgetcert_main }, { "traceroute", traceroute_main }, +#endif +#if ENABLE_OOQD { "wifimsm", wifimsm_main }, #endif { NULL, 0 } -- cgit v1.2.3