Forward port SOCKSENDBUF, SOCKRECVBUF features from 2.10.11.

[ircu2.10.12-pk.git] / ircd / listener.c

diff --git a/ircd/listener.c b/ircd/listener.c
index e0f92134e24de548c739195ee94a88a9023cb564..6b67d0ca8a0f1c9a80e0b642f19e29805ffd5c51 100644 (file)
--- a/ircd/listener.c
+++ b/ircd/listener.c
@@ -34,6 +34,7 @@
 #include "s_bsd.h"
 #include "s_conf.h"
 #include "s_misc.h"
+#include "s_stats.h"
 #include "send.h"
 #include "sys.h"         /* MAXCLIENTS */
 
@@ -116,12 +117,20 @@ void count_listener_memory(int* count_out, size_t* size_out)
  * 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;
@@ -201,7 +210,9 @@ static int inetport(struct Listener* listener)
    * else has no effect whatsoever on the connection.
    * NOTE: this must be set before listen is called
    */
-  if (!os_set_sockbufs(fd, (listener->server) ? SERVER_TCP_WINDOW : CLIENT_TCP_WINDOW)) {
+  if (!os_set_sockbufs(fd,
+                       (listener->server) ? feature_int(FEAT_SOCKSENDBUF) : CLIENT_TCP_WINDOW,
+                       (listener->server) ? feature_int(FEAT_SOCKRECVBUF) : CLIENT_TCP_WINDOW)) {
     report_error(SETBUFS_ERROR_MSG, get_listener_name(listener), errno);
     close(fd);
     return 0;
@@ -423,12 +434,12 @@ static void accept_connection(struct Event* ev)
   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;
     /*
@@ -441,9 +452,24 @@ static void accept_connection(struct Event* ev)
      * 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
@@ -452,38 +478,46 @@ static void accept_connection(struct Event* ev)
       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;
-    }
-    ++ServerStats->is_ac;
-/*      nextping = CurrentTime; */
-
-    add_connection(listener, fd);
   }
 }