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

Pass PLUTO_XAUTH_ID to updown script

Browse Source
This commit is contained in:
Martin Willi
2012-11-16 09:56:05 +01:00
parent d287c14436
commit 5b89e3b061
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/updown/updown_listener.c
+21 -1
View File
@@ -200,7 +200,7 @@ METHOD(listener_t, child_updown, bool,
char command[1024]; char command[1024];
host_t *my_client, *other_client; host_t *my_client, *other_client;
u_int8_t my_client_mask, other_client_mask; u_int8_t my_client_mask, other_client_mask;
char *virtual_ip, *iface, *mark_in, *mark_out, *udp_enc, *dns; char *virtual_ip, *iface, *mark_in, *mark_out, *udp_enc, *dns, *xauth;
mark_t mark; mark_t mark;
bool is_host, is_ipv6; bool is_host, is_ipv6;
FILE *shell; FILE *shell;
@@ -265,6 +265,23 @@ METHOD(listener_t, child_updown, bool,
} }
if (ike_sa->has_condition(ike_sa, COND_EAP_AUTHENTICATED) ||
ike_sa->has_condition(ike_sa, COND_XAUTH_AUTHENTICATED))
{
if (asprintf(&xauth, "PLUTO_XAUTH_ID='%Y' ",
ike_sa->get_other_eap_id(ike_sa)) < 0)
{
xauth = NULL;
}
}
else
{
if (asprintf(&xauth, "") < 0)
{
xauth = NULL;
}
}
if (up) if (up)
{ {
if (hydra->kernel_interface->get_interface(hydra->kernel_interface, if (hydra->kernel_interface->get_interface(hydra->kernel_interface,
@@ -311,6 +328,7 @@ METHOD(listener_t, child_updown, bool,
"%s" "%s"
"%s" "%s"
"%s" "%s"
"%s"
"%s", "%s",
up ? "up" : "down", up ? "up" : "down",
is_host ? "-host" : "-client", is_host ? "-host" : "-client",
@@ -326,6 +344,7 @@ METHOD(listener_t, child_updown, bool,
other_client, other_client_mask, other_client, other_client_mask,
other_ts->get_from_port(other_ts), other_ts->get_from_port(other_ts),
other_ts->get_protocol(other_ts), other_ts->get_protocol(other_ts),
xauth,
virtual_ip, virtual_ip,
mark_in, mark_in,
mark_out, mark_out,
@@ -341,6 +360,7 @@ METHOD(listener_t, child_updown, bool,
free(udp_enc); free(udp_enc);
free(dns); free(dns);
free(iface); free(iface);
free(xauth);
DBG3(DBG_CHD, "running updown script: %s", command); DBG3(DBG_CHD, "running updown script: %s", command);
shell = popen(command, "r"); shell = popen(command, "r");