disabled opening of ipv6 sockets since that code still isn't finished (this MIGHT...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3830 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/lhnet.c b/lhnet.c
index 16cf41748734bcac2fded46bad9e4db14f4b3e08..34052e14c55708895cafead6f5e51c1b5aaed1d8 100644 (file)
--- a/lhnet.c
+++ b/lhnet.c
@@ -95,8 +95,23 @@ int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int def
                address->addressdata.loop.port = port;
                return 1;
        }
-       // try to parse with gethostbyname first, because it can handle ipv4 and
-       // ipv6 (in various address formats), as well as dns names
+       // try to parse as dotted decimal ipv4 address first
+       if (sscanf(name, "%d.%d.%d.%d", &d1, &d2, &d3, &d4) == 4 && (unsigned int)d1 < 256 && (unsigned int)d2 < 256 && (unsigned int)d3 < 256 && (unsigned int)d4 < 256)
+       {
+               // parsed a valid ipv4 address
+               address->addresstype = LHNETADDRESSTYPE_INET4;
+               address->addressdata.inet4.family = LHNETADDRESSTYPE_INET4_FAMILY;
+               address->addressdata.inet4.port = htons((unsigned short)port);
+               address->addressdata.inet4.address[0] = (unsigned char)d1;
+               address->addressdata.inet4.address[1] = (unsigned char)d2;
+               address->addressdata.inet4.address[2] = (unsigned char)d3;
+               address->addressdata.inet4.address[3] = (unsigned char)d4;
+#ifdef STANDALONETEST
+               printf("manual parsing of ipv4 dotted decimal address \"%s\" successful: %d.%d.%d.%d:%d\n", string, (int)address->addressdata.inet4.address[0], (int)address->addressdata.inet4.address[1], (int)address->addressdata.inet4.address[2], (int)address->addressdata.inet4.address[3], (int)ntohs(address->addressdata.inet4.port));
+#endif
+               return 1;
+       }
+       // try gethostbyname (handles dns and other ip formats)
        hostentry = gethostbyname(name);
        if (hostentry)
        {
@@ -125,25 +140,9 @@ int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int def
                        return 1;
                }
        }
-       // failed, try to parse as an ipv4 address as a fallback (is this needed?)
-#ifdef STANDALONETEST
-       printf("gethostbyname and gethostbyaddr failed on address \"%s\"\n", name);
-#endif
-       if (sscanf(name, "%d.%d.%d.%d", &d1, &d2, &d3, &d4) == 4 && (unsigned int)d1 < 256 && (unsigned int)d2 < 256 && (unsigned int)d3 < 256 && (unsigned int)d4 < 256)
-       {
-               // parsed a valid ipv4 address
-               address->addresstype = LHNETADDRESSTYPE_INET4;
-               address->addressdata.inet4.family = LHNETADDRESSTYPE_INET4_FAMILY;
-               address->addressdata.inet4.port = htons((unsigned short)port);
-               address->addressdata.inet4.address[0] = (unsigned char)d1;
-               address->addressdata.inet4.address[1] = (unsigned char)d2;
-               address->addressdata.inet4.address[2] = (unsigned char)d3;
-               address->addressdata.inet4.address[3] = (unsigned char)d4;
 #ifdef STANDALONETEST
-               printf("manual parsing of ipv4 dotted decimal address \"%s\" successful: %d.%d.%d.%d:%d\n", string, (int)address->addressdata.inet4.address[0], (int)address->addressdata.inet4.address[1], (int)address->addressdata.inet4.address[2], (int)address->addressdata.inet4.address[3], (int)ntohs(address->addressdata.inet4.port));
+       printf("gethostbyname failed on address \"%s\"\n", name);
 #endif
-               return 1;
-       }
        return 0;
 }
 
@@ -340,6 +339,64 @@ void LHNET_Shutdown(void)
        lhnet_active = 0;
 }
 
+static const char *LHNETPRIVATE_StrError(void)
+{
+#ifdef WIN32
+       int i = WSAGetLastError();
+       switch (i)
+       {
+               case WSAEINTR:           return "WSAEINTR";                                     
+               case WSAEBADF:           return "WSAEBADF";
+               case WSAEACCES:          return "WSAEACCES";          
+               case WSAEFAULT:          return "WSAEFAULT";
+               case WSAEINVAL:          return "WSAEINVAL";
+               case WSAEMFILE:          return "WSAEMFILE";
+               case WSAEWOULDBLOCK:     return "WSAEWOULDBLOCK";
+               case WSAEINPROGRESS:     return "WSAEINPROGRESS";
+               case WSAEALREADY:        return "WSAEALREADY";
+               case WSAENOTSOCK:        return "WSAENOTSOCK";
+               case WSAEDESTADDRREQ:    return "WSAEDESTADDRREQ";
+               case WSAEMSGSIZE:        return "WSAEMSGSIZE";
+               case WSAEPROTOTYPE:      return "WSAEPROTOTYPE";
+               case WSAENOPROTOOPT:     return "WSAENOPROTOOPT";
+               case WSAEPROTONOSUPPORT: return "WSAEPROTONOSUPPORT";
+               case WSAESOCKTNOSUPPORT: return "WSAESOCKTNOSUPPORT";
+               case WSAEOPNOTSUPP:      return "WSAEOPNOTSUPP";
+               case WSAEPFNOSUPPORT:    return "WSAEPFNOSUPPORT";
+               case WSAEAFNOSUPPORT:    return "WSAEAFNOSUPPORT";
+               case WSAEADDRINUSE:      return "WSAEADDRINUSE";
+               case WSAEADDRNOTAVAIL:   return "WSAEADDRNOTAVAIL";
+               case WSAENETDOWN:        return "WSAENETDOWN";
+               case WSAENETUNREACH:     return "WSAENETUNREACH";
+               case WSAENETRESET:       return "WSAENETRESET";
+               case WSAECONNABORTED:    return "WSAECONNABORTED";
+               case WSAECONNRESET:      return "WSAECONNRESET";
+               case WSAENOBUFS:         return "WSAENOBUFS";
+               case WSAEISCONN:         return "WSAEISCONN";
+               case WSAENOTCONN:        return "WSAENOTCONN";
+               case WSAESHUTDOWN:       return "WSAESHUTDOWN";
+               case WSAETOOMANYREFS:    return "WSAETOOMANYREFS";
+               case WSAETIMEDOUT:       return "WSAETIMEDOUT";
+               case WSAECONNREFUSED:    return "WSAECONNREFUSED";
+               case WSAELOOP:           return "WSAELOOP";
+               case WSAENAMETOOLONG:    return "WSAENAMETOOLONG";
+               case WSAEHOSTDOWN:       return "WSAEHOSTDOWN";
+               case WSAEHOSTUNREACH:    return "WSAEHOSTUNREACH";
+               case WSAENOTEMPTY:       return "WSAENOTEMPTY";
+               case WSAEPROCLIM:        return "WSAEPROCLIM";
+               case WSAEUSERS:          return "WSAEUSERS";
+               case WSAEDQUOT:          return "WSAEDQUOT";
+               case WSAESTALE:          return "WSAESTALE";
+               case WSAEREMOTE:         return "WSAEREMOTE";
+               case WSAEDISCON:         return "WSAEDISCON";
+               case 0:                  return "no error";
+               default:                 return "unknown WSAE error";  
+       }
+#else
+       return strerror(errno);
+#endif
+}
+
 lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
 {
        lhnetsocket_t *lhnetsocket, *s;
@@ -415,13 +472,19 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
                                                        lhnetsocket->prev->next = lhnetsocket;
                                                        return lhnetsocket;
                                                }
+                                               else
+                                                       Con_Printf("LHNET_OpenSocket_Connectionless: bind returned error: %s\n", LHNETPRIVATE_StrError());
                                        }
+                                       else
+                                               Con_Printf("LHNET_OpenSocket_Connectionless: ioctlsocket returned error: %s\n", LHNETPRIVATE_StrError());
 #ifdef WIN32
                                        closesocket(lhnetsocket->inetsocket);
 #else
                                        close(lhnetsocket->inetsocket);
 #endif
                                }
+                               else
+                                       Con_Printf("LHNET_OpenSocket_Connectionless: socket returned error: %s\n", LHNETPRIVATE_StrError());
                        }
                        break;
                default:

diff --git a/lhnet.h b/lhnet.h
index b9868a190bcda42ff7aef508297651f5606c70bf..1d0de942b5d12651e8a6a6d6bb0a964931dc5e2e 100644 (file)
--- a/lhnet.h
+++ b/lhnet.h
@@ -16,7 +16,11 @@ typedef struct lhnetaddress_loop_s
 lhnetaddress_loop_t;
 
 #define LHNETADDRESSTYPE_INET4_FAMILY 2
+#ifdef WIN32
+#define LHNETADDRESSTYPE_INET6_FAMILY 23
+#else
 #define LHNETADDRESSTYPE_INET6_FAMILY 10
+#endif
 
 // compatible with sockaddr_in
 typedef struct lhnetaddress_inet4_s

diff --git a/netconn.c b/netconn.c
index df9e8b6a3c8666147c0022e4a18bf3e88b7e31cc..a855f4b7b45560c986df0e9abdaa2e8cbd9290af 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -90,11 +90,11 @@ mempool_t *netconn_mempool = NULL;
 
 cvar_t cl_netport = {0, "cl_port", "0"};
 cvar_t cl_netaddress = {0, "cl_netaddress", "0.0.0.0"};
-cvar_t cl_netaddress_ipv6 = {0, "cl_netaddress_ipv6", "[0:0:0:0:0:0:0:0]:0"};
+//cvar_t cl_netaddress_ipv6 = {0, "cl_netaddress_ipv6", "[0:0:0:0:0:0:0:0]:0"};
 
 cvar_t sv_netport = {0, "port", "26000"};
 cvar_t sv_netaddress = {0, "sv_netaddress", "0.0.0.0"};
-cvar_t sv_netaddress_ipv6 = {0, "sv_netaddress_ipv6", "[0:0:0:0:0:0:0:0]:26000"};
+//cvar_t sv_netaddress_ipv6 = {0, "sv_netaddress_ipv6", "[0:0:0:0:0:0:0:0]:26000"};
 
 int NetConn_Read(lhnetsocket_t *mysocket, void *data, int maxlength, lhnetaddress_t *peeraddress)
 {
@@ -355,7 +355,7 @@ void NetConn_OpenClientPorts(void)
        Con_Printf("Client using port %i\n", port);
        NetConn_OpenClientPort("local", port);
        NetConn_OpenClientPort(cl_netaddress.string, port);
-       NetConn_OpenClientPort(cl_netaddress_ipv6.string, port);
+       //NetConn_OpenClientPort(cl_netaddress_ipv6.string, port);
 }
 
 void NetConn_CloseServerPorts(void)
@@ -403,7 +403,7 @@ void NetConn_OpenServerPorts(int opennetports)
        if (opennetports)
        {
                NetConn_OpenServerPort(sv_netaddress.string, port);
-               NetConn_OpenServerPort(sv_netaddress_ipv6.string, port);
+               //NetConn_OpenServerPort(sv_netaddress_ipv6.string, port);
        }
        if (sv_numsockets == 0)
                Host_Error("NetConn_OpenServerPorts: unable to open any ports!\n");
@@ -1606,10 +1606,10 @@ void NetConn_Init(void)
        Cvar_RegisterVariable(&developer_networking);
        Cvar_RegisterVariable(&cl_netport);
        Cvar_RegisterVariable(&cl_netaddress);
-       Cvar_RegisterVariable(&cl_netaddress_ipv6);
+       //Cvar_RegisterVariable(&cl_netaddress_ipv6);
        Cvar_RegisterVariable(&sv_netport);
        Cvar_RegisterVariable(&sv_netaddress);
-       Cvar_RegisterVariable(&sv_netaddress_ipv6);
+       //Cvar_RegisterVariable(&sv_netaddress_ipv6);
        Cvar_RegisterVariable(&sv_public);
        Cvar_RegisterVariable(&sv_heartbeatperiod);
        for (i = 0;sv_masters[i].name;i++)