(svn r16000) -Feature: IPv6 support

3 files changed, 3 insertions, 2 deletions

diff --git a/src/network/core/address.h b/src/network/core/address.h
index 4c025b584..2c37860c4 100644
--- a/src/network/core/address.h
+++ b/src/network/core/address.h
@@ -74,7 +74,7 @@ public:
 	 * @param port the port
 	 * @param family the address family
 	 */
-	NetworkAddress(const char *hostname = "0.0.0.0", uint16 port = 0, int family = AF_INET) :
+	NetworkAddress(const char *hostname = "", uint16 port = 0, int family = AF_UNSPEC) :
 		address_length(0)
 	{
 		/* Also handle IPv6 bracket enclosed hostnames */
diff --git a/src/network/core/config.h b/src/network/core/config.h
index e2fbb5e3a..bcd85f594 100644
--- a/src/network/core/config.h
+++ b/src/network/core/config.h
@@ -24,7 +24,7 @@ enum {
 
 	NETWORK_GAME_INFO_VERSION     =    4, ///< What version of game-info do we use?
 	NETWORK_COMPANY_INFO_VERSION  =    5, ///< What version of company info is this?
-	NETWORK_MASTER_SERVER_VERSION =    1, ///< What version of master-server-protocol do we use?
+	NETWORK_MASTER_SERVER_VERSION =    2, ///< What version of master-server-protocol do we use?
 
 	NETWORK_NAME_LENGTH           =   80, ///< The maximum length of the server name and map name, in bytes including '\0'
 	NETWORK_COMPANY_NAME_LENGTH   =   31, ///< The maximum length of the company name, in bytes including '\0'
diff --git a/src/network/core/udp.cpp b/src/network/core/udp.cpp
index 9fd58eb8d..fec5bfb59 100644
--- a/src/network/core/udp.cpp
+++ b/src/network/core/udp.cpp
@@ -30,6 +30,7 @@ NetworkUDPSocketHandler::NetworkUDPSocketHandler(NetworkAddressList *bind)
 		 * resolving it we need to add an address for each of
 		 * the address families we support. */
 		*this->bind.Append() = NetworkAddress(NULL, 0, AF_INET);
+		*this->bind.Append() = NetworkAddress(NULL, 0, AF_INET6);
 	}
 }