ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove crappy, unsafe (and now unneeded!) casts.

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10476 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
w00t 2008-09-08 20:59:16 +00:00
parent 617b640fa8
commit 36b68893df
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/socket.h
View File

@ -135,7 +135,7 @@ namespace irc
* or a negative value upon failure (negative values are invalid file
* descriptors)
*/
CoreExport int OpenTCPSocket(char* addr, int socktype = SOCK_STREAM);
CoreExport int OpenTCPSocket(const char* addr, int socktype = SOCK_STREAM);
}
}
@ -171,7 +171,7 @@ class CoreExport ListenSocketBase : public EventHandler
public:
/** Create a new listening socket
*/
ListenSocketBase(InspIRCd* Instance, int port, char* addr);
ListenSocketBase(InspIRCd* Instance, int port, const std::string &addr);
/** Handle an I/O event
*/
void HandleEvent(EventType et, int errornum = 0);
@ -219,7 +219,7 @@ class CoreExport ClientListenSocket : public ListenSocketBase
{
virtual void OnAcceptReady(const std::string &ipconnectedto, int fd, const std::string &incomingip);
public:
ClientListenSocket(InspIRCd* Instance, int port, char* addr) : ListenSocketBase(Instance, port, addr) { }
ClientListenSocket(InspIRCd* Instance, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr) { }
};
#endif

8
src/listensocket.cpp
View File

@ -24,15 +24,15 @@ sockaddr* ListenSocketBase::sock_us = NULL;
sockaddr* ListenSocketBase::client = NULL;
sockaddr* ListenSocketBase::raddr = NULL;
ListenSocketBase::ListenSocketBase(InspIRCd* Instance, int port, char* addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port)
ListenSocketBase::ListenSocketBase(InspIRCd* Instance, int port, const std::string &addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port)
{
this->SetFd(irc::sockets::OpenTCPSocket(addr));
this->SetFd(irc::sockets::OpenTCPSocket(addr.c_str()));
if (this->GetFd() > -1)
{
if (!Instance->BindSocket(this->fd,port,addr))
if (!Instance->BindSocket(this->fd,port,addr.c_str()))
this->fd = -1;
#ifdef IPV6
if ((!*addr) || (strchr(addr,':')))
if ((!*addr.c_str()) || (strchr(addr.c_str(),':')))
this->family = AF_INET6;
else
#endif

2
src/modules/m_httpd.cpp
View File

@ -378,7 +378,7 @@ class HttpListener : public ListenSocketBase
virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
{
new HttpServerSocket(ServerInstance, nfd, (char *)incomingip.c_str(), index); // XXX unsafe casts suck
new HttpServerSocket(ServerInstance, nfd, incomingip.c_str(), index);
}
};

2
src/socket.cpp
View File

@ -143,7 +143,7 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
}
// Open a TCP Socket
int irc::sockets::OpenTCPSocket(char* addr, int socktype)
int irc::sockets::OpenTCPSocket(const char* addr, int socktype)
{
int sockfd;
int on = 1;