X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspsocket.cpp;h=59d9558a4ecd25a83930ff9a2935e853080d39b3;hb=7b47de3c194f239c5fea09a0e49696c9af017d51;hp=69c427212a6a2dca85980667158a818d694ba929;hpb=77730fd5f09f8fc193205654c8bba84d34365670;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 69c427212..59d9558a4 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -48,9 +48,9 @@ BufferedSocket::BufferedSocket(int newfd)
 		SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE);
 }
 
-void BufferedSocket::DoConnect(const std::string& ipaddr, int aport, unsigned int maxtime, const std::string& connectbindip)
+void BufferedSocket::DoConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned int maxtime)
 {
-	BufferedSocketError err = BeginConnect(ipaddr, aport, maxtime, connectbindip);
+	BufferedSocketError err = BeginConnect(dest, bind, maxtime);
 	if (err != I_ERR_NONE)
 	{
 		state = I_ERROR;
@@ -59,27 +59,6 @@ void BufferedSocket::DoConnect(const std::string& ipaddr, int aport, unsigned in
 	}
 }
 
-BufferedSocketError BufferedSocket::BeginConnect(const std::string& ipaddr, int aport, unsigned int maxtime, const std::string& connectbindip)
-{
-	irc::sockets::sockaddrs addr, bind;
-	if (!irc::sockets::aptosa(ipaddr, aport, addr))
-	{
-		ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: Hostname passed to BufferedSocket, rather than an IP address!");
-		return I_ERR_CONNECT;
-	}
-
-	bind.sa.sa_family = 0;
-	if (!connectbindip.empty())
-	{
-		if (!irc::sockets::aptosa(connectbindip, 0, bind))
-		{
-			return I_ERR_BIND;
-		}
-	}
-
-	return BeginConnect(addr, bind, maxtime);
-}
-
 BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned int timeout)
 {
 	if (fd < 0)
@@ -358,6 +337,11 @@ void StreamSocket::FlushSendQ(SendQueue& sq)
 		}
 }
 
+bool StreamSocket::OnSetEndPoint(const irc::sockets::sockaddrs& local, const irc::sockets::sockaddrs& remote)
+{
+	return false;
+}
+
 void StreamSocket::WriteData(const std::string &data)
 {
 	if (fd < 0)