--- smsdaemon/main.cpp	2008/06/15 20:06:39	82
+++ smsdaemon/main.cpp	2008/12/07 21:42:15	150
@@ -1,86 +1,65 @@
 #include <string>
+#include <stdlib.h>
 
-#include <cctype>
-#include <sstream>
 #include "daemon.h"
 #include "common.h"
 
-#include "GsmModem.h"
-#include "SerialPort.h"
-
-#include "Plugin.h"
-#include "kbhit.h"
-
-#include "util.h"
+#include "ModemTransceiver.h"
+#include "serialport/SerialPort.h"
+#include "SmsDaemon.h"
+#include "ConfigFile.h"
 
 using namespace std;
-using namespace Util;
 
 
-void create_log_message(SMS& sms,bool hasPlugin)
+bool sms_exit(int exitcode)
 {
-	ostringstream os;
-	os << "Recieved sms from " << sms.sender << " ; command=" << GetSmsCommand(sms);
-	if (!hasPlugin)
-		os << " -- PLUGIN NOT FOUND";
+    if (Common::instance()->isDaemon)
+        daemonCleanup();
 
-	Common::instance()->logMessage(os.str());
+	exit(exitcode);
 }
 
+SerialPort* port = 0;
+ISmsTransceiver* transceiver = 0;
 
-void main_loop(GsmModem& modem)
+void openModemPort()
 {
 	Common* cmn = Common::instance();
-	volatile bool& mainContinue = cmn->mainContinue;
-
-	PluginManager& manager = cmn->pluginManager;
+	ConfigFile* config = cmn->GetConfigfile();
 
-	mainContinue = true;
-
-	while (mainContinue)
+	port = new SerialPort ( config->GetValue("smsdaemon","serialport") );
+	try
 	{
-		vector<SMS> sms = modem.ReadSms();
-
-		for (unsigned int i=0; i<sms.size(); ++i)
-		{
-			string cmd = GetSmsCommand(sms[i]);
-			
-			cmd = Util::str_tolower(cmd);
-
-			Plugin* pl = manager.GetPlugin(cmd);
-
-			create_log_message(sms[i], pl != 0);
-
-			if (pl)
-			{
-				pl->Execute(modem, sms[i]);
-			}
-			else
-			{
-				modem.SendSms(sms[i].sender, "Unknown command!", false);
-			}
-
-			modem.DeleteSms(sms[i].sms_index);
-			cmn->smsCounter.incomming++;
-		}
-
-		cmn->taskManager.ExecuteTasks();
-
-
-		if (cmn->isDebug && kbhit())
-			break;
+		port->Open( SerialPort::BAUD_9600, 
+				   SerialPort::CHAR_SIZE_8, 
+				   SerialPort::PARITY_NONE, 
+				   SerialPort::STOP_BITS_1, 
+				   SerialPort::FLOW_CONTROL_HARD );
+	}
+	catch(std::exception &e)
+	{
+		cmn->logMessage( string("PortOpen Exception: ") + e.what() );
+		sms_exit(1);
+	}
 
-		Util::Sleep(10);
+	transceiver = new ModemTransceiver(*port);
 
+	try
+	{
+		((ModemTransceiver*)transceiver)->Init();
+	}
+	catch (std::exception& e)
+	{
+		cmn->logMessage( string("ModemTransceiver Exception: ") + e.what() );
+		sms_exit(2);
 	}
 }
-
-bool sms_exit(int exitcode)
+void closeModemPort()
 {
-    if (Common::instance()->isDaemon)
-        daemonCleanup();
-
-	exit(exitcode);
+	port->Close();
+	delete port;
+	delete transceiver;
 }
 
 int main(int argc, char* argv[])
@@ -93,66 +72,47 @@
 	cmn->pidfile = "/var/run/smsdaemon.pid";
 	cmn->spooldir = "/var/spool/smsdaemon";
 
-	cmn->uid = 1000;
-	cmn->gid = 1000;
 
 	cmn->loadConfig(argc,argv);
 	cmn->daemonStart = time(0);
 
+	ConfigFile* config = cmn->GetConfigfile();
 	
-	/////////////////////
+	bool res = config->Open( cmn->configFilePath ) ;
+	if (!res) {
+		cmn->logMessage(string("Could not open config file:") + cmn->configFilePath);
+		return 1;
+	}
 	
-	//Write a delimiter line in the logfile to seperate sessions
-
-	if (Common::instance()->isDaemon)
-		daemonize();
 
-	cmn->logMessage("--------------------------------");
-
-	cmn->taskManager.LoadTasks();
-	cmn->pluginManager.LoadPlugins();
+	/////////////////////
 	
-	SerialPort port("/dev/ttyS1" );
-	try
-	{
-		port.Open( SerialPort::BAUD_9600, 
-				   SerialPort::CHAR_SIZE_8, 
-				   SerialPort::PARITY_NONE, 
-				   SerialPort::STOP_BITS_1, 
-				   SerialPort::FLOW_CONTROL_HARD );
-	}
-	catch(std::exception &e)
-	{
-		cmn->logMessage( string("PortOpen Exception: ") + e.what() );
-		sms_exit(1);
-	}
 
-	GsmModem modem(port);
+	openModemPort();
+	closeModemPort();
+	
 
-	try
+	if (Common::instance()->isDaemon) 
 	{
-		modem.Init();
-	}
-	catch (std::exception& e)
-	{
-		cmn->logMessage( string("GsmModem Exception: ") + e.what() );
-		sms_exit(2);
+		lookup_uid_values();
+		daemonize();
+		cmn->daemonized = true;
 	}
 
+	openModemPort();
 
 	//////////////////////////////////
 
-	cmn->logMessage("SMS daemon started");
-
-	modem.DeleteAllSms();
+	SmsDaemon daemon(*transceiver);
 
-	main_loop(modem);
-
-	cmn->logMessage( cmn->getStatusMessage() );
+	daemon.Start(); 
+	//returns here when main-loop exits
 
     if (cmn->isDaemon)
         daemonCleanup();
 
+	closeModemPort();
+
 	return 0;
 }