r3326 - trunk/libmnetutil/source

[erik at minisip.org]

Author: erik
Date: 2007-06-15 15:30:34 +0200 (Fri, 15 Jun 2007)
New Revision: 3326

Modified:
   trunk/libmnetutil/source/HttpDownloader.cxx
   trunk/libmnetutil/source/NetworkFunctionsWin32.cxx
Log:

 * Bug(?) fix for HttpDownloader.cxx: 
    Scenario:
      . The server sends the response to the client.
      . The client reads the response, and blocks on "read".
      . The server closes the connection
      . The client read returns "-1"
      . Bug: The client returns "0" instead of OK.

 * Removed warning of using a deprecated code when cross-compiling
   w. mingw32.
     end -> endl



Modified: trunk/libmnetutil/source/HttpDownloader.cxx
===================================================================
--- trunk/libmnetutil/source/HttpDownloader.cxx	2007-06-14 18:22:38 UTC (rev 3325)
+++ trunk/libmnetutil/source/HttpDownloader.cxx	2007-06-15 13:30:34 UTC (rev 3326)
@@ -151,11 +151,12 @@
 	if (internalSocketObject)
 		sock->close();
 
+/*
 	if (bytesRead < 0) {
 		//cerr << "Error: Could not receive response" << endl;
 		return 0;
 	}
-
+*/
 	return HTTP_RESPONSECODE_OK;
 }
 

Modified: trunk/libmnetutil/source/NetworkFunctionsWin32.cxx
===================================================================
--- trunk/libmnetutil/source/NetworkFunctionsWin32.cxx	2007-06-14 18:22:38 UTC (rev 3325)
+++ trunk/libmnetutil/source/NetworkFunctionsWin32.cxx	2007-06-15 13:30:34 UTC (rev 3326)
@@ -59,7 +59,7 @@
 	hiphlpapi = LoadLibrary("iphlpapi");
 
 	if( !hiphlpapi ){
-		mdbg << "NetworkFunctionsWin32: no hiphlpapi" << end;
+		mdbg << "NetworkFunctionsWin32: no hiphlpapi" << endl;
 		WINXP_exit();
 		return false;
 	}
@@ -68,7 +68,7 @@
 	hGetAdaptersAddresses = (PGETADAPTERSADDRESSES)GetProcAddress(hiphlpapi, "GetAdaptersAddresses");
 	
 	if( !hGetAdaptersAddresses ){
-		mdbg << "NetworkFunctionsWin32: no GetAdaptersAddresses" << end;
+		mdbg << "NetworkFunctionsWin32: no GetAdaptersAddresses" << endl;
 		WINXP_exit();
 		return false;
 	}
@@ -76,7 +76,7 @@
 
 	hws2tcpip = LoadLibrary("ws2_32");
 	if( !hws2tcpip ){
-		mdbg << "NetworkFunctionsWin32: no ws2tcpip" << end;
+		mdbg << "NetworkFunctionsWin32: no ws2tcpip" << endl;
 		WINXP_exit();
 		return false;
 	}
@@ -84,7 +84,7 @@
 	hgetaddrinfo = (PGETADDRINFO)GetProcAddress(hws2tcpip, "getaddrinfo");
 
 	if( !hgetaddrinfo ){
-		mdbg << "NetworkFunctionsWin32: no getaddrinfo" << end;
+		mdbg << "NetworkFunctionsWin32: no getaddrinfo" << endl;
 		WINXP_exit();
 		return false;
 	}
@@ -92,7 +92,7 @@
 	hfreeaddrinfo = (PFREEADDRINFO)GetProcAddress(hws2tcpip, "freeaddrinfo");
 
 	if( !hfreeaddrinfo ){
-		mdbg << "NetworkFunctionsWin32: no freeaddrinfo" << end;
+		mdbg << "NetworkFunctionsWin32: no freeaddrinfo" << endl;
 		WINXP_exit();
 		return false;
 	}
@@ -100,11 +100,11 @@
 	hgetnameinfo = (PGETNAMEINFO)GetProcAddress(hws2tcpip, "getnameinfo");
 
 	if( !hgetnameinfo ){
-		mdbg << "NetworkFunctionsWin32: no getnameinfo" << end;
+		mdbg << "NetworkFunctionsWin32: no getnameinfo" << endl;
 		WINXP_exit();
 		return false;
 	}
 
-	mdbg << "NetworkFunctionsWin32: functions loaded ok" << end;
+	mdbg << "NetworkFunctionsWin32: functions loaded ok" << endl;
 	return true;
 }