* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
#include "socketengine.h"
#include "wildcard.h"
-using namespace std;
using namespace irc::sockets;
/* Used when comparing CIDR masks for the modulus bits left over.
};
-ListenSocket::ListenSocket(InspIRCd* Instance, int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) : ServerInstance(Instance)
+ListenSocket::ListenSocket(InspIRCd* Instance, int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) : ServerInstance(Instance), desc("plaintext")
{
this->SetFd(sockfd);
- Instance->Log(DEBUG,"Binding to port %s:%d",addr,port);
if (!Instance->BindSocket(this->fd,client,server,port,addr))
+ this->fd = -1;
+}
+
+ListenSocket::~ListenSocket()
+{
+ if (this->GetFd() > -1)
{
- Instance->Log(DEBUG,"Binding failed!");
+ shutdown(this->fd, 2);
+ close(this->fd);
this->fd = -1;
}
}
insp_sockaddr client;
socklen_t length;
int incomingSockfd, in_port;
-
- ServerInstance->Log(DEBUG,"Handle ListenSocket event");
-
uslen = sizeof(sock_us);
length = sizeof(client);
incomingSockfd = accept (this->GetFd(),(struct sockaddr*)&client, &length);
#else
in_port = ntohs(sock_us.sin_port);
#endif
- ServerInstance->Log(DEBUG,"Accepted socket %d",incomingSockfd);
NonBlocking(incomingSockfd);
if (ServerInstance->Config->GetIOHook(in_port))
{
ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin_addr), in_port);
#endif
}
- catch (ModuleException& modexcept)
+ catch (CoreException& modexcept)
{
- ServerInstance->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason());
+ ServerInstance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
}
}
ServerInstance->stats->statsAccept++;
#ifdef IPV6
- ServerInstance->Log(DEBUG,"Add ipv6 client");
userrec::AddClient(ServerInstance, incomingSockfd, in_port, false, client.sin6_addr);
#else
- ServerInstance->Log(DEBUG,"Add ipv4 client");
userrec::AddClient(ServerInstance, incomingSockfd, in_port, false, client.sin_addr);
#endif
- ServerInstance->Log(DEBUG,"Adding client on port %d fd=%d",in_port,incomingSockfd);
}
else
{
- ServerInstance->Log(DEBUG,"Accept failed on fd %d: %s",incomingSockfd,strerror(errno));
shutdown(incomingSockfd,2);
close(incomingSockfd);
ServerInstance->stats->statsRefused++;
return MatchCIDRBits(addr_raw, mask_raw, bits);
}
-inline void irc::sockets::Blocking(int s)
+void irc::sockets::Blocking(int s)
{
int flags = fcntl(s, F_GETFL, 0);
fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
}
-inline void irc::sockets::NonBlocking(int s)
+void irc::sockets::NonBlocking(int s)
{
int flags = fcntl(s, F_GETFL, 0);
fcntl(s, F_SETFL, flags | O_NONBLOCK);
}
-
/** This will bind a socket to a port. It works for UDP/TCP.
* It can only bind to IP addresses, if you wish to bind to hostnames
* you should first resolve them using class 'Resolver'.
*addr = 0;
if ((*addr) && (insp_aton(addr,&addy) < 1))
- {
- this->Log(DEBUG,"Invalid IP '%s' given to BindSocket()", addr);
return false;;
- }
#ifdef IPV6
server.sin6_family = AF_FAMILY;
}
else
{
- this->Log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port);
if (listen(sockfd, Config->MaxConn) == -1)
{
this->Log(DEFAULT,"ERROR in listen(): %s",strerror(errno));
}
/* XXX: Probably belongs in class InspIRCd */
-int InspIRCd::BindPorts(bool bail, int &ports_found)
+int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_ports)
{
char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
insp_sockaddr client, server;
ports_found = 0;
int InitialPortCount = stats->BoundPortCount;
- this->Log(DEBUG,"Initial port count: %d",InitialPortCount);
for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
{
{
irc::portparser portrange(configToken, false);
long portno = -1;
- while (portno = portrange.GetToken())
+ while ((portno = portrange.GetToken()))
{
if (!HasPort(portno, Addr))
{
strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256);
clientportcount++;
- this->Log(DEBUG,"NEW binding %s:%d [%s] from config",Addr, portno, Type);
}
}
}
int fd = OpenTCPSocket();
if (fd == ERROR)
{
- this->Log(DEBUG,"Bad fd %d binding port [%s:%d]",fd,Config->addrs[count],Config->ports[count]);
+ failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
}
else
{
shutdown(Config->openSockfd[BoundPortCount]->GetFd(),2);
close(Config->openSockfd[BoundPortCount]->GetFd());
delete Config->openSockfd[BoundPortCount];
+ failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
}
else
BoundPortCount++;
}
return InitialPortCount + BoundPortCount;
}
- else
- {
- this->Log(DEBUG,"There is nothing new to bind!");
- }
return InitialPortCount;
}
}
int fd = OpenTCPSocket();
if (fd == ERROR)
{
- this->Log(DEBUG,"Bad fd %d binding port [%s:%d]",fd,Config->addrs[count],Config->ports[count]);
+ failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
}
else
{
{
BoundPortCount++;
}
+ else
+ failed_ports.push_back(std::make_pair(Config->addrs[count],Config->ports[count]));
}
}
return BoundPortCount;
projects / user / henk / code / inspircd.git / blobdiff