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

RelatedA0 and RelatedB0 have been superceded by RelatedA and RelatedB, respectively, with slots 0-3 for each; SlottedMetaAck has been removed and tests have been changed

Browse source
This commit is contained in:
FateJH 2018-03-12 23:16:49 -04:00
parent adb7738268
commit 68e3377d2e
10 changed files with 211 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pslogin/src/main/scala/PacketCodingActor.scala
View file

@ -241,7 +241,7 @@ class PacketCodingActor extends Actor with MDCContextAware {
packet match {
case SlottedMetaPacket(slot, subslot, innerPacket) =>
subslotInbound = subslot
self.tell(PacketCoding.CreateControlPacket(SlottedMetaAck(slot, subslot)), rightRef) //will go towards network
self.tell(PacketCoding.CreateControlPacket(RelatedB(slot, subslot)), rightRef) //will go to the network
UnmarshalInnerPacket(innerPacket, "the inner packet of a SlottedMetaPacket")
case MultiPacket(packets) =>
@ -250,11 +250,11 @@ class PacketCodingActor extends Actor with MDCContextAware {
case MultiPacketEx(packets) =>
packets.foreach { UnmarshalInnerPacket(_, "the inner packet of a MultiPacketEx") }
case RelatedA0(subslot) =>
log.error(s"bad subslot data - $subslot; potential disarray")
case RelatedA(slot, subslot) =>
log.error(s"result $slot: subslot $subslot was in error")
case RelatedB0(subslot) =>
log.trace(s"good control packet received - subslot data $subslot")
case RelatedB(slot, subslot) =>
log.trace(s"result $slot: subslot $subslot accepted")
case _ =>
sendResponseRight(container)