iwinfo: add "band" and "mhz" to the scan output

[project/rpcd.git] / session.c

diff --git a/session.c b/session.c
index 347cf4e86d288443d60198d032d671d5bb5990a3..c7d9f3202e6beba81e43ccaff2a7f8e3ba18c3bb 100644 (file)
--- a/session.c
+++ b/session.c
@@ -112,7 +112,7 @@ enum {
 static const struct blobmsg_policy dump_policy[__RPC_DUMP_MAX] = {
        [RPC_DUMP_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING },
        [RPC_DUMP_TIMEOUT] = { .name = "timeout", .type = BLOBMSG_TYPE_INT32 },
-       [RPC_DUMP_EXPIRES] = { .name = "expires", .type = BLOBMSG_TYPE_INT32 },
+       [RPC_DUMP_EXPIRES] = { .name = "expires", .type = BLOBMSG_TYPE_INT64 },
        [RPC_DUMP_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
 };
 
@@ -226,7 +226,7 @@ rpc_session_to_blob(struct rpc_session *ses, bool acls)
 
        blobmsg_add_string(&buf, "ubus_rpc_session", ses->id);
        blobmsg_add_u32(&buf, "timeout", ses->timeout);
-       blobmsg_add_u32(&buf, "expires", uloop_timeout_remaining(&ses->t) / 1000);
+       blobmsg_add_u64(&buf, "expires", uloop_timeout_remaining64(&ses->t) / 1000);
 
        if (acls) {
                c = blobmsg_open_table(&buf, "acls");
@@ -1309,7 +1309,7 @@ rpc_session_from_blob(struct uci_context *uci, struct blob_attr *attr)
 
        avl_insert(&sessions, &ses->avl);
 
-       uloop_timeout_set(&ses->t, blobmsg_get_u32(tb[RPC_DUMP_EXPIRES]) * 1000);
+       uloop_timeout_set(&ses->t, blobmsg_get_u64(tb[RPC_DUMP_EXPIRES]) * 1000);
 
        return true;
 }
@@ -1332,7 +1332,7 @@ int rpc_session_api_init(struct ubus_context *ctx)
        };
 
        static struct ubus_object_type session_type =
-               UBUS_OBJECT_TYPE("luci-rpc-session", session_methods);
+               UBUS_OBJECT_TYPE("rpcd-plugin-session", session_methods);
 
        static struct ubus_object obj = {
                .name = "session",