Consolidated IPv4 and IPv6 ports to one shared

When running GS on [::], only IPv6 server will be started

9 files changed, 26 insertions, 28 deletions

diff --git a/src/base/downServer.c b/src/base/downServer.c
index 5556fc6..a5ab58a 100644
--- a/src/base/downServer.c
+++ b/src/base/downServer.c
@@ -118,9 +118,9 @@ static void destroyClient(client_ds_t *client)
 	free(client);
 }
 
-int down_server_init(char *ip4, int port4)
+int down_server_init(char *ip, int port)
 {
-	sock_server_tcp = sock_tcp_bind(ip4, port4);
+	sock_server_tcp = sock_tcp_bind(ip, port);
 
 	if (sock_server_tcp == NULL) {
 		error("Unable to initialize download server");
diff --git a/src/base/downServer.h b/src/base/downServer.h
index 9207ef5..cab59e3 100644
--- a/src/base/downServer.h
+++ b/src/base/downServer.h
@@ -5,7 +5,7 @@
 #include "tcp.h"
 #include "buffer.h"
 
-extern int down_server_init(char *ip4, int port4);
+extern int down_server_init(char *ip, int port);
 extern int down_server_set_select();
 extern int down_server_select_socket();
 extern int down_server_quit();
diff --git a/src/base/net_multiplayer.c b/src/base/net_multiplayer.c
index fc142da..9888f03 100644
--- a/src/base/net_multiplayer.c
+++ b/src/base/net_multiplayer.c
@@ -29,11 +29,11 @@ int net_multiplayer_get_game_type()
 	return netGameType;
 }
 
-int net_multiplayer_init_for_game_server(char *ip4, int port4, char *ip6, int port6)
+int net_multiplayer_init_for_game_server(char *ip4, char *ip6, int port)
 {
 	int ret;
 
-	ret = server_init(ip4, port4, ip6, port6);
+	ret = server_init(ip4, ip6, port);
 
 	if (ret > 0) {
 		netGameType = NET_GAME_TYPE_SERVER;
@@ -53,7 +53,7 @@ int net_multiplayer_init(int type, char *ip, int port, int proto)
 		case NET_GAME_TYPE_SERVER:
 			switch (proto) {
 				case PROTO_UDPv4:
-					if (server_init(ip, port, NULL, 0) != 1) {
+					if (server_init(ip, NULL, port) != 1) {
 						error("Unable to initialize multiplayer game");
 						netGameType = NET_GAME_TYPE_NONE;
 						return -1;
@@ -61,7 +61,7 @@ int net_multiplayer_init(int type, char *ip, int port, int proto)
 					break;
 
 				case PROTO_UDPv6:
-					if (server_init(NULL, 0, ip, port) != 1) {
+					if (server_init(NULL, ip, port) != 1) {
 						error("Unable to initialize multiplayer game");
 						netGameType = NET_GAME_TYPE_NONE;
 						return -1;
diff --git a/src/base/net_multiplayer.h b/src/base/net_multiplayer.h
index 3da7137..c52b1ee 100644
--- a/src/base/net_multiplayer.h
+++ b/src/base/net_multiplayer.h
@@ -26,7 +26,7 @@
 #define NET_MASTER_PORT			6800
 
 #ifdef PUBLIC_SERVER
-extern int net_multiplayer_init_for_game_server(char *ip4, int port4, char *ip6, int port6);
+extern int net_multiplayer_init_for_game_server(char *ip4, char *ip6, int port);
 #endif /* PUBLIC_SERVER */
 
 extern int net_multiplayer_init(int type, char *ip, int port, int proto);
diff --git a/src/base/server.c b/src/base/server.c
index 17d8abe..5c75d1f 100644
--- a/src/base/server.c
+++ b/src/base/server.c
@@ -228,7 +228,7 @@ void server_set_time()
 	timer_add_task(listServerTimer, TIMER_PERIODIC, eventSendPingClients, NULL, SERVER_TIME_PING);
 }
 
-int server_init(char *ip4, int port4, char *ip6, int port6)
+int server_init(char *ip4, char *ip6, int port)
 {
 	int ret;
 
@@ -240,17 +240,17 @@ int server_init(char *ip4, int port4, char *ip6, int port6)
 	server_set_max_clients(SERVER_MAX_CLIENTS);
 	server_set_time();
 
-	/*printf("%s %d %s %d\n", ip4, port4, ip6, port6);*/
-	ret = server_udp_init(ip4, port4, ip6, port6);
+	ret = server_udp_init(ip4, ip6, port);
 
 	if (ret == 0) {
 		return -1;
 	}
 
+	/* initialize the arena download server */
 	if (ip4 != NULL) {
-		down_server_init(ip4, port4);
+		down_server_init(ip4, port);
 	} else if (ip6 != NULL) {
-		down_server_init(ip6, port6);
+		down_server_init(ip6, port);
 	}
 
 	return ret;
diff --git a/src/base/server.h b/src/base/server.h
index 8149121..72d7585 100644
--- a/src/base/server.h
+++ b/src/base/server.h
@@ -45,7 +45,7 @@ typedef struct client_struct {
 	list_t *listSeesShot;
 } client_t;
 
-extern int server_init(char *ip4, int port4, char *ip6, int port6);
+extern int server_init(char *ip4, char *ip6, int port);
 extern time_t server_get_update();
 extern client_t *server_new_any_client();
 extern void server_destroy_any_client(client_t *p);
diff --git a/src/base/udp_server.c b/src/base/udp_server.c
index 0e2b521..aa24c46 100644
--- a/src/base/udp_server.c
+++ b/src/base/udp_server.c
@@ -84,31 +84,31 @@ void server_udp_destroy_client(client_t *p)
 	server_destroy_any_client(p);
 }
 
-int server_udp_init(char *ip4, int port4, char *ip6, int port6)
+int server_udp_init(char *ip4, char *ip6, int port)
 {
 	int ret;
 
 	ret = 0;
 
 	if (ip4 != NULL) {
-		sock_server_udp = sock_udp_bind(ip4, port4);
+		sock_server_udp = sock_udp_bind(ip4, port);
 
 		if (sock_server_udp != NULL) {
 			ret++;
-			debug("Starting server on [%s]:%d", ip4, port4);
+			debug("Starting server on [%s]:%d", ip4, port);
 		} else {
-			debug("Unable to start server on [%s]:%d", ip4, port4);
+			debug("Unable to start server on [%s]:%d", ip4, port);
 		}
 	}
 
 	if (ip6 != NULL) {
-		sock_server_udp_second = sock_udp_bind(ip6, port6);
+		sock_server_udp_second = sock_udp_bind(ip6, port);
 
 		if (sock_server_udp_second != NULL) {
 			ret++;
-			debug("Starting server on [%s]:%d", ip6, port6);
+			debug("Starting server on [%s]:%d", ip6, port);
 		} else {
-			debug("Unable to start server on [%s]:%d", ip6, port6);
+			debug("Unable to start server on [%s]:%d", ip6, port);
 		}
 	}
 
diff --git a/src/base/udp_server.h b/src/base/udp_server.h
index 3d7b292..0d4c1d9 100644
--- a/src/base/udp_server.h
+++ b/src/base/udp_server.h
@@ -6,7 +6,7 @@
 
 extern client_t *server_udp_new_client(sock_udp_t *sock_udp);
 extern void server_udp_destroy_client(client_t *p);
-extern int server_udp_init(char *ip4, int port4, char *ip6, int port6);
+extern int server_udp_init(char *ip4, char *ip6, int port);
 extern void server_udp_set_select();
 extern int server_udp_select_sock();
 extern void server_udp_quit();
diff --git a/src/server/publicServer.c b/src/server/publicServer.c
index e30c3d6..e52d8c6 100644
--- a/src/server/publicServer.c
+++ b/src/server/publicServer.c
@@ -223,8 +223,7 @@ static int public_server_initNetwork()
 	char ip4[STR_IP_SIZE];
 	char ip6[STR_IP_SIZE];
 	char *p_ip4, *p_ip6;
-	int port4;
-	int port6;
+	int port;
 	int ret;
 
 	ret = -1;
@@ -234,7 +233,7 @@ static int public_server_initNetwork()
 
 	p_ip4 = ip4;
 
-	if (strcmp(ip4, "none") == 0) {
+	if (strcmp(ip4, "none") == 0 || strcmp(ip6, "::") == 0) {
 		p_ip4 = NULL;
 	}
 
@@ -244,10 +243,9 @@ static int public_server_initNetwork()
 		p_ip6 = NULL;
 	}
 
-	port4 = atoi(public_server_get_setting("PORT4", "--port4", "6800"));
-	port6 = atoi(public_server_get_setting("PORT6", "--port6", "6800"));
+	port = atoi(public_server_get_setting("PORT", "--port", "6800"));
 
-	ret = net_multiplayer_init_for_game_server(p_ip4, port4, p_ip6, port6);
+	ret = net_multiplayer_init_for_game_server(p_ip4, p_ip6, port);
 
 	return ret;
 }