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

in a ESP_IN_UDP situation make UDP port available in the updown script

Browse Source
This commit is contained in:
Andreas Steffen
2010-07-17 13:27:19 +02:00
parent 34e93c0280
commit ae0e3b03b7
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/updown/updown_listener.c
+23 -1
View File
@@ -115,7 +115,7 @@ METHOD(listener_t, child_updown, bool,
{ {
char command[1024]; char command[1024];
char *my_client, *other_client, *my_client_mask, *other_client_mask; char *my_client, *other_client, *my_client_mask, *other_client_mask;
char *pos, *virtual_ip, *iface, *mark_in, *mark_out; char *pos, *virtual_ip, *iface, *mark_in, *mark_out, *udp_enc;
mark_t mark; mark_t mark;
bool is_host, is_ipv6; bool is_host, is_ipv6;
FILE *shell; FILE *shell;
@@ -197,6 +197,25 @@ METHOD(listener_t, child_updown, bool,
} }
} }
/* check for a NAT condition causing ESP_IN_UDP encapsulation */
if (ike_sa->has_condition(ike_sa, COND_NAT_ANY))
{
if (asprintf(&udp_enc, "PLUTO_UDP_ENC='%u' ",
other->get_port(other)) < 0)
{
udp_enc = NULL;
}
}
else
{
if (asprintf(&udp_enc, "") < 0)
{
udp_enc = NULL;
}
}
if (up) if (up)
{ {
iface = charon->kernel_interface->get_interface( iface = charon->kernel_interface->get_interface(
@@ -244,6 +263,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",
@@ -264,6 +284,7 @@ METHOD(listener_t, child_updown, bool,
virtual_ip, virtual_ip,
mark_in, mark_in,
mark_out, mark_out,
udp_enc,
config->get_hostaccess(config) ? "PLUTO_HOST_ACCESS='1' " : "", config->get_hostaccess(config) ? "PLUTO_HOST_ACCESS='1' " : "",
script); script);
free(my_client); free(my_client);
@@ -271,6 +292,7 @@ METHOD(listener_t, child_updown, bool,
free(virtual_ip); free(virtual_ip);
free(mark_in); free(mark_in);
free(mark_out); free(mark_out);
free(udp_enc);
free(iface); free(iface);
DBG3(DBG_CHD, "running updown script: %s", command); DBG3(DBG_CHD, "running updown script: %s", command);