* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
/** This will bind a socket to a port. It works for UDP/TCP.
* 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, const char* addr, bool dolisten)
{
/* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */
}
// XXX: it would be VERY nice to genericize this so all listen stuff (server/client) could use the one function. -- w00t
-int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
+int InspIRCd::BindPorts(FailedPortList &failed_ports)
{
char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
int bound = 0;
- bool started_with_nothing = (Config->ports.size() == 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 = Config->ports.begin(); o != Config->ports.end(); ++o)
+ for (std::vector<ListenSocketBase *>::iterator o = ports.begin(); o != ports.end(); ++o)
old_ports.push_back(make_pair((*o)->GetIP(), (*o)->GetPort()));
- for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
+ for (int count = 0; count < Config->ConfValueEnum("bind"); count++)
{
- Config->ConfValue(Config->config_data, "bind", "port", count, configToken, MAXBUF);
- Config->ConfValue(Config->config_data, "bind", "address", count, Addr, MAXBUF);
- Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF);
-
+ Config->ConfValue("bind", "port", count, configToken, MAXBUF);
+ Config->ConfValue("bind", "address", count, Addr, MAXBUF);
+ Config->ConfValue("bind", "type", count, Type, 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 ((!*Type) || (!strcmp(Type,"clients")))
{
irc::portparser portrange(configToken, false);
*Addr = 0;
bool skip = false;
- for (std::vector<ListenSocketBase *>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+ for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
{
if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
{
if (ll->GetFd() > -1)
{
bound++;
- Config->ports.push_back(ll);
+ ports.push_back(ll);
}
else
{
failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno)));
}
- ports_found++;
}
}
}
{
for (size_t k = 0; k < old_ports.size(); ++k)
{
- for (std::vector<ListenSocketBase *>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+ 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;
- Config->ports.erase(n);
+ ports.erase(n);
break;
}
}
return inet_pton(AF_FAMILY, a, n);
}
+int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
+{
+ memset(sa, 0, sizeof(*sa));
+ if (!addr || !*addr)
+ {
+#ifdef IPV6
+ sa->in6.sin6_family = AF_INET6;
+ sa->in6.sin6_port = htons(port);
+#else
+ sa->in4.sin_family = AF_INET;
+ sa->in4.sin_port = htons(port);
+#endif
+ return true;
+ }
+ else if (inet_pton(AF_INET, addr, &sa->in4.sin_addr) > 0)
+ {
+ sa->in4.sin_family = AF_INET;
+ sa->in4.sin_port = htons(port);
+ return true;
+ }
+ else if (inet_pton(AF_INET6, addr, &sa->in6.sin6_addr) > 0)
+ {
+ sa->in6.sin6_family = AF_INET6;
+ sa->in6.sin6_port = htons(port);
+ return true;
+ }
+ return false;
+}
+
+int 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)
+ {
+ if (!inet_ntop(AF_INET, &sa->in4.sin_addr, addrv, sizeof(addrv)))
+ return false;
+ addr = addrv;
+ port = ntohs(sa->in4.sin_port);
+ return true;
+ }
+ else if (sa->sa.sa_family == AF_INET6)
+ {
+ if (!inet_ntop(AF_INET6, &sa->in6.sin6_addr, addrv, sizeof(addrv)))
+ return false;
+ addr = addrv;
+ port = ntohs(sa->in6.sin6_port);
+ return true;
+ }
+ return false;
+}
+int irc::sockets::sa_size(irc::sockets::sockaddrs& sa)
+{
+ if (sa.sa.sa_family == AF_INET)
+ return sizeof(sa.in4);
+ if (sa.sa.sa_family == AF_INET6)
+ return sizeof(sa.in6);
+ return 0;
+}
projects / user / henk / code / inspircd.git / blobdiff