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

#915 add og_client_state_recv_hdr() 

Move code that handles the receiving header state into function.
master
OpenGnSys Support Team 2019-05-18 14:05:59 +02:00
parent 0d6dc82669
commit d491dfdb2d
1 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
sources/ogAdmServer.cpp
View File

@ -3529,9 +3529,39 @@ static void og_client_reset_state(struct og_client *cli)
cli->buf_len = 0; cli->buf_len = 0;
} }
static void og_client_read_cb(struct ev_loop *loop, struct ev_io *io, int events) static int og_client_state_recv_hdr(struct og_client *cli)
{ {
char hdrlen[LONHEXPRM]; char hdrlen[LONHEXPRM];
/* Still too short to validate protocol fingerprint and message
* length.
*/
if (cli->buf_len < 15 + LONHEXPRM)
return 0;
if (strncmp(cli->buf, "@JMMLCAMDJ_MCDJ", 15)) {
syslog(LOG_ERR, "bad fingerprint from client %s:%hu, closing\n",
inet_ntoa(cli->addr.sin_addr),
ntohs(cli->addr.sin_port));
return -1;
}
memcpy(hdrlen, &cli->buf[LONGITUD_CABECERATRAMA], LONHEXPRM);
cli->msg_len = strtol(hdrlen, NULL, 16);
/* Header announces more that we can fit into buffer. */
if (cli->msg_len >= sizeof(cli->buf)) {
syslog(LOG_ERR, "too large message %u bytes from %s:%hu\n",
cli->msg_len, inet_ntoa(cli->addr.sin_addr),
ntohs(cli->addr.sin_port));
return -1;
}
return 1;
}
static void og_client_read_cb(struct ev_loop *loop, struct ev_io *io, int events)
{
struct og_client *cli; struct og_client *cli;
TRAMA *ptrTrama; TRAMA *ptrTrama;
int ret, len; int ret, len;
@ -3569,30 +3599,12 @@ static void og_client_read_cb(struct ev_loop *loop, struct ev_io *io, int events
switch (cli->state) { switch (cli->state) {
case OG_CLIENT_RECEIVING_HEADER: case OG_CLIENT_RECEIVING_HEADER:
/* Still too short to validate protocol fingerprint and message ret = og_client_state_recv_hdr(cli);
* length. if (ret < 0)
*/ goto close;
if (cli->buf_len < 15 + LONHEXPRM) if (!ret)
return; return;
if (strncmp(cli->buf, "@JMMLCAMDJ_MCDJ", 15)) {
syslog(LOG_ERR, "bad fingerprint from client %s:%hu, closing\n",
inet_ntoa(cli->addr.sin_addr),
ntohs(cli->addr.sin_port));
goto close;
}
memcpy(hdrlen, &cli->buf[LONGITUD_CABECERATRAMA], LONHEXPRM);
cli->msg_len = strtol(hdrlen, NULL, 16);
/* Header announces more that we can fit into buffer. */
if (cli->msg_len >= sizeof(cli->buf)) {
syslog(LOG_ERR, "too large message %u bytes from %s:%hu\n",
cli->msg_len, inet_ntoa(cli->addr.sin_addr),
ntohs(cli->addr.sin_port));
goto close;
}
cli->state = OG_CLIENT_RECEIVING_PAYLOAD; cli->state = OG_CLIENT_RECEIVING_PAYLOAD;
/* Fall through. */ /* Fall through. */
case OG_CLIENT_RECEIVING_PAYLOAD: case OG_CLIENT_RECEIVING_PAYLOAD: