server: pass verbose to event callback

diff --git a/programs/pluto/ddns.c b/programs/pluto/ddns.c
index 121aeb863a408a40bc3d338d8904c1acc7f5155d..319fe4899048b95442bf28219b7d0d2efed1dd1a 100644 (file)
--- a/programs/pluto/ddns.c
+++ b/programs/pluto/ddns.c
@@ -166,14 +166,16 @@ static void connection_check_ddns1(struct connection *c, struct verbose verbose)
        }
 }
 
-static void connection_check_ddns(struct logger *logger)
+static void connection_check_ddns(struct verbose verbose)
 {
+       struct logger *logger = verbose.logger;
+
        threadtime_t start = threadtime_start();
 
        struct connection_filter cf = {
                .search = {
                        .order = NEW2OLD,
-                       .verbose.logger = logger,
+                       .verbose = verbose,
                        .where = HERE,
                },
        };
@@ -194,7 +196,7 @@ void whack_ddns(const struct whack_message *wm UNUSED, struct show *s)
 {
        struct logger *logger = show_logger(s);
        llog(RC_LOG, logger, "updating pending dns lookups");
-       connection_check_ddns(logger);
+       connection_check_ddns(VERBOSE(DEBUG_STREAM, logger, NULL));
 }
 
 void init_ddns(const struct logger *logger)

diff --git a/programs/pluto/hourly.c b/programs/pluto/hourly.c
index 24cc001c8b19965608f362aa1c30c8311d50fb34..f32a767dec1b78ad7ca7f381bbc9a116b8fcff02 100644 (file)
--- a/programs/pluto/hourly.c
+++ b/programs/pluto/hourly.c
@@ -20,7 +20,7 @@
  */
 
 #include "defs.h"
-
+#include "log.h"
 #include "hourly.h"
 #include "timer.h"
 
@@ -28,20 +28,20 @@
 #include "ikev2_cookie.h"      /* for refresh_v2_cookie_secret() */
 #include "ikev2_ike_session_resume.h"
 
-static void refresh_secrets(struct logger *logger)
+static void refresh_secrets(struct verbose verbose)
 {
        /*
         * Generate the secret value for responder cookies, and
         * schedule an event for refresh.
         */
-       refresh_ike_spi_secret(logger);
-       refresh_v2_cookie_secret(logger);
-       refresh_v2_ike_session_resume(logger);
+       refresh_ike_spi_secret(verbose.logger);
+       refresh_v2_cookie_secret(verbose.logger);
+       refresh_v2_ike_session_resume(verbose.logger);
 }
 
 void init_secret_timer(struct logger *logger)
 {
        enable_periodic_timer(EVENT_REINIT_SECRET, refresh_secrets,
                              deltatime(EVENT_REINIT_SECRET_DELAY), logger);
-       refresh_secrets(logger);
+       refresh_secrets(VERBOSE(DEBUG_STREAM, logger, NULL));
 }

diff --git a/programs/pluto/kernel.c b/programs/pluto/kernel.c
index 6cc6594967782741f5b1779513c60f9a6fa3bafb..a279c692dcf6c1f964fe40237345444c660f6cd4 100644 (file)
--- a/programs/pluto/kernel.c
+++ b/programs/pluto/kernel.c
@@ -2387,9 +2387,9 @@ static bool kernel_initialized = false;
 
 static global_timer_cb kernel_scan_shunts;
 
-static void kernel_scan_shunts(struct logger *logger)
+static void kernel_scan_shunts(struct verbose verbose)
 {
-       expire_bare_shunts(VERBOSE(DEBUG_STREAM, logger, NULL));
+       expire_bare_shunts(verbose);
 }
 
 void init_kernel(const struct config_setup *oco, struct logger *logger)

diff --git a/programs/pluto/log_limiter.c b/programs/pluto/log_limiter.c
index dae7a8630d93f0515bfa56f6f1a38362bcedb3c1..a6619c12bb182150775c140822f80a12357f2313 100644 (file)
--- a/programs/pluto/log_limiter.c
+++ b/programs/pluto/log_limiter.c
@@ -22,6 +22,8 @@
 #include "defs.h"
 #include "demux.h"
 
+static global_timer_cb reset_log_limiter;      /* type check */
+
 #define RATE_LIMIT 1000
 
 struct limiter {
@@ -118,15 +120,13 @@ void limited_llog(struct logger *logger, enum log_limiter log_limiter,
        }
 }
 
-static global_timer_cb reset_log_limiter;      /* type check */
-
-static void reset_log_limiter(struct logger *logger)
+static void reset_log_limiter(struct verbose verbose)
 {
        FOR_EACH_ELEMENT(limiter, log_limiters) {
                pthread_mutex_lock(&limiter->mutex);
                {
                        if (limiter->count > log_limit(limiter)) {
-                               llog(RC_LOG, logger, "%s rate limited log reset",
+                               vlog("%s rate limited log reset",
                                     limiter->what);
                        }
                        limiter->count = 0;

diff --git a/programs/pluto/pluto_sd.c b/programs/pluto/pluto_sd.c
index f6bd9ef9b1e26cebce90a9dff070a353ab3f6e2e..7a72f76dac82cffb294ad7763e3a7d2f70ffeab2 100644 (file)
--- a/programs/pluto/pluto_sd.c
+++ b/programs/pluto/pluto_sd.c
@@ -88,7 +88,7 @@ void pluto_sd(int action, int status, struct logger *logger)
        }
 }
 
-void sd_watchdog_event(struct logger *logger)
+void sd_watchdog_event(struct verbose verbose)
 {
-       pluto_sd(PLUTO_SD_WATCHDOG, SD_REPORT_NO_STATUS, logger);
+       pluto_sd(PLUTO_SD_WATCHDOG, SD_REPORT_NO_STATUS, verbose.logger);
 }

diff --git a/programs/pluto/rcv_whack.c b/programs/pluto/rcv_whack.c
index c2d9b96de201513af5a9d6f182e7f8e50469becf..d6e7dd786246f11866bfbb58e2907d331be03346 100644 (file)
--- a/programs/pluto/rcv_whack.c
+++ b/programs/pluto/rcv_whack.c
@@ -99,7 +99,7 @@ static void whack_rereadsecrets(const struct whack_message *wm UNUSED, struct sh
 static void whack_rereadcerts(const struct whack_message *wm UNUSED, struct show *s)
 {
        reread_cert_connections(show_logger(s));
-       free_root_certs(show_logger(s));
+       free_root_certs(VERBOSE(DEBUG_STREAM, show_logger(s), NULL));
 }
 
 static void whack_fetchcrls(const struct whack_message *wm UNUSED, struct show *s)

diff --git a/programs/pluto/root_certs.c b/programs/pluto/root_certs.c
index dd3c2db3b380d9d8e111b5076d552e26a88eb720..fec4da710f7fa24bdd88dfe4b9930c65d099a463 100644 (file)
--- a/programs/pluto/root_certs.c
+++ b/programs/pluto/root_certs.c
@@ -126,8 +126,10 @@ void init_root_certs(const struct logger *logger)
        init_oneshot_timer(EVENT_FREE_ROOT_CERTS, free_root_certs, logger);
 }
 
-void free_root_certs(struct logger *logger)
+void free_root_certs(struct verbose verbose)
 {
+       struct logger *logger = verbose.logger;
+
        passert(in_main_thread());
 
        /*

diff --git a/programs/pluto/root_certs.h b/programs/pluto/root_certs.h
index 114f8f060f3de1cf644a4bf2b399460e915cbe80..53a5f00bcb252176d9ef0268bdc3b611bfbf26d9 100644 (file)
--- a/programs/pluto/root_certs.h
+++ b/programs/pluto/root_certs.h
@@ -19,9 +19,10 @@
 #include "lswnss.h"
 #include "refcnt.h"
 #include "where.h"
+#include "verbose.h"
 
 void init_root_certs(const struct logger *logger);
-void free_root_certs(struct logger *logger);
+void free_root_certs(struct verbose verbose);
 
 struct root_certs {
        refcnt_t refcnt;

diff --git a/programs/pluto/server.c b/programs/pluto/server.c
index 0b3c12754fb4dd387a627aab2fa6682e6e95c6bd..658b78f910e8e58c5cf16b3b0ffa33d3a04c6e2a 100644 (file)
--- a/programs/pluto/server.c
+++ b/programs/pluto/server.c
@@ -254,21 +254,23 @@ static struct global_timer_desc global_timers[] = {
 static void global_timer_event_cb(evutil_socket_t fd UNUSED,
                                  const short event, void *arg)
 {
-       struct logger logger[1] = { global_logger, }; /* event-handler */
-       passert(in_main_thread());
+       struct verbose verbose = VERBOSE(DEBUG_STREAM, &global_logger, NULL); /* event-handler */
+       vassert(in_main_thread());
        struct global_timer_desc *gt = arg;
-       passert(event & EV_TIMEOUT);
-       passert(gt >= global_timers);
-       passert(gt < global_timers + elemsof(global_timers));
-       ldbg(logger, "processing global timer %s", gt->name);
+       vassert(event & EV_TIMEOUT);
+       vassert(gt >= global_timers);
+       vassert(gt < global_timers + elemsof(global_timers));
+       vdbg("processing global timer %s", gt->name);
        threadtime_t start = threadtime_start();
-       gt->cb(logger);
+       gt->cb(verbose);
        threadtime_stop(&start, "global timer %s", gt->name);
 }
 
 void whack_impair_call_global_event_handler(enum global_timer timer,
                                            struct logger *logger)
 {
+       struct verbose verbose = VERBOSE(DEBUG_STREAM, logger, NULL); /* event-handler */
+
        passert(in_main_thread());
        /* timer is hardwired so shouldn't happen */
        passert(timer < elemsof(global_timers));
@@ -283,7 +285,7 @@ void whack_impair_call_global_event_handler(enum global_timer timer,
 
        llog(IMPAIR_STREAM, logger, "injecting timer event %s", gt->name);
        threadtime_t start = threadtime_start();
-       gt->cb(logger);
+       gt->cb(verbose);
        threadtime_stop(&start, "global timer %s", gt->name);
 }
 

diff --git a/programs/pluto/timer.h b/programs/pluto/timer.h
index ed05b7638a8258681ea12c2ca046da82f9b8bbfe..b339840c205fbd4102434dfe33051402c5a4341d 100644 (file)
--- a/programs/pluto/timer.h
+++ b/programs/pluto/timer.h
@@ -23,6 +23,7 @@
 #include "deltatime.h"
 #include "monotime.h"
 #include "where.h"
+#include "verbose.h"
 
 struct state;   /* forward declaration */
 struct fd;
@@ -70,7 +71,7 @@ extern char *revive_conn;
  * is just easier.
  */
 
-typedef void (global_timer_cb)(struct logger *logger);
+typedef void (global_timer_cb)(struct verbose verbose);
 void enable_periodic_timer(enum global_timer type, global_timer_cb *cb,
                           deltatime_t period, const struct logger *logger);
 

diff --git a/programs/pluto/whack_shutdown.c b/programs/pluto/whack_shutdown.c
index aec5c6918e0a41dde9a4f738cabc8619f3709df8..8abf0065abe1fc506805bb1ce9ba4e8ea2348516 100644 (file)
--- a/programs/pluto/whack_shutdown.c
+++ b/programs/pluto/whack_shutdown.c
@@ -185,7 +185,7 @@ void exit_epilogue(struct logger *logger)
 
        free_help_requests(logger);
 
-       free_root_certs(logger);
+       free_root_certs(VERBOSE(DEBUG_STREAM, logger, NULL));
        free_preshared_secrets(logger);
        free_remembered_public_keys();
        /*

diff --git a/programs/pluto/x509_crl.c b/programs/pluto/x509_crl.c
index 66db8c54bcf34a15c6d1f0888ff94ecc0c0dcafb..cd02d7ecdd970ca56182ee31e0cf0e1e58eddaf8 100644 (file)
--- a/programs/pluto/x509_crl.c
+++ b/programs/pluto/x509_crl.c
@@ -436,8 +436,10 @@ stf_status fork_cb(struct state *st UNUSED,
  * when it merges these requests with any still unprocessed requests.
  */
 
-static void event_check_crls(struct logger *logger)
+static void event_check_crls(struct verbose verbose)
 {
+       struct logger *logger = verbose.logger;
+
        /*
         * CERT_GetDefaultCertDB() simply returns the contents of a
         * static variable set by NSS_Initialize().  It doesn't check
@@ -505,7 +507,7 @@ static void event_check_crls(struct logger *logger)
 
 void fetch_x509_crls(struct show *s)
 {
-       event_check_crls(show_logger(s));
+       event_check_crls(VERBOSE(DEBUG_STREAM, show_logger(s), NULL));
 }
 
 /*