From 3893c3fb519f686fa51af811525194aac56583c5 Mon Sep 17 00:00:00 2001
From: dborth <dborth@0aaa047c-bd49-0410-9b25-49477284f1fd>
Date: Mon, 22 Dec 2008 09:26:42 +0000
Subject: [PATCH] network cleanup

---
 source/ngc/smbop.c | 76 ++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/source/ngc/smbop.c b/source/ngc/smbop.c
index 7de169c..0cae4da 100644
--- a/source/ngc/smbop.c
+++ b/source/ngc/smbop.c
@@ -9,26 +9,16 @@
  * SMB support routines
  ****************************************************************************/
 
-#include <gccore.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ogcsys.h>
 #include <network.h>
 #include <smb.h>
-#include <zlib.h>
-#include <errno.h>
 
-#include "common.h"
 #include "fceugx.h"
 #include "fileop.h"
-#include "gcunzip.h"
 #include "menudraw.h"
-#include "filesel.h"
 
 bool networkInit = false;
+bool autoNetworkInit = true;
 bool networkShareInit = false;
-bool networkInitHalt = false;
 
 /****************************************************************************
  * InitializeNetwork
@@ -37,36 +27,32 @@ bool networkInitHalt = false;
 
 void InitializeNetwork(bool silent)
 {
-	if(networkInit || networkInitHalt)
+	// stop if we're already initialized, or if auto-init has failed before
+	// in which case, manual initialization is required
+	if(networkInit || !autoNetworkInit)
 		return;
 
 	if(!silent)
 		ShowAction ("Initializing network...");
 
-	s32 result;
+	char ip[16];
+	s32 initResult = if_config(ip, NULL, NULL, true);
 
-	while ((result = net_init()) == -EAGAIN);
-
-	if (result >= 0)
+	if(initResult == 0)
 	{
-		char myIP[16];
-
-		if (if_config(myIP, NULL, NULL, true) < 0)
-		{
-			networkInitHalt = true; // do not attempt a reconnection again
-
-			if(!silent)
-				WaitPrompt("Error reading IP address.");
-		}
-		else
-		{
-			networkInit = true;
-		}
+		networkInit = true;
 	}
 	else
 	{
+		// do not automatically attempt a reconnection
+		autoNetworkInit = false;
+
 		if(!silent)
-			WaitPrompt("Unable to initialize network.");
+		{
+			char msg[150];
+			sprintf(msg, "Unable to initialize network (Error #: %i)", initResult);
+			WaitPrompt(msg);
+		}
 	}
 }
 
@@ -89,14 +75,32 @@ ConnectShare (bool silent)
 	return false;
 	#endif
 
-	// check that all parameter have been set
-	if(strlen(GCSettings.smbuser) == 0 ||
-		strlen(GCSettings.smbpwd) == 0 ||
-		strlen(GCSettings.smbshare) == 0 ||
-		strlen(GCSettings.smbip) == 0)
+	int chkU = (strlen(GCSettings.smbuser) > 0) ? 0:1;
+	int chkP = (strlen(GCSettings.smbpwd) > 0) ? 0:1;
+	int chkS = (strlen(GCSettings.smbshare) > 0) ? 0:1;
+	int chkI = (strlen(GCSettings.smbip) > 0) ? 0:1;
+
+	// check that all parameters have been set
+	if(chkU + chkP + chkS + chkI > 0)
 	{
 		if(!silent)
-			WaitPrompt("Invalid network settings. Check settings.xml.");
+		{
+			char msg[50];
+			char msg2[100];
+			if(chkU + chkP + chkS + chkI > 1) // more than one thing is wrong
+				sprintf(msg, "Check settings.xml.");
+			else if(chkU)
+				sprintf(msg, "Username is blank.");
+			else if(chkP)
+				sprintf(msg, "Password is blank.");
+			else if(chkS)
+				sprintf(msg, "Share name is blank.");
+			else if(chkI)
+				sprintf(msg, "Share IP is blank.");
+
+			sprintf(msg2, "Invalid network settings - %s", msg);
+			WaitPrompt(msg2);
+		}
 		return false;
 	}