Fix MOTD and RULES to work remotely (remove the old hacks for MOTD)

[user/henk/code/inspircd.git] / src / inspsocket.cpp

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 86104c54d407eecaf030e3af50435410a867fc11..8d03004a71a61678af0bc56cdc1372628ffde524 100644 (file)
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -90,7 +90,7 @@ BufferedSocketError BufferedSocket::BeginConnect(const irc::sockets::sockaddrs&
 
        if (bind.sa.sa_family != 0)
        {
-               if (ServerInstance->SE->Bind(fd, &bind.sa, sa_size(bind)) < 0)
+               if (ServerInstance->SE->Bind(fd, bind) < 0)
                        return I_ERR_BIND;
        }
 
@@ -156,7 +156,7 @@ bool StreamSocket::GetNextLine(std::string& line, char delim)
        std::string::size_type i = recvq.find(delim);
        if (i == std::string::npos)
                return false;
-       line = recvq.substr(0, i - 1);
+       line = recvq.substr(0, i);
        // TODO is this the most efficient way to split?
        recvq = recvq.substr(i + 1);
        return true;
@@ -541,7 +541,6 @@ void StreamSocket::HandleEvent(EventType et, int errornum)
        {
                ServerInstance->Logs->Log("SOCKET", DEBUG, "Error on FD %d - '%s'", fd, error.c_str());
                OnError(errcode);
-               ServerInstance->GlobalCulls.AddItem(this);
        }
 }