bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
{
sockaddrs servaddr;
- memset(&servaddr, 0, sizeof(servaddr));
+ int ret;
- int ret, size;
+ if (*addr == '*' || *addr == '\0')
+ addr = NULL;
- if (*addr == '*')
- addr = "";
-
-#ifdef IPV6
- if (*addr)
+ if (port == -1 && !addr)
{
- /* There is an address here. Is it ipv6? */
- if (strchr(addr,':'))
- {
- if (inet_pton(AF_INET6, addr, &servaddr.in6.sin6_addr) < 1)
- {
- return false;
- }
- servaddr.in6.sin6_family = AF_INET6;
- servaddr.in6.sin6_port = htons(port);
- size = sizeof(sockaddr_in6);
- }
- else
- {
- if (inet_pton(AF_INET, addr, &servaddr.in4.sin_addr) < 1)
- {
- return false;
- }
- servaddr.in4.sin_family = AF_INET;
- servaddr.in4.sin_port = htons(port);
- size = sizeof(sockaddr_in);
- }
+ /* Port -1: Means UDP IPV4 port binding - Special case
+ * used by DNS engine.
+ */
+ memset(&servaddr, 0, sizeof(servaddr));
+ servaddr.in4.sin_family = AF_INET;
}
- else
- {
- if (port == -1)
- {
- /* Port -1: Means UDP IPV4 port binding - Special case
- * used by DNS engine.
- */
- servaddr.in4.sin_family = AF_INET;
- servaddr.in4.sin_addr.s_addr = htonl(INADDR_ANY);
- servaddr.in4.sin_port = 0;
- size = sizeof(sockaddr_in);
- }
- else
- {
- /* There's no address here, default to ipv6 bind to all */
- servaddr.in6.sin6_family = AF_INET6;
- servaddr.in6.sin6_port = htons(port);
- size = sizeof(sockaddr_in6);
- }
- }
-#else
- /* If we aren't built with ipv6, the choice becomes simple */
- servaddr.in4.sin_family = AF_INET;
- if (*addr)
- {
- /* There is an address here. */
- if (inet_pton(AF_INET, addr, &servaddr.in4.sin_addr) < 1)
- {
- return false;
- }
- }
- else
- {
- /* Bind ipv4 to all */
- servaddr.in4.sin_addr.s_addr = htonl(INADDR_ANY);
- }
- /* Bind ipv4 port number */
- servaddr.in4.sin_port = htons(port);
- size = sizeof(sockaddr_in);
-#endif
- ret = SE->Bind(sockfd, &servaddr.sa, size);
+ else if (!irc::sockets::aptosa(addr, port, &servaddr))
+ return false;
+
+ ret = SE->Bind(sockfd, &servaddr.sa, sa_size(servaddr));
if (ret < 0)
{
int on = 1;
addr = addr;
struct linger linger = { 0, 0 };
-#ifdef IPV6
if (!*addr)
{
+#ifdef IPV6
sockfd = socket (PF_INET6, socktype, 0);
if (sockfd < 0)
+#endif
sockfd = socket (PF_INET, socktype, 0);
}
else if (strchr(addr,':'))
sockfd = socket (PF_INET6, socktype, 0);
else
sockfd = socket (PF_INET, socktype, 0);
+
if (sockfd < 0)
-#else
- if ((sockfd = socket (PF_INET, socktype, 0)) < 0)
-#endif
{
return ERROR;
}
else
{
- setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on));
+ setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
/* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */
linger.l_onoff = 1;
linger.l_linger = 1;
- setsockopt(sockfd, SOL_SOCKET, SO_LINGER, (char*)&linger,sizeof(linger));
+ setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger));
return (sockfd);
}
}
// XXX: it would be VERY nice to genericize this so all listen stuff (server/client) could use the one function. -- w00t
int InspIRCd::BindPorts(FailedPortList &failed_ports)
{
- char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
+ char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF], Desc[MAXBUF];
int bound = 0;
- bool started_with_nothing = (ports.size() == 0);
- std::vector<std::pair<std::string, int> > old_ports;
-
- /* XXX: Make a copy of the old ip/port pairs here */
- for (std::vector<ListenSocketBase *>::iterator o = ports.begin(); o != ports.end(); ++o)
- old_ports.push_back(make_pair((*o)->GetIP(), (*o)->GetPort()));
+ std::vector<ListenSocketBase*> old_ports(ports.begin(), ports.end());
for (int count = 0; count < Config->ConfValueEnum("bind"); count++)
{
Config->ConfValue("bind", "port", count, configToken, MAXBUF);
Config->ConfValue("bind", "address", count, Addr, MAXBUF);
Config->ConfValue("bind", "type", count, Type, MAXBUF);
+ Config->ConfValue("bind", "ssl", count, Desc, MAXBUF);
if (strncmp(Addr, "::ffff:", 7) == 0)
this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
if (*Addr == '*')
*Addr = 0;
+ irc::sockets::sockaddrs bindspec;
+ irc::sockets::aptosa(Addr, portno, &bindspec);
+ std::string bind_readable = irc::sockets::satouser(&bindspec);
+
bool skip = false;
- for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
+ for (std::vector<ListenSocketBase *>::iterator n = old_ports.begin(); n != old_ports.end(); ++n)
{
- if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
+ if ((*n)->GetBindDesc() == bind_readable)
{
skip = true;
- /* XXX: Here, erase from our copy of the list */
- for (std::vector<std::pair<std::string, int> >::iterator k = old_ports.begin(); k != old_ports.end(); ++k)
- {
- if ((k->first == Addr) && (k->second == portno))
- {
- old_ports.erase(k);
- break;
- }
- }
+ old_ports.erase(n);
+ break;
}
}
if (!skip)
if (ll->GetFd() > -1)
{
bound++;
+ ll->SetDescription(*Desc ? Desc : "plaintext");
ports.push_back(ll);
}
else
{
- failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno)));
+ failed_ports.push_back(std::make_pair(bind_readable, strerror(errno)));
}
}
}
}
}
- /* XXX: Here, anything left in our copy list, close as removed */
- if (!started_with_nothing)
+ std::vector<ListenSocketBase *>::iterator n = ports.begin();
+ for (std::vector<ListenSocketBase *>::iterator o = old_ports.begin(); o != old_ports.end(); ++o)
{
- for (size_t k = 0; k < old_ports.size(); ++k)
+ while (n != ports.end() && *n != *o)
+ n++;
+ if (n == ports.end())
{
- for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
- {
- if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == 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;
- ports.erase(n);
- break;
- }
- }
+ this->Logs->Log("SOCKET",ERROR,"Port bindings slipped out of vector, aborting close!");
+ break;
}
- }
- return bound;
-}
+ this->Logs->Log("SOCKET",DEFAULT, "Port binding %s was removed from the config file, closing.",
+ (*n)->GetBindDesc().c_str());
+ delete *n;
-const char* irc::sockets::insp_ntoa(insp_inaddr n)
-{
- static char buf[1024];
- inet_ntop(AF_FAMILY, &n, buf, sizeof(buf));
- return buf;
-}
+ // this keeps the iterator valid, pointing to the next element
+ n = ports.erase(n);
+ }
-int irc::sockets::insp_aton(const char* a, insp_inaddr* n)
-{
- return inet_pton(AF_FAMILY, a, n);
+ return bound;
}
-int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
+bool irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
{
memset(sa, 0, sizeof(*sa));
if (!addr || !*addr)
return false;
}
-int irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
+bool irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
char addrv[INET6_ADDRSTRLEN+1];
if (sa->sa.sa_family == AF_INET)
{
return false;
}
+static const char all_zero[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 };
+
+std::string irc::sockets::satouser(const irc::sockets::sockaddrs* sa) {
+ char buffer[MAXBUF];
+ if (sa->sa.sa_family == AF_INET)
+ {
+ if (sa->in4.sin_addr.s_addr == 0)
+ {
+ sprintf(buffer, "*:%u", ntohs(sa->in4.sin_port));
+ }
+ else
+ {
+ const uint8_t* bits = reinterpret_cast<const uint8_t*>(&sa->in4.sin_addr);
+ sprintf(buffer, "%d.%d.%d.%d:%u", bits[0], bits[1], bits[2], bits[3], ntohs(sa->in4.sin_port));
+ }
+ }
+ else if (sa->sa.sa_family == AF_INET6)
+ {
+ if (!memcmp(all_zero, &sa->in6.sin6_addr, 16))
+ {
+ sprintf(buffer, "*:%u", ntohs(sa->in6.sin6_port));
+ }
+ else
+ {
+ buffer[0] = '[';
+ if (!inet_ntop(AF_INET6, &sa->in6.sin6_addr, buffer+1, MAXBUF - 10))
+ return "<unknown>"; // should never happen, buffer is large enough
+ int len = strlen(buffer);
+ // no need for snprintf, buffer has at least 9 chars left, max short len = 5
+ sprintf(buffer + len, "]:%u", ntohs(sa->in6.sin6_port));
+ }
+ }
+ else
+ return "<unknown>";
+ return std::string(buffer);
+}
+
int irc::sockets::sa_size(irc::sockets::sockaddrs& sa)
{
if (sa.sa.sa_family == AF_INET)
projects / user / henk / code / inspircd.git / blobdiff