--- smsdaemon/GsmModem.h	2008/06/09 18:15:53	26
+++ smsdaemon/GsmModem.h	2008/06/17 17:47:37	105
@@ -4,32 +4,58 @@
 /* using http://sourceforge.net/projects/libserial/
  */
 
+#include "IGsmModem.h"
 
 #include <string>
 #include <vector>
 
-#include "SerialPort.h"
 #include "Sms.h"
 
-class GsmModem
+class SerialPort;
+
+
+class GsmModem : public IGsmModem
 {
 public:
 	GsmModem(SerialPort& serialport);
 	virtual ~GsmModem() {}
 
+	void Init();
+
+	virtual void SendSms(std::string to, std::string message, bool allowMultipart);
+	void SendSmsPdu(std::string pdu, int len); 
 
-	void SendSms(std::string to, std::string message);
 	std::vector<SMS> ReadSms(bool readAll=false);
 	void DeleteSms(std::string smsIndex);
 	int DeleteAllSms();
 private:
-	void Init();
 	std::string GetResponse();
 	std::string Command(std::string command, std::string term = "OK\r\n");
 
+	void HandlePincode();
+	void WaitForSimcard();
 
+	bool _timeout;
 	SerialPort& m_port;
 };
 
+class DebugGsmModem : public IGsmModem
+{
+public:	
+	DebugGsmModem() : _print(false) {}
+	DebugGsmModem(bool print) : _print(print) {}
+
+
+	virtual void SendSms(std::string to, std::string message, bool allowMultipart);
+
+	std::string GetTo() {return _to;}
+	std::string GetMessage() {return _message;}
+	bool GetMultipart() {return _multipart;}
+private:
+	std::string _to;
+	std::string _message;
+	bool _multipart;
+	bool _print;
+};
 
 #endif // __GSMMODEM_H__