Skip to content

Fix protocol implementation error when certain packets are bigger than 129 bytes #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 31, 2020
Merged

Fix protocol implementation error when certain packets are bigger than 129 bytes #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 26 additions & 49 deletions src/MQTTClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ protected function performConnectionHandshake(
): void
{
try {
$i = 0;
$buffer = '';

// protocol header
Expand All @@ -213,48 +212,33 @@ protected function performConnectionHandshake(
$buffer .= chr(0x64); // protocol name: d
$buffer .= chr(0x70); // protocol name: p
$buffer .= chr(0x03); // protocol version (3.1)
$i += 9;

// connection flags
$flags = $this->buildConnectionFlags($username, $password, $sendCleanSessionFlag);
$buffer .= chr($flags);
$i++;
$buffer .= chr($this->buildConnectionFlags($username, $password, $sendCleanSessionFlag));

// keep alive settings
$buffer .= chr($this->settings->getKeepAlive() >> 8);
$buffer .= chr($this->settings->getKeepAlive() & 0xff);
$i += 2;

// client id (connection identifier)
$clientIdPart = $this->buildLengthPrefixedString($this->clientId);
$buffer .= $clientIdPart;
$i += strlen($clientIdPart);
$buffer .= $this->buildLengthPrefixedString($this->clientId);

// last will topic and message
if ($this->settings->hasLastWill()) {
$topicPart = $this->buildLengthPrefixedString($this->settings->getLastWillTopic());
$buffer .= $topicPart;
$i += strlen($topicPart);

$messagePart = $this->buildLengthPrefixedString($this->settings->getLastWillMessage());
$buffer .= $messagePart;
$i += strlen($messagePart);
$buffer .= $this->buildLengthPrefixedString($this->settings->getLastWillTopic());
$buffer .= $this->buildLengthPrefixedString($this->settings->getLastWillMessage());
}

// credentials
if ($username !== null) {
$usernamePart = $this->buildLengthPrefixedString($username);
$buffer .= $usernamePart;
$i += strlen($usernamePart);
$buffer .= $this->buildLengthPrefixedString($username);
}
if ($password !== null) {
$passwordPart = $this->buildLengthPrefixedString($password);
$buffer .= $passwordPart;
$i += strlen($passwordPart);
$buffer .= $this->buildLengthPrefixedString($password);
}

// message type and message length
$header = chr(0x10) . chr($i);
$header = chr(0x10) . $this->encodeMessageLength(strlen($buffer));

// send the connection message
$this->logger->info('Sending connection handshake to MQTT broker.');
Expand Down Expand Up @@ -458,33 +442,28 @@ protected function publishMessage(
call_user_func($handler, $this, $topic, $message, $messageId, $qualityOfService, $retain);
}

$i = 0;
$buffer = '';

$topicPart = $this->buildLengthPrefixedString($topic);
$buffer .= $topicPart;
$i += strlen($topicPart);
$buffer .= $this->buildLengthPrefixedString($topic);

if ($messageId !== null) {
$buffer .= $this->encodeMessageId($messageId);
$i += 2;
}

$buffer .= $message;
$i += strlen($message);

$command = 0x30;
if ($retain) {
$command += 1 << 0;
$command |= 1 << 0;
}
if ($qualityOfService > 0) {
$command += $qualityOfService << 1;
$command |= $qualityOfService << 1;
}
if ($isDuplicate) {
$command += 1 << 3;
$command |= 1 << 3;
}

$header = chr($command) . $this->encodeMessageLength($i);
$header = chr($command) . $this->encodeMessageLength(strlen($buffer));

$this->writeToSocket($header . $buffer);
}
Expand Down Expand Up @@ -524,21 +503,19 @@ public function subscribe(string $topic, callable $callback, int $qualityOfServi
'qos' => $qualityOfService,
]);

$i = 0;
$buffer = '';
$messageId = $this->nextMessageId();
$buffer .= $this->encodeMessageId($messageId);
$i += 2;

$topicPart = $this->buildLengthPrefixedString($topic);
$buffer .= $topicPart;
$i += strlen($topicPart);
$buffer .= chr($qualityOfService);
$i++;
$buffer = '';

$buffer .= $this->encodeMessageId($messageId);

$buffer .= $this->buildLengthPrefixedString($topic);

$buffer .= chr($qualityOfService);

$this->repository->addNewTopicSubscription($topic, $callback, $messageId, $qualityOfService);

$header = chr(0x82) . chr($i);
$header = chr(0x82) . $this->encodeMessageLength(strlen($buffer));

$this->writeToSocket($header . $buffer);
}
Expand Down Expand Up @@ -576,15 +553,15 @@ protected function sendUnsubscribeRequest(int $messageId, string $topic, bool $i
'is_duplicate' => $isDuplicate,
]);

$buffer = $this->encodeMessageId($messageId);
$i = 2;
$buffer = '';

$buffer .= $this->encodeMessageId($messageId);

$topicPart = $this->buildLengthPrefixedString($topic);
$buffer .= $topicPart;
$i += strlen($topicPart);
$buffer .= $this->buildLengthPrefixedString($topic);

$command = 0xa2 | ($isDuplicate ? 1 << 3 : 0);
$header = chr($command) . chr($i);

$header = chr($command) . $this->encodeMessageLength(strlen($buffer));

$this->writeToSocket($header . $buffer);
}
Expand Down