sockaddrs servaddr;
int ret;
- if (*addr == '*' || *addr == '\0')
- addr = NULL;
-
- if (port == -1 && !addr)
+ if ((*addr == '*' || *addr == '\0') && port == -1)
{
/* Port -1: Means UDP IPV4 port binding - Special case
* used by DNS engine.
}
// Open a TCP Socket
-int irc::sockets::OpenTCPSocket(const char* addr, int socktype)
+int irc::sockets::OpenTCPSocket(const std::string& addr, int socktype)
{
int sockfd;
int on = 1;
- addr = addr;
struct linger linger = { 0, 0 };
- if (!*addr)
+ if (addr.empty())
{
#ifdef IPV6
sockfd = socket (PF_INET6, socktype, 0);
#endif
sockfd = socket (PF_INET, socktype, 0);
}
- else if (strchr(addr,':'))
+ else if (addr.find(':') != std::string::npos)
sockfd = socket (PF_INET6, socktype, 0);
else
sockfd = socket (PF_INET, socktype, 0);
}
else
{
- setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+ setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&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, &linger, sizeof(linger));
+ setsockopt(sockfd, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger));
return (sockfd);
}
}
{
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++)
{
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)
{
- ClientListenSocket *ll = new ClientListenSocket(this, portno, Addr);
+ ClientListenSocket *ll = new ClientListenSocket(portno, Addr, "clients", *Desc ? Desc : "plaintext");
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)));
+ delete ll;
}
}
}
}
}
- /* 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;
}
+
+ this->Logs->Log("SOCKET",DEFAULT, "Port binding %s was removed from the config file, closing.",
+ (*n)->GetBindDesc().c_str());
+ delete *n;
+
+ // this keeps the iterator valid, pointing to the next element
+ n = ports.erase(n);
}
return bound;
}
-bool irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
+bool irc::sockets::aptosa(const std::string& addr, int port, irc::sockets::sockaddrs* sa)
{
memset(sa, 0, sizeof(*sa));
- if (!addr || !*addr)
+ if (addr.empty())
{
#ifdef IPV6
sa->in6.sin6_family = AF_INET6;
#endif
return true;
}
- else if (inet_pton(AF_INET, addr, &sa->in4.sin_addr) > 0)
+ else if (inet_pton(AF_INET, addr.c_str(), &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)
+ else if (inet_pton(AF_INET6, addr.c_str(), &sa->in6.sin6_addr) > 0)
{
sa->in6.sin6_family = AF_INET6;
sa->in6.sin6_port = htons(port);
return std::string(buffer);
}
-int irc::sockets::sa_size(irc::sockets::sockaddrs& sa)
+int irc::sockets::sa_size(const irc::sockets::sockaddrs& sa)
{
if (sa.sa.sa_family == AF_INET)
return sizeof(sa.in4);