--- trunk/FlisServer/FlisServerDlg.cpp	2007/11/27 15:26:42	70
+++ trunk/FlisServer/FlisServerDlg.cpp	2007/12/04 17:32:44	149
@@ -4,8 +4,8 @@
 #include "stdafx.h"
 #include "FlisServer.h"
 #include "FlisServerDlg.h"
-#include ".\flisserverdlg.h"
 #include <vector>
+#include ".\flisserverdlg.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -64,9 +64,9 @@
 	ON_WM_PAINT()
 	ON_WM_QUERYDRAGICON()
 	//}}AFX_MSG_MAP
-	ON_BN_CLICKED(IDOK, OnBnClickedOk)
-	ON_BN_CLICKED(IDCANCEL, OnBnClickedCancel)
-	ON_BN_CLICKED(IDC_test, OnBnClickedtest)
+	ON_BN_CLICKED(IDCLOSE, OnBnClickedClose)
+	ON_BN_CLICKED(IDC_GSMPIN, OnBnClickedGsmpin)
+	ON_BN_CLICKED(IDC_Start, OnBnClickedStart)
 END_MESSAGE_MAP()
 
 
@@ -101,7 +101,8 @@
 
 	// TODO: Add extra initialization here
 	StartSerial();
-	SetPin();
+	DBConnect();
+	ResetSms = 0;
 	
 	return TRUE;  // return TRUE  unless you set the focus to a control
 }
@@ -156,18 +157,45 @@
 }
 int CFlisServerDlg::StartSerial(void)
 {
+	
 	int Baud;
-	CString SerialPort = "COM3";
 
+	ConfigFile config;
+	try {
+		config.ReadSettings();
+	} catch(...) {
+		MessageBox("Could not open config file");
+		OnOK();
+		return true;
+	}
+	
 	Baud = 1200;
-	if( Serial.isOpen() ){
-		Serial.close();
-		Serial.open( SerialPort, Baud );
+	if( Serial.isOpen() )
+	{
+		try
+		{
+			Serial.close();
+			Serial.open( config.comport, Baud );
+		}
+		catch (exception* e)
+		{
+			MessageBox( "Serial.open() exception" );
+			return 0;
+		}
 	}
-	else {
-		Serial.open( SerialPort, Baud );
+	else
+	{
+		try
+		{
+			Serial.open( config.comport, Baud );
+		}
+		catch (exception* e)
+		{
+			MessageBox( "Serial.open() exception 2" );
+			return 0;
+		}
 	}
-
+	
 		
 return 0;
 }
@@ -176,62 +204,13 @@
 	std::vector<unsigned char> buf;
 	while(Serial.getComstat().cbInQue > 0)
 	{
-	unsigned char data = Serial.readByte();
+		unsigned char data = Serial.readByte();
 
-	buf.push_back(data);
+		buf.push_back(data);
 	}
 	return buf;
 }
-void CFlisServerDlg::OnBnClickedOk()
-{
-	// TODO: Add your control notification handler code here
-	OnOK();
-	if( Serial.isOpen() ){
-		Serial.close();
-	}
-}
-
-void CFlisServerDlg::OnBnClickedCancel()
-{
-	// TODO: Add your control notification handler code here
-	OnCancel();
-	if( Serial.isOpen() ){
-		Serial.close();
-	}
-}
-
-void CFlisServerDlg::OnBnClickedtest()
-{
-	// TODO: Add your control notification handler code here
-	/*
-	std::vector<unsigned char> data;
-	data.push_back('a');
-	data.push_back('t');
-
-	writeFrame(data);
 
-	if(Serial.getComstat().cbInQue > 0)
-	{
-	std::vector<unsigned char> answer = readFrame();
-	Sleep(50);
-	if (answer.size() == 0){
-		m_Textwindow.SetWindowText("ØV");
-	}
-	else{
-		CString ko;
-		char test[150];
-		int i;
-		for (int i=0; i<answer.size(); i++)
-		{
-			test[i] = answer[i];
-		}
-		ko = test;
-		m_Textwindow.SetWindowText(ko);
-	}
-	}
-	*/
-	SetPin();
-}
 void CFlisServerDlg::writeFrame(std::vector<unsigned char> data)
 {
 	for (int i=0; i<data.size(); i++)
@@ -243,9 +222,9 @@
 	Sleep(100);
 
 }
-int CFlisServerDlg::SetPin(void)
+void CFlisServerDlg::SetPin()
 {
-	CString tekst, oldtekst;
+	CString tekst;
 	std::vector<unsigned char> data;
 	data.push_back('a');
 	data.push_back('t');
@@ -261,58 +240,729 @@
 	data.push_back('5');
 
 	writeFrame(data);
-	Sleep(750);
+}
+void CFlisServerDlg::SendSmsData(std::vector<unsigned char> data)
+{	
+	
+	for (int i=0; i<data.size(); i++)
+	{
+		Serial.writeByte( data[i] );
+		Sleep(5);
+	}
+	Serial.writeByte(0x1A);
+	Sleep(3000);
+	if(Serial.getComstat().cbInQue > 0)
+	{
+		CString tekst;
+		std::vector<unsigned char> answer = readFrame();
+		Sleep(50);
+
+		for (int i=0; i<answer.size(); i++)
+			{
+				if ((answer[i] != 0x0A) && (answer[i] != 0x0D))
+				{
+					tekst.AppendChar(answer[i]);
+				}
+			}
+			AppendText(tekst);
+	}
+
+}
+void CFlisServerDlg::SendSmsHead(std::vector<unsigned char> tlfnr)
+{
+	vector<unsigned char> atcommand;
+	atcommand.push_back('a');
+	atcommand.push_back('t');
+	atcommand.push_back('+');
+	atcommand.push_back('c');
+	atcommand.push_back('m');
+	atcommand.push_back('g');
+	atcommand.push_back('s');
+	atcommand.push_back('=');
+	atcommand.push_back('"');
+	int s = (atcommand.size() -1 );
+	
+	for (int i=0; i<(atcommand.size()); i++)
+	{
+		Serial.writeByte( atcommand[i] );
+		Sleep(5);
+	}
+	
+	for (int i=0; i<tlfnr.size(); i++)
+	{
+		Serial.writeByte( tlfnr[i] );
+		Sleep(5);
+	}
+	Serial.writeByte(atcommand[s]);
+	Serial.writeByte(0x0D);
+	Sleep(250);
+}
+void CFlisServerDlg::DBConnect()
+{
+	CString dsn;
+	ConfigFile config;
+	try {
+		config.ReadSettings();
+	} catch(...) {
+		MessageBox("Could not open config file");
+	}
+	
+	dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=%s; uid=%s;password=%s;database=%s;sslmode=prefer",config.host,config.username, config.password, config.database);
+	db.OpenEx(dsn, CDatabase::noOdbcDialog);
+}
+vector<Commands> CFlisServerDlg::DBReadCommands(void)
+{
+	vector<Commands> buffer;
+
+	CString SQL, IDnr, CommandID, InstallationsID;
+	SQL = "select id,date_trunc('second', created) as created,executed,commandid,installationid from command WHERE executed IS NULL ORDER BY created ASC LIMIT 1;";
+	CRecordset rs(&db);
+	rs.Open(AFX_DB_USE_DEFAULT_TYPE, SQL);
+	if (rs.GetRecordCount()>0) 
+	{
+		rs.MoveFirst();
+			
+		Commands Mycom;
+		rs.GetFieldValue((short)0, IDnr);
+		rs.GetFieldValue(3, CommandID);
+		rs.GetFieldValue(4, InstallationsID);
+		
+		Mycom.IDnr = IDnr;
+		Mycom.CommandID = CommandID;
+		Mycom.InstallationsID = InstallationsID;
+
+		buffer.push_back(Mycom);
+		rs.MoveNext();
+
+	}
+	rs.Close();
+	return buffer;
+}
+void CFlisServerDlg::ReadSms()
+{
+	CString tekst, oldtekst;
+	Sleep(950);		//Holder en pause for at lade hele sms'en komme ind i serial køen.
 	if(Serial.getComstat().cbInQue > 0)
 	{
 		std::vector<unsigned char> answer = readFrame();
 		Sleep(50);
-			char array1[25];
-			int i;
+
 			for (int i=0; i<answer.size(); i++)
 			{
-				array1[i] = answer[i];
+				if ((answer[i] != 0x0A) && (answer[i] != 0x0D))
+				{
+					tekst.AppendChar(answer[i]);
+				}
 			}
+
+			AppendText(tekst);
+			SmsSplit(tekst);
+	}
+}
+void CFlisServerDlg::SmsSplit(CString data)
+{
+	CString FyrData, TlfNr, SmsCount, Temper, Flamme, Flis, FremFejl, PowerFail, oldtekst;
+	char CharData[150];
+	strcpy(CharData,data);
+	TlfNr = data.Mid(24,8);
+	FyrData = data.Mid(57,data.GetLength()-59);
+	FyrData.Append(":");
+
+	if (FyrData.MakeLower() == "conf ok:")
+	{
+		HandleAcknowledge(TlfNr);
+		return;
+	}
+	
+	SmsCount = Splitter(FyrData);
+	Temper = Splitter(FyrData);
+	Flamme = Splitter(FyrData);
+	Flis = Splitter(FyrData);
+	FremFejl = Splitter(FyrData);
+	PowerFail = Splitter(FyrData);
+		
+		CString SQL, Textwindow, InstallNR;
+		SQL.Format("select ID from installation where installationphonenr=%s",TlfNr);
+	
+		CRecordset rs(&db);
+		rs.Open(AFX_DB_USE_DEFAULT_TYPE, SQL);
+		if (rs.GetRecordCount()>0)
+		{
+			rs.MoveFirst();		
+			rs.GetFieldValue((short)0,InstallNR);
+		}
+		rs.Close();
+
+		SQL.Format("insert into logtable (logtime,temperature,flamedetector,solidfuelempty,conveyorerror,powerfailure,messagenr,installationnr) Values (now(),%s,'%s','%s','%s','%s',%s,%s)",Temper, Flamme, Flis, FremFejl, PowerFail, SmsCount,InstallNR);
+		try
+		{
+		db.ExecuteSQL(SQL);
+		}
+		catch(CDBException* e)
+		{
+			MessageBox(e->m_strError);
+		}
+		AppendText("Sms added to Log");
+		Sleep(150);
+}
+CString CFlisServerDlg::Splitter(CString& fyrdata)
+{
+	CString Output;
+
+	int pos = fyrdata.Find(':',0);
+	if (pos != -1)
+		{
+			Output = fyrdata.Left(pos);
+			fyrdata = fyrdata.Right( fyrdata.GetLength() - pos -1);
+		}
+	return Output;
+}
+void CFlisServerDlg::OnBnClickedClose()
+{
+	// TODO: Add your control notification handler code here
+	continueThread = 0;
+	DeleteSms();
+
+	Sleep(500);
+	if( Serial.isOpen() )
+	{
+		Serial.close();
+	}
+	
+	if(db.IsOpen())
+	{
+		db.Close();
+	}
+	
+	OnOK();
+
+}
+
+void CFlisServerDlg::OnBnClickedGsmpin()
+{
+	// TODO: Add your control notification handler code here
+	bool ready = true;
+	m_Textwindow.SetWindowText("Indsætter Pinkode, og venter på modem bliver klar");
+	UpdateWindow();
+	SetPin();
+	Sleep(500);
+
+	while (ready == true)
+	{
+		if (Serial.getComstat().cbInQue > 120)
+		{
+			std::vector<unsigned char> answer = readFrame();
+			CString tekst;
+		
+			for (int i=0; i<answer.size(); i++)
+			{
+				if ((answer[i] != 0x0A) && (answer[i] != 0x0D))
+				{
+					tekst.AppendChar(answer[i]);
+				}
+			}
+			int n = tekst.Find("WIND: 11",0);
+			if (n > -1)
+			{
+				ready = false;
+			}
+			else
+			{
+				AppendText(tekst);
+			}
+		}
+		Sleep(5); //Small delay to avoid busy wait
+	}
+	Sleep(100); //Give the modem a chance to send the last data
+	while(Serial.getComstat().cbInQue > 0)
+	{
+		Serial.readByte(); //Flush the incoming queue
+		Sleep(1);
+	}
+	OnBnClickedStart();
+}
+void CFlisServerDlg::DeleteSms()
+{
+	vector<unsigned char> atcommand;
+	atcommand.push_back('a');
+	atcommand.push_back('t');
+	atcommand.push_back('+');
+	atcommand.push_back('c');
+	atcommand.push_back('m');
+	atcommand.push_back('g');
+	atcommand.push_back('d');
+	atcommand.push_back('=');
+	atcommand.push_back('1');
+	atcommand.push_back(',');
+	atcommand.push_back('3');
+
+	writeFrame(atcommand);
+	Sleep(500);
+}
+UINT threadWrapper(LPVOID thread)
+{
+	CFlisServerDlg *t = (CFlisServerDlg*) thread;
+	t->runthread();
+	return 0;
+}
+
+void CFlisServerDlg::startthread()
+{
+	AfxBeginThread(threadWrapper, (LPVOID) this);
+}
+
+void CFlisServerDlg::runthread()
+{
+	while (continueThread != 0) 
+	{
+		Reader();
+	}
+}
+void CFlisServerDlg::Reader()
+{
+	if(Serial.getComstat().cbInQue > 0)
+		{
+			Sleep(250);
+			std::vector<unsigned char> answer = readFrame();
+			Sleep(500);
+			CString tekst, oldtekst;
+			int lol;
 		
 			for (int i=0; i<answer.size(); i++)
 			{
-				if ((array1[i] != 0x0A) && (array1[i] != 0x0D))
+				if ((answer[i] != 0x0A) && (answer[i] != 0x0D))
+				{
+					tekst.AppendChar(answer[i]);
+				}
+			}
+			tekst.Append(":");
+
+			CString command;
+			bool plus = false;
+				int pos = tekst.Find('+',0);
+				if (pos != -1)
+				{
+					plus = true;
+					tekst = tekst.Right( tekst.GetLength() - pos -1);
+					pos = tekst.Find(':');
+					command = tekst.Left(pos);
+					tekst = tekst.Right( tekst.GetLength() - pos -1);
+				}
+			
+			
+			if(tekst.MakeLower() == "ok")
+			{	
+				AppendText("OK tekst modtaget");
+			}
+			else if (tekst.MakeLower() == "error")
+			{
+				CString send;
+				send.Append("error tekst");
+				send.Append("\r\n");
+				send.Append(tekst);
+				AppendText(send);
+			}
+			else if (plus == true)
+			{
+				if (command.MakeLower() == "cmti")
+				{
+					CString smscount, oldteskst;
+					int pos = tekst.Find(',',0);
+					if (pos != -1)
+					{
+						smscount = tekst.Right( tekst.GetLength() - pos -1);
+						smscount.Remove(':');
+						ResetSms++;
+					}
+						////////////////Read sms ting//////////////////
+						std::vector<unsigned char> data;
+						data.push_back('a');
+						data.push_back('t');
+						data.push_back('+');
+						data.push_back('c');
+						data.push_back('m');
+						data.push_back('g');
+						data.push_back('r');
+						data.push_back('=');
+						
+						for (int i=0; i< smscount.GetLength(); i++)
+						{
+							data.push_back(smscount[i]);
+						}
+						m_Textwindow.GetWindowText(oldteskst);
+						oldteskst.Append("\r\n");
+						for (int i=0; i<data.size();i++)
+						{
+							oldteskst.AppendChar(data[i]);
+						}
+						m_Textwindow.SetWindowText(oldteskst);
+						writeFrame(data);
+						Sleep(200);
+						ReadSms();
+						ResetSms++;
+
+				}
+				else if(command.MakeLower() == "wind")
 				{
-					tekst.AppendChar(array1[i]);
+
+					CString send;
+					send.Append("Wind modtaget");
+					send.Append("\r\n");
+					send.Append(tekst);
+					AppendText(send);
 				}
 			}
+			else
+			{
+				AppendText(tekst);
+			}
+			if(ResetSms == 20)
+			{
+				DeleteSms();
+				AppendText("Sms'er slettet da vi nåede grænsen");
+			}
+
+		}
+		if (continueThread == 1)
+		{
+			
+			CString testdata, dataframe,testprint, sIDnr, sCommandID, sInstallationsID, sImei;
+			int commandtest = 0;
+			int iAll = 1;
+			std::vector<Commands> data;
+			data = DBReadCommands();
+			for (int i=0; i<data.size(); i++)
+			{
+				sIDnr = data[i].IDnr;
+				sCommandID = data[i].CommandID;
+				commandtest = atoi(data[i].CommandID);
+				sInstallationsID = "0";
+
+				if(commandtest > 1)
+				{
+					sInstallationsID = data[i].InstallationsID;
+				}
+			}
+			
+			if (commandtest > 1)
+			{
+				iAll = 0;
+			}
+
+			if (sIDnr.GetLength() > 0)
+			{
+				SendConfig(sIDnr,sCommandID,sInstallationsID);
+			}
+			Sleep(500);
+
+			CheckAcknowledges();
+			Sleep(500);
+		}
+		CTime now = CTime::GetCurrentTime();
+
+		CTimeSpan elapsed = now-Alive.tid;
+
+		if (elapsed.GetTotalSeconds() >= 900)
+		{
+			keepaliveandread();
+		}
+}
+void CFlisServerDlg::SendConfig(CString IDnr,CString CommandID,CString InstallationsID)
+{	
+	
+	std::vector<Installation> inst;
+
+	if (CommandID == "1")
+		inst = DBReadPhone("0");
+	else
+		inst = DBReadPhone(InstallationsID);
+
+	for ( int j=0; j < inst.size(); j++)
+	{
+		CString TlfNr, Imei, updaterate;
+		TlfNr.Empty();
+		Imei.Empty();
+		updaterate.Empty();
+
+		CString dataen = inst[j].InstPhoneNr;
+		TlfNr.Append(dataen);
+		CString Imeidata = inst[j].Imei;
+		Imei.Append(Imeidata);
+		CString updaterat = inst[j].Updaterate;
+		updaterate.Append(updaterat);
+	
+		vector<unsigned char> tlfnr;
+		for (int i=0; i<TlfNr.GetLength(); i++)
+		{
+			tlfnr.push_back(TlfNr[i]);
+		}
+		
+		int calcimei; 
+		__int64 buf;
+
+		buf = atof(Imei);
+		
+		calcimei = tversum(buf);
+		
+		Imei.Format("%d",calcimei);
+		
+		SendSmsHead(tlfnr);
+		Sleep(250);
+		
+		vector<unsigned char> smsdata;
+		
+		for (int i=0; i<Imei.GetLength(); i++)
+		{
+			smsdata.push_back(Imei[i]);
+		}
+		smsdata.push_back(':');
+		for (int i=0; i<Alive.Phonenr.GetLength(); i++)
+		{
+			smsdata.push_back(Alive.Phonenr[i]);
+		}
+		smsdata.push_back(':');
+		for (int i=0; i<updaterate.GetLength(); i++)
+		{
+			smsdata.push_back(updaterate[i]);
+		}
+
+		SendSmsData(smsdata);
+		Sleep(500);
+
+		if (IDnr != "0")
+		{
+			Acks.push_back( Acknowledge(inst[j].instID,TlfNr) );
+		}
 
-			m_Textwindow.GetWindowText(oldtekst);
-			oldtekst.Append("\r\n");
-			oldtekst.Append(tekst);
-			m_Textwindow.SetWindowText(oldtekst);
 	}
-return 0;
+
+	if (IDnr != "0")
+	{
+		CString SQL, Textwindow;
+		SQL.Format("update command set executed=now() where id=%s",IDnr);
+		db.ExecuteSQL(SQL);
+		AppendText("Command executed");
+	}
+	Sleep(150);
+
+
+
+
 }
-void CFlisServerDlg::SendSmsData(std::vector<unsigned char> data)
+vector<Installation> CFlisServerDlg::DBReadPhone(CString sInstallationsID)
 {
-	for (int i=0; i<data.size(); i++)
+	vector<Installation> buffer;
+
+	CString SQL, phonenr, imei, updaterate, id;
+	Installation Myinst;
+
+	if (sInstallationsID != "0")
 	{
-		Serial.writeByte( data[i] );
-		Sleep(5);
+		SQL.Format("select installationphonenr, imei, updaterate, id from installation WHERE id = %s", sInstallationsID);
+	}
+	else 
+	{
+		SQL.Format("select installationphonenr, imei, updaterate, id from installation");
 	}
-	Serial.writeByte(0x1A);
-	Sleep(100);
 
+	CRecordset rs(&db);
+	rs.Open(AFX_DB_USE_DEFAULT_TYPE, SQL);
+	if (rs.GetRecordCount()>0) 
+	{
+		rs.MoveFirst();
+		while(!rs.IsEOF())
+		{
+		
+			rs.GetFieldValue((short)0,phonenr);
+			rs.GetFieldValue(1,imei);
+			rs.GetFieldValue(2,updaterate);
+			rs.GetFieldValue(3,id);
+
+			Myinst.InstPhoneNr = phonenr;
+			Myinst.Imei = imei;
+			Myinst.Updaterate = updaterate;
+			Myinst.instID = id;
+
+			buffer.push_back(Myinst);
+			rs.MoveNext();
+		}
+	}
+	rs.Close();
+	return buffer;
 }
-void CFlisServerDlg::SendSmsHead(std::vector<unsigned char> data)
+int CFlisServerDlg::tversum(__int64 input)
 {
-	for (int i=0; i<data.size(); i++)
+	int sum = 0;
+	while (input > 0)
 	{
-		Serial.writeByte( data[i] );
-		Sleep(5);
+		sum += (input %10);
+		input /= 10;
+	}
+	return sum;
+}
+void CFlisServerDlg::OnBnClickedStart()
+{
+// TODO: Add your control notification handler code here
+    
+	continueThread = 1;
+	keepaliveandread();
+	Sleep(150);
+	m_Textwindow.SetWindowText(CString("Server phonenr read from db: ") + Alive.Phonenr );
+	AppendText("Started");
+	AfxBeginThread(threadWrapper,AfxGetMainWnd());
+}
+void CFlisServerDlg::AppendText(CString s)
+{
+	CString Tekst;
+	m_Textwindow.GetWindowText(Tekst);
+	Tekst.Append("\r\n");
+	Tekst.Append(s);
+	m_Textwindow.SetWindowText(Tekst);
+
+}
+void ConfigFile::ReadSettings()
+{
+	ifstream file("Server-Settings.ini");
+	if (!file.is_open())
+		throw("Could not open file");
+
+	char buf[200];
+	while (!file.eof() ) {
+		file.getline(buf,200);
+		CString tmp(buf);
+
+		if (tmp.GetAt(0) == '#')
+			continue;
+
+		int pos = tmp.Find('=');
+		if (pos>0) {
+			CString key = tmp.Left(pos).Trim().MakeLower();;
+			CString value = tmp.Right(tmp.GetLength()-pos-1).Trim();
+
+			if (key == "host")
+				host = value;
+			else if (key == "username")
+				username = value;
+			else if (key == "password")
+				password = value;
+			else if (key == "database")
+				database = value;
+			else if (key == "comport")
+				comport = value;
+		}
+
 	}
-	Serial.writeByte(0x0D);
-	Sleep(100);
 
+	file.close();
 }
-void CFlisServerDlg::DBconnect()
+void CFlisServerDlg::HandleAcknowledge(CString tlfnr)
 {
-	CString dsn;
-	dsn.Format("ODBC;Description=asd;DRIVER=PostgreSQL ANSI;SERVER=%s; uid=%s;password=%s;database=%s",config.host, config.username, config.password, config.database);
-	db.OpenEx(dsn, CDatabase::noOdbcDialog);
+	for (std::list<Acknowledge>::iterator it = Acks.begin(); it != Acks.end(); ++it)
+	{
+		Acknowledge& current = (*it);
+		if (current.sTlfNr == tlfnr)
+		{
+			CString SQL;
+			SQL.Format("UPDATE installation SET commerror = false WHERE id = %s", current.sInstallationID);
+			db.ExecuteSQL(SQL);
+
+			Acks.erase(it);
+
+			return;
+		}
+	}
+}
+
+void CFlisServerDlg::CheckAcknowledges()
+{
+	CTime now = CTime::GetCurrentTime();
+	for (std::list<Acknowledge>::iterator it = Acks.begin(); it != Acks.end(); ++it)
+	{
+		Acknowledge& current = (*it);
+
+		CTimeSpan elapsed = now-current.cTime;
+
+		if (elapsed.GetTotalSeconds() >= 300)
+		{
+			DumpAckList();
+			if (current.iRetry >= 1)
+			{
+				CString SQL;
+				SQL.Format("UPDATE installation SET commerror = true WHERE id = %s", current.sInstallationID);
+				db.ExecuteSQL(SQL);
+				Acks.erase(it);
+				return; // the iterator is now invalidated, but the thread loop will make sure we are here soon again
+			}
+			else
+			{
+				SendConfig("0","2",current.sInstallationID);
+				current.iRetry++;
+				current.cTime = CTime::GetCurrentTime();
+				AppendText( CString("Retry send config to ") + current.sTlfNr );
+			}
+		}
+	}
+}
+
+void CFlisServerDlg::DumpAckList()
+{
+	CTime now = CTime::GetCurrentTime();
+	OutputDebugString("-------------------------------\n");
+	int count = 0;
+	for (std::list<Acknowledge>::iterator it = Acks.begin(); it != Acks.end(); ++it)
+	{
+		CString msg;
+		msg.Format("%d:%d:%d> %4d : %s\n", now.GetHour(), now.GetMinute(), now.GetSecond(), count, (*it).sTlfNr);
+		OutputDebugString(msg);
+		count++;
+	}
+}
+vector<keepalive> CFlisServerDlg::keepaliveandread(void)
+{
+	vector<keepalive> buffer;
+
+	CString SQL, name, value;
+	SQL = "select name, value from config;";
+	CRecordset rs(&db);
+	try
+	{
+		rs.Open(AFX_DB_USE_DEFAULT_TYPE, SQL);
+		if (rs.GetRecordCount()>0) 
+		{
+			rs.MoveFirst();
+			
+			rs.GetFieldValue((short)0, name);
+			rs.GetFieldValue(1,value);
+		
+			Alive.name = name;
+			Alive.value = value;
+			Alive.tid = CTime::GetCurrentTime();
+			if(Alive.name == "phonenr")
+			{
+				Alive.Phonenr = value;
+			}
+
+			buffer.push_back(Alive);
+			rs.MoveNext();
+
+		}
+		rs.Close();
+		return buffer;
+	}
+	catch (char * str)
+	{
+		AppendText("Keepalive failed, closing and opening the db connection again");
+		if(db.IsOpen())
+		{
+			db.Close();
+			AppendText("DB connection closed");
+		}
+		if(!db.IsOpen())
+		{
+			DBConnect();
+			AppendText("DB connection started again");
+		}
+	}
+
+	
 }
\ No newline at end of file