link to my blog post

[auerswald-callnotifier.git] / src / callnotifier / EDSS1 / Parser.php

diff --git a/src/callnotifier/EDSS1/Parser.php b/src/callnotifier/EDSS1/Parser.php
index fb707497947145e5c5038acdb93b4bb792776246..b5a906d07408566970fb745d5bc3a60e94d5396a 100644 (file)
--- a/src/callnotifier/EDSS1/Parser.php
+++ b/src/callnotifier/EDSS1/Parser.php
@@ -19,8 +19,17 @@ class EDSS1_Parser
         if ($crLen == 0xFF) {
             return $m;
         }
-        $m->callRef = ord($cCallRef);
-        //var_dump($curpos, dechex($m->callRef));
+        if ($crLen > 0) {
+            $m->callRefType = ord($cCallRef{0}) >> 7;
+            $nCallRef = ord($cCallRef{0}) & 127;
+            if ($crLen > 1) {
+                $nCallRef = ord($cCallRef{1}) + ($nCallRef << 8);
+                if ($crLen > 2) {
+                    $nCallRef = ord($cCallRef{2}) + ($nCallRef << 8);
+                }
+            }
+            $m->callRef = $nCallRef;
+        }
         $m->type = ord($bytes{++$curpos});
 
         $complete = false;
@@ -31,16 +40,17 @@ class EDSS1_Parser
                 $complete = true;
                 break;
             }
-            $param = new EDSS1_Parameter();
+
+            $paramType = ord($curbit);
+            $param = $this->getParameterByType($paramType);
             $m->parameters[] = $param;
-            $param->type     = ord($curbit);
 
             //parameter length
             $curbit = $bytes{++$curpos};
             $param->length = ord($curbit);
 
             //parameter data
-            $param->data = substr($bytes, $curpos + 1, $param->length);
+            $param->setData(substr($bytes, $curpos + 1, $param->length));
             $curpos += $param->length;
         } while ($curpos < strlen($bytes) - 1);
 
@@ -65,15 +75,19 @@ class EDSS1_Parser
     }
 
     /**
-     * Read a datablock preceded with a length byte, return integer data.
-     *
-     * @return array Array with new cursor position, integer data and data length
+     * @param integer $type Parameter type ID
      */
-    public function readLengthDataInt($bytes, $curpos)
+    public function getParameterByType($type)
     {
-        $ld = $this->readLengthData($bytes, $curpos);
-        $ld[1] = ord($ld[1]);
-        return $ld;
+        $supported = array(0x28, 0x2C, 0x4C, 0x6C, 0x70);
+        if (!in_array($type, $supported)) {
+            return new EDSS1_Parameter($type);
+        }
+
+        $typeHex = sprintf('%02X', $type);
+        $class = 'callnotifier\EDSS1_Parameter_' . $typeHex;
+
+        return new $class($type);
     }
 }