Merge pull request hrydgard#19903 from hrydgard/network-connection-de…

…tection

Don't disable savestates just because adhoc is "inited"

Core/Dialog/PSPDialog.cpp

@@ -15,6 +15,7 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
 #include "Common/Data/Text/I18n.h"
 
 #include "Common/Serialize/Serializer.h"

Core/HLE/sceNet.cpp

@@ -52,7 +52,7 @@
 #include "Core/HLE/sceNetInet.h"
 #include "Core/HLE/sceNetResolver.h"
 
-bool netInited;
+bool g_netInited;
 
 u32 netDropRate = 0;
 u32 netDropDuration = 0;
@@ -64,8 +64,9 @@ static struct SceNetMallocStat netMallocStat;
 
 static std::map<int, ApctlHandler> apctlHandlers;
 
-std::string defaultNetConfigName = "NetConf";
-std::string defaultNetSSID = "Wifi"; // fake AP/hotspot
+const char * const defaultNetConfigName = "NetConf";
+const char * const defaultNetSSID = "Wifi"; // fake AP/hotspot
+
 int netApctlInfoId = 0;
 SceNetApctlInfoInternal netApctlInfo;
 
@@ -88,8 +89,13 @@ int NetApctl_Term();
 void NetApctl_InitDefaultInfo();
 void NetApctl_InitInfo(int confId);
 
+bool IsNetworkConnected() {
+	// TODO: Tweak this.
+	return __NetApctlConnected() || __NetAdhocConnected();
+}
+
 bool NetworkWarnUserIfOnlineAndCantSavestate() {
-	if (netInited && !g_Config.bAllowSavestateWhileConnected) {
+	if (IsNetworkConnected() && !g_Config.bAllowSavestateWhileConnected) {
 		auto nw = GetI18NCategory(I18NCat::NETWORKING);
 		g_OSD.Show(OSDType::MESSAGE_INFO, nw->T("Save states are not available when online"), 3.0f, "saveonline");
 		return true;
@@ -99,7 +105,7 @@ bool NetworkWarnUserIfOnlineAndCantSavestate() {
 }
 
 bool NetworkWarnUserIfOnlineAndCantSpeed() {
-	if (netInited) {
+	if (IsNetworkConnected()) {
 		auto nw = GetI18NCategory(I18NCat::NETWORKING);
 		g_OSD.Show(OSDType::MESSAGE_INFO, nw->T("Speed controls are not available when online"), 3.0f, "speedonline");
 		return true;
@@ -109,11 +115,11 @@ bool NetworkWarnUserIfOnlineAndCantSpeed() {
 }
 
 bool NetworkAllowSpeedControl() {
-	return !netInited;
+	return !IsNetworkConnected();
 }
 
 bool NetworkAllowSaveState() {
-	return !netInited || g_Config.bAllowSavestateWhileConnected;
+	return !IsNetworkConnected() || g_Config.bAllowSavestateWhileConnected;
 }
 
 void AfterApctlMipsCall::DoState(PointerWrap & p) {
@@ -165,6 +171,8 @@ bool LoadDNSForGameID(std::string_view gameID, InfraDNSConfig *dns) {
 		return false;
 	}
 
+	dns->loaded = true;
+
 	std::string_view jsonStr = std::string_view((const char *)data.get(), jsonSize);
 	json::JsonReader reader(jsonStr.data(), jsonStr.length());
 	if (!reader.ok() || !reader.root()) {
@@ -343,7 +351,7 @@ void __NetApctlInit() {
 }
 
 static void __ResetInitNetLib() {
-	netInited = false;
+	g_netInited = false;
 	netInetInited = false; // shouldn't this actually do something?
 
 	memset(&netMallocStat, 0, sizeof(netMallocStat));
@@ -435,11 +443,11 @@ void __NetDoState(PointerWrap &p) {
 	if (!s)
 		return;
 
-	auto cur_netInited = netInited;
+	auto cur_netInited = g_netInited;
 	auto cur_netInetInited = netInetInited;
 	auto cur_netApctlInited = g_netApctlInited;
 
-	Do(p, netInited);
+	Do(p, g_netInited);
 	Do(p, netInetInited);
 	Do(p, g_netApctlInited);
 	Do(p, apctlHandlers);
@@ -492,7 +500,7 @@ void __NetDoState(PointerWrap &p) {
 		// Let's not change "Inited" value when Loading SaveState in the middle of multiplayer to prevent memory & port leaks
 		g_netApctlInited = cur_netApctlInited;
 		netInetInited = cur_netInetInited;
-		netInited = cur_netInited;
+		g_netInited = cur_netInited;
 
 		// Discard leftover events
 		apctlEvents.clear();
@@ -673,7 +681,7 @@ u32 Net_Term() {
 	//NetInet_Term();
 
 	// Library is initialized
-	if (netInited) {
+	if (g_netInited) {
 		// Delete Adhoc Sockets
 		deleteAllAdhocSockets();
 
@@ -691,7 +699,7 @@ u32 Net_Term() {
 	FreeUser(netPoolAddr);
 	FreeUser(netThread1Addr);
 	FreeUser(netThread2Addr);
-	netInited = false;
+	g_netInited = false;
 
 	g_infraDNSConfig = {};
 	return 0;
@@ -720,7 +728,7 @@ static int sceNetInit(u32 poolSize, u32 calloutPri, u32 calloutStack, u32 netini
 	// TODO: Create Network Threads using given priority & stack
 	// TODO: The correct behavior is actually to allocate more and leak the other threads/pool.
 	// But we reset here for historic reasons (GTA:VCS potentially triggers this.)
-	if (netInited) {
+	if (g_netInited) {
 		// This cleanup attempt might not worked when SaveState were loaded in the middle of multiplayer game and re-entering multiplayer, thus causing memory leaks & wasting binded ports.
 		// Maybe we shouldn't save/load "Inited" vars on SaveState?
 		Net_Term();
@@ -805,7 +813,7 @@ static int sceNetInit(u32 poolSize, u32 calloutPri, u32 calloutStack, u32 netini
 		}
 	}
 
-	netInited = true;
+	g_netInited = true;
 
 	auto n = GetI18NCategory(I18NCat::NETWORKING);
 
@@ -974,7 +982,7 @@ void NetApctl_InitInfo(int confId) {
 	truncate_cpy(netApctlInfo.name, sizeof(netApctlInfo.name), defaultNetConfigName + std::to_string(confId));
 	truncate_cpy(netApctlInfo.ssid, sizeof(netApctlInfo.ssid), defaultNetSSID);
 	memcpy(netApctlInfo.bssid, "\1\1\2\2\3\3", sizeof(netApctlInfo.bssid)); // fake AP's mac address
-	netApctlInfo.ssidLength = static_cast<unsigned int>(defaultNetSSID.length());
+	netApctlInfo.ssidLength = static_cast<unsigned int>(strlen(defaultNetSSID));
 	netApctlInfo.strength = 99;
 	netApctlInfo.channel = g_Config.iWlanAdhocChannel;
 	if (netApctlInfo.channel == PSP_SYSTEMPARAM_ADHOC_CHANNEL_AUTOMATIC) netApctlInfo.channel = defaultWlanChannel;

Core/HLE/sceNet.h

@@ -108,12 +108,12 @@ class AfterApctlMipsCall : public PSPAction {
 	u32_le argsAddr = 0;
 };
 
-extern bool netInited;
+extern bool g_netInited;
 extern bool g_netApctlInited;
 extern u32 netApctlState;
 extern SceNetApctlInfoInternal netApctlInfo;
-extern std::string defaultNetConfigName;
-extern std::string defaultNetSSID;
+extern const char * const defaultNetConfigName;
+extern const char * const defaultNetSSID;
 
 void Register_sceNet();
 void Register_sceNetApctl();
@@ -131,6 +131,9 @@ bool __NetApctlConnected();
 
 int sceNetApctlConnect(int connIndex);
 
+// Are we connected - for the purpose of disabling speed consoles and savestates etc.
+bool IsNetworkConnected();
+
 // These return false if allowed to be consistent with the similar function for achievements.
 bool NetworkWarnUserIfOnlineAndCantSavestate();
 bool NetworkWarnUserIfOnlineAndCantSpeed();
@@ -146,6 +149,7 @@ enum class InfraGameState {
 
 // Loaded an interpreted for a specific game from the JSON - doesn't represent the entire JSON.
 struct InfraDNSConfig {
+	bool loaded;
 	std::string gameName;
 	std::string dns;
 	std::string dyn_dns;

Core/HLE/sceNetAdhoc.cpp

@@ -14,27 +14,16 @@
 
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
+// sceNetAdhoc
 
-#if defined(_WIN32)
-#include <WinSock2.h>
-#include "Common/CommonWindows.h"
-#endif
+// This is a direct port of Coldbird's code from http://code.google.com/p/aemu/
+// All credit goes to him!
 
-#if !defined(_WIN32)
-#include <sys/types.h>
-#include <netinet/tcp.h>
-#endif
-
-#ifndef MSG_NOSIGNAL
-// Default value to 0x00 (do nothing) in systems where it's not supported.
-#define MSG_NOSIGNAL 0x00
-#endif
 
 #include <mutex>
-// sceNetAdhoc
+#include <string>
 
-// This is a direct port of Coldbird's code from http://code.google.com/p/aemu/
-// All credit goes to him!
+#include "Common/Net/SocketCompat.h"
 #include "Common/Data/Text/I18n.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
@@ -89,7 +78,6 @@ int adhocEventDelay = 2000000; //2000000 on real PSP ?
 
 constexpr u32 defaultLastRecvDelta = 10000; //10000 usec worked well for games published by Falcom (ie. Ys vs Sora Kiseki, Vantage Master Portable)
 
-
 SceUID threadAdhocID;
 
 std::recursive_mutex adhocEvtMtx;
@@ -1352,7 +1340,7 @@ int sceNetAdhocPdpCreate(const char *mac, int port, int bufferSize, u32 flag) {
 		return hleLogError(Log::sceNet, -1, "WLAN");
 	}
 
-	if (!netInited)
+	if (!g_netInited)
 		return hleLogError(Log::sceNet, 0x800201CA); //PSP_LWMUTEX_ERROR_NO_SUCH_LWMUTEX;
 
 	// Library is initialized

Core/HLE/sceNetAdhoc.h

@@ -20,7 +20,6 @@
 #include <deque>
 #include "Core/HLE/proAdhoc.h"
 
-
 #ifdef _MSC_VER
 #pragma pack(push,1)
 #endif
@@ -128,6 +127,8 @@ extern bool netAdhocInited;
 extern bool netAdhocctlInited;
 extern bool g_adhocServerConnected;
 extern bool netAdhocGameModeEntered;
+extern s32 netAdhocDiscoverStatus;
+
 extern int netAdhocEnterGameModeTimeout;
 extern int adhocDefaultTimeout; //3000000 usec
 extern int adhocDefaultDelay; //10000

Core/HLE/sceNetAdhocMatching.h

@@ -42,3 +42,5 @@ void RestoreNetAdhocMatchingInited();
 void Register_sceNetAdhocMatching();
 void __NetAdhocMatchingInit();
 void __NetAdhocMatchingShutdown();
+
+extern bool netAdhocMatchingInited;

Core/HLE/sceNetApctl.cpp

@@ -1,3 +1,16 @@
 // TODO: move apctl here
 
 #include "sceNetApctl.h"
+
+const char *ApctlStateToString(int apctlState) {
+	switch (apctlState) {
+	case PSP_NET_APCTL_STATE_DISCONNECTED: return "DISCONNECTED";
+	case PSP_NET_APCTL_STATE_SCANNING: return "SCANNING";
+	case PSP_NET_APCTL_STATE_JOINING: return "JOINING";
+	case PSP_NET_APCTL_STATE_GETTING_IP: return "GETTING_IP";
+	case PSP_NET_APCTL_STATE_GOT_IP: return "GOT_IP";
+	case PSP_NET_APCTL_STATE_EAP_AUTH: return "EAP_AUTH";
+	case PSP_NET_APCTL_STATE_KEY_EXCHANGE: return "KEY_EXCHANGE";
+	default: return "N/A";
+	}
+}

Core/HLE/sceNetApctl.h

@@ -27,6 +27,8 @@ enum {
 	PSP_NET_APCTL_EVENT_SCAN_STOP = 11 // FIXME: not sure what this is, MGS:PW seems to check this value within ApctlHandler during Recruit, related to sceNetApctlScanSSID2 ?
 };
 
+const char *ApctlStateToString(int apctlState);
+
 #define 	PSP_NET_APCTL_INFO_PROFILE_NAME			0
 #define 	PSP_NET_APCTL_INFO_BSSID				1
 #define 	PSP_NET_APCTL_INFO_SSID					2

Core/HLE/sceNetInet.h

@@ -115,13 +115,13 @@ typedef struct InetSocket {
 
 class PointerWrap;
 
-extern bool netInited;
+extern bool g_netInited;
 extern bool netInetInited;
 extern bool g_netApctlInited;
 extern u32 netApctlState;
 extern SceNetApctlInfoInternal netApctlInfo;
-extern std::string defaultNetConfigName;
-extern std::string defaultNetSSID;
+extern const char *const defaultNetConfigName;
+extern const char *const defaultNetSSID;
 
 void Register_sceNetInet();
 

Core/HLE/scePspNpDrm_user.cpp

@@ -5,37 +5,33 @@
 #include "Core/HLE/sceIo.h"
 
 static int sceNpDrmSetLicenseeKey(u32 npDrmKeyAddr) {
-	WARN_LOG(Log::HLE, "UNIMPL: sceNpDrmSetLicenseeKey(%08x)", npDrmKeyAddr);
-	return 0;
+	return hleLogWarning(Log::HLE, 0, "UNIMPL");
 }
 
 static int sceNpDrmClearLicenseeKey() {
-	WARN_LOG(Log::HLE, "UNIMPL: sceNpDrmClearLicenseeKey()");
-	return 0;
+	return hleLogWarning(Log::HLE, 0, "UNIMPL");
 }
 
 static int sceNpDrmRenameCheck(const char *filename) {
-	WARN_LOG(Log::HLE, "UNIMPL: sceNpDrmRenameCheck(%s)", filename);
-	return 0;
+	return hleLogWarning(Log::HLE, 0, "UNIMPL");
 }
 
 static int sceNpDrmEdataSetupKey(u32 edataFd) {
-	INFO_LOG(Log::HLE, "sceNpDrmEdataSetupKey(%x)", edataFd);
 	int usec = 0;
 	// set PGD offset
 	int retval = __IoIoctl(edataFd, 0x04100002, 0x90, 0, 0, 0, usec);
 	if (retval != 0) {
-		return hleDelayResult(retval, "io ctrl command", usec);
+		return hleDelayResult(hleLogError(Log::HLE, retval), "io ctrl command", usec);
 	}
 	// call PGD open
 	// Note that usec accumulates.
 	retval = __IoIoctl(edataFd, 0x04100001, 0, 0, 0, 0, usec);
-	return hleDelayResult(retval, "io ctrl command", usec);
+	return hleDelayResult(hleLogSuccessInfoI(Log::HLE, retval), "io ctrl command", usec);
 }
 
 static int sceNpDrmEdataGetDataSize(u32 edataFd) {
-	INFO_LOG(Log::HLE, "sceNpDrmEdataGetDataSize %x", edataFd);
-	return sceIoIoctl(edataFd, 0x04100010, 0, 0, 0, 0);
+	int retval = hleCall(IoFileMgrForKernel, u32, sceIoIoctl, edataFd, 0x04100010, 0, 0, 0, 0);
+	return hleLogSuccessInfoI(Log::HLE, retval);
 }
 
 static int sceNpDrmOpen() {

Core/SaveState.cpp

@@ -456,7 +456,7 @@ namespace SaveState
 
 	void Rewind(Callback callback, void *cbUserData)
 	{
-		if (netInited) {
+		if (g_netInited) {
 			return;
 		}
 		if (coreState == CoreState::CORE_RUNTIME_ERROR)

UI/EmuScreen.cpp

@@ -939,7 +939,7 @@ void EmuScreen::onVKey(int virtualKeyCode, bool down) {
 		break;
 	case VIRTKEY_TOGGLE_WLAN:
 		// Let's not allow the user to toggle wlan while connected, could get confusing.
-		if (down && !netInited) {
+		if (down && !g_netInited) {
 			auto n = GetI18NCategory(I18NCat::NETWORKING);
 			auto di = GetI18NCategory(I18NCat::DIALOG);
 			g_Config.bEnableWlan = !g_Config.bEnableWlan;
@@ -1884,7 +1884,7 @@ void EmuScreen::resized() {
 }
 
 bool MustRunBehind() {
-	return netInited || __NetAdhocConnected();
+	return IsNetworkConnected();
 }
 
 bool ShouldRunBehind() {