Fixes #1563: Delete corresponding connections optionally on deletion …

…of tcpListener and tcpConnector
skupperproject · Aug 26, 2024 · 31c72f6 · 31c72f6
1 parent eb3c6d0
commit 31c72f6
Show file tree

Hide file tree

Showing 8 changed files with 1,271 additions and 114 deletions.
diff --git a/python/skupper_router/management/skrouter.json b/python/skupper_router/management/skrouter.json
@@ -615,6 +615,13 @@
                     "required": false,
                     "default": "auto",
                     "create": true
+                },
+                "dropTcpConnections": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Terminate corresponding TCP connections when a tcpListener or a tcpConnector is deleted.",
+                    "required": false,
+                    "create": true
                 }
             }
         },

diff --git a/src/adaptors/tcp/tcp_adaptor.c b/src/adaptors/tcp/tcp_adaptor.c
diff --git a/src/adaptors/tcp/tcp_adaptor.h b/src/adaptors/tcp/tcp_adaptor.h
@@ -37,19 +37,23 @@
 #include <proton/event.h>
 #include <proton/ssl.h>
 
-typedef struct qd_tcp_listener_t qd_tcp_listener_t;
-typedef struct qd_tcp_connector_t qd_tcp_connector_t;
-typedef struct qdr_tcp_stats_t qdr_tcp_stats_t;
-typedef struct qd_tcp_adaptor_config_t qd_tcp_adaptor_config_t;
-typedef struct qd_adaptor_listener_t qd_adaptor_listener_t;
-typedef struct qd_tls_domain_t         qd_tls_domain_t;
-
+typedef struct qd_tcp_listener_t        qd_tcp_listener_t;
+typedef struct qd_tcp_connector_t       qd_tcp_connector_t;
+typedef struct qdr_tcp_stats_t          qdr_tcp_stats_t;
+typedef struct qd_tcp_adaptor_config_t  qd_tcp_adaptor_config_t;
+typedef struct qd_adaptor_listener_t    qd_adaptor_listener_t;
+typedef struct qd_tls_domain_t          qd_tls_domain_t;
+typedef struct qdr_tcp_connection_t     qdr_tcp_connection_t;
+typedef struct qdr_tcp_connection_ref_t qdr_tcp_connection_ref_t;
 struct qd_tcp_adaptor_config_t {
     qd_adaptor_config_t *adaptor_config; // Pointer to the common adaptor config used by all adaptors.
     sys_atomic_t         ref_count;
 };
 
 ALLOC_DECLARE(qd_tcp_adaptor_config_t);
+ALLOC_DECLARE_SAFE(qdr_tcp_connection_t);
+ALLOC_DECLARE(qdr_tcp_connection_ref_t);
+DEQ_DECLARE(qdr_tcp_connection_t, qdr_tcp_connection_list_t);
 
 struct qdr_tcp_stats_t {
     // run time statistics updated by connections
@@ -72,7 +76,9 @@ struct qd_tcp_listener_t
     qdr_tcp_stats_t          *tcp_stats;
     qd_adaptor_listener_t    *adaptor_listener;
     qd_tls_domain_t          *tls_domain;
-
+    sys_mutex_t               lock;
+    qdr_tcp_connection_list_t connections;
+    sys_atomic_t              closing;
     // must hold tcp_adaptor->listener_lock during list operations:
     DEQ_LINKS(qd_tcp_listener_t);
 };
@@ -90,12 +96,21 @@ struct qd_tcp_connector_t
     vflow_record_t           *vflow;
     qdr_tcp_stats_t          *tcp_stats;
     qd_tls_domain_t          *tls_domain;
+    sys_mutex_t               lock;
+    qdr_tcp_connection_list_t connections;
+    sys_atomic_t              closing;
     DEQ_LINKS(qd_tcp_connector_t);
 };
 
 DEQ_DECLARE(qd_tcp_connector_t, qd_tcp_connector_list_t);
 ALLOC_DECLARE(qd_tcp_connector_t);
 
+struct qdr_tcp_connection_ref_t {
+    DEQ_LINKS(qdr_tcp_connection_ref_t);
+    qdr_tcp_connection_t *conn;
+};
+DEQ_DECLARE(qdr_tcp_connection_ref_t, qdr_tcp_connection_ref_list_t);
+
 void qdra_tcp_connection_get_first_CT(qdr_core_t *core, qdr_query_t *query, int offset);
 void qdra_tcp_connection_get_next_CT(qdr_core_t *core, qdr_query_t *query);
 void qdra_tcp_connection_get_CT(qdr_core_t          *core,

diff --git a/src/dispatch.c b/src/dispatch.c
@@ -242,7 +242,7 @@ qd_error_t qd_dispatch_configure_router(qd_dispatch_t *qd, qd_entity_t *entity)
     qd->timestamps_in_utc = qd_entity_opt_bool(entity, "timestampsInUTC", false); QD_ERROR_RET();
     qd->timestamp_format = qd_entity_opt_string(entity, "timestampFormat", 0); QD_ERROR_RET();
     qd->metadata = qd_entity_opt_string(entity, "metadata", 0); QD_ERROR_RET();
-
+    qd->terminate_tcp_conns = qd_entity_opt_bool(entity, "dropTcpConnections", false); QD_ERROR_RET();
     if (! qd->sasl_config_path) {
         qd->sasl_config_path = qd_entity_opt_string(entity, "saslConfigDir", 0); QD_ERROR_RET();
     }

diff --git a/src/dispatch_private.h b/src/dispatch_private.h
@@ -61,6 +61,7 @@ struct qd_dispatch_t {
     char  *metadata;
     bool   timestamps_in_utc;
     char  *data_connection_count;
+    bool   terminate_tcp_conns;
 };
 
 qd_dispatch_t *qd_dispatch_get_dispatch(void);

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -166,6 +166,7 @@ foreach(py_test_module
     system_tests_http1_over_tcp
     system_tests_tcp_adaptor
     system_tests_tcp_adaptor_tls
+    system_tests_tcp_conns_terminate
     system_tests_tcp_half_close
     system_tests_http2_tls
     system_tests_address_watch