Merge pull request #32 from jackkum/dev

Fix parse header of data, was wrong pointer size

Author: jackkum

PDU.php

@@ -89,6 +89,7 @@ public function __construct()
 	public static function getPduSubstr($length)
 	{
 		$str = mb_substr(self::$_pduParse, 0, $length);
+		PDU::debug("PDU::getPduSubstr: " . $str);
 		self::$_pduParse = mb_substr(self::$_pduParse, $length);
 		return $str;
 	}

PDU/Data/Header.php

@@ -76,14 +76,21 @@ public function __construct(array $params)
 	 */
 	public static function parse()
 	{
+		$udhl      = hexdec(PDU::getPduSubstr(2));
+		$type      = hexdec(PDU::getPduSubstr(2));
+		$psize     = hexdec(PDU::getPduSubstr(2));
+		$pointer   = hexdec(PDU::getPduSubstr( ($psize - 2) * 2 )); // psize is pointer + segments + current
+		$sergments = hexdec(PDU::getPduSubstr(2));
+		$current   = hexdec(PDU::getPduSubstr(2));
+		
 		$self = new self(
 			array(
-				'UDHL'     => hexdec(PDU::getPduSubstr(2)),
-				'TYPE'     => hexdec(PDU::getPduSubstr(2)),
-				'PSIZE'    => hexdec(PDU::getPduSubstr(2)),
-				'POINTER'  => hexdec(PDU::getPduSubstr(4)),
-				'SEGMENTS' => hexdec(PDU::getPduSubstr(2)),
-				'CURRENT'  => hexdec(PDU::getPduSubstr(2))
+				'UDHL'     => $udhl,
+				'TYPE'     => $type,
+				'PSIZE'    => $psize,
+				'POINTER'  => $pointer,
+				'SEGMENTS' => $sergments,
+				'CURRENT'  => $current
 			)
 		);
 

PDU/Data/Part.php

@@ -90,10 +90,12 @@ public static function parse(Data $data)
 		$length   = $data->getPdu()->getUdl() * ($alphabet == PDU\DCS::ALPHABET_UCS2 ? 4 : 2);
 
 		if($data->getPdu()->getType()->getUdhi()){
+			PDU::debug("Header::parse()");
 			$header = Header::parse();
 		}
 
 		$hex = PDU::getPduSubstr($length);
+		PDU::debug("Data (hex): " . $hex);
 
 		switch($alphabet){
 			case PDU\DCS::ALPHABET_DEFAULT: