aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-10-17 18:02:26 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-10-17 18:02:26 +0300
commit93f4d2b3f126412c057747ecf430a4ffba4f66a3 (patch)
tree3a644f9d0dfa45be0ae7a2db32f510a62c227a6e
parent558a133044ac638dafb7b0e9452a4d7e435177bf (diff)
downloadminetest-93f4d2b3f126412c057747ecf430a4ffba4f66a3.tar.gz
minetest-93f4d2b3f126412c057747ecf430a4ffba4f66a3.tar.bz2
minetest-93f4d2b3f126412c057747ecf430a4ffba4f66a3.zip
Catch SendFailedException when replying back in Connection::Receive()
-rw-r--r--src/connection.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/connection.cpp b/src/connection.cpp
index 89cb7dd0b..0f09753bd 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -1102,6 +1102,11 @@ u32 Connection::Receive(u16 &peer_id, u8 *data, u32 datasize)
if(m_socket.WaitData(0) == true)
continue;
}
+ catch(SendFailedException &e)
+ {
+ derr_con<<"Receive(): SendFailedException; peer_id="
+ <<peer_id<<std::endl;
+ }
} // for
}
********************************/ /* WARNING!!!! do NOT add this header in any include file or any code file */ /* not being a modapi file!!!!!!!! */ /******************************************************************************/ /******************************************************************************/ #pragma once #include <thread> #include "common/c_internal.h" #include "cpp_api/s_base.h" #include "threading/mutex_auto_lock.h" #ifdef SCRIPTAPI_LOCK_DEBUG #include <cassert> class LockChecker { public: LockChecker(int *recursion_counter, std::thread::id *owning_thread) { m_lock_recursion_counter = recursion_counter; m_owning_thread = owning_thread; m_original_level = *recursion_counter; if (*m_lock_recursion_counter > 0) { assert(*m_owning_thread == std::this_thread::get_id()); } else {