From 6c35737e67f8fbb11d57fded29b2965b41da25fe Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Thu, 15 Mar 2018 08:13:07 +0000
Subject: [PATCH] We certainly can't re-use i for error return values when it's
how many bytes have been sent!
---
src/sbbs3/main.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp
index 455fdfea5e..ceb809cb7d 100644
--- a/src/sbbs3/main.cpp
+++ b/src/sbbs3/main.cpp
@@ -2416,8 +2416,8 @@ void output_thread(void* arg)
}
else {
// READ = WRITE TIMEOUT HACK... REMOVE WHEN FIXED
- if(cryptStatusError(i=cryptSetAttribute(sbbs->ssh_session, CRYPT_OPTION_NET_WRITETIMEOUT, 1)))
- GCESS(i, sbbs->client_socket, sbbs->ssh_session, "setting write timeout");
+ if(cryptStatusError(err=cryptSetAttribute(sbbs->ssh_session, CRYPT_OPTION_NET_WRITETIMEOUT, 5)))
+ GCESS(err, sbbs->client_socket, sbbs->ssh_session, "setting write timeout");
if(cryptStatusError((err=cryptFlushData(sbbs->ssh_session)))) {
GCES(err, sbbs->cfg.node_num, sbbs->ssh_session, "flushing data");
ssh_errors++;
@@ -2427,8 +2427,8 @@ void output_thread(void* arg)
}
}
// READ = WRITE TIMEOUT HACK... REMOVE WHEN FIXED
- if(cryptStatusError(i=cryptSetAttribute(sbbs->ssh_session, CRYPT_OPTION_NET_WRITETIMEOUT, 0)))
- GCESS(i, sbbs->client_socket, sbbs->ssh_session, "setting write timeout");
+ if(cryptStatusError(err=cryptSetAttribute(sbbs->ssh_session, CRYPT_OPTION_NET_WRITETIMEOUT, 0)))
+ GCESS(err, sbbs->client_socket, sbbs->ssh_session, "setting write timeout");
}
}
pthread_mutex_unlock(&sbbs->ssh_mutex);
--
GitLab