--- smsdaemon/tester.cpp	2008/06/16 16:41:18	101
+++ smsdaemon/tester.cpp	2008/12/07 20:58:41	149
@@ -6,20 +6,20 @@
 #include <string>
 #include <iostream>
 #include <vector>
-#include "SerialPort.h"
+#include "serialport/SerialPort.h"
 
-#include "GsmModem.h"
+#include "DebugTransceiver.h"
 #include "Sms.h"
-#include "TogPlugin.h"
-#include "TrainInfo.h"
+#include "plugins/TogPlugin.h"
+#include "plugins/TrainInfo.h"
 #include "util.h"
-#include "StatusPlugin.h"
+#include "plugins/StatusPlugin.h"
 #include "SmsPdu.h"
 
 using namespace std;
+using namespace Util;
 
-
-void test_sms(GsmModem& modem, int len)
+void test_sms(ISmsTransceiver& modem, int len)
 {
 	cout << "----- test_sms( " << len << " ) ------- " << endl;
 
@@ -35,7 +35,7 @@
 		cout << "Len: " << pdu[i].len << endl;
 		cout << "Pdu: " << pdu[i].pdu << endl;
 
-		modem.SendSmsPdu(pdu[i].pdu, pdu[i].len);
+//		modem.SendSmsPdu(pdu[i].pdu, pdu[i].len);
 	}
 }
 
@@ -51,11 +51,21 @@
 	cout << end << endl;
 	return 0;
 */
+	string start = "hej ������";
+	string mid = str_latin2gsm(start);
+	string final = str_gsm2latin(mid);
+
+	str_dump (start);
+	str_dump(mid);
+	str_dump(final);
+
+
+	return 0;
 
-	DebugGsmModem modem(true);
+	DebugTransceiver modem(true);
 	SMS sms;
-	sms.sender="1234";
-	sms.message="status";
+	sms.SetSender("1234");
+	sms.SetMessage("status");
 	StatusPlugin status;
 	status.Execute(modem,sms);
 
@@ -68,7 +78,7 @@
 	        SerialPort::STOP_BITS_1,
 	        SerialPort::FLOW_CONTROL_HARD );
 
-	GsmModem modem(port);
+	ModemTransceiver modem(port);
 	modem.Init();
 
 
@@ -111,7 +121,7 @@
 	SMS sms;
 	sms.sender = "12345678";
 	sms.message = "Tog list";
-	DebugGsmModem modem;
+	DebugModemTransceiver modem;
 	TogPlugin plugin;
 
 	plugin.Execute(modem, sms);
@@ -151,7 +161,7 @@
 
 	SerialPort port("/dev/ttyS1" );
 	port.Open();
-	GsmModem modem(port);
+	ModemTransceiver modem(port);
 
 	//modem.SendSms("22337617", "Hello, sir!");
 	//