using namespace irc::sockets;
+/* Private static member data must be initialized in this manner */
+unsigned int ListenSocket::socketcount = 0;
+sockaddr* ListenSocket::sock_us = NULL;
+sockaddr* ListenSocket::client = NULL;
+sockaddr* ListenSocket::raddr = NULL;
+
/* Used when comparing CIDR masks for the modulus bits left over.
* A lot of ircd's seem to do this:
* ((-1) << (8 - (mask % 8)))
this->family = AF_INET;
Instance->SE->AddFd(this);
}
+ /* Saves needless allocations */
+ if (socketcount == 0)
+ {
+ /* All instances of ListenSocket share these, so reference count it */
+ ServerInstance->Logs->Log("SOCKET", DEBUG,"Allocate sockaddr structures");
+ sock_us = new sockaddr[2];
+ client = new sockaddr[2];
+ raddr = new sockaddr[2];
+ }
+ socketcount++;
}
ListenSocket::~ListenSocket()
if (this->GetFd() > -1)
{
ServerInstance->SE->DelFd(this);
- ServerInstance->Log(DEBUG,"Shut down listener on fd %d", this->fd);
+ ServerInstance->Logs->Log("SOCKET", DEBUG,"Shut down listener on fd %d", this->fd);
if (ServerInstance->SE->Shutdown(this, 2) || ServerInstance->SE->Close(this))
- ServerInstance->Log(DEBUG,"Failed to cancel listener: %s", strerror(errno));
+ ServerInstance->Logs->Log("SOCKET", DEBUG,"Failed to cancel listener: %s", strerror(errno));
this->fd = -1;
}
+ socketcount--;
+ if (socketcount == 0)
+ {
+ delete[] sock_us;
+ delete[] client;
+ delete[] raddr;
+ }
}
-void ListenSocket::HandleEvent(EventType, int)
+void ListenSocket::HandleEvent(EventType e, int err)
{
- sockaddr* sock_us = new sockaddr[2]; // our port number
- sockaddr* client = new sockaddr[2];
- socklen_t uslen, length; // length of our port number
- int incomingSockfd, in_port;
+ switch (e)
+ {
+ case EVENT_ERROR:
+ ServerInstance->Logs->Log("SOCKET",DEFAULT,"ListenSocket::HandleEvent() received a socket engine error event! well shit! '%s'", strerror(err));
+ break;
+ case EVENT_WRITE:
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"*** BUG *** ListenSocket::HandleEvent() got a WRITE event!!!");
+ break;
+ case EVENT_READ:
+ {
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"HandleEvent for Listensoket");
+ socklen_t uslen, length; // length of our port number
+ int incomingSockfd, in_port;
#ifdef IPV6
- if (this->family == AF_INET6)
- {
- uslen = sizeof(sockaddr_in6);
- length = sizeof(sockaddr_in6);
- }
- else
+ if (this->family == AF_INET6)
+ {
+ uslen = sizeof(sockaddr_in6);
+ length = sizeof(sockaddr_in6);
+ }
+ else
#endif
- {
- uslen = sizeof(sockaddr_in);
- length = sizeof(sockaddr_in);
- }
+ {
+ uslen = sizeof(sockaddr_in);
+ length = sizeof(sockaddr_in);
+ }
- incomingSockfd = ServerInstance->SE->Accept(this, (sockaddr*)client, &length);
+ incomingSockfd = ServerInstance->SE->Accept(this, (sockaddr*)client, &length);
+
+ if ((incomingSockfd > -1) && (!ServerInstance->SE->GetSockName(this, sock_us, &uslen)))
+ {
+ char buf[MAXBUF];
+ char target[MAXBUF];
+
+ *target = *buf = '\0';
- if ((incomingSockfd > -1) && (!ServerInstance->SE->GetSockName(this, sock_us, &uslen)))
- {
- char buf[MAXBUF];
#ifdef IPV6
- if (this->family == AF_INET6)
- {
- inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
- in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port);
- }
- else
+ if (this->family == AF_INET6)
+ {
+ in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port);
+ inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
+ socklen_t raddrsz = sizeof(sockaddr_in6);
+ if (getpeername(incomingSockfd, (sockaddr*) raddr, &raddrsz) == 0)
+ inet_ntop(AF_INET6, &((const sockaddr_in6*)raddr)->sin6_addr, target, sizeof(target));
+ else
+ ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
+ }
+ else
#endif
- {
- inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
- in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
- }
-
- ServerInstance->SE->NonBlocking(incomingSockfd);
+ {
+ inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
+ in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
+ socklen_t raddrsz = sizeof(sockaddr_in);
+ if (getpeername(incomingSockfd, (sockaddr*) raddr, &raddrsz) == 0)
+ inet_ntop(AF_INET, &((const sockaddr_in*)raddr)->sin_addr, target, sizeof(target));
+ else
+ ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
+ }
- if (ServerInstance->Config->GetIOHook(in_port))
- {
- try
- {
- ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, buf, in_port);
+ ServerInstance->SE->NonBlocking(incomingSockfd);
+ ServerInstance->stats->statsAccept++;
+ ServerInstance->Users->AddUser(ServerInstance, incomingSockfd, in_port, false, this->family, client, target);
}
- catch (CoreException& modexcept)
+ else
{
- ServerInstance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+ ServerInstance->SE->Shutdown(incomingSockfd, 2);
+ ServerInstance->SE->Close(incomingSockfd);
+ ServerInstance->stats->statsRefused++;
}
}
- ServerInstance->stats->statsAccept++;
- ServerInstance->Users->AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client);
+ break;
}
- else
- {
- ServerInstance->SE->Shutdown(incomingSockfd, 2);
- ServerInstance->SE->Close(incomingSockfd);
- ServerInstance->stats->statsRefused++;
- }
- delete[] client;
- delete[] sock_us;
}
/* Match raw bytes using CIDR bit matching, used by higher level MatchCIDR() */
* It can only bind to IP addresses, if you wish to bind to hostnames
* you should first resolve them using class 'Resolver'.
*/
-bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
+bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
{
/* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */
- sockaddr* server = new sockaddr[2];
- memset(server,0,sizeof(sockaddr)*2);
+ sockaddr* servaddr = new sockaddr[2];
+ memset(servaddr,0,sizeof(sockaddr)*2);
int ret, size;
if (*addr == '*')
- *addr = 0;
+ addr = "";
#ifdef IPV6
if (*addr)
in6_addr addy;
if (inet_pton(AF_INET6, addr, &addy) < 1)
{
- delete[] server;
+ delete[] servaddr;
return false;
}
- ((sockaddr_in6*)server)->sin6_family = AF_INET6;
- memcpy(&(((sockaddr_in6*)server)->sin6_addr), &addy, sizeof(in6_addr));
- ((sockaddr_in6*)server)->sin6_port = htons(port);
+ ((sockaddr_in6*)servaddr)->sin6_family = AF_INET6;
+ memcpy(&(((sockaddr_in6*)servaddr)->sin6_addr), &addy, sizeof(in6_addr));
+ ((sockaddr_in6*)servaddr)->sin6_port = htons(port);
size = sizeof(sockaddr_in6);
}
else
in_addr addy;
if (inet_pton(AF_INET, addr, &addy) < 1)
{
- delete[] server;
+ delete[] servaddr;
return false;
}
- ((sockaddr_in*)server)->sin_family = AF_INET;
- ((sockaddr_in*)server)->sin_addr = addy;
- ((sockaddr_in*)server)->sin_port = htons(port);
+ ((sockaddr_in*)servaddr)->sin_family = AF_INET;
+ ((sockaddr_in*)servaddr)->sin_addr = addy;
+ ((sockaddr_in*)servaddr)->sin_port = htons(port);
size = sizeof(sockaddr_in);
}
}
/* Port -1: Means UDP IPV4 port binding - Special case
* used by DNS engine.
*/
- ((sockaddr_in*)server)->sin_family = AF_INET;
- ((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY);
- ((sockaddr_in*)server)->sin_port = 0;
+ ((sockaddr_in*)servaddr)->sin_family = AF_INET;
+ ((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
+ ((sockaddr_in*)servaddr)->sin_port = 0;
size = sizeof(sockaddr_in);
}
else
{
/* Theres no address here, default to ipv6 bind to all */
- ((sockaddr_in6*)server)->sin6_family = AF_INET6;
- memset(&(((sockaddr_in6*)server)->sin6_addr), 0, sizeof(in6_addr));
- ((sockaddr_in6*)server)->sin6_port = htons(port);
+ ((sockaddr_in6*)servaddr)->sin6_family = AF_INET6;
+ memset(&(((sockaddr_in6*)servaddr)->sin6_addr), 0, sizeof(in6_addr));
+ ((sockaddr_in6*)servaddr)->sin6_port = htons(port);
size = sizeof(sockaddr_in6);
}
}
#else
/* If we aren't built with ipv6, the choice becomes simple */
- ((sockaddr_in*)server)->sin_family = AF_INET;
+ ((sockaddr_in*)servaddr)->sin_family = AF_INET;
if (*addr)
{
/* There is an address here. */
in_addr addy;
if (inet_pton(AF_INET, addr, &addy) < 1)
{
- delete[] server;
+ delete[] servaddr;
return false;
}
- ((sockaddr_in*)server)->sin_addr = addy;
+ ((sockaddr_in*)servaddr)->sin_addr = addy;
}
else
{
/* Bind ipv4 to all */
- ((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY);
+ ((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
}
/* Bind ipv4 port number */
- ((sockaddr_in*)server)->sin_port = htons(port);
+ ((sockaddr_in*)servaddr)->sin_port = htons(port);
size = sizeof(sockaddr_in);
#endif
- ret = SE->Bind(sockfd, server, size);
- delete[] server;
+ ret = SE->Bind(sockfd, servaddr, size);
+ delete[] servaddr;
if (ret < 0)
{
{
if (SE->Listen(sockfd, Config->MaxConn) == -1)
{
- this->Log(DEFAULT,"ERROR in listen(): %s",strerror(errno));
+ this->Logs->Log("SOCKET",DEFAULT,"ERROR in listen(): %s",strerror(errno));
return false;
}
else
{
- this->Log(DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
+ this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
SE->NonBlocking(sockfd);
return true;
}
}
else
{
- this->Log(DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
+ this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
return true;
}
}
Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF);
if (strncmp(Addr, "::ffff:", 7) == 0)
- this->Log(DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
+ this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
if ((!*Type) || (!strcmp(Type,"clients")))
{
irc::portparser portrange(configToken, false);
int portno = -1;
- while ((portno = portrange.GetToken()))
+ while (0 != (portno = portrange.GetToken()))
{
if (*Addr == '*')
*Addr = 0;
{
if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second))
{
- this->Log(DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second);
+ this->Logs->Log("SOCKET",DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second);
delete *n;
Config->ports.erase(n);
break;
return inet_pton(AF_FAMILY, a, n);
}
+