irc::sockets::sockaddrs ListenSocketBase::client;
irc::sockets::sockaddrs ListenSocketBase::server;
-ListenSocketBase::ListenSocketBase(InspIRCd* Instance, int port, const std::string &addr) : ServerInstance(Instance), desc("plaintext")
+ListenSocketBase::ListenSocketBase(int port, const std::string &addr, const std::string &Type, const std::string &Hook)
+ : type(Type), hook(Hook), bind_port(port)
{
irc::sockets::sockaddrs bind_to;
- irc::sockets::aptosa(addr.c_str(), port, &bind_to);
- irc::sockets::satoap(&bind_to, bind_addr, bind_port);
-
- // Preserve empty string for wildcard binds, rather than "::" or "0.0.0.0"
- if (addr.empty())
+
+ // canonicalize address if it is defined
+ if (!irc::sockets::aptosa(addr, port, &bind_to))
+ {
+ // malformed address
bind_addr = addr;
+ bind_desc = addr + ":" + ConvToStr(port);
+ this->fd = -1;
+ }
+ else
+ {
+ irc::sockets::satoap(&bind_to, bind_addr, port);
+ bind_desc = irc::sockets::satouser(&bind_to);
- this->SetFd(irc::sockets::OpenTCPSocket(bind_addr.c_str()));
- if (this->GetFd() > -1)
+ this->fd = irc::sockets::OpenTCPSocket(bind_addr);
+ }
+
+ if (this->fd > -1)
{
- if (!Instance->BindSocket(this->fd,port,bind_addr.c_str()))
+ int rv = ServerInstance->SE->Bind(this->fd, &bind_to.sa, sizeof(bind_to));
+ if (rv >= 0)
+ rv = ServerInstance->SE->Listen(this->fd, ServerInstance->Config->MaxConn);
+
+ if (rv < 0)
+ {
+ ServerInstance->SE->Shutdown(this, 2);
+ ServerInstance->SE->Close(this);
this->fd = -1;
- Instance->SE->AddFd(this);
+ }
+ else
+ {
+ ServerInstance->SE->NonBlocking(this->fd);
+ ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+ }
}
}
ServerInstance->stats->statsRefused++;
return;
}
-
+
socklen_t sz = sizeof(server);
- if (getsockname(incomingSockfd, &server.sa, &sz));
+ if (getsockname(incomingSockfd, &server.sa, &sz))
ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
/*
}
}
- std::string server_addr;
- std::string client_addr;
- int dummy_port;
- irc::sockets::satoap(&server, server_addr, dummy_port);
- irc::sockets::satoap(&client, client_addr, dummy_port);
-
ServerInstance->SE->NonBlocking(incomingSockfd);
ServerInstance->stats->statsAccept++;
- this->OnAcceptReady(server_addr, incomingSockfd, client_addr);
+ this->OnAcceptReady(incomingSockfd);
}
void ListenSocketBase::HandleEvent(EventType e, int err)
}
}
-void ClientListenSocket::OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
+void ClientListenSocket::OnAcceptReady(int nfd)
{
- ServerInstance->Users->AddUser(ServerInstance, nfd, bind_port, false, &client.sa, ipconnectedto);
+ ServerInstance->Users->AddUser(nfd, this, &client, &server);
}