diff options
Diffstat (limited to 'src/pluto/rcv_whack.c')
| -rw-r--r-- | src/pluto/rcv_whack.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/pluto/rcv_whack.c b/src/pluto/rcv_whack.c index c140095f0..0a7b33ab5 100644 --- a/src/pluto/rcv_whack.c +++ b/src/pluto/rcv_whack.c @@ -57,6 +57,7 @@ #include "myid.h" #include "kernel_alg.h" #include "ike_alg.h" +#include "plugin_list.h" #include "whack_attribute.h" /* helper variables and function to decode strings from whack message */ @@ -132,6 +133,8 @@ static void key_add_merge(struct key_add_common *oc, identification_t *keyid) } } +#ifdef ADNS + static void key_add_continue(struct adns_continuation *ac, err_t ugh) { struct key_add_continuation *kc = (void *) ac; @@ -159,6 +162,8 @@ static void key_add_continue(struct adns_continuation *ac, err_t ugh) whack_log_fd = NULL_FD; } +#endif /* ADNS */ + static void key_add_request(const whack_message_t *msg) { identification_t *key_id; @@ -189,9 +194,11 @@ static void key_add_request(const whack_message_t *msg) kc = malloc_thing(struct key_add_continuation); kc->common = oc; kc->lookingfor = kaa; + ugh = NULL; switch (kaa) { +#ifdef ADNS case ka_TXT: ugh = start_adns_query(key_id , key_id /* same */ @@ -199,6 +206,7 @@ static void key_add_request(const whack_message_t *msg) , key_add_continue , &kc->ac); break; +#endif /* ADNS */ #ifdef USE_KEYRR case ka_KEY: ugh = start_adns_query(key_id @@ -282,7 +290,7 @@ void whack_handle(int whackctlfd) { if (msg.magic == WHACK_BASIC_MAGIC) { - /* Only shutdown command. Simpler inter-version compatability. */ + /* Only shutdown command. Simpler inter-version compatibility. */ if (msg.whack_shutdown) { plog("shutting down"); @@ -437,7 +445,9 @@ void whack_handle(int whackctlfd) plog("listening for IKE messages"); listening = TRUE; daily_log_reset(); +#ifdef ADNS reset_adns_restart_count(); +#endif set_myFQDN(); find_ifaces(); load_preshared_secrets(NULL_FD); @@ -548,6 +558,11 @@ void whack_handle(int whackctlfd) kernel_alg_list(); } + if (msg.whack_list & LIST_PLUGINS) + { + plugin_list(); + } + if (msg.whack_key) { /* add a public key */ |