do not cache Bind sessions (#198)

* do not cache Bind sessions * adjust log level
openziti · Dec 4, 2020 · 75d81a3 · 75d81a3
1 parent 279ecbe
commit 75d81a3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 17 deletions.
diff --git a/library/connect.c b/library/connect.c
@@ -32,6 +32,7 @@ static const int MAX_CONNECT_RETRY = 3;
 struct ziti_conn_req {
     const char *session_type;
     char *service_id;
+    ziti_net_session *session;
     ziti_conn_cb cb;
     ziti_dial_opts *dial_opts;
     ziti_listen_opts *listen_opts;
@@ -106,6 +107,11 @@ static void free_conn_req(struct ziti_conn_req *r) {
         uv_close((uv_handle_t *) r->conn_timeout, free_handle);
     }
 
+    if (r->session_type == TYPE_BIND && r->session) {
+        free_ziti_net_session(r->session);
+        FREE(r->session);
+    }
+
     free_ziti_dial_opts(r->dial_opts);
     free_ziti_listen_opts(r->listen_opts);
     FREE(r->service_id);
@@ -319,7 +325,7 @@ static void connect_get_service_cb(ziti_service* s, ziti_error *err, void *ctx)
         complete_conn_req(conn, ZITI_SERVICE_UNAVAILABLE);
     }
     else {
-        ZITI_LOG(INFO, "got service[%s] id[%s]", s->name, s->id);
+        ZITI_LOG(DEBUG, "got service[%s] id[%s]", s->name, s->id);
         for (int i = 0; s->permissions[i] != NULL; i++) {
             if (strcmp(s->permissions[i], "Dial") == 0) {
                  s->perm_flags |= ZITI_CAN_DIAL;
@@ -351,16 +357,20 @@ static void connect_get_net_session_cb(ziti_net_session * s, ziti_error *err, vo
         complete_conn_req(conn, ZITI_SERVICE_UNAVAILABLE);
     }
     else {
-        ziti_net_session *existing = model_map_get(&ztx->sessions, req->service_id);
-        // this happen with concurrent connection requests for the same service (common with browsers)
-        if (existing) {
-            ZITI_LOG(INFO, "found session[%s] for service[%s]", existing->id, conn->service);
-            free_ziti_net_session(s);
-            free(s);
-        } else {
-            ZITI_LOG(INFO, "got session[%s] for service[%s]", s->id, conn->service);
-            s->service_id = strdup(req->service_id);
-            model_map_set(&ztx->sessions, s->service_id, s);
+        req->session = s;
+        s->service_id = strdup(req->service_id);
+        if (req->session_type == TYPE_DIAL) {
+            ziti_net_session *existing = model_map_get(&ztx->sessions, req->service_id);
+            // this happen with concurrent connection requests for the same service (common with browsers)
+            if (existing) {
+                ZITI_LOG(DEBUG, "found session[%s] for service[%s]", existing->id, conn->service);
+                free_ziti_net_session(s);
+                free(s);
+                req->session = existing;
+            } else {
+                ZITI_LOG(DEBUG, "got session[%s] for service[%s]", s->id, conn->service);
+                model_map_set(&ztx->sessions, s->service_id, s);
+            }
         }
         ziti_connect_async(ar);
     }
@@ -374,8 +384,6 @@ static void ziti_connect_async(uv_async_t *ar) {
     struct ziti_ctx *ztx = conn->ziti_ctx;
     uv_loop_t *loop = ar->loop;
 
-    const ziti_net_session *net_session = NULL;
-
     // find service
     if (req->service_id == NULL) {
         ziti_service *service = model_map_get(&ztx->services, conn->service);
@@ -390,9 +398,11 @@ static void ziti_connect_async(uv_async_t *ar) {
     }
 
     ziti_send_posture_data(ztx);
+    if (req->session == NULL && req->session_type == TYPE_DIAL) {
+        req->session = model_map_get(&ztx->sessions, req->service_id);
+    }
 
-    net_session = model_map_get(&ztx->sessions, req->service_id);
-    if (net_session == NULL || strcmp(net_session->session_type, req->session_type) != 0) {
+    if (req->session == NULL) {
         ZITI_LOG(DEBUG, "requesting '%s' session for service[%s]", req->session_type, conn->service);
         ziti_ctrl_get_net_session(&ztx->controller, req->service_id, req->session_type, connect_get_net_session_cb, ar);
         return;
@@ -403,8 +413,8 @@ static void ziti_connect_async(uv_async_t *ar) {
         req->conn_timeout->data = conn;
         uv_timer_start(req->conn_timeout, connect_timeout, conn->timeout, 0);
 
-        ZITI_LOG(DEBUG, "starting connection for service[%s] with session[%s]", conn->service, net_session->id);
-        ziti_connect(ztx, net_session, conn);
+        ZITI_LOG(DEBUG, "starting %s connection for service[%s] with session[%s]", req->session_type, conn->service, req->session->id);
+        ziti_connect(ztx, req->session, conn);
     }
 
     uv_close((uv_handle_t *) ar, free_handle);

diff --git a/programs/sample-host/sample-host.c b/programs/sample-host/sample-host.c
@@ -43,6 +43,7 @@ static ssize_t on_client_data(ziti_connection clt, uint8_t *data, ssize_t len) {
     }
     else if (len == ZITI_EOF) {
         printf("client disconnected\n");
+        ziti_close(&clt);
     }
     else {
         fprintf(stderr, "error: %zd(%s)", len, ziti_errorstr(len));