parse sapi and cr-bit

diff --git a/src/callnotifier/EDSS1/Message.php b/src/callnotifier/EDSS1/Message.php
index 08fa44f94f9bef1f24053cbc639f6b24948b8b38..4c3bd68b99c2ff654373401616a7b34f5def6ed1 100644 (file)
--- a/src/callnotifier/EDSS1/Message.php
+++ b/src/callnotifier/EDSS1/Message.php
@@ -26,6 +26,19 @@ class EDSS1_Message
      */
     public $callRef;
 
+    /**
+     * Service AccessPoint Identifier
+     */
+    public $sapi;
+
+    /**
+     * Call/Response bit
+     *
+     * Is 1 when the message contains a command or
+     * the answer to a command.
+     */
+    public $callResponse;
+
     /**
      * Terminal Endpoint Identifier (internal Telephone ID)
      *

diff --git a/src/callnotifier/EDSS1/Parser.php b/src/callnotifier/EDSS1/Parser.php
index 64a072e91cb6fab891f9094a7265a4e61ad65a94..fb707497947145e5c5038acdb93b4bb792776246 100644 (file)
--- a/src/callnotifier/EDSS1/Parser.php
+++ b/src/callnotifier/EDSS1/Parser.php
@@ -10,10 +10,16 @@ class EDSS1_Parser
     public function parse($bytes)
     {
         $m = new EDSS1_Message();
-        $m->tei = ord($bytes{1}) >> 1;//1st bit is always 1 and needs to be removed
+        $m->sapi = ord($bytes{0}) >> 2;
+        $m->callResponse = (int) ((ord($bytes{0}) & 2) == 2);
+        $m->tei  = ord($bytes{1}) >> 1;
 
         $curpos = 4;
-        list($curpos, $m->callRef) = $this->readLengthDataInt($bytes, ++$curpos);
+        list($curpos, $cCallRef, $crLen) = $this->readLengthData($bytes, ++$curpos);
+        if ($crLen == 0xFF) {
+            return $m;
+        }
+        $m->callRef = ord($cCallRef);
         //var_dump($curpos, dechex($m->callRef));
         $m->type = ord($bytes{++$curpos});
 
@@ -50,7 +56,11 @@ class EDSS1_Parser
     {
         //var_dump('old' . $curpos);
         $length = ord($bytes{$curpos});
-        $data = substr($bytes, $curpos + 1, $length);
+        if ($length != 0xFF) {
+            $data = substr($bytes, $curpos + 1, $length);
+        } else {
+            $data = null;
+        }
         return array($curpos + $length, $data, $length);
     }
 

diff --git a/tests/callnotifier/EDSS1/ParserTest.php b/tests/callnotifier/EDSS1/ParserTest.php
index 117a8d03eac042e18eeaab428c4fa218d799b381..2846f7b86ba202e6889f5b38bf9252cf39b2fd96 100644 (file)
--- a/tests/callnotifier/EDSS1/ParserTest.php
+++ b/tests/callnotifier/EDSS1/ParserTest.php
@@ -3,7 +3,6 @@ namespace callnotifier;
 
 class EDSS1_ParserTest extends \PHPUnit_Framework_TestCase
 {
-
     public function testParse()
     {
         $bs = '00 A3 02 02 08 01 01 7B 70 0C 81 30 31 36 33 34 37 37 39 38 37 38 FF 0A';
@@ -11,6 +10,7 @@ class EDSS1_ParserTest extends \PHPUnit_Framework_TestCase
         $msg = $p->parse(MessageHandler::getBytesFromHexString($bs));
 
         self::assertInstanceOf('callnotifier\EDSS1_Message', $msg);
+        self::assertEquals(0, $msg->sapi, 'SAPI is wrong');
         self::assertEquals(81, $msg->tei, 'TEI is wrong');
         self::assertEquals(123, $msg->type, 'Message type is wrong');
         self::assertEquals(1, $msg->callRef, 'Call reference is wrong');
@@ -21,6 +21,29 @@ class EDSS1_ParserTest extends \PHPUnit_Framework_TestCase
         self::assertEquals("\x8101634779878", $p->data, 'Parameter data is wrong');
     }
 
+    public function testParseSAPI()
+    {
+        $bs = 'FC A3 02 02 08 FF 0A';
+        $p = new EDSS1_Parser();
+        $msg = $p->parse(MessageHandler::getBytesFromHexString($bs));
+
+        self::assertInstanceOf('callnotifier\EDSS1_Message', $msg);
+        //SAPI: 0xFC = 252. 252 >> 2 = 63
+        self::assertEquals(63, $msg->sapi, 'SAPI is wrong');
+        self::assertEquals(0, $msg->callResponse, 'CR-bit is wrong');
+    }
+
+    public function testParseCallResponse()
+    {
+        $bs = 'FE A3 02 02 08 FF 0A';
+        $p = new EDSS1_Parser();
+        $msg = $p->parse(MessageHandler::getBytesFromHexString($bs));
+
+        self::assertInstanceOf('callnotifier\EDSS1_Message', $msg);
+        //SAPI: 0xFE = 254. 254 & 2 = 2 -> cr bit set
+        self::assertEquals(63, $msg->sapi, 'SAPI is wrong');
+        self::assertEquals(1, $msg->callResponse, 'CR-bit is wrong');
+    }
 }
 
 ?>