* +------------------------------------+
*
* InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
+ * E-mail:
+ * <brain@chatspike.net>
+ * <Craig@chatspike.net>
*
* Written by Craig Edwards, Craig McLure, and others.
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
#include "configreader.h"
#include "socket.h"
#include "inspircd.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
#include "socketengine.h"
#include "wildcard.h"
-#include "message.h"
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern time_t TIME;
+using namespace std;
+using namespace irc::sockets;
/* Used when comparing CIDR masks for the modulus bits left over.
* A lot of ircd's seem to do this:
0xFE /* 11111110 - 7 bits */
};
+
+ListenSocket::ListenSocket(InspIRCd* Instance, int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr) : ServerInstance(Instance)
+{
+ this->SetFd(sockfd);
+ Instance->Log(DEBUG,"Binding to port %s:%d",addr,port);
+ if (!Instance->BindSocket(this->fd,client,server,port,addr))
+ {
+ Instance->Log(DEBUG,"Binding failed!");
+ this->fd = -1;
+ }
+}
+
+void ListenSocket::HandleEvent(EventType et)
+{
+ insp_sockaddr sock_us; // our port number
+ socklen_t uslen; // length of our port number
+ 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);
+
+ if ((incomingSockfd > -1) && (!getsockname(incomingSockfd, (sockaddr*)&sock_us, &uslen)))
+ {
+#ifdef IPV6
+ in_port = ntohs(sock_us.sin6_port);
+#else
+ in_port = ntohs(sock_us.sin_port);
+#endif
+ ServerInstance->Log(DEBUG,"Accepted socket %d",incomingSockfd);
+ NonBlocking(incomingSockfd);
+ if (ServerInstance->Config->GetIOHook(in_port))
+ {
+ try
+ {
+#ifdef IPV6
+ ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin6_addr), in_port);
+#else
+ ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin_addr), in_port);
+#endif
+ }
+ catch (ModuleException& modexcept)
+ {
+ ServerInstance->Log(DEBUG,"Module exception cought: %s",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++;
+ }
+}
+
/* Match raw bytes using CIDR bit matching, used by higher level MatchCIDR() */
-bool MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits)
+bool irc::sockets::MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits)
{
unsigned int modulus = mask_bits % 8; /* Number of whole bytes in the mask */
unsigned int divisor = mask_bits / 8; /* Remaining bits in the mask after whole bytes are dealt with */
}
/* Match CIDR, but dont attempt to match() against leading *!*@ sections */
-bool MatchCIDR(const char* address, const char* cidr_mask)
+bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask)
{
return MatchCIDR(address, cidr_mask, false);
}
* This will also attempt to match any leading usernames or nicknames on the mask, using
* match(), when match_with_username is true.
*/
-bool MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username)
+bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username)
{
unsigned char addr_raw[16];
unsigned char mask_raw[16];
else
{
/* No 'number of bits' field! */
+ free(mask);
return false;
}
return MatchCIDRBits(addr_raw, mask_raw, bits);
}
+inline 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)
+{
+ 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'.
*/
-bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr)
+bool InspIRCd::BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port, char* addr)
{
memset(&server,0,sizeof(server));
insp_inaddr addy;
if ((*addr) && (insp_aton(addr,&addy) < 1))
{
- log(DEBUG,"Invalid IP '%s' given to BindSocket()", addr);
+ this->Log(DEBUG,"Invalid IP '%s' given to BindSocket()", addr);
return false;;
}
}
else
{
- log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port);
+ this->Log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port);
if (listen(sockfd, Config->MaxConn) == -1)
{
- log(DEFAULT,"ERROR in listen(): %s",strerror(errno));
+ this->Log(DEFAULT,"ERROR in listen(): %s",strerror(errno));
return false;
}
else
// Open a TCP Socket
-int OpenTCPSocket()
+int irc::sockets::OpenTCPSocket()
{
int sockfd;
int on = 1;
if ((sockfd = socket (AF_FAMILY, SOCK_STREAM, 0)) < 0)
{
- log(DEFAULT,"Error creating TCP socket: %s",strerror(errno));
- return (ERROR);
+ return ERROR;
}
else
{
}
}
-bool HasPort(int port, char* addr)
+/* XXX: Probably belongs in class InspIRCd */
+bool InspIRCd::HasPort(int port, char* addr)
{
- for (unsigned long count = 0; count < ServerInstance->stats->BoundPortCount; count++)
+ for (unsigned long count = 0; count < stats->BoundPortCount; count++)
{
if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr)))
{
return false;
}
-int BindPorts(bool bail)
+/* XXX: Probably belongs in class InspIRCd */
+int InspIRCd::BindPorts(bool bail)
{
char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
insp_sockaddr client, server;
if (!bail)
{
- int InitialPortCount = ServerInstance->stats->BoundPortCount;
- log(DEBUG,"Initial port count: %d",InitialPortCount);
+ int InitialPortCount = stats->BoundPortCount;
+ this->Log(DEBUG,"Initial port count: %d",InitialPortCount);
for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
{
strlcpy(Config->addrs[clientportcount+InitialPortCount],Addr,256);
clientportcount++;
- log(DEBUG,"NEW binding %s:%s [%s] from config",Addr,configToken, Type);
+ this->Log(DEBUG,"NEW binding %s:%s [%s] from config",Addr,configToken, Type);
}
}
int PortCount = clientportcount;
if (PortCount)
{
+ BoundPortCount = stats->BoundPortCount;
for (int count = InitialPortCount; count < InitialPortCount + PortCount; count++)
{
- if ((Config->openSockfd[count] = OpenTCPSocket()) == ERROR)
+ int fd = OpenTCPSocket();
+ if (fd == ERROR)
{
- log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[count],Config->addrs[count],Config->ports[count]);
+ this->Log(DEBUG,"Bad fd %d binding port [%s:%d]",fd,Config->addrs[count],Config->ports[count]);
}
else
{
- if (!BindSocket(Config->openSockfd[count],client,server,Config->ports[count],Config->addrs[count]))
- {
- log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
- }
- else
+ Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]);
+ if (Config->openSockfd[BoundPortCount]->GetFd() > -1)
{
- /* Associate the new open port with a slot in the socket engine */
- if (Config->openSockfd[count] > -1)
+ if (!SE->AddFd(Config->openSockfd[BoundPortCount]))
{
- ServerInstance->SE->AddFd(Config->openSockfd[count],true,X_LISTEN);
- BoundPortCount++;
+ this->Log(DEFAULT,"ERK! Failed to add listening port to socket engine!");
+ shutdown(Config->openSockfd[BoundPortCount]->GetFd(),2);
+ close(Config->openSockfd[BoundPortCount]->GetFd());
+ delete Config->openSockfd[BoundPortCount];
}
+ else
+ BoundPortCount++;
}
+ /*if (!BindSocket(Config->openSockfd[count],client,server,Config->ports[count],Config->addrs[count]))
+ {
+ this->Log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
+ }*/
}
}
return InitialPortCount + BoundPortCount;
}
else
{
- log(DEBUG,"There is nothing new to bind!");
+ this->Log(DEBUG,"There is nothing new to bind!");
}
return InitialPortCount;
}
strlcpy(Config->addrs[clientportcount],Addr,256);
clientportcount++;
- log(DEBUG,"Binding %s:%s [%s] from config",Addr,configToken, Type);
+ this->Log(DEBUG,"Binding %s:%s [%s] from config",Addr,configToken, Type);
}
}
for (int count = 0; count < PortCount; count++)
{
- if ((Config->openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR)
+ int fd = OpenTCPSocket();
+ if (fd == ERROR)
{
- log(DEBUG,"Bad fd %d binding port [%s:%d]",Config->openSockfd[BoundPortCount],Config->addrs[count],Config->ports[count]);
+ this->Log(DEBUG,"Bad fd %d binding port [%s:%d]",fd,Config->addrs[count],Config->ports[count]);
}
else
{
- if (!BindSocket(Config->openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count]))
+ Config->openSockfd[BoundPortCount] = new ListenSocket(this,fd,client,server,Config->ports[count],Config->addrs[count]);
+ if (Config->openSockfd[BoundPortCount]->GetFd() > -1)
{
- log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
- }
- else
- {
- /* well we at least bound to one socket so we'll continue */
BoundPortCount++;
}
+ /*if (!BindSocket(Config->openSockfd[BoundPortCount],client,server,Config->ports[count],Config->addrs[count]))
+ {
+ this->Log(DEFAULT,"Failed to bind port [%s:%d]: %s",Config->addrs[count],Config->ports[count],strerror(errno));
+ }*/
}
}
return BoundPortCount;
}
-const char* insp_ntoa(insp_inaddr n)
+const char* irc::sockets::insp_ntoa(insp_inaddr n)
{
static char buf[1024];
inet_ntop(AF_FAMILY, &n, buf, sizeof(buf));
return buf;
}
-int insp_aton(const char* a, insp_inaddr* n)
+int irc::sockets::insp_aton(const char* a, insp_inaddr* n)
{
return inet_pton(AF_FAMILY, a, n);
}
projects / user / henk / code / inspircd.git / blobdiff