ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

vici: Return authentication rounds with unique names 

To simplify handling of authentication rounds in dictionaries/hashtables on the
client side, we assign unique names to each authentication round when listing
connection.
This commit is contained in:
Martin Willi 2015-02-27 14:28:47 +01:00
parent d1ad65f7b2
commit 94bb26fae3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcharon/plugins/vici/vici_query.c
View File

@ -508,11 +508,14 @@ static void build_auth_cfgs(peer_cfg_t *peer_cfg, bool local, vici_builder_t *b)
certificate_t *cert;
char *str;
} v;
char buf[32];
int i = 0;
enumerator = peer_cfg->create_auth_cfg_enumerator(peer_cfg, local);
while (enumerator->enumerate(enumerator, &auth))
{
b->begin_section(b, local ? "local" : "remote");
snprintf(buf, sizeof(buf), "%s-%d", local ? "local" : "remote", ++i);
b->begin_section(b, buf);
rules = auth->create_enumerator(auth);
while (rules->enumerate(rules, &rule, &v))

5
src/swanctl/commands/list_conns.c
View File

@ -103,7 +103,7 @@ CALLBACK(conn_sn, int,
{
return vici_parse_cb(res, children_sn, NULL, NULL, NULL);
}
if (streq(name, "local") || streq(name, "remote"))
if (strpfx(name, "local") || strpfx(name, "remote"))
{
hashtable_t *auth;
@ -112,7 +112,8 @@ CALLBACK(conn_sn, int,
if (ret == 0)
{
printf(" %s %s authentication:\n",
name, auth->get(auth, "class") ?: "unspecified");
strpfx(name, "local") ? "local" : "remote",
auth->get(auth, "class") ?: "unspecified");
if (auth->get(auth, "id"))
{
printf(" id: %s\n", auth->get(auth, "id"));