From 3b98f3439e33b15bba2036c402f9925340fdb2b9 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Sat, 29 Jun 2013 23:23:43 -0700
Subject: Poison std::string and use the various string classes

---
 src/common/socket.cpp | 47 +++++++----------------------------------------
 1 file changed, 7 insertions(+), 40 deletions(-)

(limited to 'src/common/socket.cpp')

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 214fb5a..2d08171 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -21,8 +21,6 @@
 static
 fd_set readfds;
 int fd_max;
-static
-int currentuse;
 
 static
 const uint32_t RFIFO_SIZE = 65536;
@@ -128,16 +126,17 @@ void connect_client(int listen_fd)
         perror("accept");
         return;
     }
-    if (fd_max <= fd)
-    {
-        fd_max = fd + 1;
-    }
-    if (!free_fds())
+    if (fd >= SOFT_LIMIT)
     {
         FPRINTF(stderr, "softlimit reached, disconnecting : %d\n", fd);
-        delete_session(fd);
+        shutdown(fd, SHUT_RDWR);
+        close(fd);
         return;
     }
+    if (fd_max <= fd)
+    {
+        fd_max = fd + 1;
+    }
 
     const int yes = 1;
     /// Allow to bind() again after the server restarts.
@@ -178,8 +177,6 @@ void connect_client(int listen_fd)
     session[fd]->client_addr = client_address;
     session[fd]->created = TimeT::now();
     session[fd]->connected = 0;
-
-    currentuse++;
 }
 
 int make_listen_port(uint16_t port)
@@ -237,7 +234,6 @@ int make_listen_port(uint16_t port)
     session[fd]->created = TimeT::now();
     session[fd]->connected = 1;
 
-    currentuse++;
     return fd;
 }
 
@@ -295,7 +291,6 @@ int make_connection(uint32_t ip, uint16_t port)
     session[fd]->created = TimeT::now();
     session[fd]->connected = 1;
 
-    currentuse++;
     return fd;
 }
 
@@ -326,13 +321,6 @@ void delete_session(int fd)
     // just close() would try to keep sending buffers
     shutdown(fd, SHUT_RDWR);
     close(fd);
-    currentuse--;
-    if (currentuse < 0)
-    {
-        FPRINTF(stderr, "delete_session: current sessions negative!\n");
-        currentuse = 0;
-    }
-    return;
 }
 
 void realloc_fifo(int fd, size_t rfifo_size, size_t wfifo_size)
@@ -446,7 +434,6 @@ void do_socket(void)
 #pragma GCC diagnostic ignored "-Wold-style-cast"
     FD_ZERO(&readfds);
 #pragma GCC diagnostic pop
-    currentuse = 3;
 }
 
 void RFIFOSKIP(int fd, size_t len)
@@ -460,23 +447,3 @@ void RFIFOSKIP(int fd, size_t len)
         abort();
     }
 }
-
-void fclose_(FILE * fp)
-{
-    if (fclose(fp))
-        perror("fclose"), abort();
-    currentuse--;
-}
-
-FILE *fopen_(const char *path, const char *mode)
-{
-    FILE *f = fopen(path, mode);
-    if (f)
-        currentuse++;
-    return f;
-}
-
-bool free_fds(void)
-{
-    return currentuse < SOFT_LIMIT;
-}
-- 
cgit v1.2.3-70-g09d2