--- trunk/FlisServer/FlisServerDlg.h	2007/11/29 16:16:34	103
+++ trunk/FlisServer/FlisServerDlg.h	2007/12/04 13:26:00	144
@@ -5,8 +5,11 @@
 #include "afxwin.h"
 #include "stdafx.h"
 #include <vector>
+#include <list>
 #include "Containers.h"
-
+#include "Serial.h"
+#include <iostream>
+#include <fstream>
 
 // CFlisServerDlg dialog
 class CFlisServerDlg : public CDialog
@@ -15,7 +18,9 @@
 public:
 	CFlisServerDlg(CWnd* pParent = NULL);	// standard constructor
 	CSerial Serial;
-
+	keepalive Alive;
+	CFlisServerDlg * mainwindow;
+	std::list<Acknowledge> Acks;
 // Dialog Data
 	enum { IDD = IDD_FLISSERVER_DIALOG };
 
@@ -39,16 +44,31 @@
 	std::vector<unsigned char> readFrame();
 	void writeFrame(std::vector<unsigned char> data);
 	void SendSmsData(std::vector<unsigned char> data);
-	void SendSmsHead(std::vector<unsigned char> data);
-	int SetPin(void);
+	void SendSmsHead(std::vector<unsigned char> tlfnr);
+	void SetPin();
 	void DBConnect();
-	vector<Commands> DBRead(void);
+	vector<Commands> DBReadCommands(void);
 	void ReadSms();
 	void SmsSplit(CString data);
 	CString Splitter(CString& fyrdata);
-	
+	void DeleteSms();
+	void startthread();
+	virtual void runthread();
+	void Reader();
+	void SendConfig(CString IDnr,CString CommandID,CString InstallationsID);
+	vector<Installation> DBReadPhone(CString sInstallationsID);
+	int tversum(__int64 input);
+	void AppendText(CString s);
+	vector<keepalive> keepaliveandread(void);
+
 public:
 	CEdit m_Textwindow;
-	afx_msg void OnBnClickedtest();
 	afx_msg void OnBnClickedClose();
+	afx_msg void OnBnClickedGsmpin();
+	int continueThread, ResetSms;
+	friend UINT threadWrapper(LPVOID thread);
+	afx_msg void OnBnClickedStart();
+	void HandleAcknowledge(CString tlfnr);
+	void CheckAcknowledges();
+	void DumpAckList();
 };