about summary refs log tree commit diff
path: root/src/mastersrv/mastersrv.cpp
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2012-03-04 12:47:16 +0100
committeroy <Tom_Adams@web.de>2013-02-24 17:26:59 +0100
commit13d06e45ac14d5f584462d0611f85a4e1dafcf17 (patch)
tree473e7b8e8bff5c9efb0c06b51acef10e6a1a5a43 /src/mastersrv/mastersrv.cpp
parentffd89938d7caebe2ecd7bf18d00283e6aadea981 (diff)
downloadzcatch-13d06e45ac14d5f584462d0611f85a4e1dafcf17.tar.gz
zcatch-13d06e45ac14d5f584462d0611f85a4e1dafcf17.zip
fixed used nettype in server browser and try to use ipv4 and ipv6 socket when using a bindaddr. Closes #940
Diffstat (limited to 'src/mastersrv/mastersrv.cpp')
-rw-r--r--src/mastersrv/mastersrv.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mastersrv/mastersrv.cpp b/src/mastersrv/mastersrv.cpp
index c88a9e78..922577ca 100644
--- a/src/mastersrv/mastersrv.cpp
+++ b/src/mastersrv/mastersrv.cpp
@@ -348,7 +348,11 @@ int main(int argc, const char **argv) // ignore_convention
 		m_pConsole->ParseArguments(argc-1, &argv[1]); // ignore_convention
 
 	if(g_Config.m_Bindaddr[0] && net_host_lookup(g_Config.m_Bindaddr, &BindAddr, NETTYPE_ALL) == 0)
+	{
+		// got bindaddr
+		BindAddr.type = NETTYPE_ALL;
 		BindAddr.port = MASTERSERVER_PORT;
+	}
 	else
 	{
 		mem_zero(&BindAddr, sizeof(BindAddr));