diff options
| author | Martin Willi <martin@revosec.ch> | 2013-07-17 10:01:22 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2013-07-17 17:20:18 +0200 |
| commit | 553bb7873040c3f71247f55e23ec72a4913d2e4d (patch) | |
| tree | a46ff61d39e74bcefb6f7c7f0ecab91547c965fe /src/libcharon/plugins/uci/uci_control.c | |
| parent | 6207fadb6cc0127a8c1fcaba438cf278b6013c4b (diff) | |
| download | strongswan-553bb7873040c3f71247f55e23ec72a4913d2e4d.tar.bz2 strongswan-553bb7873040c3f71247f55e23ec72a4913d2e4d.tar.xz | |
child-sa: replace get_traffic_selectors() with create_ts_enumerator()
Not directly returning a linked list allows us to change the internals of
the CHILD_SA transparently.
Diffstat (limited to 'src/libcharon/plugins/uci/uci_control.c')
| -rw-r--r-- | src/libcharon/plugins/uci/uci_control.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libcharon/plugins/uci/uci_control.c b/src/libcharon/plugins/uci/uci_control.c index 53221b786..cebc389e7 100644 --- a/src/libcharon/plugins/uci/uci_control.c +++ b/src/libcharon/plugins/uci/uci_control.c @@ -72,6 +72,7 @@ static void write_fifo(private_uci_control_t *this, char *format, ...) static void status(private_uci_control_t *this, char *name) { enumerator_t *configs, *sas, *children; + linked_list_t *list; ike_sa_t *ike_sa; child_sa_t *child_sa; peer_cfg_t *peer_cfg; @@ -108,8 +109,10 @@ static void status(private_uci_control_t *this, char *name) children = ike_sa->create_child_sa_enumerator(ike_sa); while (children->enumerate(children, (void**)&child_sa)) { - fprintf(out, "%#R", - child_sa->get_traffic_selectors(child_sa, FALSE)); + list = linked_list_create_from_enumerator( + child_sa->create_ts_enumerator(child_sa, FALSE)); + fprintf(out, "%#R", list); + list->destroy(list); } children->destroy(children); fprintf(out, "\n"); @@ -296,4 +299,3 @@ uci_control_t *uci_control_create() } return &this->public; } - |