mirror of
https://gitlab.com/openconnect/ocserv.git
synced 2026-10-12 01:26:48 +08:00
dbus: include no-route information in the user info
This commit is contained in:
+12
-1
@@ -97,7 +97,7 @@ typedef struct {
|
||||
{name, sizeof(name)-1, iface, sizeof(iface)-1, desc, sizeof(desc)-1, func}
|
||||
|
||||
#define LIST_USERS_SIG "(issssssssusssss)"
|
||||
#define LIST_SINGLE_USER_SIG "(issssssssusssssssuuuasasasas)"
|
||||
#define LIST_SINGLE_USER_SIG "(issssssssusssssssuuuasasasasas)"
|
||||
#define LIST_BANNED_SIG "(usu)"
|
||||
|
||||
#define DESC_LIST \
|
||||
@@ -632,6 +632,17 @@ static int append_user_info(main_server_st * s, DBusMessageIter * subs,
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (ctmp->config.no_routes_size > 0) {
|
||||
list = ctmp->config.no_routes;
|
||||
list_size = ctmp->config.no_routes_size;
|
||||
} else {
|
||||
list = s->config->network.no_routes;
|
||||
list_size = s->config->network.no_routes_size;
|
||||
}
|
||||
ret = append_list(subs, list, list_size);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (ctmp->config.iroutes_size > 0) {
|
||||
list = ctmp->config.iroutes;
|
||||
list_size = ctmp->config.iroutes_size;
|
||||
|
||||
@@ -1050,6 +1050,12 @@ int common_info_cmd(DBusMessageIter * args)
|
||||
fprintf(out, "Routes: defaultroute\n");
|
||||
}
|
||||
|
||||
if (!dbus_message_iter_next(&subs))
|
||||
goto error_recv;
|
||||
|
||||
if ((r = print_list_entries(out, "\tNo-routes:", &subs)) < 0)
|
||||
goto error_parse;
|
||||
|
||||
if (!dbus_message_iter_next(&subs))
|
||||
goto error_recv;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user