Servlink control data is read again, this makes /stats Z work.

This commit is contained in:
Jilles Tjoelker 2008-04-04 00:45:38 +02:00
parent 8c689f969d
commit f455ed520d
3 changed files with 128 additions and 0 deletions

View file

@ -46,6 +46,7 @@
#define MAX_FLOOD 5 #define MAX_FLOOD 5
#define MAX_FLOOD_BURST MAX_FLOOD * 8 #define MAX_FLOOD_BURST MAX_FLOOD * 8
extern PF read_ctrl_packet;
extern PF read_packet; extern PF read_packet;
extern EVH flood_recalc; extern EVH flood_recalc;
extern void flood_endgrace(struct Client *); extern void flood_endgrace(struct Client *);

View file

@ -224,6 +224,132 @@ flood_recalc(void *unused)
} }
} }
/*
* read_ctrl_packet - Read a 'packet' of data from a servlink control
* link and process it.
*/
void
read_ctrl_packet(rb_fde_t *F, void *data)
{
struct Client *server = data;
struct LocalUser *lserver = server->localClient;
struct SlinkRpl *reply;
int length = 0;
unsigned char tmp[2];
unsigned char *len = tmp;
struct SlinkRplDef *replydef;
#ifdef USE_IODEBUG_HOOKS
hook_data_int hdata;
#endif
s_assert(lserver != NULL);
if(IsAnyDead(server))
return;
reply = &lserver->slinkrpl;
if(!reply->command)
{
reply->gotdatalen = 0;
reply->readdata = 0;
reply->data = NULL;
length = rb_read(F, tmp, 1);
if(length <= 0)
{
if((length == -1) && rb_ignore_errno(errno))
goto nodata;
error_exit_client(server, length);
return;
}
reply->command = tmp[0];
}
for (replydef = slinkrpltab; replydef->handler; replydef++)
{
if((int)replydef->replyid == reply->command)
break;
}
/* we should be able to trust a local slink process...
* and if it sends an invalid command, that's a bug.. */
s_assert(replydef->handler);
if((replydef->flags & SLINKRPL_FLAG_DATA) && (reply->gotdatalen < 2))
{
/* we need a datalen u16 which we don't have yet... */
length = rb_read(F, len, (2 - reply->gotdatalen));
if(length <= 0)
{
if((length == -1) && rb_ignore_errno(errno))
goto nodata;
error_exit_client(server, length);
return;
}
if(reply->gotdatalen == 0)
{
reply->datalen = *len << 8;
reply->gotdatalen++;
length--;
len++;
}
if(length && (reply->gotdatalen == 1))
{
reply->datalen |= *len;
reply->gotdatalen++;
if(reply->datalen > 0)
reply->data = rb_malloc(reply->datalen);
}
if(reply->gotdatalen < 2)
return; /* wait for more data */
}
if(reply->readdata < reply->datalen) /* try to get any remaining data */
{
length = rb_read(F, (reply->data + reply->readdata),
(reply->datalen - reply->readdata));
if(length <= 0)
{
if((length == -1) && rb_ignore_errno(errno))
goto nodata;
error_exit_client(server, length);
return;
}
reply->readdata += length;
if(reply->readdata < reply->datalen)
return; /* wait for more data */
}
#ifdef USE_IODEBUG_HOOKS
hdata.client = server;
hdata.arg1 = NULL;
hdata.arg2 = reply->command;
hdata.data = NULL;
call_hook(h_iorecvctrl_id, &hdata);
#endif
/* we now have the command and any data, pass it off to the handler */
(*replydef->handler) (reply->command, reply->datalen, reply->data, server);
/* reset SlinkRpl */
if(reply->datalen > 0)
rb_free(reply->data);
reply->command = 0;
if(IsAnyDead(server))
return;
nodata:
/* If we get here, we need to register for another COMM_SELECT_READ */
rb_setselect(F, RB_SELECT_READ, read_ctrl_packet, server);
}
/* /*
* 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.
*/ */

View file

@ -1421,6 +1421,7 @@ fork_server(struct Client *server)
ilog_error("setting a slink fd nonblocking"); ilog_error("setting a slink fd nonblocking");
} }
read_ctrl_packet(server->localClient->ctrlF, server);
read_packet(server->localClient->F, server); read_packet(server->localClient->F, server);
} }