--- smsdaemon/SmsPdu.cpp 2008/12/12 12:13:05 178 +++ smsdaemon/SmsPdu.cpp 2008/12/18 06:53:29 196 @@ -8,7 +8,7 @@ #include #include -#include +#include #include "Logger.h" #include "Util.h" @@ -29,7 +29,7 @@ string SwitchChars(string input) { for (unsigned int i=1; i partlist; typedef std::list::iterator iterator; - + SMS ConcatenateParts(SmsPart& part) { SMS sms; - if (part.group == -1) + if (part.group == -1) { sms.SetMessage(part.message); sms.SetSender(part.sender); - } - else + } + else { partlist.push_back(part); - + vector vec; for (iterator it=partlist.begin(); it!=partlist.end(); ++it) { @@ -335,24 +335,24 @@ void ParseUdh(vector& udh, SmsPart& part) { - if (udh.size() == 0) + if (udh.size() == 0) { Logger::logMessage("ParseUdh(): empty udh"); return; } - - if (udh[0] != 0) + + if (udh[0] != 0) { Logger::logMessage("unknown UDH type"); return; } - if (udh.size() < 5) + 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]; @@ -398,7 +398,7 @@ if (UDHI) { - int udh_len = (*it++); + int udh_len = (*it++); vector udh; for (int i=0; i user_data; user_data.insert(user_data.end(), it, it+data_len); - + string message = Decode8to7bit(user_data, shift_start).substr(0,data_len); message = Util::str_trim(message); - + part.message = message; part.sender = sender;