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

vici: Properly handle absence of peer ID on mediation connections

Browse Source 
Fixes #2794.
This commit is contained in:
Tobias Brunner
2018-10-26 11:25:31 +02:00
parent 46bea1add9
commit 6e9cfe9751
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/vici/vici_config.c
+5 -2
View File
@@ -733,7 +733,7 @@ CALLBACK(parse_ts, bool,
if (host_create_from_range(buf, &lower, &upper)) if (host_create_from_range(buf, &lower, &upper))
{ {
type = (lower->get_family(lower) == AF_INET) ? type = (lower->get_family(lower) == AF_INET) ?
TS_IPV4_ADDR_RANGE : TS_IPV6_ADDR_RANGE; TS_IPV4_ADDR_RANGE : TS_IPV6_ADDR_RANGE;
ts = traffic_selector_create_from_bytes(proto, type, ts = traffic_selector_create_from_bytes(proto, type,
lower->get_address(lower), from, lower->get_address(lower), from,
upper->get_address(upper), to); upper->get_address(upper), to);
@@ -2494,7 +2494,10 @@ CALLBACK(config_sn, bool,
if (peer.mediated_by) if (peer.mediated_by)
{ {
cfg.mediated_by = peer.mediated_by; cfg.mediated_by = peer.mediated_by;
cfg.peer_id = peer.peer_id->clone(peer.peer_id); if (peer.peer_id)
{
cfg.peer_id = peer.peer_id->clone(peer.peer_id);
}
} }
#endif /* ME */ #endif /* ME */
peer_cfg = peer_cfg_create(name, ike_cfg, &cfg); peer_cfg = peer_cfg_create(name, ike_cfg, &cfg);