48k.eu-mirror
/
ogserver
mirror of https://git.48k.eu/ogserver
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1065 split og_status_session_toggle 

Handles non usual situations like a client sending more than
one event of same type.

When toggling, receiving two events of the same type is the
same as receiving two different ones (eg. start, then stop).

Split into _session_start and _session_stop in order to check
valid client status.
master
Jose M. Guisado 2021-12-02 09:15:23 +01:00
parent 772811e76f
commit ff9dbd9033
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/client.c
View File

@ -24,23 +24,34 @@
#include <jansson.h> #include <jansson.h>
#include <time.h> #include <time.h>
static int og_status_session_toggle(struct og_client *cli) static int og_status_session_start(struct og_client *cli)
{ {
switch (cli->status) { switch (cli->status) {
case OG_CLIENT_STATUS_LINUX: case OG_CLIENT_STATUS_LINUX:
cli->status = OG_CLIENT_STATUS_LINUX_SESSION; cli->status = OG_CLIENT_STATUS_LINUX_SESSION;
break; break;
case OG_CLIENT_STATUS_LINUX_SESSION:
cli->status = OG_CLIENT_STATUS_LINUX;
break;
case OG_CLIENT_STATUS_WIN: case OG_CLIENT_STATUS_WIN:
cli->status = OG_CLIENT_STATUS_WIN_SESSION; cli->status = OG_CLIENT_STATUS_WIN_SESSION;
break; break;
default:
syslog(LOG_ERR, "%s:%d: invalid session start for status %d\n",
__FILE__, __LINE__, cli->status);
return -1;
}
return 0;
}
static int og_status_session_stop(struct og_client *cli)
{
switch (cli->status) {
case OG_CLIENT_STATUS_WIN_SESSION: case OG_CLIENT_STATUS_WIN_SESSION:
cli->status = OG_CLIENT_STATUS_WIN; cli->status = OG_CLIENT_STATUS_WIN;
break; break;
case OG_CLIENT_STATUS_LINUX_SESSION:
cli->status = OG_CLIENT_STATUS_LINUX;
break;
default: default:
syslog(LOG_ERR, "%s:%d: invalid toggle session for status %d\n", syslog(LOG_ERR, "%s:%d: invalid session stop for status %d\n",
__FILE__, __LINE__, cli->status); __FILE__, __LINE__, cli->status);
return -1; return -1;
} }
@ -78,11 +89,13 @@ static int og_resp_early_hints(struct og_client *cli, json_t *data)
if (strncmp(event, "session", strlen("session"))) if (strncmp(event, "session", strlen("session")))
return -1; return -1;
if (strncmp(action, "start", strlen("start")) && if (!strncmp(action, "start", strlen("start")))
strncmp(action, "stop", strlen("stop"))) return og_status_session_start(cli);
return -1; if (!strncmp(action, "stop", strlen("stop")))
return og_status_session_stop(cli);
return og_status_session_toggle(cli); syslog(LOG_ERR, "Invalid action for event %s %s %s\n", event, action, user);
return -1;
} }
static int og_resp_probe(struct og_client *cli, json_t *data) static int og_resp_probe(struct og_client *cli, json_t *data)