--- smsdaemon/SmsToolTransceiver.cpp	2008/12/08 17:14:21	155
+++ smsdaemon/SmsToolTransceiver.cpp	2008/12/09 19:42:45	167
@@ -1,7 +1,8 @@
 #include "SmsToolTransceiver.h"
 
-#include "common.h"
-#include "util.h"
+#include "Logger.h"
+#include "Util.h"
+#include "Common.h"
 
 #include <stdexcept>
 #include <iostream>
@@ -21,7 +22,7 @@
 void SmsToolTransceiver::SendSms(std::string to, std::string message, bool allowMultipart)
 {
 	std::string filename = CreateFilename();
-	Common::instance()->logMessage( std::string("Sending sms to: ") + to);
+	Logger::logMessage( std::string("Sending sms to: ") + to);
 
 	string tempfile = "/var/spool/sms/";
 	tempfile += filename;
@@ -32,16 +33,18 @@
 	ofstream out( tempfile.c_str() );
 	if (!out )
 	{
-		Common::instance()->logMessage("SmsToolTransceiver:: could not create temp file");
+		Logger::logMessage("SmsToolTransceiver:: could not create temp file");
 		return;
 	}
 	out << "To: " << to << "\n\n" << message ;
 	out.close();
+
+	Common::instance()->smsCounter.outgoing++;
 	
 	int result = rename(tempfile.c_str(), destfile.c_str());
 
 	if (result)
-		Common::instance()->logMessage( string("SmsToolTransceiver could not spool file: ") + strerror(errno) );
+		Logger::logMessage( string("SmsToolTransceiver could not spool file: ") + strerror(errno) );
 }
 
 std::string SmsToolTransceiver::CreateFilename()
@@ -56,9 +59,9 @@
 
 std::vector<SMS> SmsToolTransceiver::ReadSms(bool readAll)
 {
-	const std::string incoming = "/var/spool/sms/incoming/";
+	const std::string inbox = "/var/spool/sms/inbox/";
 	std::vector<SMS> vec;
-	DIR* dir = opendir( incoming.c_str() );
+	DIR* dir = opendir( inbox.c_str() );
 
 	if (dir != 0) 
 	{
@@ -67,15 +70,16 @@
 		{
 			if (entry->d_name[0] == '.')
 				continue;
-			
+			Logger::logMessage( string("SmsTool::ReadSms >") +entry->d_name);
+
 			try
 			{
-				SMS sms = ParseFile( incoming + entry->d_name);
+				SMS sms = ParseFile( inbox + entry->d_name);
 				vec.push_back(sms);
 			} 
 			catch (std::exception& e) 
 			{
-				Common::instance()->logMessage(e.what());
+				Logger::logMessage(e.what());
 			}
 
 			if (!readAll)
@@ -84,7 +88,7 @@
 	}
 	else
 	{
-		Common::instance()->logMessage( string("SmsToolTransceiver could open incoming dir ") + strerror(errno) );
+		Logger::logMessage( string("SmsToolTransceiver could open inbox dir ") + strerror(errno) );
 	}
 	closedir(dir);
 
@@ -135,15 +139,22 @@
 
 	for (unsigned int i=0; i<headers.size(); i++) 
 	{
-		int pos = headers[i].find(":");
-		string key = Util::str_trim( headers[i].substr(0,pos) );
-		string val = Util::str_trim( headers[i].substr(pos+1) );
+		unsigned int  pos = headers[i].find(":");
+		if (pos != string::npos)
+		{
+			string key = Util::str_trim( headers[i].substr(0,pos) );
+			string val = Util::str_trim( headers[i].substr(pos+1) );
 
-		if (key == "From")
-			sms.SetSender(val);
+			if (key == "From")
+				sms.SetSender(val);
 
-		if (key == "Received")
-			sms.SetTimestamp(val);
+			if (key == "Received")
+				sms.SetTimestamp(val);
+		}
+		else
+		{
+			Logger::logMessage(string("SmsTool: Invalid sms file header> ") + headers[i]);
+		}
 	}
 
 }