summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/inspsocket.cpp12
-rw-r--r--src/modules/m_spanningtree/treesocket2.cpp2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index ef1ba7ee2..7b2400473 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());
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 06c547ac3..6b1ca21d0 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -407,7 +407,7 @@ void TreeSocket::OnTimeout()
void TreeSocket::Close()
{
- if (fd < 0)
+ if (!HasFd())
return;
ServerInstance->GlobalCulls.AddItem(this);