--- smsdaemon/SmsDaemon.cpp	2008/06/16 11:57:48	94
+++ smsdaemon/SmsDaemon.cpp	2008/12/23 14:20:43	217
@@ -3,36 +3,48 @@
 #include <string>
 
 #include <sstream>
-#include "common.h"
+#include <stdlib.h>
 
-#include "GsmModem.h"
+#include "Common.h"
+
+#include "ISmsTransceiver.h"
 
 #include "Plugin.h"
 #include "kbhit.h"
 
-#include "util.h"
+#include "Util.h"
 
 #include "TaskManager.h"
 #include "PluginManager.h"
+#include "ConfigFile.h"
+#include "Logger.h"
+#include "AccessManager.h"
 
 #include "version.h"
 
 using namespace std;
 
-
 void SmsDaemon::CreateLogMessage(SMS& sms,bool hasPlugin)
 {
 	ostringstream os;
-	os << "Recieved sms from " << sms.sender << " ; command=" << GetSmsCommand(sms);
+	os << "Recieved sms from " << sms.GetSender() << " ; command=" << sms.ExtractCommand();
 	if (!hasPlugin)
 		os << " -- PLUGIN NOT FOUND";
 
-	Common::instance()->logMessage(os.str());
+	Logger::logMessage(os.str());
 }
 
 
 void SmsDaemon::CheckSms()
 {
+	const int INTERVAL = 1000; //no of milliseconds between sms checks
+	timeval now = Util::GetTimeOfDay();
+
+	if ( Util::mTimeDiff(_lastSmsCheck,now) < INTERVAL)
+		return;
+
+	_lastSmsCheck = now;
+
 	Common* cmn = Common::instance();
 
 	PluginManager* manager = cmn->GetPluginManager();
@@ -40,8 +52,8 @@
 
 	for (unsigned int i=0; i<sms.size(); ++i)
 	{
-		string cmd = GetSmsCommand(sms[i]);
-			
+		string cmd = sms[i].ExtractCommand();
+
 		cmd = Util::str_tolower(cmd);
 
 		Plugin* pl = manager->GetPlugin(cmd);
@@ -54,10 +66,9 @@
 		}
 		else
 		{
-			_modem.SendSms(sms[i].sender, "Unknown command!", false);
+			_modem.SendSms(sms[i].GetSender(), "Unknown command!", false);
 		}
 
-		_modem.DeleteSms(sms[i].sms_index);
 		cmn->smsCounter.incomming++;
 	}
 }
@@ -67,7 +78,7 @@
 {
 	Common* cmn = Common::instance();
 	volatile bool& mainContinue = cmn->mainContinue;
-
+	volatile bool& reloadConfig = cmn->reloadConfig;
 
 	mainContinue = true;
 
@@ -81,40 +92,65 @@
 		if (cmn->isDebug && kbhit())
 			break;
 
-		Util::Sleep(10);
+		if (reloadConfig)
+			ReloadConfig();
+
+		Util::Sleep(100);
 
 	}
 }
 
+void SmsDaemon::ReloadConfig()
+{
+	Common* cmn = Common::instance();
+	cmn->reloadConfig = false;
+
+	cmn->GetConfigfile()->Reload();
+
+	cmn->GetPluginManager()->DestroyPlugins();
+	cmn->GetPluginManager()->LoadPlugins();
+
+	cmn->GetTaskManager()->DestroyTasks();
+	cmn->GetTaskManager()->LoadTasks();
+
+	AccessManager::Load(); //reload blaclist & privileged list
+}
+
 void SmsDaemon::Start()
 {
 	Common* cmn = Common::instance();
+	string transceiver = cmn->GetConfigfile()->GetValue("smsdaemon","transceiver");
 
+	srand(time(0));
 
 	cmn->daemonStart = time(0);
+	_lastSmsCheck = Util::GetTimeOfDay();
 
-	cmn->logMessage("--------------------------------");
-	cmn->logMessage( VERSION );
-	cmn->logMessage( SVNVER );
+	Logger::logMessage("--------------------------------");
+	Logger::logMessage( VERSION );
+	Logger::logMessage( SVNVERSION );
+	Logger::logMessage( string("Transceiver: ") + transceiver );
 
+	AccessManager::Load(); //reload blaclist & privileged list
 	cmn->GetTaskManager()->LoadTasks();
 	cmn->GetPluginManager()->LoadPlugins();
-	cmn->logMessage("SMS daemon started");
+	Logger::logMessage("SMS daemon started");
+
 
-	_modem.DeleteAllSms();
-	
 	try
 	{
 		MainLoop();
 	}
 	catch (std::exception& e)
 	{
-		cmn->logMessage( e.what() );
+		Logger::logMessage( e.what() );
 	}
 	catch (...)
 	{
-		cmn->logMessage( "Caught unknown exception" );
+		Logger::logMessage( "Caught unknown exception" );
 	}
 
-	cmn->logMessage( cmn->getStatusMessage() );
+	cmn->GetPluginManager()->DestroyPlugins();
+
+	Logger::logMessage( cmn->getStatusMessage() );
 }