dorkbox/Network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code polish

Browse Source
This commit is contained in:
nathan 2020-09-04 10:19:29 +02:00
parent f4b8ef9c5d
commit 4e0ff43f5e
3 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dorkbox/network/Server.kt
View File

@ -200,13 +200,13 @@ open class Server<CONNECTION : Connection>(config: ServerConfiguration = ServerC
val clientAddress = IPv4.toInt(clientAddressString)
val message = readHandshakeMessage(buffer, offset, length, header)
handshake.processHandshakeMessageServer(this@Server,
handshakePublication,
sessionId,
clientAddressString,
clientAddress,
message,
aeron)
handshake.processUdpHandshakeMessageServer(this@Server,
handshakePublication,
sessionId,
clientAddressString,
clientAddress,
message,
aeron)
}
val ipcHandshakeHandler = FragmentAssembler { buffer: DirectBuffer, offset: Int, length: Int, header: Header ->
@ -217,11 +217,11 @@ open class Server<CONNECTION : Connection>(config: ServerConfiguration = ServerC
val sessionId = header.sessionId()
val message = readHandshakeMessage(buffer, offset, length, header)
handshake.processHandshakeMessageServer(this@Server,
ipcHandshakePublication,
sessionId,
message,
aeron)
handshake.processIpcHandshakeMessageServer(this@Server,
ipcHandshakePublication,
sessionId,
message,
aeron)
}
actionDispatch.launch {

2
src/dorkbox/network/handshake/HandshakeMessage.kt
View File

@ -122,6 +122,6 @@ internal class HandshakeMessage private constructor() {
}
return "HandshakeMessage(oneTimePad=$oneTimePad, sid= $sessionId $stateStr$errorMsg)"
return "HandshakeMessage($sessionId : oneTimePad=$oneTimePad $stateStr$errorMsg)"
}
}

25
src/dorkbox/network/handshake/ServerHandshake.kt
View File

@ -169,11 +169,11 @@ internal class ServerHandshake<CONNECTION : Connection>(private val logger: KLog
// note: CANNOT be called in action dispatch
fun processHandshakeMessageServer(server: Server<CONNECTION>,
handshakePublication: Publication,
sessionId: Int,
message: Any?,
aeron: Aeron) {
fun processIpcHandshakeMessageServer(server: Server<CONNECTION>,
handshakePublication: Publication,
sessionId: Int,
message: Any?,
aeron: Aeron) {
val connectionString = "IPC"
@ -184,7 +184,6 @@ internal class ServerHandshake<CONNECTION : Connection>(private val logger: KLog
val serialization = config.serialization
/////
/////
///// DONE WITH VALIDATION
@ -322,13 +321,13 @@ internal class ServerHandshake<CONNECTION : Connection>(private val logger: KLog
}
// note: CANNOT be called in action dispatch
fun processHandshakeMessageServer(server: Server<CONNECTION>,
handshakePublication: Publication,
sessionId: Int,
clientAddressString: String,
clientAddress: Int,
message: Any?,
aeron: Aeron) {
fun processUdpHandshakeMessageServer(server: Server<CONNECTION>,
handshakePublication: Publication,
sessionId: Int,
clientAddressString: String,
clientAddress: Int,
message: Any?,
aeron: Aeron) {
if (!validateMessageTypeAndDoPending(server, handshakePublication, message, sessionId, clientAddressString)) {
return