PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-15 16:34:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix client not compiling

Browse source
This commit is contained in:
Jakob Gillich 2020-09-27 00:08:39 +02:00 • committed by GitHub
parent 407429ee21
commit 4dd414589b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tools/client/src/main/scala/net/psforever/tools/client/Client.scala
View file

@ -6,7 +6,14 @@ import java.security.{SecureRandom, Security}
import akka.actor.typed.ActorRef import akka.actor.typed.ActorRef
import akka.io.Udp import akka.io.Udp
import enumeratum.{Enum, EnumEntry} import enumeratum.{Enum, EnumEntry}
import net.psforever.packet.{CryptoPacketOpcode, PacketCoding, PlanetSideControlPacket, PlanetSideCryptoPacket, PlanetSideGamePacket, PlanetSidePacket} import net.psforever.packet.{
CryptoPacketOpcode,
PacketCoding,
PlanetSideControlPacket,
PlanetSideCryptoPacket,
PlanetSideGamePacket,
PlanetSidePacket
}
import net.psforever.packet.PacketCoding.CryptoCoding import net.psforever.packet.PacketCoding.CryptoCoding
import net.psforever.packet.control.{ClientStart, ServerStart} import net.psforever.packet.control.{ClientStart, ServerStart}
import net.psforever.packet.crypto.{ClientChallengeXchg, ServerChallengeXchg} import net.psforever.packet.crypto.{ClientChallengeXchg, ServerChallengeXchg}
@ -79,9 +86,9 @@ class Client(username: String, password: String) {
assert(state == ClientState.Disconnected) assert(state == ClientState.Disconnected)
var macBuffer: ByteVector = ByteVector.empty var macBuffer: ByteVector = ByteVector.empty
send(ClientStart(0))] send(ClientStart(0))
val serverStart = waitFor[ServerStart]().require val serverStart = waitFor[ServerStart]().require
assert(.clientNonce == 0) assert(serverStart.clientNonce == 0)
val time = System.currentTimeMillis() val time = System.currentTimeMillis()
val challenge = randomBytes(12) val challenge = randomBytes(12)
@ -90,10 +97,6 @@ class Client(username: String, password: String) {
send(ClientChallengeXchg(time, challenge, p, g)) send(ClientChallengeXchg(time, challenge, p, g))
val serverKey = waitFor[ServerChallengeXchg]().require.pubKey val serverKey = waitFor[ServerChallengeXchg]().require.pubKey
val
println(res)
} }
private def waitFor[T]( private def waitFor[T](