X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=917fe9323920bf03efdb90a36f384e7885f5a0ec;hb=73eb66f2b1c82f9e1d1a24093aa4a305c2cfe2e7;hp=48c0170d3e4ae624a1bb37232be0775c127d4ee1;hpb=de6bba7882bc53b5a23e4854069d4846616f2001;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socket.cpp b/src/socket.cpp index 48c0170d3..917fe9323 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -20,6 +20,12 @@ 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))) @@ -51,6 +57,16 @@ ListenSocket::ListenSocket(InspIRCd* Instance, int port, char* addr) : ServerIns 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() @@ -58,75 +74,96 @@ 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",DEBUG,"HandleEvent for listensocket GOT AN ERROR! well shit! '%s'", strerror(err)); + break; + case EVENT_WRITE: + ServerInstance->Logs->Log("SOCKET",DEBUG,"*** BUG *** HandleEvent for listensocket 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); + ServerInstance->Logs->Log("SOCKET",DEBUG,"Call to accept with client=%08lx, length=%d", client, length); + incomingSockfd = ServerInstance->SE->Accept(this, (sockaddr*)client, &length); + ServerInstance->Logs->Log("SOCKET",DEBUG,"Accept returned %d: %d", WSAGetLastError()); + + 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); - } - else - { - ServerInstance->SE->Shutdown(incomingSockfd, 2); - ServerInstance->SE->Close(incomingSockfd); - ServerInstance->stats->statsRefused++; + break; } - delete[] client; - delete[] sock_us; } /* Match raw bytes using CIDR bit matching, used by higher level MatchCIDR() */ @@ -300,16 +337,16 @@ bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask, bool ma * 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) @@ -321,13 +358,13 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten) 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 @@ -336,13 +373,13 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten) 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); } } @@ -353,45 +390,45 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten) /* 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) { @@ -403,19 +440,19 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten) { 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; } } @@ -469,7 +506,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports) 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"))) { @@ -524,7 +561,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports) { 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;