X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=fa5f0709c2e0a87c83d1da509f88939055b33484;hb=35d20fbabe8babe761e938e4c9a65c47f303f81d;hp=f1a81435868e493ecf4cb0ae0a8e24d4daea5a58;hpb=f7bfee1e9210b83d0cb544ce14aa52f8637bdf21;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index f1a814358..fa5f0709c 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -143,14 +143,20 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 }
 
 // Open a TCP Socket
-int irc::sockets::OpenTCPSocket(char* addr, int socktype)
+int irc::sockets::OpenTCPSocket(const char* addr, int socktype)
 {
 	int sockfd;
 	int on = 1;
 	addr = addr;
 	struct linger linger = { 0, 0 };
 #ifdef IPV6
-	if (strchr(addr,':') || (!*addr))
+	if (!*addr)
+	{
+		sockfd = socket (PF_INET6, socktype, 0);
+		if (sockfd < 0)
+			sockfd = socket (PF_INET, socktype, 0);
+	}
+	else if (strchr(addr,':'))
 		sockfd = socket (PF_INET6, socktype, 0);
 	else
 		sockfd = socket (PF_INET, socktype, 0);
@@ -172,6 +178,7 @@ int irc::sockets::OpenTCPSocket(char* addr, int socktype)
 	}
 }
 
+// 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)
 {
 	char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
@@ -180,7 +187,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 	std::vector<std::pair<std::string, int> > old_ports;
 
 	/* XXX: Make a copy of the old ip/port pairs here */
-	for (std::vector<ListenSocket*>::iterator o = Config->ports.begin(); o != Config->ports.end(); ++o)
+	for (std::vector<ListenSocketBase *>::iterator o = Config->ports.begin(); o != Config->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++)
@@ -202,7 +209,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 					*Addr = 0;
 
 				bool skip = false;
-				for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+				for (std::vector<ListenSocketBase *>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
 				{
 					if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
 					{
@@ -220,7 +227,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 				}
 				if (!skip)
 				{
-					ListenSocket* ll = new ListenSocket(this, portno, Addr);
+					ClientListenSocket *ll = new ClientListenSocket(this, portno, Addr);
 					if (ll->GetFd() > -1)
 					{
 						bound++;
@@ -241,7 +248,7 @@ int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
 	{
 		for (size_t k = 0; k < old_ports.size(); ++k)
 		{
-			for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+			for (std::vector<ListenSocketBase *>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
 			{
 				if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second))
 				{