Changeset 524

Timestamp:

04/16/07 18:44:12 (16 months ago)

Author:

hyriand

Message:

Don't heap-allocate 1 megabyte for every incoming packet, stack-allocate 16kb instead. Handle incoming data before issuing a disconnect on closed socket.

Files:

• museek+/trunk/sources/Museekal/ClientConnection.cc (modified) (2 diffs)

museek+/trunk/sources/Museekal/ClientConnection.cc

@@ -230 +230 @@
 
         if (mask & MASKIN) {
-                char *data = new char[1024 * 1024];
-                int i = 1, read = 0;
+                char data[16384];
+                int i = 1, read = 0, _errno = EAGAIN;
 
                 while(i > 0) {
-                        i = recv(sock, data, 1024 * 1024, 0);
+                        i = recv(sock, data, 16384, 0);
                         if (i > 0) {
                                 TrafficTracker::instance()->collect(1, i);
@@ -242 +242 @@
                         }
                 }
-                if ((i == 0) || (errno != EAGAIN))
-                        disconnect();
-
-                delete [] data;
+                if (i < 0)
+                        _errno = errno;
 
                 if (! inbuf.empty())
                         process();
-        }
-}
+
+                if ((i == 0) || (_errno != EAGAIN))
+                        disconnect();
+        }
+}