--- smsdaemon/SmsPdu.cpp	2008/12/07 15:51:02	142
+++ smsdaemon/SmsPdu.cpp	2008/12/12 10:58:11	177
@@ -10,8 +10,8 @@
 #include <time.h>
 #include <stdlib.h> 
 
-#include "common.h"
-#include "util.h"
+#include "Logger.h"
+#include "Util.h"
 
 
 using namespace std;
@@ -154,7 +154,7 @@
 		{
 			if (message.length() > 800)
 			{
-				Common::instance()->logMessage("Trying to send multipart sms > 800 bytes !!!");
+				Logger::logMessage("Trying to send multipart sms > 800 bytes !!!");
 				message = message.substr(0,800);
 			}
 
@@ -207,7 +207,7 @@
 				if (message.length() > 160)
 				{
 					message_part = message.substr(0,160); //truncate to 160
-					Common::instance()->logMessage("Truncated message");
+					Logger::logMessage("Truncated message");
 				}
 				else
 				{
@@ -274,8 +274,46 @@
 	}
 
 
+
 	SMS ParseSmsPdu(std::string pdu_str)
 	{
+		SmsPart part = ParseSmsPduWorker(pdu_str);
+
+
+		SMS sms;
+		sms.SetMessage(part.message);
+		sms.SetSender(part.sender);
+		return sms;
+	}
+
+	void ParseUdh(vector<unsigned char>& udh, SmsPart& part)
+	{
+		if (udh.size() == 0) 
+		{
+			Logger::logMessage("ParseUdh(): empty udh");
+			return;
+		}
+	
+		if (udh[0] != 0) 
+		{
+			Logger::logMessage("unknown UDH type");
+			return;
+		}
+
+		if (udh.size() < 5) 
+		{
+			Logger::logMessage("UDH to short to be multipart");
+			return;
+		}
+		
+		part.group = udh[2];
+		part.count = udh[3];
+		part.id = udh[4];
+	}
+
+
+	SmsPart ParseSmsPduWorker(std::string pdu_str)
+	{
 
 		vector<unsigned char> pdu = HexDecodeString(pdu_str);
 
@@ -305,11 +343,23 @@
 
 		unsigned char data_len = (*it++);
 
+
+		SmsPart part;
+		part.group = -1;
+
 		int shift_start = 0;
+
 		if (UDHI)
 		{
 			int udh_len = (*it++); 
-			it += udh_len; //just ignore the User Data Header
+
+			vector<unsigned char> udh;
+			for (int i=0; i<udh_len; i++)
+			{
+				udh.push_back (*it++);
+			}
+			ParseUdh(udh,part);
+
 			data_len -= udh_len;
 
 			shift_start = udh_len+1; //make the 8to7bit decode start with the right shift level
@@ -322,12 +372,12 @@
 		string message = Decode8to7bit(user_data, shift_start).substr(0,data_len);
 
 		message = Util::str_trim(message);
+
 		
-		SMS result;
-		result.SetMessage(message);
-		result.SetSender(sender);
+		part.message = message;
+		part.sender = sender;
 
-		return result;
+		return part;
 	}
 
 }