--- smsdaemon/SmsToolTransceiver.cpp	2008/12/08 10:42:04	151
+++ smsdaemon/SmsToolTransceiver.cpp	2008/12/21 21:14:40	210
@@ -1,7 +1,9 @@
 #include "SmsToolTransceiver.h"
 
-#include "common.h"
-#include "util.h"
+#include "Logger.h"
+#include "Util.h"
+#include "Common.h"
+#include "ConfigFile.h"
 
 #include <stdexcept>
 #include <iostream>
@@ -18,30 +20,70 @@
 
 using namespace std;
 
+string appendSlash(string& str)
+{
+	if (str.at(str.length()-1) != '/');
+	str += "/";
+	return str;
+}
+
+SmsToolTransceiver::SmsToolTransceiver()
+{
+	Common* cmn = Common::instance();
+
+	try
+	{
+		inboxdir = cmn->GetConfigfile()->GetValue("smstools","inboxdir").StringValue();
+	}
+	catch (...)
+	{
+		Logger::logMessage("Config error> smstools::inboxdir not specified");
+		exit(1);
+	}
+	try
+	{
+		outgoingdir = cmn->GetConfigfile()->GetValue("smstools","outgoingdir").StringValue();
+	}
+	catch (...)
+	{
+		Logger::logMessage("Config error> smstools::outgoingdir not specified");
+		exit(1);
+	}
+
+	inboxdir = appendSlash(inboxdir);
+	outgoingdir = appendSlash(outgoingdir);
+
+}
+
+
 void SmsToolTransceiver::SendSms(std::string to, std::string message, bool allowMultipart)
 {
+	if (allowMultipart == false && message.size() > 160)
+		message = message.substr(0,160);
+	
+
 	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;
+	string tempfile = outgoingdir + filename + ".LOCK";
 
-	string destfile = "/var/spool/sms/outgoing/";
-	destfile += filename;
+	string destfile = outgoingdir + filename;
 
 	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,26 +98,26 @@
 
 std::vector<SMS> SmsToolTransceiver::ReadSms(bool readAll)
 {
-	const std::string incoming = "/var/spool/sms/incoming/";
 	std::vector<SMS> vec;
-	DIR* dir = opendir( incoming.c_str() );
+	DIR* dir = opendir( inboxdir.c_str() );
 
-	if (dir != 0) 
+	if (dir != 0)
 	{
 		dirent* entry;
 		while ( (entry = readdir(dir)) != 0)
 		{
 			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( inboxdir + entry->d_name);
 				vec.push_back(sms);
-			} 
-			catch (std::exception& e) 
+			}
+			catch (std::exception& e)
 			{
-				Common::instance()->logMessage(e.what());
+				Logger::logMessage(e.what());
 			}
 
 			if (!readAll)
@@ -84,26 +126,24 @@
 	}
 	else
 	{
-		Common::instance()->logMessage( string("SmsToolTransceiver could open incoming dir ") + strerror(errno) );
+		Logger::logMessage( string("SmsToolTransceiver could open inbox dir ") + strerror(errno) );
 	}
+	closedir(dir);
 
 	return vec;
 }
 
-void SmsToolTransceiver::DeleteSms(std::string smsIndex)
-{
-}
 
 SMS SmsToolTransceiver::ParseFile(std::string path)
 {
 	SMS sms;
-	
+
 	string file = Util::readfile(path);
 	int result = ::unlink(path.c_str());
-	if (result) 
+	if (result)
 	{
 		string message = "SmsTool> unlink ";
-		message += path; 
+		message += path;
 		message += " failed: ";
 		message += strerror(errno);
 		throw std::runtime_error( message );
@@ -112,7 +152,8 @@
 
 	unsigned int pos = file.find("\n\n");
 
-	if (pos != string::npos) {
+	if (pos != string::npos)
+	{
 		string header = file.substr(0,pos);
 		string body = file.substr(pos+2,1024);
 
@@ -121,7 +162,9 @@
 
 		ParseHeaders(header, sms);
 
-	} else {
+	}
+	else
+	{
 		throw std::runtime_error("SmsTool: invalid incomming file");
 	}
 
@@ -132,24 +175,27 @@
 {
 	std::vector<std::string> headers = Util::str_split(headerstring, "\n");
 
-	for (unsigned int i=0; i<headers.size(); i++) 
+	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]);
+		}
 	}
 
 }
 
-int SmsToolTransceiver::DeleteAllSms()
-{
-	return 0;
-}