comparison libgaim/network.c @ 14776:a87c53e7b1e2

[gaim-migrate @ 17540] Various fixes for wingaim network manager stuff. When unable to look up network connections, assume that there is one. Fix error handling. Remove note about using WSANSPIoctl directly - it isn't supported on w2k anyway. Fix compile warning committer: Tailor Script <[e-mail]>

14775:d1ffbae3a73a

	qs.dwSize = sizeof(WSAQUERYSET);
	qs.dwNameSpace = NS_ALL;

	retval = WSALookupServiceBegin(&qs, LUP_RETURN_ALL, &h);
	if (retval != ERROR_SUCCESS) {
		gchar *msg = g_win32_error_message(retval);
		gaim_debug_warning("network", "Couldn't look up connected networks. %s (%lu).\n", msg, retval);
		g_free(msg);
	} else {
		char buf[1024];
		WSAQUERYSET *res = (LPWSAQUERYSET) buf;
		DWORD size = sizeof(buf);
		while (WSALookupServiceNext(h, 0, &size, res) == ERROR_SUCCESS) {

		qs.dwNameSpace = NS_ALL;

		retval = WSALookupServiceBegin(&qs, LUP_RETURN_ALL, &h);

		/* This will block until there is a network change */
		/* This is missing from the MinGW libws2_32.a as of version 3.7.
		 * When this patch: http://sourceforge.net/tracker/index.php?func=detail&aid=1576083&group_id=2435&atid=302435 gets into a release, we can call this directly
		 * retval = WSANSPIoctl(h, SIO_NSP_NOTIFY_CHANGE, NULL, 0, NULL, 0, &retLen, NULL);*/
		 retval = MyWSANSPIoctl(h, SIO_NSP_NOTIFY_CHANGE, NULL, 0, NULL, 0, &retLen, NULL);

		retval = WSALookupServiceEnd(h);

		g_idle_add(wgaim_network_change_thread_cb, NULL);
	}

			gaim_debug_warning("network", "NetworkManager not active or reports no connection (retval = %i)\n", libnm_retval);
			return FALSE;
		}
		if (libnm_retval == LIBNM_ACTIVE_NETWORK_CONNECTION)	return TRUE;
	}
#elif _WIN32
	return (current_network_count > 0);
#endif
	return TRUE;
}

14776:a87c53e7b1e2

	qs.dwSize = sizeof(WSAQUERYSET);
	qs.dwNameSpace = NS_ALL;

	retval = WSALookupServiceBegin(&qs, LUP_RETURN_ALL, &h);
	if (retval != ERROR_SUCCESS) {
		int errorid = WSAGetLastError();
		gchar *msg = g_win32_error_message(errorid);
		gaim_debug_warning("network", "Couldn't look up connected networks. %s (%d).\n", msg, errorid);
		g_free(msg);

		net_cnt = 1; /* Assume something is connected */
	} else {
		char buf[1024];
		WSAQUERYSET *res = (LPWSAQUERYSET) buf;
		DWORD size = sizeof(buf);
		while (WSALookupServiceNext(h, 0, &size, res) == ERROR_SUCCESS) {

		qs.dwNameSpace = NS_ALL;

		retval = WSALookupServiceBegin(&qs, LUP_RETURN_ALL, &h);

		/* This will block until there is a network change */
		retval = MyWSANSPIoctl(h, SIO_NSP_NOTIFY_CHANGE, NULL, 0, NULL, 0, &retLen, NULL);

		retval = WSALookupServiceEnd(h);

		g_idle_add(wgaim_network_change_thread_cb, NULL);
	}

			gaim_debug_warning("network", "NetworkManager not active or reports no connection (retval = %i)\n", libnm_retval);
			return FALSE;
		}
		if (libnm_retval == LIBNM_ACTIVE_NETWORK_CONNECTION)	return TRUE;
	}
#elif define _WIN32
	return (current_network_count > 0);
#endif
	return TRUE;
}