Added Endpoint::drop_connection

- Sometimes when ngtcp2 does not want a connection close packet written, we delete the connection from the endpoint's internal map - In these cases, we still want to notify the calling endpoint that the connection was closed
oxen-io · Sep 12, 2023 · 3d9c072 · 3d9c072
1 parent 82d0a5a
commit 3d9c072
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/include/quic/endpoint.hpp b/include/quic/endpoint.hpp
@@ -177,7 +177,9 @@ namespace oxen::quic
 
         void close_conns(std::optional<Direction> d = std::nullopt);
 
-        void close_connection(Connection& conn, io_error code = io_error{0}, std::string_view msg = "NO_ERROR"sv);
+        void drop_connection(Connection& conn, io_error ec = io_error{0});
+
+        void close_connection(Connection& conn, io_error ec = io_error{0}, std::string_view msg = "NO_ERROR"sv);
 
         const Address& local() { return _local; }
 

diff --git a/include/quic/error.hpp b/include/quic/error.hpp
@@ -16,7 +16,8 @@ namespace oxen::quic
         STREAM_EXCEPTION = (1ULL << 62) - 32,
         STREAM_CONNECTION_EXPIRED = (1ULL << 62) - 31,
 
-        CONN_WRITE_CLOSE_FAIL = (1ULL << 62)
+        CONN_WRITE_CLOSE_FAIL = (1ULL << 62),
+        CONN_SEND_CLOSE_FAIL = (1ULL << 62) + 1
     };
 
     inline const char* quic_strerror(uint64_t e)
@@ -39,6 +40,8 @@ namespace oxen::quic
                 return "No error - draining connection";
             case error::CONN_WRITE_CLOSE_FAIL:
                 return "Error - Failed to write connection close";
+            case error::CONN_SEND_CLOSE_FAIL:
+                return "Error = Failed to send connection close";
             default:
                 return "Unknown error";
         }

diff --git a/src/connection.cpp b/src/connection.cpp
@@ -272,7 +272,7 @@ namespace oxen::quic
 
             _endpoint.call([this]() {
                 log::debug(log_cat, "Note: connection (CID: {}) is in closing period; endpoint deleting connection", scid());
-                _endpoint.delete_connection(scid());
+                _endpoint.drop_connection(*this, io_error{NGTCP2_ERR_CLOSING});
             });
             return;
         }
@@ -326,7 +326,7 @@ namespace oxen::quic
                         ngtcp2_strerror(rv));
                 _endpoint.call([this]() {
                     log::debug(log_cat, "Endpoint deleting CID: {}", scid());
-                    _endpoint.delete_connection(scid());
+                    _endpoint.drop_connection(*this, io_error{NGTCP2_ERR_DROP_CONN});
                 });
                 break;
             case NGTCP2_ERR_CRYPTO:
@@ -340,7 +340,7 @@ namespace oxen::quic
                         ngtcp2_strerror(rv));
                 _endpoint.call([this]() {
                     log::debug(log_cat, "Endpoint deleting CID: {}", scid());
-                    _endpoint.delete_connection(scid());
+                    _endpoint.drop_connection(*this, io_error{NGTCP2_ERR_CRYPTO});
                 });
                 break;
             default:

diff --git a/src/endpoint.cpp b/src/endpoint.cpp
@@ -169,6 +169,16 @@ namespace oxen::quic
         return;
     }
 
+    void Endpoint::drop_connection(Connection& conn, io_error ec)
+    {
+        log::debug(log_cat, "Dropping connection (CID: {})", *conn.scid().data);
+
+        if (connection_close_cb)
+            connection_close_cb(conn, ec.code());
+
+        delete_connection(conn.scid());
+    }
+
     void Endpoint::close_connection(Connection& conn, io_error ec, std::string_view msg)
     {
         log::debug(log_cat, "Closing connection (CID: {})", *conn.scid().data);
@@ -183,7 +193,7 @@ namespace oxen::quic
                     "Connection (CID: {}) passed idle expiry timer; closing now without close "
                     "packet",
                     *conn.scid().data);
-            delete_connection(conn.scid());
+            drop_connection(conn, io_error{NGTCP2_ERR_IDLE_CLOSE});
             return;
         }
 

diff --git a/tests/001-handshake.cpp b/tests/001-handshake.cpp
@@ -115,9 +115,6 @@ namespace oxen::quic::test
             auto client_established = bool_waiter{[](connection_interface&) {}};
             auto server_established = bool_waiter{[](connection_interface&) {}};
 
-            // connection_open_callback server_established{server_waiter};
-            // connection_open_callback client_established{client_waiter};
-
             Network test_net{};
 
             auto server_tls = GNUTLSCreds::make("./serverkey.pem"s, "./servercert.pem"s, "./clientcert.pem"s);