session BUGFIX timeout 0 means infinite

michalvasko · michalvasko · commit 5c1c9b368641 · 2024-02-02T09:32:34.000+01:00
Fixes #459
diff --git a/src/session.c b/src/session.c
@@ -1371,7 +1371,7 @@ nc_send_hello_io(struct nc_session *session)
         if (session->flags & NC_SESSION_CALLHOME) {
             timeout_io = NC_SERVER_CH_HELLO_TIMEOUT * 1000;
         } else {
-            timeout_io = server_opts.idle_timeout * 1000;
+            timeout_io = server_opts.idle_timeout ? server_opts.idle_timeout * 1000 : -1;
         }
         sid = &session->id;
     }
@@ -1481,7 +1481,7 @@ nc_recv_server_hello_io(struct nc_session *session)
     if (session->flags & NC_SESSION_CALLHOME) {
         timeout_io = NC_SERVER_CH_HELLO_TIMEOUT * 1000;
     } else {
-        timeout_io = server_opts.idle_timeout * 1000;
+        timeout_io = server_opts.idle_timeout ? server_opts.idle_timeout * 1000 : -1;
     }
 
     r = nc_read_msg_poll_io(session, timeout_io, &msg);

Original file line number	Diff line number	Diff line change
`@@ -1371,7 +1371,7 @@ nc_send_hello_io(struct nc_session *session)`
`1371`	`1371`	`if (session->flags & NC_SESSION_CALLHOME) {`
`1372`	`1372`	`timeout_io = NC_SERVER_CH_HELLO_TIMEOUT * 1000;`
`1373`	`1373`	`} else {`
`1374`		`- timeout_io = server_opts.idle_timeout * 1000;`
	`1374`	`+ timeout_io = server_opts.idle_timeout ? server_opts.idle_timeout * 1000 : -1;`
`1375`	`1375`	`}`
`1376`	`1376`	`sid = &session->id;`
`1377`	`1377`	`}`
`@@ -1481,7 +1481,7 @@ nc_recv_server_hello_io(struct nc_session *session)`
`1481`	`1481`	`if (session->flags & NC_SESSION_CALLHOME) {`
`1482`	`1482`	`timeout_io = NC_SERVER_CH_HELLO_TIMEOUT * 1000;`
`1483`	`1483`	`} else {`
`1484`		`- timeout_io = server_opts.idle_timeout * 1000;`
	`1484`	`+ timeout_io = server_opts.idle_timeout ? server_opts.idle_timeout * 1000 : -1;`
`1485`	`1485`	`}`
`1486`	`1486`
`1487`	`1487`	`r = nc_read_msg_poll_io(session, timeout_io, &msg);`