odon
/
routeros-api-php
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Refactoring parseResponse method

pull/33/head
Compolomus 6 years ago
parent
809eec7e74
commit
5701aee3ee
2 changed files with 52 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 63
      src/APILengthCoDec.php
  2. 29
      src/Client.php

63
src/APILengthCoDec.php
View File

@ -2,6 +2,7 @@
namespace RouterOS;
use DomainException;
use RouterOS\Interfaces\StreamInterface;
use RouterOS\Helpers\BinaryStringHelper;
@ -18,43 +19,43 @@ class APILengthCoDec
/**
* Encode string to length of string
*
* Encode the length :
- if length <= 0x7F (binary : 01111111 => 7 bits set to 1)
- encode length with one byte
- set the byte to length value, as length maximal value is 7 bits set to 1, the most significant bit is always 0
- end
- length <= 0x3FFF (binary : 00111111 11111111 => 14 bits set to 1)
- encode length with two bytes
- set length value to 0x8000 (=> 10000000 00000000)
- add length : as length maximumal value is 14 bits to 1, this does not modify the 2 most significance bits (10)
- end
=> minimal encoded value is 10000000 10000000
- length <= 0x1FFFFF (binary : 00011111 11111111 11111111 => 21 bits set to 1)
- encode length with three bytes
- set length value to 0xC00000 (binary : 11000000 00000000 00000000)
- add length : as length maximal value is 21 bits to 1, this does not modify the 3 most significance bits (110)
- end
=> minimal encoded value is 11000000 01000000 00000000
- length <= 0x0FFFFFFF (binary : 00001111 11111111 11111111 11111111 => 28 bits set to 1)
- encode length with four bytes
- set length value to 0xE0000000 (binary : 11100000 00000000 00000000 00000000)
- add length : as length maximal value is 28 bits to 1, this does not modify the 4 most significance bits (1110)
- end
=> minimal encoded value is 11100000 00100000 00000000 00000000
- length <= 0x7FFFFFFFFF (binary : 00000111 11111111 11111111 11111111 11111111 => 35 bits set to 1)
- encode length with five bytes
- set length value to 0xF000000000 (binary : 11110000 00000000 00000000 00000000 00000000)
- add length : as length maximal value is 35 bits to 1, this does not modify the 5 most significance bits (11110)
- end
- length > 0x7FFFFFFFFF : not supported
*
* @param int|float $length
* @return string
*/
public static function encodeLength($length): string
{
// Encode the length :
// - if length <= 0x7F (binary : 01111111 => 7 bits set to 1)
// - encode length with one byte
// - set the byte to length value, as length maximal value is 7 bits set to 1, the most significant bit is always 0
// - end
// - length <= 0x3FFF (binary : 00111111 11111111 => 14 bits set to 1)
// - encode length with two bytes
// - set length value to 0x8000 (=> 10000000 00000000)
// - add length : as length maximumal value is 14 bits to 1, this does not modify the 2 most significance bits (10)
// - end
// => minimal encoded value is 10000000 10000000
// - length <= 0x1FFFFF (binary : 00011111 11111111 11111111 => 21 bits set to 1)
// - encode length with three bytes
// - set length value to 0xC00000 (binary : 11000000 00000000 00000000)
// - add length : as length maximal vlaue is 21 bits to 1, this does not modify the 3 most significance bits (110)
// - end
// => minimal encoded value is 11000000 01000000 00000000
// - length <= 0x0FFFFFFF (binary : 00001111 11111111 11111111 11111111 => 28 bits set to 1)
// - encode length with four bytes
// - set length value to 0xE0000000 (binary : 11100000 00000000 00000000 00000000)
// - add length : as length maximal vlaue is 28 bits to 1, this does not modify the 4 most significance bits (1110)
// - end
// => minimal encoded value is 11100000 00100000 00000000 00000000
// - length <= 0x7FFFFFFFFF (binary : 00000111 11111111 11111111 11111111 11111111 => 35 bits set to 1)
// - encode length with five bytes
// - set length value to 0xF000000000 (binary : 11110000 00000000 00000000 00000000 00000000)
// - add length : as length maximal vlaue is 35 bits to 1, this does not modify the 5 most significance bits (11110)
// - end
// - length > 0x7FFFFFFFFF : not supported
if ($length < 0) {
throw new \DomainException("Length of word could not to be negative ($length)");
throw new DomainException("Length of word could not to be negative ($length)");
}
if ($length <= 0x7F) {

29
src/Client.php
View File

@ -7,6 +7,7 @@ use RouterOS\Exceptions\ConfigException;
use RouterOS\Exceptions\QueryException;
use RouterOS\Helpers\ArrayHelper;
use function array_keys;
use function array_shift;
use function chr;
use function count;
@ -308,7 +309,7 @@ class Client implements Interfaces\ClientInterface
private function rosario(array $raw): array
{
// This RAW should't be an error
$positions = \array_keys($raw, '!re');
$positions = array_keys($raw, '!re');
$count = count($raw);
$result = [];
@ -363,18 +364,12 @@ class Client implements Interfaces\ClientInterface
for ($j = $key + 1; $j <= $lines; $j++) {
// If we have lines after current one
if (isset($response[$j])) {
$this->pregResponse($response[$j], $matches);
if (isset($matches[1][0], $matches[2][0])) {
$result['after'][$matches[1][0]] = $matches[2][0];
}
$this->preParseResponse($response[$j], $result, $matches, $j);
}
}
break 2;
default:
$this->pregResponse($value, $matches);
if (isset($matches[1][0], $matches[2][0])) {
$result[$i][$matches[1][0]] = $matches[2][0];
}
$this->preParseResponse($value, $result, $matches);
break;
}
}
@ -382,6 +377,22 @@ class Client implements Interfaces\ClientInterface
}
/**
* Response helper
*
* @param $value
* @param $result
* @param $matches
* @param string $iterator
*/
private function preParseResponse($value, &$result, &$matches, $iterator = 'after'): void
{
$this->pregResponse($value, $matches);
if (isset($matches[1][0], $matches[2][0])) {
$result[$iterator][$matches[1][0]] = $matches[2][0];
}
}
/**
* Parse result from RouterOS by regular expression
*
* @param string $value

Write Preview
Loading…
Cancel
Save