Compiles

TCPSession.cpp

@@ -9,6 +9,7 @@ namespace core {
 
    TCPSession::~TCPSession() {
       server.removeFromSessionList(this);
+      server.subscriptions.removeSessionSubscriptions(*this);
    	coreutils::Log(coreutils::LOG_DEBUG_1) << "Terminating TCPSession level.";
    }
 
@@ -17,8 +18,10 @@ namespace core {
    }
 
    void TCPSession::protocol(coreutils::ZString &data) {
-      if(!server.commands.processRequest(data, *this)) {
-   	 coreutils::Log(coreutils::LOG_DEBUG_1) << "Received data could not be parsed: " << data.str();
+      if(data.getLength() != 0) {
+         if(!server.commands.processRequest(data, *this)) {
+      	 coreutils::Log(coreutils::LOG_DEBUG_1) << "Received data could not be parsed: " << data.str();
+         }
       }
    }
 
@@ -35,33 +38,33 @@ namespace core {
 
    void TCPSession::onDataReceived(coreutils::ZString &data) {
       if(data.getLength() > 0) {
-	 lineBuffer = (char *)realloc(lineBuffer, lineBufferSize + data.getLength());
-	 memcpy(lineBuffer + lineBufferSize, data.getData(), data.getLength());
-	 lineBufferSize += data.getLength();
-	 while(lineBufferSize > 0) {
-	    if(blockSize == 0) {
-	       lineLength = strcspn(lineBuffer, "\r\n");
-	       if(lineLength == lineBufferSize)
-		 break;
+   	   lineBuffer = (char *)realloc(lineBuffer, lineBufferSize + data.getLength());
+	      memcpy(lineBuffer + lineBufferSize, data.getData(), data.getLength());
+	      lineBufferSize += data.getLength();
+	      while(lineBufferSize > 0) {
+	         if(blockSize == 0) {
+	            lineLength = strcspn(lineBuffer, "\r\n");
+	            if(lineLength == lineBufferSize)
+		           break;
                coreutils::ZString zLine(lineBuffer, lineLength);
-	       onLineReceived(zLine);
-	       if(lineBuffer[lineLength] == '\r')
-		 ++lineLength;
-	       if(lineBuffer[lineLength] == '\n')
-		 ++lineLength;
-	       lineBufferSize -= lineLength;
-	       if(lineBufferSize > 0)
-		 memmove(lineBuffer, lineBuffer + lineLength, lineBufferSize);
-	       lineBuffer = (char *)realloc(lineBuffer, lineBufferSize);
+	            onLineReceived(zLine);
+	            if(lineBuffer[lineLength] == '\r')
+		           ++lineLength;
+	            if(lineBuffer[lineLength] == '\n')
+		           ++lineLength;
+	            lineBufferSize -= lineLength;
+	            if(lineBufferSize > 0)
+		           memmove(lineBuffer, lineBuffer + lineLength, lineBufferSize);
+	            lineBuffer = (char *)realloc(lineBuffer, lineBufferSize);
             } else if(lineBufferSize >= blockLength) {
-               coreutils::ZString zBlock(lineBuffer, blockLength);
-	       onBlockReceived(zBlock);
-	       lineBufferSize -= blockLength;
-	       if(lineBufferSize > 0)
-		 memmove(lineBuffer, lineBuffer + blockLength, lineBufferSize);
-	       lineBuffer = (char *)realloc(lineBuffer, lineBufferSize);
-	    }
-	 }
+              coreutils::ZString zBlock(lineBuffer, blockLength);
+	            onBlockReceived(zBlock);
+	            lineBufferSize -= blockLength;
+	            if(lineBufferSize > 0)
+		           memmove(lineBuffer, lineBuffer + blockLength, lineBufferSize);
+	            lineBuffer = (char *)realloc(lineBuffer, lineBufferSize);
+	         }
+	      }
       }
    }
 
@@ -84,7 +87,7 @@ namespace core {
 
    void TCPSession::send() {
       if(out.tellp() > 0)
-	write(out.str());
+     	  write(out.str());
       out.str("");
    }