[Gaim-commits] SF.net SVN: gaim: [17667] trunk/libgaim/network.c

[<dat...@us...>]

Revision: 17667
          http://svn.sourceforge.net/gaim/?rev=17667&view=rev
Author:   datallah
Date:     2006-11-04 14:00:22 -0800 (Sat, 04 Nov 2006)

Log Message:
-----------
Add further error checking and fallbacks to the Network awareness code.

Modified Paths:
--------------
    trunk/libgaim/network.c

Modified: trunk/libgaim/network.c
===================================================================
--- trunk/libgaim/network.c	2006-11-04 03:42:04 UTC (rev 17666)
+++ trunk/libgaim/network.c	2006-11-04 22:00:22 UTC (rev 17667)
@@ -390,7 +390,8 @@
 
 	WSAQUERYSET qs;
 	HANDLE h;
-	int retval;
+	gint retval;
+	int errorid;
 
 	memset(&qs, 0, sizeof(WSAQUERYSET));
 	qs.dwSize = sizeof(WSAQUERYSET);
@@ -398,8 +399,9 @@
 
 	retval = WSALookupServiceBegin(&qs, LUP_RETURN_ALL, &h);
 	if (retval != ERROR_SUCCESS) {
-		int errorid = WSAGetLastError();
-		gchar *msg = g_win32_error_message(errorid);
+		gchar *msg;
+		errorid = WSAGetLastError();
+		msg = g_win32_error_message(errorid);
 		gaim_debug_warning("network", "Couldn't retrieve NLA SP lookup handle. "
 						"NLA service is probably not running. Message: %s (%d).\n",
 						msg, errorid);
@@ -410,14 +412,23 @@
 		char buf[1024];
 		WSAQUERYSET *res = (LPWSAQUERYSET) buf;
 		DWORD size = sizeof(buf);
-		while (WSALookupServiceNext(h, 0, &size, res) == ERROR_SUCCESS) {
+		while ((retval = WSALookupServiceNext(h, 0, &size, res)) == ERROR_SUCCESS) {
 			net_cnt++;
 			gaim_debug_info("network", "found network '%s'\n",
 					res->lpszServiceInstanceName ? res->lpszServiceInstanceName : "(NULL)");
 			size = sizeof(buf);
 		}
 
-		WSALookupServiceEnd(h);
+		errorid = WSAGetLastError();
+		if (!(errorid == WSA_E_NO_MORE || errorid == WSAENOMORE)) {
+			gchar *msg = g_win32_error_message(errorid);
+			gaim_debug_error("network", "got unexpected NLA response %s (%d)\n", msg, errorid);
+			g_free(msg);
+
+			net_cnt = -1;
+		}
+
+		retval = WSALookupServiceEnd(h);
 	}
 
 	return net_cnt;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.