--- smsdaemon/GsmModem.h	2008/06/11 08:25:34	44
+++ smsdaemon/GsmModem.h	2008/12/07 16:27:34	144
@@ -4,20 +4,15 @@
 /* using http://sourceforge.net/projects/libserial/
  */
 
+#include "IGsmModem.h"
 
 #include <string>
 #include <vector>
 
-#include "SerialPort.h"
 #include "Sms.h"
 
+class SerialPort;
 
-class IGsmModem
-{
-public:
-	virtual void SendSms(std::string to, std::string message) = 0;
-	virtual ~IGsmModem() {}
-};
 
 class GsmModem : public IGsmModem
 {
@@ -25,31 +20,49 @@
 	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); 
+
+	virtual std::vector<SMS> ReadSms(bool readAll=false);
 
-	virtual void SendSms(std::string to, std::string message);
-	std::vector<SMS> ReadSms(bool readAll=false);
-	void DeleteSms(std::string smsIndex);
-	int DeleteAllSms();
+	virtual void DeleteSms(std::string smsIndex);
+	virtual 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:	
-	virtual void SendSms(std::string to, std::string message) 
-		{_to=to; _message = message;}
+	DebugGsmModem() : _print(false) {}
+	DebugGsmModem(bool print) : _print(print) {}
+
+
+	virtual std::vector<SMS> ReadSms(bool readAll=false);
+	virtual void SendSms(std::string to, std::string message, bool allowMultipart);
+
+    virtual void DeleteSms(std::string smsIndex) {}
+    virtual int DeleteAllSms() { return 0;}
+
+
 
 	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__