xaymar/DataPath
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

windows: Fix accidental rename

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2020-01-23 02:35:36 +01:00
parent 08713db947
commit 55d7d90209
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/windows/server.cpp
+2 -2
View File
@@ -152,7 +152,7 @@ void datapath::windows::server::_watcher()
std::unique_lock<std::mutex> ul(this->lock); std::unique_lock<std::mutex> ul(this->lock);
std::list<HANDLE> to_kill; std::list<HANDLE> to_kill;
if (this->_on_accept) { if (this->on_accept) {
for (auto itr = this->pending_sockets.begin(); itr != this->pending_sockets.end(); itr++) { for (auto itr = this->pending_sockets.begin(); itr != this->pending_sockets.end(); itr++) {
HANDLE handle = *itr; HANDLE handle = *itr;
bool accept = true; bool accept = true;
@@ -161,7 +161,7 @@ void datapath::windows::server::_watcher()
sock->_connect(handle); sock->_connect(handle);
auto isock = std::dynamic_pointer_cast<datapath::isocket>(sock); auto isock = std::dynamic_pointer_cast<datapath::isocket>(sock);
this->_on_accept(accept, isock); this->on_accept(accept, isock);
if (accept) { if (accept) {
to_kill.push_back(handle); to_kill.push_back(handle);
source/windows/socket.cpp
+6 -6
View File
@@ -39,8 +39,8 @@ void datapath::windows::socket::_connect(HANDLE handle)
void datapath::windows::socket::_disconnect() void datapath::windows::socket::_disconnect()
{ {
if (this->_on_close) { if (this->on_close) {
this->_on_close(); this->on_close();
} }
{ {
@@ -96,8 +96,8 @@ void datapath::windows::socket::_watcher()
}); });
read_content_ov->_on_wait_success.add([this, &read_buffer, &state, &waitable](datapath::error ec) { read_content_ov->_on_wait_success.add([this, &read_buffer, &state, &waitable](datapath::error ec) {
// We have content! // We have content!
if (this->_on_message) { if (this->on_message) {
this->_on_message(read_buffer); this->on_message(read_buffer);
state = readstate::Unknown; state = readstate::Unknown;
} else { } else {
// We're buffering the message in read_buffer until there is a hook to on_message. // We're buffering the message in read_buffer until there is a hook to on_message.
@@ -138,8 +138,8 @@ void datapath::windows::socket::_watcher()
// This logic is in the on_wait_success handler, and continued here. // This logic is in the on_wait_success handler, and continued here.
if (!waitable) { if (!waitable) {
// We currently have a message buffered, but there was no handler last time we checked. // We currently have a message buffered, but there was no handler last time we checked.
if (this->_on_message) { if (this->on_message) {
this->_on_message(read_buffer); this->on_message(read_buffer);
state = readstate::Unknown; state = readstate::Unknown;
} }
} }