#include "ircd_features.h"
#include "ircd_osdep.h"
#include "ircd_reply.h"
+#include "ircd_snprintf.h"
#include "ircd_string.h"
#include "numeric.h"
#include "s_bsd.h"
#include "s_conf.h"
#include "s_misc.h"
+#include "s_stats.h"
#include "send.h"
-#include "sprintf_irc.h"
#include "sys.h" /* MAXCLIENTS */
#include <assert.h>
{
static char buf[HOSTLEN + PORTNAMELEN + 4];
assert(0 != listener);
- sprintf_irc(buf, "%s:%u", cli_name(&me), listener->port);
+ ircd_snprintf(0, buf, sizeof(buf), "%s:%u", cli_name(&me), listener->port);
return buf;
}
* side effects - show ports
* author - Dianora
*/
-void show_ports(struct Client* sptr, int show_hidden, int port, int count)
+void show_ports(struct Client* sptr, struct StatDesc* sd, int stat,
+ char* param)
{
- struct Listener* listener = 0;
- char flags[8];
+ struct Listener *listener = 0;
+ char flags[8];
+ int show_hidden = IsOper(sptr);
+ int count = (IsOper(sptr) || MyUser(sptr)) ? 100 : 8;
+ int port = 0;
+
assert(0 != sptr);
+ if (param)
+ port = atoi(param);
+
for (listener = ListenerPollList; listener; listener = listener->next) {
if (port && port != listener->port)
continue;
* easy conversion of "*" 0.0.0.0 or 134.* to 134.0.0.0 :-)
*/
sscanf(mask, "%d.%d.%d.%d", &ad[0], &ad[1], &ad[2], &ad[3]);
- sprintf_irc(ipname, "%d.%d.%d.%d", ad[0], ad[1], ad[2], ad[3]);
+ ircd_snprintf(0, ipname, sizeof(ipname), "%d.%d.%d.%d", ad[0], ad[1], ad[2],
+ ad[3]);
listener->mask.s_addr = inet_addr(ipname);
}
assert(0 != ev_socket(ev));
assert(0 != s_data(ev_socket(ev)));
- listener = s_data(ev_socket(ev));
+ listener = (struct Listener*) s_data(ev_socket(ev));
if (ev_type(ev) == ET_DESTROY) /* being destroyed */
free_listener(listener);
else {
- assert(ev_type(ev) == ET_ACCEPT);
+ assert(ev_type(ev) == ET_ACCEPT || ev_type(ev) == ET_ERROR);
listener->last_accept = CurrentTime;
/*
* Thus no specific errors are tested at this
* point, just assume that connections cannot
* be accepted until some old is closed first.
+ *
+ * This piece of code implements multi-accept, based
+ * on the idea that poll/select can only be efficient,
+ * if we succeed in handling all available events,
+ * i.e. accept all pending connections.
+ *
+ * http://www.hpl.hp.com/techreports/2000/HPL-2000-174.html
*/
- if (-1 == (fd = accept(listener->fd, (struct sockaddr*) &addr,
- &addrlen))) {
+ while (1)
+ {
+ if ((fd = accept(listener->fd, (struct sockaddr*) &addr, &addrlen))
+ == -1)
+ {
+ if (errno == EAGAIN ||
+#ifdef EWOULDBLOCK
+ errno == EWOULDBLOCK)
+#endif
+ return;
/* Lotsa admins seem to have problems with not giving enough file
* descriptors to their server so we'll add a generic warning mechanism
* here. If it turns out too many messages are generated for
sendto_opmask_butone(0, SNO_TCPCOMMON,
"Unable to accept connection: %m");
return;
+ }
+ /*
+ * check for connection limit. If this fd exceeds the limit,
+ * all further accept()ed connections will also exceed it.
+ * Enable the server to clear out other connections before
+ * continuing to accept() new connections.
+ */
+ if (fd > MAXCLIENTS - 1)
+ {
+ ++ServerStats->is_ref;
+ send(fd, "ERROR :All connections in use\r\n", 32, 0);
+ close(fd);
+ return;
+ }
+ /*
+ * check to see if listener is shutting down. Continue
+ * to accept(), because it makes sense to clear our the
+ * socket's queue as fast as possible.
+ */
+ if (!listener->active)
+ {
+ ++ServerStats->is_ref;
+ send(fd, "ERROR :Use another port\r\n", 25, 0);
+ close(fd);
+ continue;
+ }
+ /*
+ * check to see if connection is allowed for this address mask
+ */
+ if (!connection_allowed((const char*) &addr,
+ (const char*) &listener->mask))
+ {
+ ++ServerStats->is_ref;
+ send(fd, "ERROR :Use another port\r\n", 25, 0);
+ close(fd);
+ continue;
+ }
+ ++ServerStats->is_ac;
+ /* nextping = CurrentTime; */
+ add_connection(listener, fd);
}
- /*
- * check for connection limit
- */
- if (fd > MAXCLIENTS - 1) {
- ++ServerStats->is_ref;
- send(fd, "ERROR :All connections in use\r\n", 32, 0);
- close(fd);
- return;
- }
- /*
- * check to see if listener is shutting down
- */
- if (!listener->active) {
- ++ServerStats->is_ref;
- send(fd, "ERROR :Use another port\r\n", 25, 0);
- close(fd);
- return;
- }
- /*
- * check to see if connection is allowed for this address mask
- */
- if (!connection_allowed((const char*) &addr,
- (const char*) &listener->mask)) {
- ++ServerStats->is_ref;
- send(fd, "ERROR :Use another port\r\n", 25, 0);
- close(fd);
- return;
- }
-#if 0
- /*
- * check conf for ip address access
- */
- if (!conf_connect_allowed(addr.sin_addr)) {
- ++ServerStats->is_ref;
- send(fd, "ERROR :Not authorized\r\n", 23, 0);
- close(fd);
- return;
- }
-#endif
- ++ServerStats->is_ac;
-/* nextping = CurrentTime; */
-
- add_connection(listener, fd);
}
}
projects / ircu2.10.12-pk.git / blobdiff