Improved termination of broken connections.

Author: dreibh

src/control.cc

@@ -793,7 +793,7 @@ static bool uploadOutputFile(const int         controlSocket,
       std::cerr << "WARNING: Unable to upload results (errno=" << errno << "): "
                 << strerror(errno) << "\n";
       gOutputMutex.unlock();
-      sendAbort(controlSocket);
+      ext_shutdown(controlSocket, 2);
    }
    if(gOutputVerbosity >= NPFOV_CONNECTIONS) {
       gOutputMutex.lock();
@@ -1150,7 +1150,7 @@ bool handleNetPerfMeterControlMessage(MessageReader* messageReader,
          printTimeStamp(std::cerr);
          std::cerr << "ERROR: Control connection is broken!\n";
          gOutputMutex.unlock();
-         sendAbort(controlSocket, -1);
+         ext_shutdown(controlSocket, 2);
       }
       return(false);
    }
@@ -1201,7 +1201,7 @@ bool handleNetPerfMeterControlMessage(MessageReader* messageReader,
             std::cerr << "ERROR: Received invalid control message of type "
                      << (unsigned int)header->Type << "!\n";
             gOutputMutex.unlock();
-            sendAbort(controlSocket);
+            ext_shutdown(controlSocket, 2);
             return(false);
       }
    }

src/flow.cc

@@ -839,6 +839,7 @@ void FlowManager::run()
                                             iterator->first) == 0) {
                      // Incoming connection has already been closed -> remove it!
                      gOutputMutex.lock();
+                     printTimeStamp(std::cout);
                      std::cout << "NOTE: Shutdown of still unidentified incoming connection "
                                << iterator->first << "!\n";
                      gOutputMutex.unlock();

src/messagereader.cc

@@ -31,8 +31,8 @@
 #include "tools.h"
 
 
-// #define DEBUG_SOCKETS
-// #define DEBUG_MESSAGEREADER
+#define DEBUG_SOCKETS
+#define DEBUG_MESSAGEREADER
 
 
 

src/transfer.cc

@@ -278,6 +278,7 @@ ssize_t handleNetPerfMeterData(const bool               isActiveMode,
             printAddress(std::cout, &from.sa, true);
             std::cout << " on socket " << sd << "!\n";
             gOutputMutex.unlock();
+            ext_shutdown(sd, 2);
          }
       }
       else {
@@ -287,6 +288,7 @@ ssize_t handleNetPerfMeterData(const bool               isActiveMode,
          printAddress(std::cout, &from.sa, true);
          std::cout << " on socket " << sd << "!\n";
          gOutputMutex.unlock();
+         ext_shutdown(sd, 2);
       }
    }
 
@@ -301,6 +303,7 @@ ssize_t handleNetPerfMeterData(const bool               isActiveMode,
             std::cout << " on socket " << sd << "!\n";
             gOutputMutex.unlock();
             flow->unlock();
+            ext_shutdown(sd, 2);
          }
          flow->endOfInput();
       }