--- trunk/FlisServer/FlisServerDlg.cpp 2007/12/05 16:00:03 165 +++ trunk/FlisServer/FlisServerDlg.cpp 2007/12/05 16:03:05 166 @@ -6,6 +6,7 @@ #include "FlisServerDlg.h" #include #include ".\flisserverdlg.h" +#include #ifdef _DEBUG #define new DEBUG_NEW @@ -373,7 +374,23 @@ HandleAcknowledge(TlfNr); return; } - + CAtlRegExp<> regex; + if (regex.Parse("^{[0-9]+}:{[0-9]+}:[0-1]:[0-1]:[0-1]:[0-1]:$") == REPARSE_ERROR_OK) + { + + CAtlREMatchContext<> pContext; + + if (!regex.Match(FyrData, &pContext)) + { + AppendText("Invalid SMS recieved"); + return; + } + } + else + { + AppendText("Regex PARSE error!!!"); //Burde aldrig kunne ske ! + } + SmsCount = Splitter(FyrData); Temper = Splitter(FyrData); Flamme = Splitter(FyrData); @@ -421,6 +438,7 @@ { // TODO: Add your control notification handler code here continueThread = 0; + Sleep(250); DeleteSms(); Sleep(500); @@ -741,7 +759,7 @@ CString SQL, Textwindow; SQL.Format("update command set executed=now() where id=%s",IDnr); db.ExecuteSQL(SQL); - Sleep(10); + Sleep(100); AppendText("Command executed"); } Sleep(150); @@ -966,4 +984,4 @@ } -} \ No newline at end of file +}