From 637de00822b8e4c1cc2f7052eb106e598b34167e Mon Sep 17 00:00:00 2001 From: cybermind <iddqd_mail@mail.ru> Date: Sat, 20 Jul 2013 16:46:55 +0600 Subject: [PATCH] [-] Fixed bug which didn't allow client to join into game (note: I'm not highly knowledgable in network protocol programming, but looks like stratagus tries to connect on localhost instrad of address specified in join window) --- src/network/network.cpp | 3 ++- src/network/udpsocket.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/network/network.cpp b/src/network/network.cpp index 1d8324129..f609dba97 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -398,7 +398,8 @@ void InitNetwork1() // Our communication port const int port = CNetworkParameter::Instance.localPort; - const CHost host(CNetworkParameter::Instance.localHost.c_str(), port); + const char *NetworkAddr = NULL; // FIXME : bad use + const CHost host(NetworkAddr, port); NetworkFildes.Open(host); if (NetworkFildes.IsValid() == false) { fprintf(stderr, "NETWORK: No free port %d available, aborting\n", port); diff --git a/src/network/udpsocket.cpp b/src/network/udpsocket.cpp index 8621024e7..7133d30db 100644 --- a/src/network/udpsocket.cpp +++ b/src/network/udpsocket.cpp @@ -46,7 +46,7 @@ CHost::CHost(const char *name, int port) { - this->ip = NetResolveHost(name ? name : "127.0.0.1"); + this->ip = name ? NetResolveHost(name) : INADDR_ANY; this->port = htons(port); }