diff options
| author |  Sadie Powell | 2020-04-09 18:06:50 +0100 |
|---|---|---|
| committer | Sadie Powell | 2020-04-09 18:06:50 +0100 |
| commit | e1ed9b275f465fbc235a23e416ba7626c7cba6cc (patch) | |
| tree | a0cda4ca3cf14e2731ada5cd6fc890eb90e80731 /src/inspsocket.cpp | |
| parent | Merge branch 'insp3' into master. (diff) | |
| parent | Set the minimum length to 1 for most config items with a default. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/inspsocket.cpp')
| -rw-r--r-- | src/inspsocket.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 1a1ca6a5e..f73c48560 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -49,7 +49,7 @@ BufferedSocket::BufferedSocket(int newfd) Timeout = NULL; this->fd = newfd; this->state = I_CONNECTED; - if (fd > -1) + if (HasFd()) SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE); } @@ -66,10 +66,10 @@ void BufferedSocket::DoConnect(const irc::sockets::sockaddrs& dest, const irc::s BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned int timeout) { - if (fd < 0) + if (!HasFd()) fd = socket(dest.family(), SOCK_STREAM, 0); - if (fd < 0) + if (!HasFd()) return I_ERR_SOCKET; if (bind.family() != 0) @@ -104,7 +104,7 @@ void StreamSocket::Close() return; closing = true; - if (this->fd > -1) + if (HasFd()) { // final chance, dump as much of the sendq as we can DoWrite(); @@ -229,7 +229,7 @@ void StreamSocket::DoWrite() return; } - if (!error.empty() || fd < 0) + if (!error.empty() || !HasFd()) { ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "DoWrite on errored or closed socket"); return; @@ -369,7 +369,7 @@ bool StreamSocket::OnSetEndPoint(const irc::sockets::sockaddrs& local, const irc void StreamSocket::WriteData(const std::string &data) { - if (fd < 0) + if (!HasFd()) { ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Attempt to write data to dead socket: %s", data.c_str()); |