Basic quick ACK support

danog · danog · commit 29760e010f2e · 2024-01-25T18:32:37.000+01:00
diff --git a/src/Loop/Connection/ReadLoop.php b/src/Loop/Connection/ReadLoop.php
@@ -139,10 +139,25 @@ public function readMessage(): ?int
             }
             throw $e;
         }
-        if ($payload_length === 4) {
-            $payload = Tools::unpackSignedInt($buffer->bufferRead(4));
-            $this->API->logger("Received {$payload} from DC ".$this->datacenter, Logger::ULTRA_VERBOSE);
-            return $payload;
+        if ($payload_length & (1 << 31)) {
+            $this->API->logger("Received quick ACK $payload_length from DC ".$this->datacenter, Logger::ULTRA_VERBOSE);
+            return null;
+        }
+        if ($payload_length <= 16) {
+            $code = Tools::unpackSignedInt($buffer->bufferRead(4));
+            if ($code === -1 && $payload_length >= 8) {
+                $ack = unpack('V', $buffer->bufferRead(4))[1];
+                $this->API->logger("Received quick ACK $ack (padded) from DC ".$this->datacenter, Logger::ULTRA_VERBOSE);
+                if ($payload_length > 8) {
+                    $buffer->bufferRead($payload_length-8);
+                }
+                return null;
+            }
+            if ($payload_length > 4) {
+                $buffer->bufferRead($payload_length-4);
+            }
+            $this->API->logger("Received {$code} from DC ".$this->datacenter, Logger::ULTRA_VERBOSE);
+            return $code;
         }
         $this->connection->reading(true);
         try {
diff --git a/src/Loop/Connection/WriteLoop.php b/src/Loop/Connection/WriteLoop.php
@@ -342,7 +342,9 @@ public function encryptedWriteLoop(): bool
                 $padding += 16;
             }
             $padding = Tools::random($padding);
-            $message_key = substr(hash('sha256', substr($this->shared->getTempAuthKey()->getAuthKey(), 88, 32).$plaintext.$padding, true), 8, 16);
+            $message_key_large = hash('sha256', substr($this->shared->getTempAuthKey()->getAuthKey(), 88, 32).$plaintext.$padding, true);
+            $message_key = substr($message_key_large, 8, 16);
+            //$ack = unpack('V', substr($message_key_large, 0, 4))[1] | (1 << 31);
             [$aes_key, $aes_iv] = Crypt::kdf($message_key, $this->shared->getTempAuthKey()->getAuthKey());
             $message = $this->shared->getTempAuthKey()->getID().$message_key.Crypt::igeEncrypt($plaintext.$padding, $aes_key, $aes_iv);
             $buffer = $this->connection->stream->getWriteBuffer(\strlen($message));
diff --git a/src/Stream/MTProtoTransport/AbridgedStream.php b/src/Stream/MTProtoTransport/AbridgedStream.php
@@ -59,8 +59,10 @@ public function getWriteBuffer(int $length, string $append = ''): \danog\Madelin
     {
         $length >>= 2;
         if ($length < 127) {
+            // $message = \chr($length | (1 << 7));
             $message = \chr($length);
         } else {
+            // $message = \chr(255).substr(pack('V', $length), 0, 3);
             $message = \chr(127).substr(pack('V', $length), 0, 3);
         }
         $buffer = $this->stream->getWriteBuffer(\strlen($message) + $length, $append);
@@ -75,7 +77,12 @@ public function getWriteBuffer(int $length, string $append = ''): \danog\Madelin
     public function getReadBuffer(?int &$length): \danog\MadelineProto\Stream\ReadBufferInterface
     {
         $buffer = $this->stream->getReadBuffer($l);
-        $length = \ord($buffer->bufferRead(1));
+        $c = $buffer->bufferRead(1);
+        $length = \ord($c);
+        /*if (($length & (1 << 7)) !== 0) {
+            $length = unpack('V', strrev($c.$buffer->bufferRead(3)))[1];
+            return $buffer;
+        }*/
         if ($length >= 127) {
             $length = unpack('V', ($buffer->bufferRead(3))."\0")[1];
         }
diff --git a/src/Stream/MTProtoTransport/IntermediatePaddedStream.php b/src/Stream/MTProtoTransport/IntermediatePaddedStream.php
@@ -62,6 +62,7 @@ public function getWriteBuffer(int $length, string $append = ''): \danog\Madelin
     {
         $padding_length = Tools::randomInt(modulus: 16);
         $buffer = $this->stream->getWriteBuffer(4 + $length + $padding_length, $append.Tools::random($padding_length));
+        //$buffer->bufferWrite(pack('V', ($padding_length + $length) | (1 << 31)));
         $buffer->bufferWrite(pack('V', $padding_length + $length));
         return $buffer;
     }
diff --git a/src/Stream/MTProtoTransport/IntermediateStream.php b/src/Stream/MTProtoTransport/IntermediateStream.php
@@ -60,6 +60,7 @@ public function disconnect(): void
     public function getWriteBuffer(int $length, string $append = ''): \danog\MadelineProto\Stream\WriteBufferInterface
     {
         $buffer = $this->stream->getWriteBuffer($length + 4, $append);
+        //$buffer->bufferWrite(pack('V', ($length) | (1 << 31)));
         $buffer->bufferWrite(pack('V', $length));
         return $buffer;
     }

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,10 @@ public function getWriteBuffer(int $length, string $append = ''): \danog\Madelin`
`59`	`59`	`{`
`60`	`60`	`$length >>= 2;`
`61`	`61`	`if ($length < 127) {`
	`62`	`+ // $message = \chr($length \| (1 << 7));`
`62`	`63`	`$message = \chr($length);`
`63`	`64`	`} else {`
	`65`	`+ // $message = \chr(255).substr(pack('V', $length), 0, 3);`
`64`	`66`	`$message = \chr(127).substr(pack('V', $length), 0, 3);`
`65`	`67`	`}`
`66`	`68`	`$buffer = $this->stream->getWriteBuffer(\strlen($message) + $length, $append);`
`@@ -75,7 +77,12 @@ public function getWriteBuffer(int $length, string $append = ''): \danog\Madelin`
`75`	`77`	`public function getReadBuffer(?int &$length): \danog\MadelineProto\Stream\ReadBufferInterface`
`76`	`78`	`{`
`77`	`79`	`$buffer = $this->stream->getReadBuffer($l);`
`78`		`- $length = \ord($buffer->bufferRead(1));`
	`80`	`+ $c = $buffer->bufferRead(1);`
	`81`	`+ $length = \ord($c);`
	`82`	`+ /*if (($length & (1 << 7)) !== 0) {`
	`83`	`+ $length = unpack('V', strrev($c.$buffer->bufferRead(3)))[1];`
	`84`	`+ return $buffer;`
	`85`	`+ }*/`
`79`	`86`	`if ($length >= 127) {`
`80`	`87`	`$length = unpack('V', ($buffer->bufferRead(3))."\0")[1];`
`81`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ public function getWriteBuffer(int $length, string $append = ''): \danog\Madelin`
`62`	`62`	`{`
`63`	`63`	`$padding_length = Tools::randomInt(modulus: 16);`
`64`	`64`	`$buffer = $this->stream->getWriteBuffer(4 + $length + $padding_length, $append.Tools::random($padding_length));`
	`65`	`+ //$buffer->bufferWrite(pack('V', ($padding_length + $length) \| (1 << 31)));`
`65`	`66`	`$buffer->bufferWrite(pack('V', $padding_length + $length));`
`66`	`67`	`return $buffer;`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ public function disconnect(): void`
`60`	`60`	`public function getWriteBuffer(int $length, string $append = ''): \danog\MadelineProto\Stream\WriteBufferInterface`
`61`	`61`	`{`
`62`	`62`	`$buffer = $this->stream->getWriteBuffer($length + 4, $append);`
	`63`	`+ //$buffer->bufferWrite(pack('V', ($length) \| (1 << 31)));`
`63`	`64`	`$buffer->bufferWrite(pack('V', $length));`
`64`	`65`	`return $buffer;`
`65`	`66`	`}`