9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

packet.c fixed

Browse source
This commit is contained in:
Valery Yatsko 2008-04-02 21:23:29 +04:00
parent e967e868c4
commit d91ce397ba
1 changed files with 62 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
src/packet.c
View file

@ -228,7 +228,7 @@ flood_recalc(void *unused)
* read_packet - Read a 'packet' of data from a connection and process it. * read_packet - Read a 'packet' of data from a connection and process it.
*/ */
void void
read_packet(int fd, void *data) read_packet(rb_fde_t * F, void *data)
{ {
struct Client *client_p = data; struct Client *client_p = data;
struct LocalUser *lclient_p = client_p->localClient; struct LocalUser *lclient_p = client_p->localClient;
@ -239,82 +239,85 @@ read_packet(int fd, void *data)
#ifdef USE_IODEBUG_HOOKS #ifdef USE_IODEBUG_HOOKS
hook_data_int hdata; hook_data_int hdata;
#endif #endif
if(IsAnyDead(client_p))
return;
/* while(1)
* Read some data. We *used to* do anti-flood protection here, but
* I personally think it makes the code too hairy to make sane.
* -- adrian
*/
length = client_p->localClient->F->read_impl(client_p->localClient->F, readBuf, READBUF_SIZE);
if(length <= 0)
{ {
if((length == -1) && ignoreErrno(errno)) if(IsAnyDead(client_p))
return;
/*
* Read some data. We *used to* do anti-flood protection here, but
* I personally think it makes the code too hairy to make sane.
* -- adrian
*/
length = rb_read(client_p->localClient->F, readBuf, READBUF_SIZE);
if(length <= 0)
{ {
rb_setselect(client_p->localClient->F->fd, FDLIST_IDLECLIENT, if(rb_ignore_errno(errno))
COMM_SELECT_READ, read_packet, client_p, 0); {
rb_setselect(client_p->localClient->F,
RB_SELECT_READ, read_packet, client_p);
} else
error_exit_client(client_p, length);
return;
}
if(length == 0)
{
error_exit_client(client_p, length);
return; return;
} }
error_exit_client(client_p, length);
return;
}
#ifdef USE_IODEBUG_HOOKS #ifdef USE_IODEBUG_HOOKS
hdata.client = client_p; hdata.client = client_p;
hdata.arg1 = readBuf; hdata.arg1 = readBuf;
hdata.arg2 = length; hdata.arg2 = length;
call_hook(h_iorecv_id, &hdata); call_hook(h_iorecv_id, &hdata);
#endif #endif
if(client_p->localClient->lasttime < rb_current_time()) if(client_p->localClient->lasttime < rb_current_time())
client_p->localClient->lasttime = rb_current_time(); client_p->localClient->lasttime = rb_current_time();
client_p->flags &= ~FLAGS_PINGSENT; client_p->flags &= ~FLAGS_PINGSENT;
/* /*
* Before we even think of parsing what we just read, stick * Before we even think of parsing what we just read, stick
* it on the end of the receive queue and do it when its * it on the end of the receive queue and do it when its
* turn comes around. * turn comes around.
*/ */
if(IsHandshake(client_p) || IsUnknown(client_p)) if(IsHandshake(client_p) || IsUnknown(client_p))
binary = 1; binary = 1;
lbuf_len = rb_linebuf_parse(&client_p->localClient->buf_recvq, readBuf, length, binary); lbuf_len = rb_linebuf_parse(&client_p->localClient->buf_recvq, readBuf, length, binary);
lclient_p->actually_read += lbuf_len; lclient_p->actually_read += lbuf_len;
if(IsAnyDead(client_p)) if(IsAnyDead(client_p))
return; return;
/* Attempt to parse what we have */ /* Attempt to parse what we have */
parse_client_queued(client_p); parse_client_queued(client_p);
if(IsAnyDead(client_p)) if(IsAnyDead(client_p))
return; return;
/* Check to make sure we're not flooding */ /* Check to make sure we're not flooding */
if(!IsAnyServer(client_p) && if(!IsAnyServer(client_p) &&
(rb_linebuf_alloclen(&client_p->localClient->buf_recvq) > ConfigFileEntry.client_flood)) (rb_linebuf_alloclen(&client_p->localClient->buf_recvq) > ConfigFileEntry.client_flood))
{
if(!(ConfigFileEntry.no_oper_flood && IsOper(client_p)))
{ {
exit_client(client_p, client_p, client_p, "Excess Flood"); if(!(ConfigFileEntry.no_oper_flood && IsOper(client_p)))
{
exit_client(client_p, client_p, client_p, "Excess Flood");
return;
}
}
/* bail if short read */
if(length < READBUF_SIZE)
{
rb_setselect(client_p->localClient->F, RB_SELECT_READ, read_packet, client_p);
return; return;
} }
} }
/* If we get here, we need to register for another COMM_SELECT_READ */
if(PARSE_AS_SERVER(client_p))
{
rb_setselect(client_p->localClient->F->fd, FDLIST_SERVER, COMM_SELECT_READ,
read_packet, client_p, 0);
}
else
{
rb_setselect(client_p->localClient->F->fd, FDLIST_IDLECLIENT,
COMM_SELECT_READ, read_packet, client_p, 0);
}
} }
/* /*