client_p->localClient->sent_parsed = 0;
}
-/*\r
- * flood_recalc\r
- *\r
- * recalculate the number of allowed flood lines. this should be called\r
- * once a second on any given client. We then attempt to flush some data.\r
- */\r
-void\r
-flood_recalc(void *unused)\r
-{\r
- rb_dlink_node *ptr, *next;\r
- struct Client *client_p;\r
-\r
- RB_DLINK_FOREACH_SAFE(ptr, next, lclient_list.head)\r
- {\r
- client_p = ptr->data;\r
-\r
- if(unlikely(IsMe(client_p)))\r
- continue;\r
- \r
- if(unlikely(client_p->localClient == NULL))\r
- continue;\r
- \r
- if(IsFloodDone(client_p))\r
- client_p->localClient->sent_parsed -= 2;\r
- else\r
- client_p->localClient->sent_parsed = 0;\r
- \r
- if(client_p->localClient->sent_parsed < 0)\r
- client_p->localClient->sent_parsed = 0;\r
-\r
- if(--client_p->localClient->actually_read < 0)\r
- client_p->localClient->actually_read = 0;\r
-\r
- parse_client_queued(client_p);\r
- \r
- if(unlikely(IsAnyDead(client_p)))\r
- continue;\r
-\r
- }\r
-\r
- RB_DLINK_FOREACH_SAFE(ptr, next, unknown_list.head)\r
- {\r
- client_p = ptr->data;\r
-\r
- if(client_p->localClient == NULL)\r
- continue;\r
-\r
- client_p->localClient->sent_parsed--;\r
-\r
- if(client_p->localClient->sent_parsed < 0)\r
- client_p->localClient->sent_parsed = 0;\r
-\r
- if(--client_p->localClient->actually_read < 0)\r
- client_p->localClient->actually_read = 0;\r
-\r
- parse_client_queued(client_p);\r
- }\r
+/*
+ * flood_recalc
+ *
+ * recalculate the number of allowed flood lines. this should be called
+ * once a second on any given client. We then attempt to flush some data.
+ */
+void
+flood_recalc(void *unused)
+{
+ rb_dlink_node *ptr, *next;
+ struct Client *client_p;
+
+ RB_DLINK_FOREACH_SAFE(ptr, next, lclient_list.head)
+ {
+ client_p = ptr->data;
+
+ if(unlikely(IsMe(client_p)))
+ continue;
+
+ if(unlikely(client_p->localClient == NULL))
+ continue;
+
+ if(IsFloodDone(client_p))
+ client_p->localClient->sent_parsed -= 2;
+ else
+ client_p->localClient->sent_parsed = 0;
+
+ if(client_p->localClient->sent_parsed < 0)
+ client_p->localClient->sent_parsed = 0;
+
+ if(--client_p->localClient->actually_read < 0)
+ client_p->localClient->actually_read = 0;
+
+ parse_client_queued(client_p);
+
+ if(unlikely(IsAnyDead(client_p)))
+ continue;
+
+ }
+
+ RB_DLINK_FOREACH_SAFE(ptr, next, unknown_list.head)
+ {
+ client_p = ptr->data;
+
+ if(client_p->localClient == NULL)
+ continue;
+
+ client_p->localClient->sent_parsed--;
+
+ if(client_p->localClient->sent_parsed < 0)
+ client_p->localClient->sent_parsed = 0;
+
+ if(--client_p->localClient->actually_read < 0)
+ client_p->localClient->actually_read = 0;
+
+ parse_client_queued(client_p);
+ }
+}
+
+/*
+ * 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.
*/
void
-read_packet(int fd, void *data)
+read_packet(rb_fde_t * F, void *data)
{
struct Client *client_p = data;
struct LocalUser *lclient_p = client_p->localClient;
#ifdef USE_IODEBUG_HOOKS
hook_data_int hdata;
#endif
- 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 = client_p->localClient->F->read_impl(client_p->localClient->F, readBuf, READBUF_SIZE);
- if(length <= 0)
+ while(1)
{
- 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,
- COMM_SELECT_READ, read_packet, client_p, 0);
+ if(rb_ignore_errno(errno))
+ rb_setselect(client_p->localClient->F,
+ RB_SELECT_READ, read_packet, client_p);
+ else
+ error_exit_client(client_p, length);
+ return;
+ }
+ else if(length == 0)
+ {
+ error_exit_client(client_p, length);
return;
}
- error_exit_client(client_p, length);
- return;
- }
#ifdef USE_IODEBUG_HOOKS
- hdata.client = client_p;
- hdata.arg1 = readBuf;
- hdata.arg2 = length;
- call_hook(h_iorecv_id, &hdata);
+ hdata.client = client_p;
+ hdata.arg1 = readBuf;
+ hdata.arg2 = length;
+ call_hook(h_iorecv_id, &hdata);
#endif
- if(client_p->localClient->lasttime < rb_current_time())
- client_p->localClient->lasttime = rb_current_time();
- client_p->flags &= ~FLAGS_PINGSENT;
+ if(client_p->localClient->lasttime < rb_current_time())
+ client_p->localClient->lasttime = rb_current_time();
+ client_p->flags &= ~FLAGS_PINGSENT;
- /*
- * Before we even think of parsing what we just read, stick
- * it on the end of the receive queue and do it when its
- * turn comes around.
- */
- if(IsHandshake(client_p) || IsUnknown(client_p))
- binary = 1;
+ /*
+ * Before we even think of parsing what we just read, stick
+ * it on the end of the receive queue and do it when its
+ * turn comes around.
+ */
+ if(IsHandshake(client_p) || IsUnknown(client_p))
+ 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))
- return;
-
- /* Attempt to parse what we have */
- parse_client_queued(client_p);
+ if(IsAnyDead(client_p))
+ return;
+
+ /* Attempt to parse what we have */
+ parse_client_queued(client_p);
- if(IsAnyDead(client_p))
- return;
-
- /* Check to make sure we're not flooding */
- if(!IsAnyServer(client_p) &&
- (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(IsAnyDead(client_p))
return;
+
+ /* Check to make sure we're not flooding */
+ if(!IsAnyServer(client_p) &&
+ (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");
+ 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);
+ /* bail if short read */
+ if(length < READBUF_SIZE)
+ {
+ rb_setselect(client_p->localClient->F, RB_SELECT_READ, read_packet, client_p);
+ return;
+ }
}
}
projects / irc / rqf / shadowircd.git / blobdiff