From 2cf4b614e6c23bfc6d47da2ec4b1932ee2f62cf0 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Sat, 8 Feb 2014 13:10:09 +0100 Subject: Change SocketEngine functions that do not require an instance to be static --- src/commands/cmd_dns.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/commands/cmd_dns.cpp') diff --git a/src/commands/cmd_dns.cpp b/src/commands/cmd_dns.cpp index 07ade381a..4af8b2c9e 100644 --- a/src/commands/cmd_dns.cpp +++ b/src/commands/cmd_dns.cpp @@ -682,8 +682,8 @@ class MyManager : public Manager, public Timer, public EventHandler if (this->GetFd() > -1) { ServerInstance->SE->DelFd(this); - ServerInstance->SE->Shutdown(this, 2); - ServerInstance->SE->Close(this); + SocketEngine::Shutdown(this, 2); + SocketEngine::Close(this); this->SetFd(-1); /* Remove expired entries from the cache */ @@ -699,24 +699,24 @@ class MyManager : public Manager, public Timer, public EventHandler /* Have we got a socket? */ if (this->GetFd() != -1) { - ServerInstance->SE->SetReuse(s); - ServerInstance->SE->NonBlocking(s); + SocketEngine::SetReuse(s); + SocketEngine::NonBlocking(s); irc::sockets::sockaddrs bindto; memset(&bindto, 0, sizeof(bindto)); bindto.sa.sa_family = myserver.sa.sa_family; - if (ServerInstance->SE->Bind(this->GetFd(), bindto) < 0) + if (SocketEngine::Bind(this->GetFd(), bindto) < 0) { /* Failed to bind */ ServerInstance->Logs->Log("RESOLVER", LOG_SPARSE, "Resolver: Error binding dns socket - hostnames will NOT resolve"); - ServerInstance->SE->Close(this); + SocketEngine::Close(this); this->SetFd(-1); } else if (!ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE)) { ServerInstance->Logs->Log("RESOLVER", LOG_SPARSE, "Resolver: Internal error starting DNS - hostnames will NOT resolve."); - ServerInstance->SE->Close(this); + SocketEngine::Close(this); this->SetFd(-1); } } -- cgit v1.3.1-10-gc9f91