vici: Add option to reauthenticae instead of rekey an IKEv2 SA

diff --git a/src/libcharon/plugins/vici/README.md b/src/libcharon/plugins/vici/README.md
index 2446a07b3a21cfa86d9874a899d9654db7862f1d..5bd8c172721bb2a9c98d1ff43cdc7ac1a96c60f0 100644 (file)
--- a/src/libcharon/plugins/vici/README.md
+++ b/src/libcharon/plugins/vici/README.md
@@ -302,6 +302,7 @@ Initiate the rekeying of an SA.
                ike = <rekey an IKE_SA by configuration name>
                child-id = <rekey a CHILD_SA by its reqid>
                ike-id = <rekey an IKE_SA by its unique id>
+               reauth = <reauthenticate instead of rekey an IKEv2 SA>
        } => {
                success = <yes or no>
                matches = <number of matched SAs>

diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c
index ce19608dc0b954978fd2d055ee1e3e0ed7be8fee..16e49fdbcd4d6c89125e8962f115d20f61738ba6 100644 (file)
--- a/src/libcharon/plugins/vici/vici_control.c
+++ b/src/libcharon/plugins/vici/vici_control.c
@@ -373,11 +373,13 @@ CALLBACK(rekey, vici_message_t*,
        ike_sa_t *ike_sa;
        child_sa_t *child_sa;
        vici_builder_t *builder;
+       bool reauth;
 
        child = request->get_str(request, NULL, "child");
        ike = request->get_str(request, NULL, "ike");
        child_id = request->get_int(request, 0, "child-id");
        ike_id = request->get_int(request, 0, "ike-id");
+       reauth = request->get_bool(request, FALSE, "reauth");
 
        if (!child && !ike && !ike_id && !child_id)
        {
@@ -438,7 +440,7 @@ CALLBACK(rekey, vici_message_t*,
                                 (ike_id && ike_id == ike_sa->get_unique_id(ike_sa)))
                {
                        lib->processor->queue_job(lib->processor,
-                               (job_t*)rekey_ike_sa_job_create(ike_sa->get_id(ike_sa), FALSE));
+                               (job_t*)rekey_ike_sa_job_create(ike_sa->get_id(ike_sa), reauth));
                        found++;
                }
        }