From 84527b7edabcee5b4cd1b2b217af8e767b5d2f67 Mon Sep 17 00:00:00 2001
From: Daniel Collins <solemnwarning@solemnwarning.net>
Date: Sun, 24 Apr 2011 23:40:52 +0000
Subject: [PATCH] Moved shared configuration stuff into config.h

---
 src/config.h      | 38 ++++++++++++++++++++++++++++++++++++++
 src/ipxconfig.cpp | 18 ++----------------
 src/ipxwrapper.h  | 20 ++------------------
 3 files changed, 42 insertions(+), 34 deletions(-)
 create mode 100644 src/config.h

diff --git a/src/config.h b/src/config.h
new file mode 100644
index 0000000..c1f14cb
--- /dev/null
+++ b/src/config.h
@@ -0,0 +1,38 @@
+/* ipxwrapper - Configuration header
+ * Copyright (C) 2011 Daniel Collins <solemnwarning@solemnwarning.net>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#ifndef IPX_CONFIG_H
+#define IPX_CONFIG_H
+
+#define DEFAULT_PORT 54792
+#define TTL 60
+
+struct reg_value {
+	unsigned char ipx_net[4];
+	unsigned char ipx_node[6];
+	unsigned char enabled;
+	unsigned char primary;
+} __attribute__((__packed__));
+
+struct reg_global {
+	uint16_t udp_port;
+	unsigned char w95_bug;
+	unsigned char bcast_all;
+	unsigned char filter;
+} __attribute__((__packed__));
+
+#endif /* !IPX_CONFIG_H */
diff --git a/src/ipxconfig.cpp b/src/ipxconfig.cpp
index cfd4f06..92d25d1 100644
--- a/src/ipxconfig.cpp
+++ b/src/ipxconfig.cpp
@@ -25,7 +25,7 @@
 #include <vector>
 #include <stdint.h>
 
-#define PORT 54792
+#include "config.h"
 
 #define ID_NIC_LIST 1
 #define ID_NIC_ENABLE 2
@@ -54,20 +54,6 @@ struct iface {
 	bool primary;
 };
 
-struct reg_value {
-	unsigned char ipx_net[4];
-	unsigned char ipx_node[6];
-	unsigned char enabled;
-	unsigned char primary;
-} __attribute__((__packed__));
-
-struct reg_global {
-	uint16_t udp_port;
-	unsigned char w95_bug;
-	unsigned char bcast_all;
-	unsigned char filter;
-} __attribute__((__packed__));
-
 typedef std::vector<iface> iface_list;
 
 static void addr_input_dialog(const char *desc, char *dest, int size);
@@ -413,7 +399,7 @@ int main() {
 	DWORD gsize = sizeof(global_conf);
 	
 	if(!regkey || RegQueryValueEx(regkey, "global", NULL, NULL, (BYTE*)&global_conf, &gsize) != ERROR_SUCCESS || gsize != sizeof(global_conf)) {
-		global_conf.udp_port = PORT;
+		global_conf.udp_port = DEFAULT_PORT;
 		global_conf.w95_bug = 1;
 		global_conf.bcast_all = 0;
 		global_conf.filter = 1;
diff --git a/src/ipxwrapper.h b/src/ipxwrapper.h
index 2cf6f64..bccdb3c 100644
--- a/src/ipxwrapper.h
+++ b/src/ipxwrapper.h
@@ -1,5 +1,5 @@
 /* ipxwrapper - Library header
- * Copyright (C) 2008 Daniel Collins <solemnwarning@solemnwarning.net>
+ * Copyright (C) 2008-2011 Daniel Collins <solemnwarning@solemnwarning.net>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published by
@@ -23,8 +23,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#define DEFAULT_PORT 54792
-#define TTL 60
+#include "config.h"
 
 #define DEBUG "ipxwrapper.log"
 
@@ -131,21 +130,6 @@ struct ipx_host {
 	ipx_host *next;
 };
 
-/* Interface settings stored in registry */
-struct reg_value {
-	unsigned char ipx_net[4];
-	unsigned char ipx_node[6];
-	unsigned char enabled;
-	unsigned char primary;
-} __attribute__((__packed__));
-
-struct reg_global {
-	uint16_t udp_port;
-	unsigned char w95_bug;
-	unsigned char bcast_all;
-	unsigned char filter;
-} __attribute__((__packed__));
-
 extern ipx_socket *sockets;
 extern ipx_nic *nics;
 extern ipx_host *hosts;