Skip to content
Snippets Groups Projects
Commit e2d56435 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Revert the last changes.

Something weird is happening to the cryptlib session when SZ sends
a lot of data... no real clues left.
parent ddc0c321
No related branches found
No related tags found
No related merge requests found
...@@ -2458,23 +2458,14 @@ void output_thread(void* arg) ...@@ -2458,23 +2458,14 @@ void output_thread(void* arg)
*/ */
if(cryptStatusError(err=cryptSetAttribute(sbbs->ssh_session, CRYPT_OPTION_NET_WRITETIMEOUT, 5))) if(cryptStatusError(err=cryptSetAttribute(sbbs->ssh_session, CRYPT_OPTION_NET_WRITETIMEOUT, 5)))
GCESSTR(err, node, LOG_WARNING, sbbs->ssh_session, "setting write timeout"); GCESSTR(err, node, LOG_WARNING, sbbs->ssh_session, "setting write timeout");
do { if(cryptStatusError((err=cryptFlushData(sbbs->ssh_session)))) {
if(cryptStatusError((err=cryptFlushData(sbbs->ssh_session)))) { GCESSTR(err, node, LOG_WARNING, sbbs->ssh_session, "flushing data");
GCESSTR(err, node, LOG_WARNING, sbbs->ssh_session, "flushing data"); ssh_errors++;
ssh_errors++; if (err != CRYPT_ERROR_TIMEOUT) {
if (err == CRYPT_ERROR_TIMEOUT) { sbbs->online=FALSE;
(void)cryptPopData(sbbs->ssh_session, (void *)"", 0, &err); i=buftop-bufbot; // Pretend we sent it all
if (cryptStatusError(err))
GCESSTR(err, node, LOG_WARNING, sbbs->ssh_session, "popping SSH data after timeout");
else
err = CRYPT_ERROR_TIMEOUT;
}
else {
sbbs->online=FALSE;
i=buftop-bufbot; // Pretend we sent it all
}
} }
} while (err == CRYPT_ERROR_TIMEOUT); }
// READ = WRITE TIMEOUT HACK... REMOVE WHEN FIXED // READ = WRITE TIMEOUT HACK... REMOVE WHEN FIXED
if(cryptStatusError(err=cryptSetAttribute(sbbs->ssh_session, CRYPT_OPTION_NET_WRITETIMEOUT, 0))) if(cryptStatusError(err=cryptSetAttribute(sbbs->ssh_session, CRYPT_OPTION_NET_WRITETIMEOUT, 0)))
GCESSTR(err, node, LOG_WARNING, sbbs->ssh_session, "setting write timeout"); GCESSTR(err, node, LOG_WARNING, sbbs->ssh_session, "setting write timeout");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment