Skip to content

Commit 6e9cfe9

Browse files
committed
vici: Properly handle absence of peer ID on mediation connections
Fixes #2794.
1 parent 46bea1a commit 6e9cfe9

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/libcharon/plugins/vici/vici_config.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ CALLBACK(parse_ts, bool,
733733
if (host_create_from_range(buf, &lower, &upper))
734734
{
735735
type = (lower->get_family(lower) == AF_INET) ?
736-
TS_IPV4_ADDR_RANGE : TS_IPV6_ADDR_RANGE;
736+
TS_IPV4_ADDR_RANGE : TS_IPV6_ADDR_RANGE;
737737
ts = traffic_selector_create_from_bytes(proto, type,
738738
lower->get_address(lower), from,
739739
upper->get_address(upper), to);
@@ -2494,7 +2494,10 @@ CALLBACK(config_sn, bool,
24942494
if (peer.mediated_by)
24952495
{
24962496
cfg.mediated_by = peer.mediated_by;
2497-
cfg.peer_id = peer.peer_id->clone(peer.peer_id);
2497+
if (peer.peer_id)
2498+
{
2499+
cfg.peer_id = peer.peer_id->clone(peer.peer_id);
2500+
}
24982501
}
24992502
#endif /* ME */
25002503
peer_cfg = peer_cfg_create(name, ike_cfg, &cfg);

0 commit comments

Comments
 (0)