--- trunk/FlisServer/FlisServerDlg.h	2007/12/01 14:18:33	113
+++ trunk/FlisServer/FlisServerDlg.h	2007/12/06 12:53:06	174
@@ -5,9 +5,11 @@
 #include "afxwin.h"
 #include "stdafx.h"
 #include <vector>
+#include <list>
 #include "Containers.h"
 #include "Serial.h"
-#define UWM_MYMESSAGE 0x8100
+#include <iostream>
+#include <fstream>
 
 // CFlisServerDlg dialog
 class CFlisServerDlg : public CDialog
@@ -16,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 };
 
@@ -30,7 +34,6 @@
 
 	// Generated message map functions
 	virtual BOOL OnInitDialog();
-	afx_msg LRESULT OnShowString(WPARAM,LPARAM);
 	afx_msg void OnSysCommand(UINT nID, LPARAM lParam);
 	afx_msg void OnPaint();
 	afx_msg HCURSOR OnQueryDragIcon();
@@ -41,25 +44,30 @@
 	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);
+	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 DBReadData(CString IDnr,CString CommandID,CString InstallationsID);
+	void MyMainThread();
+	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();
 };