avoid setting immediate timeout on connect (#606)

* avoid setting immediate timeout on connect * init header value
openziti · Jan 4, 2024 · 2e9e833 · 2e9e833
1 parent ad42129
commit 2e9e833
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/library/channel.c b/library/channel.c
@@ -698,7 +698,7 @@ static void hello_reply_cb(void *ctx, message *msg, int err) {
 }
 
 static void send_hello(ziti_channel_t *ch, ziti_api_session *session) {
-    uint8_t true_val;
+    uint8_t true_val = 1;
     hdr_t headers[] = {
             {
                     .header_id = SessionTokenHeader,

diff --git a/library/connect.c b/library/connect.c
@@ -483,11 +483,12 @@ static void process_connect(struct ziti_conn *conn) {
                                  conn);
         return;
     } else {
-        req->conn_timeout = calloc(1, sizeof(uv_timer_t));
-        uv_timer_init(loop, req->conn_timeout);
-        req->conn_timeout->data = conn;
-        uv_timer_start(req->conn_timeout, connect_timeout, req->dial_opts.connect_timeout_seconds * 1000, 0);
-
+        if (req->dial_opts.connect_timeout_seconds > 0) {
+            req->conn_timeout = calloc(1, sizeof(uv_timer_t));
+            uv_timer_init(loop, req->conn_timeout);
+            req->conn_timeout->data = conn;
+            uv_timer_start(req->conn_timeout, connect_timeout, req->dial_opts.connect_timeout_seconds * 1000, 0);
+        }
         CONN_LOG(DEBUG, "starting %s connection for service[%s] with session[%s]",
                  ziti_session_types.name(req->session_type), conn->service, req->session->id);
         ziti_connect(ztx, req->session, conn);