diff options
author | Patric Stout <truebrain@openttd.org> | 2021-05-13 11:46:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-13 11:46:51 +0200 |
commit | a403653805c6fd6022868c5f381e10107e1d2b20 (patch) | |
tree | b44e4df40d65cf1fecdadab090badb73d78e0a6d /src/network/network_udp.cpp | |
parent | 86741ad489c3ee2d519eeb071be846721b90412c (diff) | |
download | openttd-a403653805c6fd6022868c5f381e10107e1d2b20.tar.xz |
Codechange: [Network] split CloseSocket and CloseConnection more clearly (#9261)
* Codechange: [Network] split CloseSocket and CloseConnection more clearly
- CloseSocket now closes the actual OS socket.
- CloseConnection frees up the resources to just before CloseSocket.
- dtors call CloseSocket / CloseConnection where needed.
Diffstat (limited to 'src/network/network_udp.cpp')
-rw-r--r-- | src/network/network_udp.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp index 75bf4563d..0da5a8b26 100644 --- a/src/network/network_udp.cpp +++ b/src/network/network_udp.cpp @@ -54,10 +54,10 @@ struct UDPSocket { UDPSocket(const std::string &name_) : name(name_), socket(nullptr) {} - void Close() + void CloseSocket() { std::lock_guard<std::mutex> lock(mutex); - socket->Close(); + socket->CloseSocket(); delete socket; socket = nullptr; } @@ -619,9 +619,9 @@ void NetworkUDPServerListen() /** Close all UDP related stuff. */ void NetworkUDPClose() { - _udp_client.Close(); - _udp_server.Close(); - _udp_master.Close(); + _udp_client.CloseSocket(); + _udp_server.CloseSocket(); + _udp_master.CloseSocket(); _network_udp_server = false; _network_udp_broadcast = 0; |