WIP TCP/SIOsio

3 files changed, 41 insertions, 25 deletions

diff --git a/plugins/dfnet/dfnet.c b/plugins/dfnet/dfnet.c
index fcd438b5..205ae307 100644
--- a/plugins/dfnet/dfnet.c
+++ b/plugins/dfnet/dfnet.c
@@ -16,6 +16,22 @@ extern int errno;
 
 #include "dfnet.h"
 
+struct timeval tm;
+Config conf;
+int sock;
+char *PadSendData;
+char *PadRecvData;
+char PadSendSize;
+char PadRecvSize;
+char PadSize[2];
+int PadCount;
+int PadCountMax;
+int PadInit;
+int Ping;
+volatile int WaitCancel;
+fd_set rset;
+fd_set wset;
+
 const unsigned char version  = 2;    // NET library v2
 const unsigned char revision = 0;
 const unsigned char build    = 3;    // increase that with each version
@@ -125,8 +141,8 @@ long CALLBACK NETopen(unsigned long *gpuDisp) {
 		if (bind(listen_sock,(struct sockaddr *) &address, sizeof(address)) == -1)
 			return -1;
 
-		if (listen(listen_sock, 1) != 0) 
-			return -1; 
+		if (listen(listen_sock, 1) != 0)
+			return -1;
 
 		sock = -1;
 
diff --git a/plugins/dfnet/dfnet.h b/plugins/dfnet/dfnet.h
index b824a790..d29e642d 100644
--- a/plugins/dfnet/dfnet.h
+++ b/plugins/dfnet/dfnet.h
@@ -56,8 +56,6 @@ __private_extern char* PLUGLOC(char* toloc);
 
 typedef void* HWND;
 
-struct timeval tm;
-
 #define CALLBACK
 
 long timeGetTime();
@@ -70,25 +68,25 @@ typedef struct {
 	char ipAddress[32];
 } Config;
 
-Config conf;
+extern struct timeval tm;
+extern Config conf;
+extern int sock;
+extern char *PadSendData;
+extern char *PadRecvData;
+extern char PadSendSize;
+extern char PadRecvSize;
+extern char PadSize[2];
+extern int PadCount;
+extern int PadCountMax;
+extern int PadInit;
+extern int Ping;
+extern volatile int WaitCancel;
+extern fd_set rset;
+extern fd_set wset;
 
 void LoadConf();
 void SaveConf();
 
-int sock;
-char *PadSendData;
-char *PadRecvData;
-char PadSendSize;
-char PadRecvSize;
-char PadSize[2];
-int PadCount;
-int PadCountMax;
-int PadInit;
-int Ping;
-volatile int WaitCancel;
-fd_set rset;
-fd_set wset;
-
 long sockInit();
 long sockShutdown();
 long sockOpen();
diff --git a/plugins/dfnet/gui.c b/plugins/dfnet/gui.c
index 85d0871f..746f34a6 100644
--- a/plugins/dfnet/gui.c
+++ b/plugins/dfnet/gui.c
@@ -15,6 +15,8 @@
 
 #include "cfg.c"
 
+Config conf;
+
 void cfgSysMessage(const char *fmt, ...) {
 	GtkWidget *MsgDlg;
 	va_list list;
@@ -220,16 +222,16 @@ int main(int argc, char *argv[]) {
 		return 0;
 	}
 
-	if (strcmp(argv[1], "about") != 0 && 
-		strcmp(argv[1], "configure") != 0 && 
-		strcmp(argv[1], "open") != 0 && 
-		strcmp(argv[1], "wait") != 0 && 
-		strcmp(argv[1], "pause") != 0 && 
+	if (strcmp(argv[1], "about") != 0 &&
+		strcmp(argv[1], "configure") != 0 &&
+		strcmp(argv[1], "open") != 0 &&
+		strcmp(argv[1], "wait") != 0 &&
+		strcmp(argv[1], "pause") != 0 &&
 		strcmp(argv[1], "message") != 0) {
 		printf ("Usage: cfgDFNet {about | configure | open | wait | pause | message}\n");
 		return 0;
 	}
-	
+
 	if(argc > 1) {
 		if (!strcmp(argv[1], "configure")) {
 			CFGconfigure();