Browse Source

Remove some eap stupid

Adam Johnson 13 years ago
parent
commit
bd6300d6c7
  1. 36
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
  2. 30
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
  3. 36
      Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp

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

@ -1698,9 +1698,9 @@ void CliAuConn::AutoPing () {
void CliAuConn::StopAutoPing () { void CliAuConn::StopAutoPing () {
critsect.Enter(); critsect.Enter();
{ {
if (AsyncTimer * timer = pingTimer) { if (pingTimer) {
AsyncTimerDeleteCallback(pingTimer, CliAuConnTimerDestroyed);
pingTimer = nil; pingTimer = nil;
AsyncTimerDeleteCallback(timer, CliAuConnTimerDestroyed);
} }
} }
critsect.Leave(); critsect.Leave();
@ -1708,30 +1708,18 @@ void CliAuConn::StopAutoPing () {
//============================================================================ //============================================================================
void CliAuConn::TimerPing () { void CliAuConn::TimerPing () {
// Send a ping request
#if 0 pingSendTimeMs = GetNonZeroTimeMs();
// if the time difference between when we last sent a ping and when we last
// heard from the server is >= 3x the ping interval, the socket is stale.
if (pingSendTimeMs && abs(int(pingSendTimeMs - lastHeardTimeMs)) >= kPingTimeoutMs) {
// ping timed out, disconnect the socket
AsyncSocketDisconnect(sock, true);
}
else
#endif
{
// Send a ping request
pingSendTimeMs = GetNonZeroTimeMs();
const uintptr_t msg[] = { const uintptr_t msg[] = {
kCli2Auth_PingRequest, kCli2Auth_PingRequest,
pingSendTimeMs, pingSendTimeMs,
0, // not a transaction 0, // not a transaction
0, // no payload 0, // no payload
nil nil
}; };
Send(msg, arrsize(msg)); Send(msg, arrsize(msg));
}
} }
//============================================================================ //============================================================================

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

@ -445,9 +445,9 @@ void CliGmConn::AutoPing () {
void CliGmConn::StopAutoPing () { void CliGmConn::StopAutoPing () {
critsect.Enter(); critsect.Enter();
{ {
if (AsyncTimer * timer = pingTimer) { if (pingTimer) {
AsyncTimerDeleteCallback(pingTimer, CliGmConnTimerDestroyed);
pingTimer = nil; pingTimer = nil;
AsyncTimerDeleteCallback(timer, CliGmConnTimerDestroyed);
} }
} }
critsect.Leave(); critsect.Leave();
@ -455,27 +455,15 @@ void CliGmConn::StopAutoPing () {
//============================================================================ //============================================================================
void CliGmConn::TimerPing () { void CliGmConn::TimerPing () {
// Send a ping request
pingSendTimeMs = GetNonZeroTimeMs();
#if 0 const uintptr_t msg[] = {
// if the time difference between when we last sent a ping and when we last kCli2Game_PingRequest,
// heard from the server is >= 3x the ping interval, the socket is stale. pingSendTimeMs
if (pingSendTimeMs && abs(int(pingSendTimeMs - lastHeardTimeMs)) >= kPingTimeoutMs) { };
// ping timed out, disconnect the socket
AsyncSocketDisconnect(sock, true);
}
else
#endif
{
// Send a ping request
pingSendTimeMs = GetNonZeroTimeMs();
const uintptr_t msg[] = {
kCli2Game_PingRequest,
pingSendTimeMs
};
Send(msg, arrsize(msg)); Send(msg, arrsize(msg));
}
} }
//============================================================================ //============================================================================

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

@ -636,9 +636,9 @@ void CliGkConn::AutoPing () {
void CliGkConn::StopAutoPing () { void CliGkConn::StopAutoPing () {
critsect.Enter(); critsect.Enter();
{ {
if (AsyncTimer * timer = pingTimer) { if (pingTimer) {
AsyncTimerDeleteCallback(pingTimer, CliGkConnTimerDestroyed);
pingTimer = nil; pingTimer = nil;
AsyncTimerDeleteCallback(timer, CliGkConnTimerDestroyed);
} }
} }
critsect.Leave(); critsect.Leave();
@ -646,30 +646,18 @@ void CliGkConn::StopAutoPing () {
//============================================================================ //============================================================================
void CliGkConn::TimerPing () { void CliGkConn::TimerPing () {
// Send a ping request
#if 0 pingSendTimeMs = GetNonZeroTimeMs();
// if the time difference between when we last sent a ping and when we last
// heard from the server is >= 3x the ping interval, the socket is stale.
if (pingSendTimeMs && abs(int(pingSendTimeMs - lastHeardTimeMs)) >= kPingTimeoutMs) {
// ping timed out, disconnect the socket
AsyncSocketDisconnect(sock, true);
}
else
#endif
{
// Send a ping request
pingSendTimeMs = GetNonZeroTimeMs();
const uintptr_t msg[] = { const uintptr_t msg[] = {
kCli2GateKeeper_PingRequest, kCli2GateKeeper_PingRequest,
pingSendTimeMs, pingSendTimeMs,
0, // not a transaction 0, // not a transaction
0, // no payload 0, // no payload
nil nil
}; };
//Send(msg, arrsize(msg)); Send(msg, arrsize(msg));
}
} }
//============================================================================ //============================================================================

Loading…
Cancel
Save