Merge branch 'stable' into ext-encoding

Author: dktapps

phpstan.neon.dist

@@ -1,5 +1,4 @@
 includes:
-	- tests/phpstan/configs/encapsulated-packet-sucks.neon
 	- tests/phpstan/configs/phpstan-bugs.neon
 	- vendor/phpstan/phpstan-strict-rules/rules.neon
 

src/generic/ReceiveReliabilityLayer.php

@@ -176,6 +176,7 @@ private function handleEncapsulatedPacket(EncapsulatedPacket $packet) : void{
 		}
 
 		if(PacketReliability::isSequenced($packet->reliability)){
+			assert($packet->orderChannel !== null && $packet->sequenceIndex !== null, 'These should have been set during decode');
 			if($packet->sequenceIndex < $this->receiveSequencedHighestIndex[$packet->orderChannel] or $packet->orderIndex < $this->receiveOrderedIndex[$packet->orderChannel]){
 				//too old sequenced packet, discard it
 				return;
@@ -184,28 +185,30 @@ private function handleEncapsulatedPacket(EncapsulatedPacket $packet) : void{
 			$this->receiveSequencedHighestIndex[$packet->orderChannel] = $packet->sequenceIndex + 1;
 			$this->handleEncapsulatedPacketRoute($packet);
 		}elseif(PacketReliability::isOrdered($packet->reliability)){
-			if($packet->orderIndex === $this->receiveOrderedIndex[$packet->orderChannel]){
+			$orderChannel = $packet->orderChannel;
+			assert($orderChannel !== null, 'This should have been set during decode');
+			if($packet->orderIndex === $this->receiveOrderedIndex[$orderChannel]){
 				//this is the packet we expected to get next
 				//Any ordered packet resets the sequence index to zero, so that sequenced packets older than this ordered
 				//one get discarded. Sequenced packets also include (but don't increment) the order index, so a sequenced
 				//packet with an order index less than this will get discarded
-				$this->receiveSequencedHighestIndex[$packet->orderChannel] = 0;
-				$this->receiveOrderedIndex[$packet->orderChannel] = $packet->orderIndex + 1;
+				$this->receiveSequencedHighestIndex[$orderChannel] = 0;
+				$this->receiveOrderedIndex[$orderChannel] = $packet->orderIndex + 1;
 
 				$this->handleEncapsulatedPacketRoute($packet);
-				$i = $this->receiveOrderedIndex[$packet->orderChannel];
-				for(; isset($this->receiveOrderedPackets[$packet->orderChannel][$i]); ++$i){
-					$this->handleEncapsulatedPacketRoute($this->receiveOrderedPackets[$packet->orderChannel][$i]);
-					unset($this->receiveOrderedPackets[$packet->orderChannel][$i]);
+				$i = $this->receiveOrderedIndex[$orderChannel];
+				for(; isset($this->receiveOrderedPackets[$orderChannel][$i]); ++$i){
+					$this->handleEncapsulatedPacketRoute($this->receiveOrderedPackets[$orderChannel][$i]);
+					unset($this->receiveOrderedPackets[$orderChannel][$i]);
 				}
 
-				$this->receiveOrderedIndex[$packet->orderChannel] = $i;
-			}elseif($packet->orderIndex > $this->receiveOrderedIndex[$packet->orderChannel]){
-				if(count($this->receiveOrderedPackets[$packet->orderChannel]) >= self::$WINDOW_SIZE){
+				$this->receiveOrderedIndex[$orderChannel] = $i;
+			}elseif($packet->orderIndex > $this->receiveOrderedIndex[$orderChannel]){
+				if(count($this->receiveOrderedPackets[$orderChannel]) >= self::$WINDOW_SIZE){
 					//queue overflow for this channel - we should probably disconnect the peer at this point
 					return;
 				}
-				$this->receiveOrderedPackets[$packet->orderChannel][$packet->orderIndex] = $packet;
+				$this->receiveOrderedPackets[$orderChannel][$packet->orderIndex] = $packet;
 			}else{
 				//duplicate/already received packet
 			}

src/generic/SendReliabilityLayer.php

@@ -169,8 +169,14 @@ public function addEncapsulatedToQueue(EncapsulatedPacket $packet, bool $immedia
 		}
 
 		if(PacketReliability::isOrdered($packet->reliability)){
+			if($packet->orderChannel === null){
+				throw new \InvalidArgumentException("Order channel must be set reliability $packet->reliability");
+			}
 			$packet->orderIndex = $this->sendOrderedIndex[$packet->orderChannel]++;
 		}elseif(PacketReliability::isSequenced($packet->reliability)){
+			if($packet->orderChannel === null){
+				throw new \InvalidArgumentException("Order channel must be set for reliability $packet->reliability");
+			}
 			$packet->orderIndex = $this->sendOrderedIndex[$packet->orderChannel]; //sequenced packets don't increment the ordered channel index
 			$packet->sequenceIndex = $this->sendSequencedIndex[$packet->orderChannel]++;
 		}

src/protocol/EncapsulatedPacket.php

@@ -86,14 +86,14 @@ public function toBinary(ByteBufferWriter $out) : void{
 
 		BE::writeUnsignedShort($out, strlen($this->buffer) << 3);
 		if(PacketReliability::isReliable($this->reliability)){
-			LE::writeUnsignedTriad($out, $this->messageIndex);
+			LE::writeUnsignedTriad($out, $this->messageIndex ?? throw new \LogicException("Message index must be set for reliability $this->reliability"));
 		}
 		if(PacketReliability::isSequenced($this->reliability)){
-			LE::writeUnsignedTriad($out, $this->sequenceIndex);
+			LE::writeUnsignedTriad($out, $this->sequenceIndex ?? throw new \LogicException("Sequence index must be set for reliability $this->reliability"));
 		}
 		if(PacketReliability::isSequencedOrOrdered($this->reliability)){
-			LE::writeUnsignedTriad($out, $this->orderIndex);
-			Byte::writeUnsigned($out, $this->orderChannel);
+			LE::writeUnsignedTriad($out, $this->orderIndex ?? throw new \LogicException("Order index must be set for reliability $this->reliability"));
+			Byte::writeUnsigned($out, $this->orderChannel ?? throw new \LogicException("Order channel must be set for reliability $this->reliability"));
 		}
 		if($this->splitInfo !== null){
 			BE::writeUnsignedInt($out, $this->splitInfo->getTotalPartCount());

tests/phpstan/configs/encapsulated-packet-sucks.neon

@@ -32,6 +32,7 @@
 $bindAddr = "0.0.0.0";
 $bindPort = 19132;
 
+$argv ??= [];
 if(count($argv) === 3){
 	$serverAddress = $argv[1];
 	$serverPort = (int) $argv[2];

tools/proxy.php

@@ -11,7 +11,7 @@
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-if(count($argv) === 3){
+if(isset($argv) && count($argv) === 3){
 	$broadcastAddress = $argv[1];
 	$port = (int) $argv[2];
 }else{