updown: Add PLUTO_IPCOMP to indicate if IPComp was negotiated

diff --git a/src/_updown/_updown.in b/src/_updown/_updown.in
index c68c23d8a595e2a4dcc38d3b1562db13dac2f86f..36bf64c6a9a78199aa9d603d4a172a4b41ccc3e0 100644 (file)
--- a/src/_updown/_updown.in
+++ b/src/_updown/_updown.in
@@ -50,6 +50,9 @@
 #       PLUTO_PROTO
 #              is the negotiated IPsec protocol, ah|esp
 #
+#       PLUTO_IPCOMP
+#              is not empty if IPComp was negotiated
+#
 #       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 81adfdb136295e511bc0aa095e35539b27d7d8ac..e62309760c58f82d91737ef1460bc2948fc91e69 100644 (file)
--- a/src/libcharon/plugins/updown/updown_listener.c
+++ b/src/libcharon/plugins/updown/updown_listener.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2013 Tobias Brunner
  * Copyright (C) 2008 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
@@ -223,7 +224,7 @@ METHOD(listener_t, child_updown, bool,
                u_int8_t my_client_mask, other_client_mask;
                char *virtual_ip, *iface, *mark_in, *mark_out, *udp_enc, *dns, *xauth;
                mark_t mark;
-               bool is_host, is_ipv6;
+               bool is_host, is_ipv6, use_ipcomp;
                FILE *shell;
 
                my_ts->to_subnet(my_ts, &my_client, &my_client_mask);
@@ -322,6 +323,9 @@ METHOD(listener_t, child_updown, bool,
 
                dns = make_dns_vars(this, ike_sa);
 
+               /* check for IPComp */
+               use_ipcomp = child_sa->get_ipcomp(child_sa) != IPCOMP_NONE;
+
                /* determine IPv4/IPv6 and client/host situation */
                is_host = my_ts->is_host(my_ts, me);
                is_ipv6 = is_host ? (me->get_family(me) == AF_INET6) :
@@ -355,6 +359,7 @@ METHOD(listener_t, child_updown, bool,
                                "%s"
                                "%s"
                                "%s"
+                               "%s"
                                "%s",
                                 up ? "up" : "down",
                                 is_host ? "-host" : "-client",
@@ -377,6 +382,7 @@ METHOD(listener_t, child_updown, bool,
                                 mark_in,
                                 mark_out,
                                 udp_enc,
+                                use_ipcomp ? "PLUTO_IPCOMP='1' " : "",
                                 config->get_hostaccess(config) ? "PLUTO_HOST_ACCESS='1' " : "",
                                 dns,
                                 script);