Make xline expiry messages a bit clearer that the xline may have expired a while...

[user/henk/code/inspircd.git] / src / socket.cpp

diff --git a/src/socket.cpp b/src/socket.cpp
index 01c07e2d093651b50ef3cdfe4befd1525ca9a711..fa5f0709c2e0a87c83d1da509f88939055b33484 100644 (file)
--- 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);