Changeset 184:675dfcc4d494 in finroc_plugins_tcp

Timestamp:

30.04.2020 13:26:06 (4 years ago)

Author:

Max Reichardt <max.reichardt@…>

Branch:

17.03

Children:

185:48a60159deb2, 187:da63d2c59a8a

Parents:

180:f7c6a039c519 (diff), 183:d28e321696e1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge with 14.08

Files:

• internal/tServer.cpp (modified) (2 diffs)
• internal/tServer.cpp (modified) (6 diffs)

internal/tServer.cpp

@@ -74 +74 @@
 //----------------------------------------------------------------------
 
+namespace
+{
+
+size_t connection_error_count = 0;
+rrlib::time::tTimestamp last_unfiltered_connection_error = rrlib::time::cNO_TIME;
+const int cMAX_DISPLAYED_CONNECTION_ERRORS = 5;
+const rrlib::time::tDuration cMAX_DISPLAYED_CONNECTION_ERRORS_PERIOD = std::chrono::seconds(10);
+
+}
+
 /*!
  * Handles accepted connections
@@ -95 +105 @@
     else
     {
-      FINROC_LOG_PRINT(ERROR, "Connection error ", error.category().name());
+      auto now = rrlib::time::Now();
+
+      if (now > last_unfiltered_connection_error + cMAX_DISPLAYED_CONNECTION_ERRORS_PERIOD)
+      {
+        if (connection_error_count > cMAX_DISPLAYED_CONNECTION_ERRORS)
+        {
+          FINROC_LOG_PRINT(ERROR, "Filtered ", connection_error_count - cMAX_DISPLAYED_CONNECTION_ERRORS , " additional errors");
+        }
+        connection_error_count = 0;
+      }
+
+      connection_error_count++;
+      if (connection_error_count <= cMAX_DISPLAYED_CONNECTION_ERRORS)
+      {
+        FINROC_LOG_PRINT(ERROR, "Error accepting TCP connection: ", error);
+        if (connection_error_count == cMAX_DISPLAYED_CONNECTION_ERRORS)
+        {
+          FINROC_LOG_PRINT(ERROR, "Filtering additional errors...");
+        }
+        last_unfiltered_connection_error = now;
+      }
     }
 

internal/tServer.cpp

@@ -39 +39 @@
 // Internal includes with ""
 //----------------------------------------------------------------------
-#include "plugins/tcp/tSettings.h"
 #include "plugins/tcp/internal/tConnection.h"
 #include "plugins/tcp/internal/tPeerImplementation.h"
@@ -102 +101 @@
     if (!error)
     {
-      tConnection::InitConnection(implementation->peer, socket, 0, NULL);
+      tConnection::TryToEstablishConnection(implementation->peer, socket, 0, nullptr);
     }
     else
@@ -143 +142 @@
 
 tServer::tServer(tPeerImplementation& peer) :
-  tFrameworkElement(&peer.framework_element, "TCP Server", tFlag::NETWORK_ELEMENT),
-  peer(peer),
-  desired_port(peer.create_options.preferred_server_port),
-  try_next_ports_if_occupied(peer.create_options.try_next_ports_if_occupied),
-  server_listen_address(peer.create_options.server_listen_address)
+  tFrameworkElement(peer.GetPluginRootFrameworkElement(), "TCP Server", tFlag::NETWORK_ELEMENT),
+  peer(peer)
 {
 }
@@ -161 +157 @@
   boost::system::error_code ec;
 
-  boost::asio::ip::address listen_address = boost::asio::ip::address::from_string(server_listen_address);
-
+  boost::asio::ip::address listen_address = boost::asio::ip::address::from_string(peer.par_server_listen_address.Get());
+
+  auto desired_port = peer.par_preferred_server_port.Get();
+  bool try_next_ports_if_occupied = peer.par_try_next_ports_if_occupied.Get();
   for (int port_to_try = desired_port;
-       port_to_try < (try_next_ports_if_occupied ? (desired_port + tSettings::cMAX_PORTS_TO_TRY_FOR_CREATING_SERVER_PORT) : (desired_port + 1));
+       port_to_try < (try_next_ports_if_occupied ? (desired_port + peer.par_max_ports_to_try_creating_server_port.Get()) : (desired_port + 1));
        port_to_try++)
   {
@@ -196 +194 @@
   if (!acceptor)
   {
-    FINROC_LOG_PRINT(ERROR, "TCP server could not listen on any of the ", tSettings::cMAX_PORTS_TO_TRY_FOR_CREATING_SERVER_PORT, " ports. TCP interface is not available.");
+    FINROC_LOG_PRINT(ERROR, "TCP server could not listen on any of the ", peer.par_max_ports_to_try_creating_server_port.Get(), " ports tried. TCP interface is not available.");
     return;
   }
@@ -202 +200 @@
 
   // If no connect-address was specified and desired port was occupied - connect to part that is running there
-  if (peer.create_options.auto_connect_to_all_peers && DesiredPort() != peer.this_peer.uuid.port)
-  {
-    peer.connect_to.push_back(std::string("localhost:") + std::to_string(DesiredPort()));
+  if (peer.par_auto_connect_to_all_peers.Get() && desired_port != peer.this_peer.uuid.port)
+  {
+    peer.AddRuntimeToConnectTo(std::string("localhost:") + std::to_string(desired_port));
   }