vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Manage override sessions properly

Browse source
This commit is contained in:
Ed Kellett 2021-04-26 01:26:43 +01:00
parent 64d5cff464
commit 0abb79b706
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
extensions/override.c
View file

@ -73,7 +73,11 @@ update_session_deadline(struct Client *source_p, struct OverrideSession *session
} }
} }
if (session_p == NULL) if (session_p != NULL)
{
rb_dlinkDelete(&session_p->node, &overriding_opers);
}
else
{ {
session_p = rb_malloc(sizeof(struct OverrideSession)); session_p = rb_malloc(sizeof(struct OverrideSession));
session_p->client = source_p; session_p->client = source_p;
@ -81,8 +85,7 @@ update_session_deadline(struct Client *source_p, struct OverrideSession *session
session_p->deadline = rb_current_time() + 1800; session_p->deadline = rb_current_time() + 1800;
rb_dlinkDelete(&session_p->node, &overriding_opers); rb_dlinkAddTail(session_p, &session_p->node, &overriding_opers);
rb_dlinkAdd(session_p, &session_p->node, &overriding_opers);
} }
static void static void
@ -94,9 +97,11 @@ expire_override_deadlines(void *unused)
{ {
struct OverrideSession *session_p = n->data; struct OverrideSession *session_p = n->data;
if (session_p->deadline > rb_current_time()) if (session_p->deadline >= rb_current_time())
{
break; break;
else if (session_p->deadline < rb_current_time()) }
else
{ {
const char *parv[4] = {session_p->client->name, session_p->client->name, "-p", NULL}; const char *parv[4] = {session_p->client->name, session_p->client->name, "-p", NULL};
user_mode(session_p->client, session_p->client, 3, parv); user_mode(session_p->client, session_p->client, 3, parv);