child-cfg: Use separate method to get configured traffic selectors
Optionally with "dynamic" traffic selectors resolved. A new method is added for those cases where we actually want to select potentially narrowed traffic selectors using a supplied list. The latter now also always logs details, while the former does not.
This commit is contained in:
@@ -187,7 +187,7 @@ static bool dynamic_remote_ts(child_cfg_t *child)
|
||||
traffic_selector_t *ts;
|
||||
bool found = FALSE;
|
||||
|
||||
other_ts = child->get_traffic_selectors(child, FALSE, NULL, NULL, FALSE);
|
||||
other_ts = child->get_traffic_selectors(child, FALSE, NULL);
|
||||
enumerator = other_ts->create_enumerator(other_ts);
|
||||
while (enumerator->enumerate(enumerator, &ts))
|
||||
{
|
||||
@@ -215,8 +215,8 @@ static status_t install_trap(child_sa_t *child_sa, linked_list_t *local,
|
||||
|
||||
child = child_sa->get_config(child_sa);
|
||||
|
||||
my_ts = child->get_traffic_selectors(child, TRUE, NULL, local, FALSE);
|
||||
other_ts = child->get_traffic_selectors(child, FALSE, NULL, remote, FALSE);
|
||||
my_ts = child->get_traffic_selectors(child, TRUE, local);
|
||||
other_ts = child->get_traffic_selectors(child, FALSE, remote);
|
||||
|
||||
/* we don't know the finally negotiated protocol (ESP|AH), we install
|
||||
* the SA with the protocol of the first proposal */
|
||||
|
||||
Reference in New Issue
Block a user