denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updown: Pass virtual IPs assigned to a peer to the updown script

Browse Source 
Previously only received virtual IPs were available.

References #1008.
This commit is contained in:
Tobias Brunner
2015-08-06 16:30:08 +02:00
parent d04b093374
commit 1de31bcc2b
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/_updown/_updown.in
+9 -1
View File
@@ -71,7 +71,7 @@
# PLUTO_MY_SOURCEIP6_$i # PLUTO_MY_SOURCEIP6_$i
# contains IPv4/IPv6 virtual IP received from a responder, # contains IPv4/IPv6 virtual IP received from a responder,
# $i enumerates from 1 to the number of IP per address family. # $i enumerates from 1 to the number of IP per address family.
# PLUTO_MY_SOURCEIP is a legacy variable and equals to the first # PLUTO_MY_SOURCEIP is a legacy variable and equal to the first
# virtual IP, IPv4 or IPv6. # virtual IP, IPv4 or IPv6.
# #
# PLUTO_MY_PROTOCOL # PLUTO_MY_PROTOCOL
@@ -94,6 +94,14 @@
# the peer's own IP address / max (where max is 32 # the peer's own IP address / max (where max is 32
# for IPv4 and 128 for IPv6). # for IPv4 and 128 for IPv6).
# #
# PLUTO_PEER_SOURCEIP
# PLUTO_PEER_SOURCEIP4_$i
# PLUTO_PEER_SOURCEIP6_$i
# contains IPv4/IPv6 virtual IP sent to an initiator,
# $i enumerates from 1 to the number of IP per address family.
# PLUTO_PEER_SOURCEIP is a legacy variable and equal to the first
# virtual IP, IPv4 or IPv6.
#
# PLUTO_PEER_PROTOCOL # PLUTO_PEER_PROTOCOL
# is the IP protocol that will be transported. # is the IP protocol that will be transported.
# #
src/libcharon/plugins/updown/updown_listener.c
+11 -7
View File
@@ -169,31 +169,34 @@ static void push_dns_env(private_updown_listener_t *this, ike_sa_t *ike_sa,
} }
/** /**
* Push variables for local virtual IPs * Push variables for local/remote virtual IPs
*/ */
static void push_vip_env(private_updown_listener_t *this, ike_sa_t *ike_sa, static void push_vip_env(private_updown_listener_t *this, ike_sa_t *ike_sa,
char *envp[], u_int count) char *envp[], u_int count, bool local)
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
host_t *host; host_t *host;
int v4 = 0, v6 = 0; int v4 = 0, v6 = 0;
bool first = TRUE; bool first = TRUE;
enumerator = ike_sa->create_virtual_ip_enumerator(ike_sa, TRUE); enumerator = ike_sa->create_virtual_ip_enumerator(ike_sa, local);
while (enumerator->enumerate(enumerator, &host)) while (enumerator->enumerate(enumerator, &host))
{ {
if (first) if (first)
{ /* legacy variable for first VIP */ { /* legacy variable for first VIP */
first = FALSE; first = FALSE;
push_env(envp, count, "PLUTO_MY_SOURCEIP=%H", host); push_env(envp, count, "PLUTO_%s_SOURCEIP=%H",
local ? "MY" : "PEER", host);
} }
switch (host->get_family(host)) switch (host->get_family(host))
{ {
case AF_INET: case AF_INET:
push_env(envp, count, "PLUTO_MY_SOURCEIP4_%d=%H", ++v4, host); push_env(envp, count, "PLUTO_%s_SOURCEIP4_%d=%H",
local ? "MY" : "PEER", ++v4, host);
break; break;
case AF_INET6: case AF_INET6:
push_env(envp, count, "PLUTO_MY_SOURCEIP6_%d=%H", ++v6, host); push_env(envp, count, "PLUTO_%s_SOURCEIP6_%d=%H",
local ? "MY" : "PEER", ++v6, host);
break; break;
default: default:
continue; continue;
@@ -313,7 +316,8 @@ static void invoke_once(private_updown_listener_t *this, ike_sa_t *ike_sa,
push_env(envp, countof(envp), "PLUTO_XAUTH_ID=%Y", push_env(envp, countof(envp), "PLUTO_XAUTH_ID=%Y",
ike_sa->get_other_eap_id(ike_sa)); ike_sa->get_other_eap_id(ike_sa));
} }
push_vip_env(this, ike_sa, envp, countof(envp)); push_vip_env(this, ike_sa, envp, countof(envp), TRUE);
push_vip_env(this, ike_sa, envp, countof(envp), FALSE);
mark = config->get_mark(config, TRUE); mark = config->get_mark(config, TRUE);
if (mark.value) if (mark.value)
{ {