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

fixed firewall script invocation when interface is not available anymore

Browse Source
This commit is contained in:
Martin Willi
2007-07-03 13:49:29 +00:00
parent 959b01aca5
commit 7b8bae9941
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/child_sa.c
+26 -15
View File
@@ -60,7 +60,7 @@ struct sa_policy_t {
typedef struct private_child_sa_t private_child_sa_t; typedef struct private_child_sa_t private_child_sa_t;
/** /**
* Private data of a child_sa_t bject. * Private data of a child_sa_t object.
*/ */
struct private_child_sa_t { struct private_child_sa_t {
/** /**
@@ -156,6 +156,11 @@ struct private_child_sa_t {
* config used to create this child * config used to create this child
*/ */
child_cfg_t *config; child_cfg_t *config;
/**
* cached interface name for iptables
*/
char *iface;
}; };
/** /**
@@ -276,7 +281,6 @@ static void updown(private_child_sa_t *this, bool up)
while (iterator->iterate(iterator, (void**)&policy)) while (iterator->iterate(iterator, (void**)&policy))
{ {
char command[1024]; char command[1024];
char *ifname = NULL;
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; char *pos, *virtual_ip;
FILE *shell; FILE *shell;
@@ -301,18 +305,24 @@ static void updown(private_child_sa_t *this, bool up)
*pos = '\0'; *pos = '\0';
} }
if (this->virtual_ip) if (this->virtual_ip)
{ {
asprintf(&virtual_ip, "PLUTO_MY_SOURCEIP='%H' ", asprintf(&virtual_ip, "PLUTO_MY_SOURCEIP='%H' ",
this->virtual_ip); this->virtual_ip);
} }
else else
{ {
asprintf(&virtual_ip, ""); asprintf(&virtual_ip, "");
} }
ifname = charon->kernel_interface->get_interface(charon->kernel_interface, /* we cache the iface name, as it may not be available when
this->me.addr); * the SA gets deleted */
if (up)
{
free(this->iface);
this->iface = charon->kernel_interface->get_interface(
charon->kernel_interface, this->me.addr);
}
/* build the command with all env variables. /* build the command with all env variables.
* TODO: PLUTO_PEER_CA and PLUTO_NEXT_HOP are currently missing * TODO: PLUTO_PEER_CA and PLUTO_NEXT_HOP are currently missing
@@ -346,7 +356,7 @@ static void updown(private_child_sa_t *this, bool up)
this->me.addr) ? "-host" : "-client", this->me.addr) ? "-host" : "-client",
this->me.addr->get_family(this->me.addr) == AF_INET ? "" : "-ipv6", this->me.addr->get_family(this->me.addr) == AF_INET ? "" : "-ipv6",
this->config->get_name(this->config), this->config->get_name(this->config),
ifname ? ifname : "(unknown)", this->iface ? this->iface : "unknown",
this->reqid, this->reqid,
this->me.addr, this->me.addr,
this->me.id, this->me.id,
@@ -364,7 +374,6 @@ static void updown(private_child_sa_t *this, bool up)
this->config->get_hostaccess(this->config) ? this->config->get_hostaccess(this->config) ?
"PLUTO_HOST_ACCESS='1' " : "", "PLUTO_HOST_ACCESS='1' " : "",
script); script);
free(ifname);
free(my_client); free(my_client);
free(other_client); free(other_client);
free(virtual_ip); free(virtual_ip);
@@ -926,6 +935,7 @@ static void destroy(private_child_sa_t *this)
this->me.id->destroy(this->me.id); this->me.id->destroy(this->me.id);
this->other.id->destroy(this->other.id); this->other.id->destroy(this->other.id);
this->config->destroy(this->config); this->config->destroy(this->config);
free(this->iface);
DESTROY_IF(this->virtual_ip); DESTROY_IF(this->virtual_ip);
free(this); free(this);
} }
@@ -982,6 +992,7 @@ child_sa_t * child_sa_create(host_t *me, host_t* other,
this->protocol = PROTO_NONE; this->protocol = PROTO_NONE;
this->mode = MODE_TUNNEL; this->mode = MODE_TUNNEL;
this->virtual_ip = NULL; this->virtual_ip = NULL;
this->iface = NULL;
this->config = config; this->config = config;
config->get_ref(config); config->get_ref(config);