Commit 6942d1ec authored by deuce's avatar deuce
Browse files

It appears you are trying to use C++... would you like to know more about

constructors and destructors?
parent b559a1dc
...@@ -1528,7 +1528,6 @@ void input_thread(void *arg) ...@@ -1528,7 +1528,6 @@ void input_thread(void *arg)
lprintf(LOG_DEBUG,"Node %d input thread started",sbbs->cfg.node_num); lprintf(LOG_DEBUG,"Node %d input thread started",sbbs->cfg.node_num);
#endif #endif
pthread_mutex_init(&sbbs->input_thread_mutex,NULL);
sbbs->input_thread_running = true; sbbs->input_thread_running = true;
sbbs->console|=CON_R_INPUT; sbbs->console|=CON_R_INPUT;
...@@ -1767,11 +1766,6 @@ void input_thread(void *arg) ...@@ -1767,11 +1766,6 @@ void input_thread(void *arg)
if(node_socket[sbbs->cfg.node_num-1]==INVALID_SOCKET) // Shutdown locally if(node_socket[sbbs->cfg.node_num-1]==INVALID_SOCKET) // Shutdown locally
sbbs->terminated = true; // Signal JS to stop execution sbbs->terminated = true; // Signal JS to stop execution
while(pthread_mutex_destroy(&sbbs->ssh_mutex)==EBUSY)
mswait(1);
while(pthread_mutex_destroy(&sbbs->input_thread_mutex)==EBUSY)
mswait(1);
thread_down(); thread_down();
lprintf(LOG_DEBUG,"Node %d input thread terminated (received %lu bytes in %lu blocks)" lprintf(LOG_DEBUG,"Node %d input thread terminated (received %lu bytes in %lu blocks)"
,sbbs->cfg.node_num, total_recv, total_pkts); ,sbbs->cfg.node_num, total_recv, total_pkts);
...@@ -3344,6 +3338,9 @@ bool sbbs_t::init() ...@@ -3344,6 +3338,9 @@ bool sbbs_t::init()
} }
} }
pthread_mutex_init(&ssh_mutex,NULL);
pthread_mutex_init(&input_thread_mutex,NULL);
reset_logon_vars(); reset_logon_vars();
online=ON_REMOTE; online=ON_REMOTE;
...@@ -3469,6 +3466,11 @@ sbbs_t::~sbbs_t() ...@@ -3469,6 +3466,11 @@ sbbs_t::~sbbs_t()
FREE_AND_NULL(batdn_cdt); FREE_AND_NULL(batdn_cdt);
FREE_AND_NULL(batdn_alt); FREE_AND_NULL(batdn_alt);
while(pthread_mutex_destroy(&ssh_mutex)==EBUSY)
mswait(1);
while(pthread_mutex_destroy(&input_thread_mutex)==EBUSY)
mswait(1);
#if 0 && defined(_WIN32) && defined(_DEBUG) && defined(_MSC_VER) #if 0 && defined(_WIN32) && defined(_DEBUG) && defined(_MSC_VER)
if(!_CrtCheckMemory()) if(!_CrtCheckMemory())
lprintf(LOG_ERR,"!MEMORY ERRORS REPORTED IN DATA/DEBUG.LOG!"); lprintf(LOG_ERR,"!MEMORY ERRORS REPORTED IN DATA/DEBUG.LOG!");
...@@ -5383,7 +5385,6 @@ NO_SSH: ...@@ -5383,7 +5385,6 @@ NO_SSH:
new_node->sys_status|=SS_RLOGIN; new_node->sys_status|=SS_RLOGIN;
new_node->telnet_mode|=TELNET_MODE_OFF; // RLogin does not use Telnet commands new_node->telnet_mode|=TELNET_MODE_OFF; // RLogin does not use Telnet commands
} }
pthread_mutex_init(&new_node->ssh_mutex,NULL);
#ifdef USE_CRYPTLIB #ifdef USE_CRYPTLIB
if(ssh) { if(ssh) {
SOCKET tmp_sock; SOCKET tmp_sock;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment