[Common-cvs] netio/platform/posix hxposixsockutil.cpp,1.4,1.5

[Common-cvs] netio/platform/posix hxposixsockutil.cpp,1.4,1.5

liam_murray at helixcommunity.org liam_murray at helixcommunity.org
Thu Nov 11 11:22:50 PST 2004


Update of /cvsroot/common/netio/platform/posix
In directory cvs-new:/tmp/cvs-serv27172/platform/posix

Modified Files:
	hxposixsockutil.cpp 
Log Message:
Fix to get network code up and working on Win2000 (ipv4 winsock) (bug 128711). Endian conversion fix, assert fix.


Index: hxposixsockutil.cpp
===================================================================
RCS file: /cvsroot/common/netio/platform/posix/hxposixsockutil.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- hxposixsockutil.cpp	9 Aug 2004 21:28:01 -0000	1.4
+++ hxposixsockutil.cpp	11 Nov 2004 19:22:48 -0000	1.5
@@ -34,6 +34,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 
+
 #include "hxtypes.h"
 #include "nettypes.h"
 #include "hxnet.h"
@@ -44,6 +45,7 @@
 #include "hxsockutil.h"
 #include "hxposixsockutil.h"
 
+#include "hxtlogutil.h"
 #include "debug.h"
 #include "hxassert.h"
 #include "hxheap.h"
@@ -52,10 +54,6 @@
 static const char HX_THIS_FILE[] = __FILE__;
 #endif
 
-
-#define D_SOCKUTIL D_INFO //XXXLCM
-
-
 HX_RESULT HXPosixSockUtil::CreateAddrIN6(IHXNetServices* pNetServices,
                      const struct sockaddr_in6* psa,
                      IHXSockAddr*& pAddrOut /*out*/)
@@ -133,7 +131,7 @@
         break;
     default:
         HX_ASSERT(false); //XXXLCM
-        DPRINTF(D_SOCKUTIL, ("CreateAddr(): unknown family = %u\n", pAddr->sa_family));
+        HXLOGL3(HXLOG_NETW, "CreateAddr(): unknown family = %u", pAddr->sa_family);
     }
 
     return hr;
@@ -156,7 +154,6 @@
 
     for (UINT32 idx = 0; /* nothing*/; ++idx)
     {
-
         IHXSockAddr* pAddr = 0;
 
         const char* pAddrOctets = phe->h_addr_list[idx];
@@ -169,8 +166,7 @@
         HX_ASSERT(phe->h_length == sizeof(UINT32));
 
         UINT32 addr = *(const UINT32*)(pAddrOctets);
-
-        hr = HXSockUtil::CreateAddrIN4(pNetServices,  WToHost(addr), 0, pAddr);
+        hr = HXSockUtil::CreateAddrIN4(pNetServices,  DwToHost(addr), 0, pAddr);
         if (HXR_OK == hr)
         {
             HX_ASSERT(pAddr != 0);




More information about the Common-cvs mailing list
 

Site Map   |   Terms of Use   |   Privacy Policy   |   Contact Us

Copyright © 1995-2007 RealNetworks, Inc. All rights reserved. RealNetworks and Helix are trademarks of RealNetworks.
All other trademarks or registered trademarks are the property of their respective holders.