DGNum/rpcd
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

session: use uloop_timeout_remaining64

Browse source 
The uloop_timeout_remaining is being deprecated.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Acked-by: John Crispin <john@phrozen.org>
This commit is contained in:
Stijn Tintel 2021-11-04 13:00:05 +02:00
parent 1fa35765dd
commit 20bf958bea
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
session.c
View file

@ -112,7 +112,7 @@ enum {
static const struct blobmsg_policy dump_policy[__RPC_DUMP_MAX] = { static const struct blobmsg_policy dump_policy[__RPC_DUMP_MAX] = {
[RPC_DUMP_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING }, [RPC_DUMP_SID] = { .name = "ubus_rpc_session", .type = BLOBMSG_TYPE_STRING },
[RPC_DUMP_TIMEOUT] = { .name = "timeout", .type = BLOBMSG_TYPE_INT32 }, [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 }, [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_string(&buf, "ubus_rpc_session", ses->id);
blobmsg_add_u32(&buf, "timeout", ses->timeout); 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) { if (acls) {
c = blobmsg_open_table(&buf, "acls"); c = blobmsg_open_table(&buf, "acls");