Changeset 9572 for ps

Timestamp:

05/29/11 21:59:51 (14 years ago)

Author:

Jan Wassenberg

Message:

remove no longer necessary lowlevel wsock implementation (superseded by enet) since the delay load hook isn't compatible with a DLL packaging of enet.
-> cstr serialization uses lib/byte_order.h instead of htons; removed hostname/IP from system_info (Philip agrees its utility is negligible)

Location:

ps/trunk/source

Files:

• lib/posix/posix.h (modified) (1 diff)
• lib/posix/posix_sock.h (deleted)
• lib/sysdep/os/win/win.h (modified) (1 diff)
• lib/sysdep/os/win/wposix/wsock.cpp (deleted)
• lib/sysdep/os/win/wposix/wsock.h (deleted)
• lib/sysdep/os/win/wposix/wsock_internal.h (deleted)
• ps/CStr.cpp (modified) (3 diffs)
• ps/Util.cpp (modified) (2 diffs)

ps/trunk/source/lib/posix/posix.h

@@ -75 +75 @@
 //#include "lib/posix/posix_mman.h"
 //#include "lib/posix/posix_pthread.h"
-//#include "lib/posix/posix_sock.h"
 //#include "lib/posix/posix_time.h"
 //#include "lib/posix/posix_utsname.h"

ps/trunk/source/lib/sysdep/os/win/win.h

@@ -33 +33 @@
 
 // Win32 socket declarations aren't portable (e.g. problems with socklen_t)
-// => skip winsock.h; posix_sock.h should be used instead.
+// => skip winsock.h; use curl or enet library instead.
 #define _WINSOCKAPI_
 

ps/trunk/source/ps/CStr.cpp

@@ -27 +27 @@
 #define CStr_CPP_FIRST
 
-#include "lib/posix/posix_sock.h" // htons, ntohs
 #include "lib/fnv_hash.h"
 #include "lib/utf8.h"
+#include "lib/byte_order.h"
 #include "network/Serialization.h"
 #include <cassert>
@@ -447 +447 @@
     size_t i = 0;
     for (i = 0; i < len; i++)
-        *(u16 *)(buffer + i*2) = htons((*this)[i]); // convert to network order (big-endian)
+    {
+        const u16 bigEndian = to_be16((*this)[i]);
+        *(u16 *)(buffer + i*2) = bigEndian;
+    }
     *(u16 *)(buffer + i*2) = 0;
     return buffer + len*2 + 2;
@@ -463 +466 @@
     std::wstring::iterator str = begin();
     while (ptr < strend)
-        *(str++) = (tchar)ntohs(*(ptr++)); // convert from network order (big-endian)
+    {
+        const u16 native = to_be16(*(ptr++));   // we want from_be16, but that's the same
+        *(str++) = (tchar)native;
+    }
 
     return (const u8 *)(strend+1);

ps/trunk/source/ps/Util.cpp

@@ -21 +21 @@
 
 #include "lib/posix/posix_utsname.h"
-#include "lib/posix/posix_sock.h"
 #include "lib/ogl.h"
 #include "lib/timer.h"
@@ -127 +126 @@
     fprintf(f, "Sound Drivers  : %ls\n", snd_drv_ver);
 
-
-    //
-    // network name / ips
-    //
-
-    // note: can't use un.nodename because it is for an
-    // "implementation-defined communications network".
-    char hostname[128] = "(unknown)";
-    (void)gethostname(hostname, sizeof(hostname)-1);
-    // -1 makes sure it's 0-terminated. if the function fails,
-    // we display "(unknown)" and will skip IP output below.
-    fprintf(f, "Network Name   : %s", hostname);
-
-    {
-        // ignore exception here - see https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=114032
-        hostent* host = gethostbyname(hostname);
-        if(!host)
-            goto no_ip;
-        struct in_addr** ips = (struct in_addr**)host->h_addr_list;
-        if(!ips)
-            goto no_ip;
-
-        // output all IPs (> 1 if using VMware or dual ethernet)
-        fprintf(f, " (");
-        for(size_t i = 0; i < 256 && ips[i]; i++)   // safety
-        {
-            // separate entries but avoid trailing comma
-            if(i != 0)
-                fprintf(f, ", ");
-            fprintf(f, "%s", inet_ntoa(*ips[i]));
-        }
-        fprintf(f, ")");
-    }
-
-no_ip:
-    fprintf(f, "\n");
-
-
     // OpenGL extensions (write them last, since it's a lot of text)
     const char* exts = ogl_ExtensionString();