Browse Source

Merge pull request #462 from Hoikas/config-port

Allow non-14617 server ports
Adam Johnson 10 years ago
parent
commit
1035cae516
  1. 10
      Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCommandsCore.cpp
  2. 4
      Sources/Plasma/NucleusLib/pnNetBase/pnNbConst.h
  3. 14
      Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.cpp
  4. 3
      Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.h
  5. 4
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
  6. 41
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp
  7. 6
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.h
  8. 2
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
  9. 4
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp

10
Sources/Plasma/FeatureLib/pfConsoleCore/pfConsoleCommandsCore.cpp

@ -112,6 +112,16 @@ PF_CONSOLE_CMD(
SetServerDisplayName(params[0]); SetServerDisplayName(params[0]);
} }
//============================================================================
PF_CONSOLE_CMD(
Server,
Port,
"int port",
"Set server's port"
) {
SetClientPort((int)params[0]);
}
//============================================================================ //============================================================================
// Server.File group // Server.File group

4
Sources/Plasma/NucleusLib/pnNetBase/pnNbConst.h

@ -52,10 +52,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
//============================================================================ //============================================================================
// Network constants // Network constants
//============================================================================ //============================================================================
const unsigned kNetLegacyClientPort = 80;
const unsigned kNetDefaultClientPort = 14617;
const unsigned kNetDefaultServerPort = 14618;
const unsigned kNetDefaultSimpleNetPort = 14620;
const unsigned kMaxTcpPacketSize = 1460; const unsigned kMaxTcpPacketSize = 1460;
//============================================================================ //============================================================================

14
Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.cpp

@ -70,6 +70,8 @@ static const char* s_gateKeeperAddrs[] = {
s_gateKeeperAddrConsole s_gateKeeperAddrConsole
}; };
static unsigned s_clientPort = 14617;
/***************************************************************************** /*****************************************************************************
* *
@ -121,6 +123,18 @@ void SetGateKeeperSrvHostname (const char addr[]) {
strncpy(s_gateKeeperAddrConsole, addr, arrsize(s_gateKeeperAddrConsole)); strncpy(s_gateKeeperAddrConsole, addr, arrsize(s_gateKeeperAddrConsole));
} }
//============================================================================
// Client Port
//============================================================================
unsigned GetClientPort() {
return s_clientPort;
}
//============================================================================
void SetClientPort(unsigned port) {
s_clientPort = port;
}
//============================================================================ //============================================================================
// User-visible Server // User-visible Server

3
Sources/Plasma/NucleusLib/pnNetBase/pnNbSrvs.h

@ -93,6 +93,9 @@ void SetFileSrvHostname (const char addr[]);
unsigned GetGateKeeperSrvHostnames (const char*** addrs); // returns addrCount unsigned GetGateKeeperSrvHostnames (const char*** addrs); // returns addrCount
void SetGateKeeperSrvHostname (const char addr[]); void SetGateKeeperSrvHostname (const char addr[]);
unsigned GetClientPort();
void SetClientPort(unsigned port);
const char *GetServerStatusUrl (); const char *GetServerStatusUrl ();
void SetServerStatusUrl (const char url[]); void SetServerStatusUrl (const char url[]);

4
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp

@ -5143,14 +5143,14 @@ void NetCliAuthStartConnect (
&cancelId, &cancelId,
AsyncLookupCallback, AsyncLookupCallback,
authAddrList[i], authAddrList[i],
kNetDefaultClientPort, GetClientPort(),
nil nil
); );
break; break;
} }
} }
if (!name[0]) { if (!name[0]) {
plNetAddress addr(authAddrList[i], kNetDefaultClientPort); plNetAddress addr(authAddrList[i], GetClientPort());
Connect(authAddrList[i], addr); Connect(authAddrList[i], addr);
} }
} }

41
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp

@ -1365,51 +1365,14 @@ void NetCliFileStartConnect (
&cancelId, &cancelId,
AsyncLookupCallback, AsyncLookupCallback,
fileAddrList[i], fileAddrList[i],
kNetDefaultClientPort, GetClientPort(),
nil nil
); );
break; break;
} }
} }
if (!name[0]) { if (!name[0]) {
plNetAddress addr(fileAddrList[i], kNetDefaultClientPort); plNetAddress addr(fileAddrList[i], GetClientPort());
Connect(fileAddrList[i], addr);
}
}
}
//============================================================================
void NetCliFileStartConnectAsServer (
const char* fileAddrList[],
uint32_t fileAddrCount,
unsigned serverType,
unsigned serverBuildId
) {
// TEMP: Only connect to one file server until we fill out this module
// to choose the "best" file connection.
fileAddrCount = std::min(fileAddrCount, 1u);
s_connectBuildId = serverBuildId;
s_serverType = serverType;
for (unsigned i = 0; i < fileAddrCount; ++i) {
// Do we need to lookup the address?
const char* name = fileAddrList[i];
while (unsigned ch = *name) {
++name;
if (!(isdigit(ch) || ch == L'.' || ch == L':')) {
AsyncCancelId cancelId;
AsyncAddressLookupName(
&cancelId,
AsyncLookupCallback,
fileAddrList[i],
kNetDefaultClientPort,
nil
);
break;
}
}
if (!name[0]) {
plNetAddress addr(fileAddrList[i], kNetDefaultServerPort);
Connect(fileAddrList[i], addr); Connect(fileAddrList[i], addr);
} }
} }

6
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.h

@ -66,12 +66,6 @@ void NetCliFileStartConnect (
unsigned fileAddrCount, unsigned fileAddrCount,
bool isPatcher = false bool isPatcher = false
); );
void NetCliFileStartConnectAsServer (
const char* fileAddrList[],
unsigned fileAddrCount,
unsigned serverType,
unsigned serverBuildId
);
//============================================================================ //============================================================================
// Disconnect // Disconnect

2
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp

@ -801,7 +801,7 @@ void GamePingEnable (bool enable) {
void NetCliGameStartConnect ( void NetCliGameStartConnect (
const uint32_t node const uint32_t node
) { ) {
plNetAddress addr(node, kNetDefaultClientPort); plNetAddress addr(node, GetClientPort());
Connect(addr); Connect(addr);
} }

4
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp

@ -1075,14 +1075,14 @@ void NetCliGateKeeperStartConnect (
&cancelId, &cancelId,
AsyncLookupCallback, AsyncLookupCallback,
gateKeeperAddrList[i], gateKeeperAddrList[i],
kNetDefaultClientPort, GetClientPort(),
nil nil
); );
break; break;
} }
} }
if (!name[0]) { if (!name[0]) {
plNetAddress addr(gateKeeperAddrList[i], kNetDefaultClientPort); plNetAddress addr(gateKeeperAddrList[i], GetClientPort());
Connect(gateKeeperAddrList[i], addr); Connect(gateKeeperAddrList[i], addr);
} }
} }

Loading…
Cancel
Save