d4708
/
source-engine
mirror of https://github.com/nillerusr/source-engine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

engine: remove PROTOCOL_STEAM requirement

pull/52/head
nillerusr 3 years ago
parent
edc8d6c584
commit
f7233c84e0
2 changed files with 13 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      engine/baseclientstate.cpp
  2. 13
      engine/baseserver.cpp

6
engine/baseclientstate.cpp
Unescape View File

@ -570,7 +570,7 @@ bool CBaseClientState::PrepareSteamConnectResponse( uint64 unGSSteamID, bool bGS
return true; return true;
} }
#if !defined( NO_STEAM ) && !defined( SWDS ) #if 0 //!defined( NO_STEAM ) && !defined( SWDS )
if ( !Steam3Client().SteamUser() ) if ( !Steam3Client().SteamUser() )
{ {
COM_ExplainDisconnection( true, "#GameUI_ServerRequireSteam" ); COM_ExplainDisconnection( true, "#GameUI_ServerRequireSteam" );
@ -585,7 +585,7 @@ bool CBaseClientState::PrepareSteamConnectResponse( uint64 unGSSteamID, bool bGS
checkAdr.SetIP( net_local_adr.GetIPHostByteOrder() ); checkAdr.SetIP( net_local_adr.GetIPHostByteOrder() );
} }
#ifndef SWDS #if 0 // #ifndef SWDS
// now append the steam3 cookie // now append the steam3 cookie
char steam3Cookie[ STEAM_KEYSIZE ]; char steam3Cookie[ STEAM_KEYSIZE ];
uint32 steam3CookieLen = 0; uint32 steam3CookieLen = 0;
@ -936,6 +936,7 @@ bool CBaseClientState::ProcessConnectionlessPacket( netpacket_t *packet )
int authprotocol = msg.ReadLong(); int authprotocol = msg.ReadLong();
uint64 unGSSteamID = 0; uint64 unGSSteamID = 0;
bool bGSSecure = false; bool bGSSecure = false;
#if 0
if ( authprotocol == PROTOCOL_STEAM ) if ( authprotocol == PROTOCOL_STEAM )
{ {
if ( msg.ReadShort() != 0 ) if ( msg.ReadShort() != 0 )
@ -963,6 +964,7 @@ bool CBaseClientState::ProcessConnectionlessPacket( netpacket_t *packet )
return false; return false;
} }
} }
#endif
SendConnectPacket( challenge, authprotocol, unGSSteamID, bGSSecure ); SendConnectPacket( challenge, authprotocol, unGSSteamID, bGSSecure );
} }
break; break;

13
engine/baseserver.cpp
Unescape View File

@ -741,7 +741,7 @@ bool CBaseServer::ProcessConnectionlessPacket(netpacket_t * packet)
// break; // break;
// } // }
if ( authProtocol == PROTOCOL_STEAM ) /* if ( authProtocol == PROTOCOL_STEAM )
{ {
int keyLen = msg.ReadShort(); int keyLen = msg.ReadShort();
if ( keyLen < 0 || keyLen > sizeof(cdkey) ) if ( keyLen < 0 || keyLen > sizeof(cdkey) )
@ -753,7 +753,7 @@ bool CBaseServer::ProcessConnectionlessPacket(netpacket_t * packet)
ConnectClient( packet->from, protocol, challengeNr, clientChallenge, authProtocol, name, password, cdkey, keyLen ); // cd key is actually a raw encrypted key ConnectClient( packet->from, protocol, challengeNr, clientChallenge, authProtocol, name, password, cdkey, keyLen ); // cd key is actually a raw encrypted key
} }
else else*/
{ {
msg.ReadString( cdkey, sizeof(cdkey) ); msg.ReadString( cdkey, sizeof(cdkey) );
ConnectClient( packet->from, protocol, challengeNr, clientChallenge, authProtocol, name, password, cdkey, strlen(cdkey) ); ConnectClient( packet->from, protocol, challengeNr, clientChallenge, authProtocol, name, password, cdkey, strlen(cdkey) );
@ -1434,11 +1434,13 @@ bool CBaseServer::CheckChallengeType( CBaseClient * client, int nNewUserID, neta
return false; return false;
} }
#if 0
if ( ( nAuthProtocol == PROTOCOL_HASHEDCDKEY ) && (Q_strlen( pchLogonCookie ) <= 0 || Q_strlen(pchLogonCookie) != 32 ) ) if ( ( nAuthProtocol == PROTOCOL_HASHEDCDKEY ) && (Q_strlen( pchLogonCookie ) <= 0 || Q_strlen(pchLogonCookie) != 32 ) )
{ {
RejectConnection( adr, clientChallenge, "#GameUI_ServerRejectInvalidCertLen" ); RejectConnection( adr, clientChallenge, "#GameUI_ServerRejectInvalidCertLen" );
return false; return false;
} }
#endif
Assert( !IsReplay() ); Assert( !IsReplay() );
@ -1470,23 +1472,24 @@ bool CBaseServer::CheckChallengeType( CBaseClient * client, int nNewUserID, neta
client->SetSteamID( CSteamID() ); // set an invalid SteamID client->SetSteamID( CSteamID() ); // set an invalid SteamID
// Convert raw certificate back into data // Convert raw certificate back into data
if ( cbCookie <= 0 || cbCookie >= STEAM_KEYSIZE ) /* if ( cbCookie <= 0 || cbCookie >= STEAM_KEYSIZE )
{ {
RejectConnection( adr, clientChallenge, "#GameUI_ServerRejectInvalidSteamCertLen" ); RejectConnection( adr, clientChallenge, "#GameUI_ServerRejectInvalidSteamCertLen" );
return false; return false;
} }*/
netadr_t checkAdr = adr; netadr_t checkAdr = adr;
if ( adr.GetType() == NA_LOOPBACK || adr.IsLocalhost() ) if ( adr.GetType() == NA_LOOPBACK || adr.IsLocalhost() )
{ {
checkAdr.SetIP( net_local_adr.GetIPHostByteOrder() ); checkAdr.SetIP( net_local_adr.GetIPHostByteOrder() );
} }
#if 0
if ( !Steam3Server().NotifyClientConnect( client, nNewUserID, checkAdr, pchLogonCookie, cbCookie ) if ( !Steam3Server().NotifyClientConnect( client, nNewUserID, checkAdr, pchLogonCookie, cbCookie )
&& !Steam3Server().BLanOnly() ) // the userID isn't alloc'd yet so we need to fill it in manually && !Steam3Server().BLanOnly() ) // the userID isn't alloc'd yet so we need to fill it in manually
{ {
RejectConnection( adr, clientChallenge, "#GameUI_ServerRejectSteam" ); RejectConnection( adr, clientChallenge, "#GameUI_ServerRejectSteam" );
return false; return false;
} }
#endif
// //
// Any rejections below this must call SendUserDisconnect // Any rejections below this must call SendUserDisconnect

Write Preview
Loading…
Cancel
Save