summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c1c6d3f)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9400
e03df62e-2008-0410-955e-
edbf42e46eb7
std::string bind_addr;
/** Port socket is bound to */
int bind_port;
std::string bind_addr;
/** Port socket is bound to */
int bind_port;
+
+ static sockaddr *sock_us;
+
+ static sockaddr *client;
+
+ static sockaddr *raddr;
+
+ static unsigned int socketcount;
+
public:
/** Create a new listening socket
*/
public:
/** Create a new listening socket
*/
- reason = pcnt ? parameters[1] : "";
+ reason = pcnt > 1 ? parameters[1] : "";
}
if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
}
if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
using namespace irc::sockets;
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)))
/* 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);
}
this->family = AF_INET;
Instance->SE->AddFd(this);
}
+ /* Saves needless allocations */
+ if (socketcount == 0)
+ {
+ /* All instances of ListenSocket share these, so reference count it */
+ sock_us = new sockaddr[2];
+ client = new sockaddr[2];
+ raddr = new sockaddr[2];
+ }
+ socketcount++;
}
ListenSocket::~ListenSocket()
}
ListenSocket::~ListenSocket()
ServerInstance->Logs->Log("SOCKET", DEBUG,"Failed to cancel listener: %s", strerror(errno));
this->fd = -1;
}
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;
+ }
-
-// XXX this is a bit of an untidy way to avoid reallocating this constantly. also, we leak it on shutdown.. but that's kinda minor - w
-static sockaddr *sock_us;
-static sockaddr *client;
-static bool setup_sock = false;
-
void ListenSocket::HandleEvent(EventType, int)
{
socklen_t uslen, length; // length of our port number
int incomingSockfd, in_port;
void ListenSocket::HandleEvent(EventType, int)
{
socklen_t uslen, length; // length of our port number
int incomingSockfd, in_port;
- if (!setup_sock)
- {
- sock_us = new sockaddr[2];
- client = new sockaddr[2];
- setup_sock = true;
- }
-
#ifdef IPV6
if (this->family == AF_INET6)
{
#ifdef IPV6
if (this->family == AF_INET6)
{
- sockaddr* raddr = new sockaddr[2];
-
#ifdef IPV6
if (this->family == AF_INET6)
{
#ifdef IPV6
if (this->family == AF_INET6)
{
ServerInstance->SE->NonBlocking(incomingSockfd);
ServerInstance->stats->statsAccept++;
ServerInstance->SE->NonBlocking(incomingSockfd);
ServerInstance->stats->statsAccept++;