--- smsdaemon/SmsToolTransceiver.cpp	2008/12/08 10:42:04	151
+++ smsdaemon/SmsToolTransceiver.cpp	2008/12/08 22:11:01	160
@@ -1,7 +1,7 @@
 #include "SmsToolTransceiver.h"
 
-#include "common.h"
-#include "util.h"
+#include "Logger.h"
+#include "Util.h"
 
 #include <stdexcept>
 #include <iostream>
@@ -21,7 +21,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 +32,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()
@@ -75,7 +77,7 @@
 			} 
 			catch (std::exception& e) 
 			{
-				Common::instance()->logMessage(e.what());
+				Logger::logMessage(e.what());
 			}
 
 			if (!readAll)
@@ -84,8 +86,9 @@
 	}
 	else
 	{
-		Common::instance()->logMessage( string("SmsToolTransceiver could open incoming dir ") + strerror(errno) );
+		Logger::logMessage( string("SmsToolTransceiver could open incoming dir ") + strerror(errno) );
 	}
+	closedir(dir);
 
 	return vec;
 }