updown: Add a PLUTO_PROTO variable set to 'ah' or 'esp'

diff --git a/src/_updown/_updown.in b/src/_updown/_updown.in
index f582e1a78f0c9523bb255dc6b337830802fdee39..d851b5aed68e7abee7fa7838737beeae94ddd69f 100644 (file)
--- a/src/_updown/_updown.in
+++ b/src/_updown/_updown.in
@@ -45,7 +45,10 @@
 #              is the name of the ipsec interface to be used.
 #
 #       PLUTO_REQID
-#              is the requid of the ESP policy
+#              is the requid of the AH|ESP policy
+#
+#       PLUTO_PROTO
+#              is the negotiated IPsec protocol, ah|esp
 #
 #       PLUTO_UNIQUEID
 #              is the unique identifier of the associated IKE_SA

diff --git a/src/libcharon/plugins/updown/updown_listener.c b/src/libcharon/plugins/updown/updown_listener.c
index 0268c88f3ac15c532916f3450ea56933bc2674ee..3c3994b812f35a9e7cf61bc5a4cb882559509c15 100644 (file)
--- a/src/libcharon/plugins/updown/updown_listener.c
+++ b/src/libcharon/plugins/updown/updown_listener.c
@@ -311,6 +311,7 @@ METHOD(listener_t, child_updown, bool,
                                "PLUTO_CONNECTION='%s' "
                                "PLUTO_INTERFACE='%s' "
                                "PLUTO_REQID='%u' "
+                               "PLUTO_PROTO='%s' "
                                "PLUTO_UNIQUEID='%u' "
                                "PLUTO_ME='%H' "
                                "PLUTO_MY_ID='%Y' "
@@ -336,6 +337,7 @@ METHOD(listener_t, child_updown, bool,
                                 config->get_name(config),
                                 iface ? iface : "unknown",
                                 child_sa->get_reqid(child_sa),
+                                child_sa->get_protocol(child_sa) == PROTO_ESP ? "esp" : "ah",
                                 ike_sa->get_unique_id(ike_sa),
                                 me, ike_sa->get_my_id(ike_sa),
                                 my_client, my_client_mask,