remove obsolete child_cfg_t.equal_traffic_selectors() method
This commit is contained in:
@@ -344,35 +344,6 @@ static linked_list_t* get_traffic_selectors(private_child_cfg_t *this, bool loca
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Implementation of child_cfg_t.equal_traffic_selectors.
|
|
||||||
*/
|
|
||||||
bool equal_traffic_selectors(private_child_cfg_t *this, bool local,
|
|
||||||
linked_list_t *ts_list, host_t *host)
|
|
||||||
{
|
|
||||||
linked_list_t *this_list;
|
|
||||||
traffic_selector_t *this_ts, *ts;
|
|
||||||
bool result;
|
|
||||||
|
|
||||||
this_list = (local) ? this->my_ts : this->other_ts;
|
|
||||||
|
|
||||||
/* currently equality is established for single traffic selectors only */
|
|
||||||
if (this_list->get_count(this_list) != 1 || ts_list->get_count(ts_list) != 1)
|
|
||||||
{
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
this_list->get_first(this_list, (void**)&this_ts);
|
|
||||||
this_ts = this_ts->clone(this_ts);
|
|
||||||
this_ts->set_address(this_ts, host);
|
|
||||||
ts_list->get_first(ts_list, (void**)&ts);
|
|
||||||
|
|
||||||
result = ts->equals(ts, this_ts);
|
|
||||||
|
|
||||||
this_ts->destroy(this_ts);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implementation of child_cfg_t.get_updown.
|
* Implementation of child_cfg_t.get_updown.
|
||||||
*/
|
*/
|
||||||
@@ -525,7 +496,6 @@ child_cfg_t *child_cfg_create(char *name, u_int32_t lifetime,
|
|||||||
this->public.get_name = (char* (*) (child_cfg_t*))get_name;
|
this->public.get_name = (char* (*) (child_cfg_t*))get_name;
|
||||||
this->public.add_traffic_selector = (void (*)(child_cfg_t*,bool,traffic_selector_t*))add_traffic_selector;
|
this->public.add_traffic_selector = (void (*)(child_cfg_t*,bool,traffic_selector_t*))add_traffic_selector;
|
||||||
this->public.get_traffic_selectors = (linked_list_t*(*)(child_cfg_t*,bool,linked_list_t*,host_t*))get_traffic_selectors;
|
this->public.get_traffic_selectors = (linked_list_t*(*)(child_cfg_t*,bool,linked_list_t*,host_t*))get_traffic_selectors;
|
||||||
this->public.equal_traffic_selectors = (bool (*)(child_cfg_t*,bool,linked_list_t*,host_t*))equal_traffic_selectors;
|
|
||||||
this->public.add_proposal = (void (*) (child_cfg_t*,proposal_t*))add_proposal;
|
this->public.add_proposal = (void (*) (child_cfg_t*,proposal_t*))add_proposal;
|
||||||
this->public.get_proposals = (linked_list_t* (*) (child_cfg_t*,bool))get_proposals;
|
this->public.get_proposals = (linked_list_t* (*) (child_cfg_t*,bool))get_proposals;
|
||||||
this->public.select_proposal = (proposal_t* (*) (child_cfg_t*,linked_list_t*,bool))select_proposal;
|
this->public.select_proposal = (proposal_t* (*) (child_cfg_t*,linked_list_t*,bool))select_proposal;
|
||||||
|
|||||||
@@ -150,18 +150,6 @@ struct child_cfg_t {
|
|||||||
linked_list_t *(*get_traffic_selectors)(child_cfg_t *this, bool local,
|
linked_list_t *(*get_traffic_selectors)(child_cfg_t *this, bool local,
|
||||||
linked_list_t *supplied,
|
linked_list_t *supplied,
|
||||||
host_t *host);
|
host_t *host);
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks [single] traffic selectors for equality
|
|
||||||
*
|
|
||||||
* @param local TRUE for TS on local side, FALSE for remote
|
|
||||||
* @param ts list with single traffic selector to compare with
|
|
||||||
* @param host address to use for narrowing "dynamic" TS', or NULL
|
|
||||||
* @return TRUE if TS are equal, FALSE otherwise
|
|
||||||
*/
|
|
||||||
bool (*equal_traffic_selectors)(child_cfg_t *this, bool local,
|
|
||||||
linked_list_t *ts_list, host_t *host);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the updown script to run for the CHILD_SA.
|
* Get the updown script to run for the CHILD_SA.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user