commit b7854aff6b7aea11ea99085b2d9058ea3263dfcc
author Michal Vasko <mvasko@cesnet.cz> Thu Aug 03 15:01:13 2017 +0200
committer GitHub <noreply@github.com> Thu Aug 03 15:01:13 2017 +0200
tree d867b4bce40ddffa838320f6a008f610a063d704
parent 06bde41e5af893ccf0ec540cba953518569649df
parent 75888b6980b74f1b1936f428319c4463b2411276

Merge pull request #36 from fanchanghu/devel

session BUGFIX set default server hello timeout

src/session.c

diff --git a/src/session.c b/src/session.c
index fcb6e40..88eb17d 100644
--- a/src/session.c
+++ b/src/session.c
@@ -42,6 +42,7 @@
 
 /* in seconds */
 #define NC_CLIENT_HELLO_TIMEOUT 60
+#define NC_SERVER_HELLO_TIMEOUT 60
 
 /* in milliseconds */
 #define NC_CLOSE_REPLY_TIMEOUT 200
@@ -1135,7 +1136,7 @@
     int ver = -1;
     int flag = 0;
 
-    msgtype = nc_read_msg_poll(session, (server_opts.hello_timeout ? server_opts.hello_timeout * 1000 : -1), &xml);
+    msgtype = nc_read_msg_poll(session, (server_opts.hello_timeout ? server_opts.hello_timeout * 1000 : NC_SERVER_HELLO_TIMEOUT * 1000), &xml);
 
     switch (msgtype) {
     case NC_MSG_HELLO: