AppServer/LocationThread.cs

@@ -23,7 +23,6 @@ namespace AppServer
         private volatile DBvehiclesManager dbvehs;
         private DBvehiclesManager DBvehInfo;
 
-
         public static volatile Int32 LocationCheckQueuesCount = 0;
         Int64 count = 0;
         private bool sendCalloutStop;
@@ -185,12 +184,12 @@ namespace AppServer
                                 {
                                     Vehicle_Data v_data = (Vehicle_Data)MainForm.VehList[radioID2.ToString()];
                                     Alarm alarm = v_data.alm;
-                                    
+                                    bool zone = false;
-
+                                    bool landMark = false;
-                                    bool zone = (alarm.Zone != "") ;
-                                    bool landMark = (alarm.Landmark != "") ;
-
                                     String SpeedProccess = "";
+                                    if (alarm.Zone != "") zone = true;
+                                    if (alarm.Landmark != "") landMark = true;
+
                                     if (zone || landMark)
                                     {
                                         SpeedProccess = processZoneAlarm(radioID2, dec2.cell, zone, landMark, alarm.Email, !prevGps);
@@ -262,7 +261,6 @@ namespace AppServer
                                             {
                                                 continue;
                                             }
-
                                             //get unit system position
                                             int unitSC_ID = ((Vehicle_Data)MainForm.VehList[radioID2]).sc_id;
                                             UnitSysPosition sysPos = DBvehInfo.getSystemPosition(unitSC_ID);
@@ -272,8 +270,7 @@ namespace AppServer
                                             //send radio disable to GW
                                             Utils.WriteLine("Radio disable was sent on " + sysPos.Gw_id + "." + sysPos.R_gw_id + " gateway", ConsoleColor.Cyan);
                                             string test2 = $"#{(int)MessageBusCmds.RadioEnableDisableRequest}#" + dest + "#0#";
-                                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test2);
+                                            MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0" + test2), Utils.Convert_text_For_multicast("#0.0" + test2).Length);
-                                            MainForm.udp.Send(dataToSend, dataToSend.Length);
                                         }
                                         catch (Exception ex)
                                         {
@@ -351,13 +348,9 @@ namespace AppServer
                                 try
                                 {
                                     string test2 = "#210#1#Can't write GPS data in DB#";
-                                    if (ex.Message == "AlarmError")
+                                    if (ex.Message == "AlarmError") test2 = "#210#5#Can't write Alarm data in DB#";
-                                        test2 = "#210#5#Can't write Alarm data in DB#";
+                                    else if (ex.Message == "StolenError") test2 = "#210#6#Can't write Stolen data in DB#";
-                                    else if (ex.Message == "StolenError")
+                                    MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test2), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test2).Length);
-                                        test2 = "#210#6#Can't write Stolen data in DB#";
-
-                                    byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test2);
-                                    MainForm.udp.Send(dataToSend, dataToSend.Length);
                                 }
                                 catch (Exception ex2)
                                 {
@@ -403,10 +396,7 @@ namespace AppServer
                         {
                             // send callout clear
                             string test = "#178#" + callout.RadioID.ToString() + "#" + callout.Severity + "#";
-
+                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);
-                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test);
-                            MainForm.udp.Send(dataToSend, dataToSend.Length);
-
                             Utils.WriteLine($"Sent CallOut Stop request with Severity [{callout.Severity}] for unit {callout.RadioID.ToString()} ");
                         }
                     }
@@ -418,49 +408,32 @@ namespace AppServer
         private void sendMailGeo(string mes, String subj, string mailAdr)
         {
 
-            if (Program.cfg.enableEmailService)
+            if (Program.cfg.enableEmailService && !String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
             {
-                if (!String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
+                try
                 {
-                    if (MainForm.IsBlacklistedAddress(mailAdr))
+                    MailAddress from = new MailAddress(Program.cfg.emailAddress);
+                    String[] address = mailAdr.Split(";".ToCharArray());
+                    MailAddress to = new MailAddress(address[0]);
+                    MailMessage message = new MailMessage(from, to);
+                    if (address.Count() > 1)
                     {
-                        Utils.WriteLine($"sendMailGeo : The email '{subj}' was not sent. Email address '{mailAdr}' is in blacklist count = {MainForm.blackListAddress[mailAdr]}");
+                        Boolean skipeFirst = true;
-                        return;
+                        foreach (String obj in address)
-                    }
-
-                    try
-                    {
-                        MailAddress from = new MailAddress(Program.cfg.emailAddress);
-                        String[] address = mailAdr.Split(";".ToCharArray());
-                        MailAddress to = new MailAddress(address[0]);
-                        MailMessage message = new MailMessage(from, to);
-                        if (address.Count() > 1)
                         {
-                            Boolean skipeFirst = true;
+                            if (skipeFirst)
-                            foreach (String obj in address)
+                            { skipeFirst = false; }
-                            {
+                            else
-                                if (skipeFirst)
+                                message.To.Add(new MailAddress(obj));
-                                { skipeFirst = false; }
-                                else
-                                    message.To.Add(new MailAddress(obj));
-                            }
                         }
-                        message.Subject = subj;
-                        message.Body = mes;
-                        EmailServerSSL.sendEmail(Program.cfg.smtpServer, Program.cfg.smtpPort, Program.cfg.emailAddress, Program.cfg.emailPassword, message, Program.cfg.smtpSSLState);
-                    }
-                    catch (Exception ex)
-                    {
-                        if (ex.ToString().Contains("timed out") ||
-                              ex.ToString().Contains("the client was not authenticated"))
-                            MainForm.HandleTimeoutError(mailAdr);
-
-                        Utils.WriteLine($"Exception in sendMailGeo: {ex.ToString()}");
                     }
+                    message.Subject = subj;
+                    message.Body = mes;
+                    EmailServerSSL.sendEmail(Program.cfg.smtpServer, Program.cfg.smtpPort, Program.cfg.emailAddress, Program.cfg.emailPassword, message, Program.cfg.smtpSSLState);
                 }
-                else
+                catch (Exception ex)
                 {
-                    Utils.WriteLine($"Missing email address From = {Program.cfg.emailAddress} To = {mailAdr})", ConsoleColor.Cyan);
+                    Console.WriteLine("Exception in sendMailGeo: ", ex.ToString());
                 }
             }
             else
@@ -470,46 +443,27 @@ namespace AppServer
 
         }
 
-
         private void sendAlarmMail(string title, string mes, string mailAdr)
         {
-            if (Program.cfg.enableEmailService)
+            if (Program.cfg.enableEmailService && !String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
             {
-                if (!String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
+                try
                 {
-
+                    MailAddress from = new MailAddress(Program.cfg.emailAddress);
-                    if (MainForm.IsBlacklistedAddress(mailAdr))
+                    MailAddress to = new MailAddress(mailAdr);
-                    {
+                    MailMessage message = new MailMessage(from, to);
-                        Utils.WriteLine($" sendAlarmMail : The email '{title}' was not sent. Email address '{mailAdr}' is in blacklist count = {MainForm.blackListAddress[mailAdr]}");
+                    message.Subject = title;
-                        return;
+                    message.Body = mes;
-                    }
+                    EmailServerSSL.sendEmail(Program.cfg.smtpServer, Program.cfg.smtpPort, Program.cfg.emailAddress, Program.cfg.emailPassword, message, Program.cfg.smtpSSLState);
-
-                    try
-                    {
-                        MailAddress from = new MailAddress(Program.cfg.emailAddress);
-                        MailAddress to = new MailAddress(mailAdr);
-                        MailMessage message = new MailMessage(from, to);
-                        message.Subject = title;
-                        message.Body = mes;
-                        EmailServerSSL.sendEmail(Program.cfg.smtpServer, Program.cfg.smtpPort, Program.cfg.emailAddress, Program.cfg.emailPassword, message, Program.cfg.smtpSSLState);
-                    }
-                    catch (Exception ex)
-                    {
-                        if ( ex.ToString().Contains("timed out") ||
-                             ex.ToString().Contains("the client was not authenticated"))
-                            MainForm.HandleTimeoutError(mailAdr);
-
-                        Utils.WriteLine("Exception in sendMailAlarm2: {0}" + ex.ToString(), ConsoleColor.Red);
-                    }
                 }
-                else
+                catch (Exception ex)
                 {
-                    Utils.WriteLine($"Missing email address From = {Program.cfg.emailAddress} To = {mailAdr})", ConsoleColor.Cyan);
+                    Utils.WriteLine("Exception in sendMailAlarm2: {0}" + ex.ToString(), ConsoleColor.Red);
                 }
             }
             else
             {
-                Utils.WriteLine("Email Server not Set", ConsoleColor.Cyan);
+                Utils.WriteLine("Email Server not Set",ConsoleColor.Cyan);
             }
         }  
 
@@ -587,8 +541,7 @@ namespace AppServer
                                         {
                                             //send alarm on message buss
                                             test = "#136#" + radioID.ToString() + "#" + tmpresp + "#";
-                                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test);
+                                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);
-                                            MainForm.udp.Send(dataToSend, dataToSend.Length);
                                         }
 
                                         String date = DateTime.Now.ToUniversalTime().DateTo70Format().ToString();
@@ -616,10 +569,7 @@ namespace AppServer
                                                     tmpX = dbvehs.getSystemPosition(Convert.ToInt32(keyobj));
                                                     
                                                     test = "#142#" + tmpX.Gw_id + "." + tmpX.R_gw_id + "." + (String)tmpHashName[keyobj] + "#" + /*"Message from unit " + ((Vehicle_Data)MainForm.VehList[radioID.ToString()]).Name + " :" +*/ obj2.msgbody + "#" + date + "#";
-
+                                                    MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0." + date + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0." + date + test).Length);
-                                                    byte[] dataToSend = Utils.Convert_text_For_multicast("#0." + date + test);
-                                                    MainForm.udp.Send(dataToSend, dataToSend.Length);
-
                                                     Thread.Sleep(100);
 
                                                     Utils.WriteLine($"Zone alert sms request [{obj2.msgbody}] for unit {(String)tmpHashName[keyobj]} on gw [{(tmpX.Gw_id + "." + tmpX.R_gw_id)}]");
@@ -631,8 +581,7 @@ namespace AppServer
                                         {
                                             tmpX = dbvehs.getSystemPositionIMEI(radioID);
                                             test = "#142#" + tmpX.Gw_id + "." + tmpX.R_gw_id + "." + radioID + "#" + obj2.msgbody2 + "#" + DateTime.Now.ToUniversalTime().DateTo70Format().ToString() + "#";                                            
-                                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0." + date + test);
+                                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0." + date + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0." + date + test).Length);
-                                            MainForm.udp.Send(dataToSend, dataToSend.Length);
 
                                             Utils.WriteLine($"Zone alert sms request [{obj2.msgbody2}] for unit {radioID} on gw [{(tmpX.Gw_id + "." + tmpX.R_gw_id)}]");
                                         }
@@ -642,8 +591,7 @@ namespace AppServer
                                         {
                                             tmpX = dbvehs.getSystemPositionIMEI(radioID);
                                             test = "#177#" + radioID.ToString() + "#" + obj2.calloutSeverity + "#" + obj2.name + "#";
-                                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0." + test);
+                                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);
-                                            MainForm.udp.Send(dataToSend, dataToSend.Length);
 
                                             callOutQueue.PostItem(new CallOut() { RadioID = radioID, Severity = obj2.calloutSeverity, Time = DateTime.Now});
                                             Utils.WriteLine($"Zone CallOut request with Severity [{obj2.calloutSeverity}] for unit {radioID} on gw [{(tmpX.Gw_id + "." + tmpX.R_gw_id)}]");
@@ -699,16 +647,14 @@ namespace AppServer
                                     {
                                         //send alarm on message buss
                                         string test = "#137#" + radioID.ToString() + "#" + tmpresp + "#";
-                                        byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test);
+                                        MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);
-                                        MainForm.udp.Send(dataToSend, dataToSend.Length);
                                     }
                                     
                                     //send CallOut
                                     if(obj2.callout && tmpresp.ToString().Contains("IN "))
                                     {
                                         string test = "#177#" + radioID + "#" + obj2.calloutSeverity + "#" + obj2.name + "#";
-                                        byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test);
+                                        MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);
-                                        MainForm.udp.Send(dataToSend, dataToSend.Length);
 
                                         callOutQueue.PostItem(new CallOut() { RadioID = radioID, Severity = obj2.calloutSeverity, Time = DateTime.Now });
                                         Utils.WriteLine($"Landmark CallOut request with Severity [{obj2.calloutSeverity}] for unit {radioID} ");
@@ -777,8 +723,7 @@ namespace AppServer
                     //send alarm on message buss
                     string speed4send = $"{speed}_{speedUnits}";
                     string test = "#135#" + radioID.ToString() + "#" + speed4send + "#";
-
+                    MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);
-                    MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0" + test), Utils.Convert_text_For_multicast("#0.0" + test).Length);
                 }
             }
             

AppServer/MainForm.cs

@@ -96,9 +96,6 @@ namespace AppServer
         public static String dbAccess;
         private WebsocketThread websocket = null;
 
-        public static Dictionary<string, int> blackListAddress = new Dictionary<string, int>();
-        public const int MAX_ATTEMPTS = 100;
-
 
         public delegate void UpdateLicensesUIInvokeCallBack();
         public MainForm()
@@ -341,37 +338,6 @@ namespace AppServer
         }
 
 
-
-        public static void HandleTimeoutError(string mailAdr)
-        {
-
-            // add address to backlist 
-            if (!blackListAddress.ContainsKey(mailAdr))
-                blackListAddress.Add(mailAdr, MAX_ATTEMPTS);
-
-        }
-
-
-        public static bool IsBlacklistedAddress(string mailAdr)
-        {
-
-            if (!blackListAddress.ContainsKey(mailAdr))
-                return false;
-
-            // avoid to send the email MAX_ATTEMPTS times => give another chance to try to send email when count = 0
-            int count = blackListAddress[mailAdr];
-            if (count == 0)
-            {
-                blackListAddress.Remove(mailAdr);
-                return false;
-            }
-
-
-            blackListAddress[mailAdr] = count - 1;
-            return true;
-        }
-
-
         private void ConfigureWebSocket()
         {
             if (!checkWebsocketServerStatus.Enabled)
@@ -1058,8 +1024,7 @@ namespace AppServer
                 {                    
                     try
                     {                        
-                        byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#210#4#AppServer stoped#");
+                        udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#4#AppServer stoped#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#4#AppServer stoped#").Length);                                    
-                        udp.Send(dataToSend, dataToSend.Length);                                    
                     }
                     catch (Exception ex2)
                     {
@@ -1107,8 +1072,7 @@ namespace AppServer
                         error = true;
                         try
                         {                            
-                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#210#2#Dongle missing Application server stopped#");
+                            udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#2#Dongle missing Application server stopped#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#2#Dongle missing Application server stopped#").Length);                                    
-                            udp.Send(dataToSend, dataToSend.Length);                                    
                         }
                         catch (Exception ex2)
                         {
@@ -1228,10 +1192,8 @@ namespace AppServer
 
 
             MainForm.websocketLocationQueue.PostItem(data);
-
+            if(!sendWebsocketTimer.Enabled)
-            if (!sendWebsocketTimer.Enabled)
                 sendWebsocketTimer.Enabled = true;
-
             if (!checkWebsocketServerStatus.Enabled)
                 checkWebsocketServerStatus.Enabled = true;
         }
@@ -1283,12 +1245,10 @@ namespace AppServer
             }
             try
             {
-                byte[] dataToSend = Utils.Convert_text_For_multicast($"#0.0#{Utils.enumConvertToString(MessageBusCmds.WebsocketStatusToMsgBus)}#offline#");
+                udp.Send(Utils.Convert_text_For_multicast($"#0.0#{Utils.enumConvertToString(MessageBusCmds.WebsocketStatusToMsgBus)}#offline#"),
-                udp.Send(dataToSend, dataToSend.Length);
+                    Utils.Convert_text_For_multicast($"#0.0#{Utils.enumConvertToString(MessageBusCmds.WebsocketStatusToMsgBus)}#offline#").Length);
-
+                udp.Send(Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#"),
-
+                    Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#").Length);
-                dataToSend = Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#");
-                udp.Send(dataToSend, dataToSend.Length);
             }
             catch (Exception ex2)
             {
@@ -1304,8 +1264,7 @@ namespace AppServer
             {
                 try
                 {                    
-                    byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#210#5#Application server restart#");
+                    udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#5#Application server restart#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#5#Application server restart#").Length);                                    
-                    udp.Send(dataToSend, dataToSend.Length);                                    
                 }
                 catch (Exception ex2)
                 {

AppServer/MulticastListener.cs

@@ -28,7 +28,6 @@ namespace AppServer
         private DBvehiclesManager dbvehs;
         internal DBsubsOperationManager dbsubsoperManage;
         private DBcallPatchManager dbCallPatch;
-
         #region code for zone 
         private volatile static ArrayList ZoneList = new ArrayList();
         private volatile static ArrayList LandList = new ArrayList();
@@ -606,8 +605,7 @@ namespace AppServer
                                 Utils.WriteLine("Radio disable was sent on " + sysPos.Gw_id + "." + sysPos.R_gw_id + " gateway", ConsoleColor.Cyan);
                                 //send radio disable to GW
                                 string test2 = "#150#" + dest + "#0#";
-                                byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test2);
+                                MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0" + test2), Utils.Convert_text_For_multicast("#0.0" + test2).Length);
-                                MainForm.udp.Send(dataToSend, dataToSend.Length);
                             }
                             catch (Exception ex)
                             {
@@ -728,9 +726,7 @@ namespace AppServer
                             UnitSysPosition sysPos = DBvehInfo.getSystemPosition(unitSC_ID);
                             string message = string.Format("Ticket no. {0} is no longer active!", dec3.delete_ticket_id);
                             string test1 = "#143#" + sysPos.Gw_id + "." + sysPos.R_gw_id + "." + radioID3 + "#" + message + "#" + 0 + "#";                            
-
+                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0"+test1), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0"+test1).Length);                                    
-                            byte[] cmd = Utils.Convert_text_For_multicast("#0.0" + test1);
-                            MainForm.udp.Send(cmd, cmd.Length);                                    
                         }
                         //send to email if was sms->email type
                         if (dec3.isEmail)
@@ -738,11 +734,12 @@ namespace AppServer
                             sendMail(dec3.emailAddr, dec3.messBody, radioID3);
                         }
                         //send ACK back to GW
-                        test = (dec3.sqlResp == sqlResponse.done) ? "#232#1#" : "#232#0#";
+                        test = "";
-                        
+                        if (dec3.sqlResp == sqlResponse.done)
-
+                            test = "#232#1#";
-                        byte[] dataToSend = Utils.Convert_text_For_multicast("#" + seqID3 + test);
+                        else
-                        MainForm.udp.Send(dataToSend, dataToSend.Length);                                    
+                            test = "#232#0#";                        
+                        MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqID3 + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqID3 + test).Length);                                    
 
                         if (MainForm.SendPOLLafterSMS)
                         {
@@ -752,8 +749,7 @@ namespace AppServer
                             string dest = $"0.0.{radioID3}";
                             if (sysPos != null) dest = $"{sysPos.Gw_id}.{sysPos.R_gw_id}.{radioID3}";
                             
-                            dataToSend = Utils.Convert_text_For_multicast("#0.0#154#" + dest + "#");
+                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#154#" + dest + "#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#154#" + dest + "#").Length);                                    
-                            MainForm.udp.Send(dataToSend, dataToSend.Length);                                    
                         }
                     }
                     catch (Exception ex)
@@ -931,9 +927,7 @@ namespace AppServer
                                     System.Threading.Thread.Sleep(100);
                                     SM.Debug("Sending telemetry alarm to SD; digital:" + tObj.DigitalNr);
                                     test = $"#140#{radioID}#{tObj.Name}#";                                                                   
-
+                                    MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0"+test).Length);                                    
-                                    byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test);
-                                    MainForm.udp.Send(dataToSend, dataToSend.Length);                                    
                                 }
                                 else
                                 {
@@ -944,8 +938,7 @@ namespace AppServer
                         }
                         if (IhaveData)
                         {                            
-                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#154#" + dest + "#");
+                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#154#" + dest + "#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#154#" + dest + "#").Length);                                         
-                            MainForm.udp.Send(dataToSend, dataToSend.Length);                                         
                         }
                     }
                     catch (Exception ex)
@@ -1039,8 +1032,7 @@ namespace AppServer
                         bgWorkerDBbackup.RunWorkerAsync(param);
 
                         //send ACK back to SUM                        
-                        byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#71#1#");
+                        MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#71#1#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#71#1#").Length);                                    
-                        MainForm.udp.Send(dataToSend, dataToSend.Length);                                    
                     }
                     catch (Exception ex)
                     {
@@ -1068,14 +1060,12 @@ namespace AppServer
                             object[] param2 = { completeFileName, posgresPath };
                             bgWorkerDBrestore.RunWorkerAsync(param2);
                             //send ACK back to SUM
-                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#72#1#");
+                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#72#1#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#72#1#").Length);                                    
-                            MainForm.udp.Send(dataToSend, dataToSend.Length);                                    
                         }
                         else
                         {
                             SM.Debug("DB restored failed !!!" + "File " + completeFileName + " missing!!!");                            
-                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#62#0#");
+                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#62#0#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#62#0#").Length);                                    
-                            MainForm.udp.Send(dataToSend, dataToSend.Length);                                    
                         }
                     }
                     catch (Exception ex)
@@ -1147,9 +1137,7 @@ namespace AppServer
                                 //send broadcast messages I'm back in business
                                 Utils.WriteLine(string.Format("receive 500 from radio: Gateway {0} is ON", ((RadioGateway)MainForm.RadioGWHash[key]).Name), ConsoleColor.Green);
                                 string test1 = "#501#" + tempArr[4] + "#" + tempArr[5] + "#" + "ON#" + ((RadioGateway)MainForm.RadioGWHash[key]).Name + "#";
-
+                                MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqID4 + test1), SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqID4 + test1).Length);
-                                byte[] dataToSend = Utils.Convert_text_For_multicast("#" + seqID4 + test1);
-                                MainForm.udp.Send(dataToSend, dataToSend.Length);
                             }
                             ((RadioGateway)MainForm.RadioGWHash[key]).Alive = true;
                             ((RadioGateway)MainForm.RadioGWHash[key]).LastUpdate = DateTime.UtcNow;
@@ -1176,9 +1164,7 @@ namespace AppServer
                             string status = ((RadioGateway)(entry.Value)).Alive ? "ON" : "OFF";
                             Utils.WriteLine(string.Format("Response for SD request: Gateway {0} is {1}", ((RadioGateway)(entry.Value)).Name, status), status == "ON" ? ConsoleColor.Green : ConsoleColor.Red);
                             string test1 = "#501#" + ((RadioGateway)(entry.Value)).Gw_id + "#" + ((RadioGateway)(entry.Value)).Id + "#" + status + "#" + ((RadioGateway)(entry.Value)).Name + "#";
-
+                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + "0.0" + test1), SafeMobileLib.Utils.Convert_text_For_multicast("#" + "0.0" + test1).Length);
-                            byte[] dataToSend = Utils.Convert_text_For_multicast("#" + "0.0" + test1);
-                            MainForm.udp.Send(dataToSend, dataToSend.Length);
                         }
                     }
                     break;
@@ -1301,14 +1287,11 @@ namespace AppServer
                         if (sysPos != null) dest = sysPos.Gw_id + "." + sysPos.R_gw_id + "." + radioID.ToString();
 
                         String test = "#154#" + dest + "#";
-
+                        MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqId + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqId + test).Length);
-                        byte[] dataToSend = Utils.Convert_text_For_multicast("#" + seqId + test);
-                        MainForm.udp.Send(dataToSend, dataToSend.Length);
 
                         //send emergency alarm to SD
                         test = "#134#" + radioID.ToString() + "#" + emergencyType;
-                        dataToSend = Utils.Convert_text_For_multicast("#" + seqId + test);
+                        MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqId + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + seqId + test).Length);
-                        MainForm.udp.Send(dataToSend, dataToSend.Length);
 
                         ((VehicleStatus)MainForm.VehicleHashStat[radioID]).curentStatus = Status_for_tab.EMERG;
                         ((VehicleStatus)MainForm.VehicleHashStat[radioID]).lastArsTime = DateTime.Now;
@@ -1389,9 +1372,7 @@ namespace AppServer
                         UnitSysPosition tmpX = dbvehs.getSystemPosition(msg.sc_id_dest);
                         //string test = "#143#" + tmpX.Gw_id + "." + tmpX.R_gw_id+"."+msg.imei_dest + "#" + msg.mess + "#" + msg.sched_timeGMT + "#";     
                         string test = "#143#" + tmpX.Gw_id + "." + tmpX.R_gw_id + "." + msg.imei_dest + "#" + msg.mess + "#" + msg.sched_timeGMT + "#" + msg.dispatcherID + "#";
-
+                        MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + msg.seq_id + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + msg.seq_id + test).Length);
-                        byte[] dataToSend = Utils.Convert_text_For_multicast("#" + msg.seq_id + test);
-                        MainForm.udp.Send(dataToSend, dataToSend.Length);
                     }
                     else
                         SM.Debug("message will be sent at a later time - schedule: " + msg.sched_timeGMT + " current:" + DateTime.Now.ToUniversalTime().DateTo70Format());
@@ -1423,7 +1404,6 @@ namespace AppServer
                 string test = "";
                 String cmdok = "";
                 var subsBlackList = new List<int> { (int)Status_for_tab.OFF, (int)Status_for_tab.DISABLE, (int)Status_for_tab.MADEOFF };
-                byte[] dataToSend = null;
                
                 foreach (smsmessage msg in smss)
                 {
@@ -1436,9 +1416,7 @@ namespace AppServer
                             if (SysPosList[sc_id]!=null)
                                 test = "#143#" + ((UnitSysPosition)SysPosList[sc_id]).Gw_id + "." + ((UnitSysPosition)SysPosList[sc_id]).R_gw_id + "." + msg.imei_dest + "#" + msg.mess + "#" + msg.sched_timeGMT + "#" + msg.dispatcherID + "#";
                             else test = "#143#" + "0.0" + "." + msg.imei_dest + "#" + msg.mess + "#" + msg.sched_timeGMT + "#" + msg.dispatcherID + "#";                            
-
+                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + msg.seq_id + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + msg.seq_id + test).Length);
-                            dataToSend = Utils.Convert_text_For_multicast("#" + msg.seq_id + test);
-                            MainForm.udp.Send(dataToSend, dataToSend.Length);
                         }
                         else
                             SM.Debug("message will be sent at a later time - schedule: " + msg.sched_timeGMT + " current:" + DateTime.Now.ToUniversalTime().DateTo70Format());
@@ -1451,8 +1429,7 @@ namespace AppServer
                     UnitSysPosition tmpX = dbvehs.getSystemPosition_for_group(msg.imei_dest);
                     
                     test = "#145#" + tmpX.Gw_id + "." + tmpX.R_gw_id + "." + msg.sc_id_dest + "#" + msg.mess + "#" + msg.sched_timeGMT + "#";                    
-                    dataToSend = Utils.Convert_text_For_multicast("#" + msg.seq_id + test);
+                    MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + msg.seq_id + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + msg.seq_id + test).Length);                                    
-                    MainForm.udp.Send(dataToSend, dataToSend.Length);                                    
                 }
 
                 Utils.WriteLine($"Undelivered {undeliveredSMS} private messages and {smss.Count} group messages", ConsoleColor.White);
@@ -1468,19 +1445,19 @@ namespace AppServer
         {
             //Check4ExpiredTickets
             List<JobTickets> jtlist = new List<JobTickets>();
-            
+            string list_of_id_text = "";
             try
             {
                 DBTicketingManager DBT = new DBTicketingManager(Program.cfg.DB_IP, Program.cfg.DB_schema, Program.cfg.DB_user, Program.cfg.DB_passwd, Program.cfg.DB_port);
                 List<Int32> ExpiredTicketsIdList  = DBT.updateTicketExpireDate(DateTo70Format(DateTime.UtcNow));
                 if(ExpiredTicketsIdList.Count>0)
                 {
-                    
+                    foreach(Int32 id in ExpiredTicketsIdList)
-                    // get comma separated list
+                    {
-                    string list_of_id_text = string.Join<string>(",", ExpiredTicketsIdList.Select(x => $"{x}"));
+                        list_of_id_text += id + ",";
-
+                    }
-                    byte[] dataToSend = Utils.Convert_text_For_multicast($"#0.0#251#{list_of_id_text}#");
+                    list_of_id_text = list_of_id_text.Substring(0, list_of_id_text.Length - 1);                                 
-                    MainForm.udp.Send(dataToSend, dataToSend.Length);                                    
+                    MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#251#" + list_of_id_text + "#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#251#" + list_of_id_text + "#").Length);                                    
                 }
             }
             catch (Exception ex)
@@ -1518,10 +1495,7 @@ namespace AppServer
                         string head = "#143#0.0." + ticket.Imei + "#";
                         if (SysPosList[ticket.sc_id] != null) head = "#143#" + ((UnitSysPosition)SysPosList[ticket.sc_id]).Gw_id + "." + ((UnitSysPosition)SysPosList[ticket.sc_id]).R_gw_id + "." + ticket.Imei + "#";
                         string test = head + message + "#" + 0 + "#";                        
-
+                        MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + ticket.seq_id + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + ticket.seq_id + test).Length);                                    
-
-                        byte[] dataToSend = Utils.Convert_text_For_multicast("#" + ticket.seq_id + test);
-                        MainForm.udp.Send(dataToSend, dataToSend.Length);                                    
                     }
                 }
             }
@@ -1547,8 +1521,7 @@ namespace AppServer
                             if (SysPosList[ticket.sc_id] != null) head = "#143#" + ((UnitSysPosition)SysPosList[ticket.sc_id]).Gw_id + "." + ((UnitSysPosition)SysPosList[ticket.sc_id]).R_gw_id + "." + ticket.Imei + "#";
 
                             string test = head + ticket.Name + "#" + 0 + "#";                        
-                            byte[] dataToSend = Utils.Convert_text_For_multicast("#" + ticket.seq_id + test);
+                        MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + ticket.seq_id + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + ticket.seq_id + test).Length);                                    
-                            MainForm.udp.Send(dataToSend, dataToSend.Length);                                    
                         }
                         else
                             SM.Debug("ticket will be sent at a later time - schedule: " + ticket.sched_timegmt + " current:" + DateTime.Now.ToUniversalTime().DateTo70Format());
@@ -1580,9 +1553,7 @@ namespace AppServer
                         if (DateTime.Now.ToUniversalTime() > item.Timegmt.AddSeconds(item.ArsInterval + 10))// added 10 seconds; marja erroare
                         {
                             SM.Debug("Unit:" + item.Imei + " ARS interval expired. Marking unit as OFF");                            
-
+                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#130#" + item.Imei + "#OFF#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#130#" + item.Imei + "#OFF#").Length);                                                                
-                            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#130#" + item.Imei + "#OFF#");
-                            MainForm.udp.Send(dataToSend, dataToSend.Length);                                                                
                         }
                     }
                 }
@@ -1628,9 +1599,7 @@ namespace AppServer
                             
 
                             string test = "#501#" + ((RadioGateway)(entry.Value)).Gw_id + "#" + ((RadioGateway)(entry.Value)).Id + "#" + "OFF" + "#" + ((RadioGateway)(entry.Value)).Name + "#";
-
+                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#" + "0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#" + "0.0" + test).Length);
-                            byte[] dataToSend = Utils.Convert_text_For_multicast("#" + "0.0" + test);
-                            MainForm.udp.Send(dataToSend, dataToSend.Length);
                             ((RadioGateway)(entry.Value)).Alive = false;
                         }
                     }
@@ -1715,9 +1684,7 @@ namespace AppServer
         public static void PushStatus(String IMEI,Status_for_tab stat)
         {
             Utils.WriteLine("Send PushStatus:" + stat+" Imei:"+IMEI,ConsoleColor.Yellow);
-
+            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#153#" + IMEI + "#" + (Int32)stat + "#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#153#" + IMEI + "#" + (Int32)stat + "#").Length);                                                                
-            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#153#" + IMEI + "#" + (Int32)stat + "#");
-            MainForm.udp.Send(dataToSend, dataToSend.Length);                                                                
         }
 
 
@@ -2116,8 +2083,7 @@ namespace AppServer
                     messageOnScreen = true;
                     try
                     {                        
-                        byte[] dataToSend = Utils.Convert_text_For_multicast("#Application server database connection failed#");
+                        MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#Application server database connection failed#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#3#Application server database connection failed#").Length);                                                                
-                        MainForm.udp.Send(dataToSend, dataToSend.Length);                                                                
                     }
                     catch (Exception ex2)
                     {
@@ -2184,47 +2150,22 @@ namespace AppServer
 
         private void sendAlarmMail(string mes, string mailAdr)
         {
-            if (Program.cfg.enableEmailService)
+            try
             {
-
+                MailAddress from = new MailAddress(Program.cfg.emailAddress);
-                if (!String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
+                MailAddress to = new MailAddress(mailAdr);
-                {
+                MailMessage message = new MailMessage(from, to);
-                    if (MainForm.IsBlacklistedAddress(mailAdr))
+                message.Subject = "Alarm";
-                    {
+                message.Body = mes;
-                        Utils.WriteLine($" sendAlarmMail : The email was not sent. Email address '{mailAdr}' is in blacklist ");
+                EmailServerSSL.sendEmail(Program.cfg.smtpServer, Program.cfg.smtpPort, Program.cfg.emailAddress, Program.cfg.emailPassword, message, Program.cfg.smtpSSLState);
-                        return;
-                    }
-
-                    try
-                    {
-                        MailAddress from = new MailAddress(Program.cfg.emailAddress);
-                        MailAddress to = new MailAddress(mailAdr);
-                        MailMessage message = new MailMessage(from, to);
-                        message.Subject = "Alarm";
-                        message.Body = mes;
-                        EmailServerSSL.sendEmail(Program.cfg.smtpServer, Program.cfg.smtpPort, Program.cfg.emailAddress, Program.cfg.emailPassword, message, Program.cfg.smtpSSLState);
-                    }
-                    catch (Exception ex)
-                    {
-                        if (ex.ToString().Contains("timed out"))
-                            MainForm.HandleTimeoutError(mailAdr);
-
-                        Utils.WriteLine("Exception in sendMailAlarm: " + ex.ToString(), ConsoleColor.Red);
-                        //Console.WriteLine(e.ToString());
-                    }
-                }
-                else
-                {
-                    Utils.WriteLine($"Missing email address From = {Program.cfg.emailAddress} To = {mailAdr})", ConsoleColor.Red);
-                }
             }
-            else
+            catch (Exception ex)
             {
-                SM.Debug("email disabled");
+                Utils.WriteLine("Exception in sendMailAlarm: " + ex.ToString(), ConsoleColor.Red);
+                //Console.WriteLine(e.ToString());
             }
         }        
 
-
         public void sendDailyReportMail(String PdfFile, string mailAdr)
         {
             try
@@ -2298,20 +2239,11 @@ namespace AppServer
                 if (Program.cfg.enableEmailService)
                 {
                     SM.Debug(new string[] { "Checking mail at:" + DateTime.Now.ToString(), "For " + Program.cfg.emailAddress.ToString() + " on " + Program.cfg.pop3Server.ToString() });
-
                     emailHT = dbsubsoperManage.getAll_imei_sc_id("ByMail");
                     if (emailHT.Count > 0)
                     {
                         SM.Debug("Load " + emailHT.Count + " subscribers emails from DB ...");
                     }
-
-                    if (sslServer == null)
-                    {
-                        SM.Debug("sslServer is null");
-                        return;
-                    }
-
-
                     Int64 latestEmailTime = sslServer.getLastEmailTime();
                     ArrayList EmailList = sslServer.getEmails();
 
@@ -2322,23 +2254,19 @@ namespace AppServer
                         DB.SetLastEmailTime(sslServer.getLastEmailTime());
                     }
 
-
-                    DBsmsManager DBsms = new DBsmsManager(Program.cfg.DB_IP, Program.cfg.DB_schema, Program.cfg.DB_user, Program.cfg.DB_passwd, Program.cfg.DB_port);
                     DBvehiclesManager dbvehs = new DBvehiclesManager(Program.cfg.DB_IP, Program.cfg.DB_schema, Program.cfg.DB_user, Program.cfg.DB_passwd, Program.cfg.DB_port);
 
-
                     foreach (EmailtoSMS obj in EmailList)
                     {
                         String seqID = "0." + (DateTime.Now.GetSecondsLocalFromDT()) + DateTime.Now.Millisecond.ToString();
-
+                        SM.Debug(new string[] {"-----START OK----",
-                        SM.Debug(new string[] { "-----START OK----",
+                                        "From: " + obj.from,
-                                                "From: " + obj.from,
+                                        "ID: " + obj.id,
-                                                "ID: "   + obj.id,
+                                        "Text: " + obj.text});
-                                                "Text: " + obj.text});
                         try
                         {
                             // app server idx =0
-                            
+                            DBsmsManager DB = new DBsmsManager(Program.cfg.DB_IP, Program.cfg.DB_schema, Program.cfg.DB_user, Program.cfg.DB_passwd, Program.cfg.DB_port);
                             //bigu code remove # from text and also replace "'"
                             try
                             {
@@ -2349,15 +2277,13 @@ namespace AppServer
                             {
                                 SM.Debug("Error on converting email:" + ex.ToString());
                             }
-
                             //end bigu code
-                            if (!obj.is_group) DBsms.insert_sms_received(obj.id, obj.text, 7, obj.from, seqID);
+                            if (!obj.is_group) DB.insert_sms_received(obj.id, obj.text, 7, obj.from, seqID);
                             if (obj.is_sierra)
                             {
                                 if (emailHT.Contains(obj.from))
                                 {
                                     SM.Debug("Email received <<" + obj.text + ">> from address: " + obj.from);
-
                                     seqID = "1." + Utils.GetSecondsLocalFromDT(DateTime.Now).ToString() + DateTime.Now.Millisecond.ToString();
                                     string test = "#132#" + ((SW_Subscriber)emailHT[obj.from]).imei + "#" + obj.text + "#hyt#";
                                     String cmdok = "#" + seqID + test; Int32 tmp = cmdok.Length + 1; tmp += tmp.ToString().Length; cmdok = "#" + tmp.ToString() + cmdok;
@@ -2365,7 +2291,6 @@ namespace AppServer
                                     byte[] buf = enc.GetBytes(cmdok);
                                     //send to messagebus
                                     MainForm.udp.Send(buf, buf.Length);
-
                                     SM.Debug("Email thread successfully sent data to message bus");
                                 }
                             }
@@ -2380,36 +2305,26 @@ namespace AppServer
                             obj.text = obj.text.Remove(140 - 3 - obj.from.Length) + " [" + obj.from + "]";
                         else
                             obj.text = obj.text + " [" + obj.from + "]";
-                        
                         //send SMS on message buss 
                         if (!obj.is_sierra)
                         {
+                            UnitSysPosition tmpX = dbvehs.getSystemPosition(dbvehs.getSCID(obj.id));
 
-                            if (dbvehs != null)
+                            string msg = "#143#" + tmpX.Gw_id + "." + tmpX.R_gw_id + "." + obj.id + "#" + obj.text + "#" + (DateTime.Now.GetSecondsLocalFromDT()) + "#";
+                            if (obj.is_group) msg = "#144#" + tmpX.Gw_id + "." + tmpX.R_gw_id + "." + obj.id + "#" + obj.text + "#" + (DateTime.Now.GetSecondsLocalFromDT()) + "#";
+
+                            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + msg), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + msg).Length);
+
+                            if (obj.is_group)
                             {
-                                UnitSysPosition tmpX = dbvehs.getSystemPosition(dbvehs.getSCID(obj.id));
+                                Int32 oldgatewayID = 0;
-
+                                foreach (RadioGateway obj2 in RadioListIP)
-                                string cmd = $"{tmpX.Gw_id}.{tmpX.R_gw_id}.{obj.id}#{obj.text}#{DateTime.Now.GetSecondsLocalFromDT()}#";
-                                string code = (obj.is_group) ? "#144#" : "#143#" ;
-                                byte[] msg = Utils.Convert_text_For_multicast("#0.0" + code + cmd);
-
-                                if (msg != null && msg.Length > 0)
-                                    MainForm.udp.Send(msg, msg.Length);
-
-                                if (obj.is_group)
                                 {
-                                    Int32 oldgatewayID = 0;
+                                    if (oldgatewayID != obj2.Gw_id)
-                                    foreach (RadioGateway obj2 in RadioListIP)
                                     {
-                                        if (oldgatewayID != obj2.Gw_id)
+                                        oldgatewayID = (Int32)obj2.Gw_id;
-                                        {
+                                        string msg2 = "#144#" + obj2.Gw_id + "." + obj2.Id + "." + obj.id + "#" + obj.text + "#" + (DateTime.Now.GetSecondsLocalFromDT()) + "#";
-                                            oldgatewayID = (Int32)obj2.Gw_id;
+                                        MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#1." + (DateTime.Now.GetSecondsLocalFromDT()) + DateTime.Now.Ticks.ToString() + msg2), SafeMobileLib.Utils.Convert_text_For_multicast("#1." + (DateTime.Now.GetSecondsLocalFromDT()) + DateTime.Now.Ticks.ToString() + msg2).Length);
-                                            cmd = $"#144#{obj2.Gw_id}.{obj2.Id}.{obj.id}#{obj.text}#{DateTime.Now.GetSecondsLocalFromDT()}#";
-                                            byte[] msg2 = Utils.Convert_text_For_multicast("#1." + (DateTime.Now.GetSecondsLocalFromDT()) + DateTime.Now.Ticks.ToString() + cmd);
-
-                                            if( msg2 != null && msg2.Length > 0)
-                                                MainForm.udp.Send(msg2, msg2.Length);
-                                        }
                                     }
                                 }
                             }
@@ -2433,43 +2348,24 @@ namespace AppServer
         {
             if (Program.cfg.enableEmailService)
             {
-                if (!String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
+                SM.Debug("Sending mail to " + mailAdr + " from radioId " + radioID.ToString());
+                try
                 {
+                    MailMessage message = new MailMessage();
+                    message.From = new MailAddress(Program.cfg.emailAddress);
+                    message.To.Add(mailAdr);
+                    message.Subject = "RadioID: " + radioID.ToString() + "  Subject:" + (mailBody.Length < 25 ? mailBody : (mailBody.Remove(25) + "..."));
+                    message.Body = "You received a message from radio id " + radioID.ToString() +
+                                   "\n------------------------------\n" +
+                                   mailBody +
+                                   "\n------------------------------\n ";
+                    message.IsBodyHtml = true;
 
-                    if (MainForm.IsBlacklistedAddress(mailAdr))
+                    EmailServerSSL.sendEmail(Program.cfg.smtpServer, Program.cfg.smtpPort, Program.cfg.emailAddress, Program.cfg.emailPassword, message, Program.cfg.smtpSSLState);
-                    {
-                        Utils.WriteLine($"sendMail : The email was not sent. Email address '{mailAdr}' is in blacklist count = {MainForm.blackListAddress[mailAdr]}");
-                        return;
-                    }
-
-
-                    SM.Debug("Sending mail to " + mailAdr + " from radioId " + radioID.ToString());
-                    try
-                    {
-                        MailMessage message = new MailMessage();
-                        message.From = new MailAddress(Program.cfg.emailAddress);
-                        message.To.Add(mailAdr);
-                        message.Subject = "RadioID: " + radioID.ToString() + "  Subject:" + (mailBody.Length < 25 ? mailBody : (mailBody.Remove(25) + "..."));
-                        message.Body = "You received a message from radio id " + radioID.ToString() +
-                                       "\n------------------------------\n" +
-                                       mailBody +
-                                       "\n------------------------------\n ";
-                        message.IsBodyHtml = true;
-
-                        EmailServerSSL.sendEmail(Program.cfg.smtpServer, Program.cfg.smtpPort, Program.cfg.emailAddress, Program.cfg.emailPassword, message, Program.cfg.smtpSSLState);
-                    }
-                    catch (Exception ex)
-                    {
-                        if (ex.ToString().Contains("timed out") ||
-                             ex.ToString().Contains("the client was not authenticated"))
-                            MainForm.HandleTimeoutError(mailAdr);
-
-                        Utils.WriteLine("Exception in sendMail: " + ex.ToString(), ConsoleColor.Red);
-                    }
                 }
-                else
+                catch (Exception ex)
                 {
-                    Utils.WriteLine($"Missing email address From = {Program.cfg.emailAddress} To = {mailAdr})", ConsoleColor.Red);
+                    Utils.WriteLine("Exception in sendMail: " + ex.ToString(), ConsoleColor.Red);
                 }
             }
             else
@@ -2482,46 +2378,20 @@ namespace AppServer
         //sms-> email Sierra Wireless
         private void sendMail_SW(string mailAdr, string mailBody)
         {
-            if (Program.cfg.enableEmailService)
+            SM.Debug("Sending mail to " + mailAdr);
+            try
             {
-                if (!String.IsNullOrEmpty(Program.cfg.emailAddress) && !String.IsNullOrEmpty(mailAdr))
+                MailMessage message = new MailMessage();
-                {
+                message.From = new MailAddress(Program.cfg.emailAddress);
+                message.To.Add(mailAdr);
+                message.Body = mailBody;
+                message.IsBodyHtml = true;
 
-                    if (MainForm.IsBlacklistedAddress(mailAdr))
+                EmailServerSSL.sendEmail(Program.cfg.smtpServer, Program.cfg.smtpPort, Program.cfg.emailAddress, Program.cfg.emailPassword, message, Program.cfg.smtpSSLState);
-                    {
-                        Utils.WriteLine($"sendMail_SW : The email was not sent. Email address '{mailAdr}' is in blacklist count = {MainForm.blackListAddress[mailAdr]}");
-                        return;
-                    }
-
-                    SM.Debug("Sending mail to " + mailAdr);
-
-                    try
-                    {
-                        MailMessage message = new MailMessage();
-                        message.From = new MailAddress(Program.cfg.emailAddress);
-                        message.To.Add(mailAdr);
-                        message.Body = mailBody;
-                        message.IsBodyHtml = true;
-
-                        EmailServerSSL.sendEmail(Program.cfg.smtpServer, Program.cfg.smtpPort, Program.cfg.emailAddress, Program.cfg.emailPassword, message, Program.cfg.smtpSSLState);
-                    }
-                    catch (Exception ex)
-                    {
-                        if (ex.ToString().Contains("timed out") ||
-                             ex.ToString().Contains("the client was not authenticated"))
-                            MainForm.HandleTimeoutError(mailAdr);
-
-                        Utils.WriteLine("Exception in sendMail Sierra Wireless Gateway: " + ex.ToString(), ConsoleColor.Red);
-                    }
-                }
-                else
-                {
-                    Utils.WriteLine($"Missing email address From = {Program.cfg.emailAddress} To = {mailAdr})", ConsoleColor.Red);
-                }
             }
-            else
+            catch (Exception ex)
             {
-                SM.Debug("email disabled");
+                Utils.WriteLine("Exception in sendMail Sierra Wireless Gateway: "+ ex.ToString() ,ConsoleColor.Red);
             }
 
         }
@@ -2553,9 +2423,8 @@ namespace AppServer
         {
             //send emergency alarm to SD
             //send ACK back to GW
-            string code = (backupDOne == true) ? "#61#1#" : "#61#0#";
+            string test = (backupDOne == true) ? "#61#1#" : "#61#0#";            
-            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + code);
+            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);                                                                
-            MainForm.udp.Send(dataToSend, dataToSend.Length);                                                                
         }
         #endregion
 
@@ -2582,10 +2451,8 @@ namespace AppServer
         {
             //send emergency alarm to SD
             //send ACK back to GW
-            string code = (restoreDOne == true) ? "#62#1#" : "#252#0#";
+            string test = (restoreDOne == true) ? "#62#1#" : "#252#0#";            
-
+            MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);                                                                
-            byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + code);
-            MainForm.udp.Send(dataToSend, dataToSend.Length);                                                                
         }
         #endregion
 

AppServer/Program.cs

@@ -215,8 +215,8 @@ namespace AppServer
             Thread.Sleep(2000);
             try
             {
-                byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#");
+                MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#"),
-                MainForm.udp.Send(dataToSend, dataToSend.Length);
+                Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#").Length);
 
                 // save all unhandled gps positions 
                 MainForm.DumpLocationQueueToFile();
@@ -241,9 +241,7 @@ namespace AppServer
             Thread.Sleep(2000);
             try
             {                
-
+                MainForm.udp?.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#"), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#").Length);
-                byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#210#4#Application server stopped#");
-                MainForm.udp?.Send(dataToSend, dataToSend.Length);
 
                 // save all unhandled gps positions 
                 MainForm.DumpLocationQueueToFile();

AppServer/RegistrationThread.cs

@@ -108,9 +108,8 @@ namespace AppServer
                                     + Program.cfg.DB_schema + ";" + Program.cfg.DB_user + ";" + Program.cfg.DB_passwd
                                     + ";" + Program.cfg.DB_port + ";" + Program.cfg.VoicePort + ";"
                                     + audibleAlerts.ToString() + ";" + MainForm.dbAccess.ToString() + ";";                                                   
-
+                                MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0#156#" + command[1].Trim() + "#"), Utils.Convert_text_For_multicast("#0.0#156#"
-                                byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#156#" + command[1].Trim() + "#");
+                                    + command[1].Trim() + "#").Length);
-                                MainForm.udp.Send(dataToSend, dataToSend.Length);
 
                                 MainForm.RegistrationAnswer = false;
                                 Int32 countWait = 0; //maxim 30 = 3 seconds

AppServer/VoiceRecording.cs

@@ -172,9 +172,7 @@ namespace AppServer
 
 
                     test = $"#155#{rec.id}#{rec.hddLocation}#{rec.gwID}#{rec.radioGWID}#{rec.group_cpsId}#{rec.subs_imei}#{rec.startTime}#{rec.endTime}#{rec.typeSD}#{rec.calltype}#{rec.dispatcher_id}#";                    
-
+                    MainForm.udp.Send(SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test), SafeMobileLib.Utils.Convert_text_For_multicast("#0.0" + test).Length);                                         
-                    byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0" + test);
-                    MainForm.udp.Send(dataToSend, dataToSend.Length);                                         
                 }
             }
             catch (Exception ex)

MotoTrbo_GW/Main.cs

@@ -376,40 +376,6 @@ namespace MotoTrbo_GW
         }
 
 
-        private void FetchAudioSettings()
-        {
-            DBsettingsManager dbSettings = new DBsettingsManager(DBServer, DBSchema, DBUser, DBPass, DBPort);
-
-            string tmpSamplaRate = dbSettings.getSettingValue(0, "sampleRate");
-            if (!string.IsNullOrEmpty(tmpSamplaRate))
-                sampleRate = int.Parse(tmpSamplaRate);
-            else
-            {
-                SafeMobileLib.Utils.WriteLine("Invalid sample rate", ConsoleColor.Red);
-            }
-
-            string tmpBitDepth = dbSettings.getSettingValue(0, "bitDepth");
-            if (!string.IsNullOrEmpty(tmpSamplaRate))
-            {
-                bitdepth = int.Parse(tmpBitDepth);
-                bitdepthInBytes = bitdepth / 8;
-            }
-            else
-            {
-                SafeMobileLib.Utils.WriteLine("Invalid bit depth", ConsoleColor.Red);
-            }
-
-            string tmpBufferMilliseconds = dbSettings.getSettingValue(0, "bufferMilliseconds");
-            if (!string.IsNullOrEmpty(tmpBufferMilliseconds))
-                recordedBufferMiliseconds = int.Parse(tmpBufferMilliseconds);
-            else
-            {
-                SafeMobileLib.Utils.WriteLine("Invalid bufferMilliseconds", ConsoleColor.Red);
-            }
-
-
-        }
-
         private void ContinueConstructor()
         {
 
@@ -428,78 +394,45 @@ namespace MotoTrbo_GW
                     "Update required...", MessageBoxButtons.YesNo, RadMessageIcon.Exclamation);
 
                 if (dr == DialogResult.Yes)
+                {
                     CheckForUpdate(true);
-                
+                    Application.Exit();
-                Application.Exit();
+                }
+                else
+                    Application.Exit();
             }
             else
             {
-                //new code 
-                List <Gateway> listGW = new List<Gateway>();
-                try
-                {
-
-                    if (!string.IsNullOrEmpty(DBServer))
-                    {
-                        listGW = getGWidFromDB(DBServer);
-                    }
-
-
-                    if (listGW.Count == 0)
-                    {
-                        DBServer = "127.0.0.1";
-                        listGW = getGWidFromDB(DBServer);
-                    }
-
-
-                }
-                catch (Exception ex)
-                {
-                    SafeMobileLib.Utils.WriteLine("Ex on find automat the gateway ID:" + ex.ToString());
-                }
-
-
-                try
-                {
-                    if (listGW.Count == 0)
-                    {
-                        FeedbackRadMessageBox.ShowError("Gateway IP not present in DB\n\r Please go to Administrative module and register this GW with IP:!!!" + DBServer, "IP missing");
-
-                        System.Environment.Exit(0);
-                        return;
-                    }
-                    else
-                    {
-                        GWID = ((Gateway)listGW[0]).Id;
-                        source = new IniConfigSource(Main.CFG_FILE);
-                        source.Configs["Gateway"].Set("id", GWID);
-                        // source.Configs["NAI"].Set("peerID", ((Gateway)listGW[0]).Peer_id);
-                        source.Save();
-
-                        SafeMobileLib.Utils.WriteLine("Gateway ID is " + GWID, ConsoleColor.Cyan);
-
-                        //SafeMobileLib.Utils.WriteLine("ID:" + GWID + " saved to config file.");
-                        btGWID.Text = GWID.ToString();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    SafeMobileLib.Utils.WriteLine("DB error!!!");
-                    SafeMobileLib.Utils.WriteLine(ex.ToString());
-
-                    FeedbackRadMessageBox.ShowError("DB error.\n\rPlease turn down the firewall or add an exception for the Datebase in the firewall and try again!!!\n\r DB ip:" + DBServer,
-                        "DB error");
-                    
-
-                    System.Environment.Exit(0);
-                    //System.Windows.Forms.Application.Exit();
-                    return;
-                }
-                //end of new code
-
-
                 // Get Audio settings
-                FetchAudioSettings();
+                DBsettingsManager dbSettings = new DBsettingsManager(DBServer, DBSchema, DBUser, DBPass, DBPort);
+
+                string tmpSamplaRate = dbSettings.getSettingValue(0, "sampleRate");
+                if (!string.IsNullOrEmpty(tmpSamplaRate))
+                    sampleRate = int.Parse(tmpSamplaRate);
+                else
+                {
+                    SafeMobileLib.Utils.WriteLine("Invalid sample rate", ConsoleColor.Red);
+                }
+
+                string tmpBitDepth = dbSettings.getSettingValue(0, "bitDepth");
+                if (!string.IsNullOrEmpty(tmpSamplaRate))
+                {
+                    bitdepth = int.Parse(tmpBitDepth);
+                    bitdepthInBytes = bitdepth / 8;
+                }
+                else
+                {
+                    SafeMobileLib.Utils.WriteLine("Invalid bit depth", ConsoleColor.Red);
+                }
+
+                string tmpBufferMilliseconds = dbSettings.getSettingValue(0, "bufferMilliseconds");
+                if (!string.IsNullOrEmpty(tmpBufferMilliseconds))
+                    recordedBufferMiliseconds = int.Parse(tmpBufferMilliseconds);
+                else
+                {
+                    SafeMobileLib.Utils.WriteLine("Invalid bufferMilliseconds", ConsoleColor.Red);
+                }
+
 
 
                 //int asio driver object
@@ -536,7 +469,91 @@ namespace MotoTrbo_GW
                         }
                     }
                 }
+                //old code
+                /*if (GWID == -1)
+                {
+                    int id = getGWidFromDB(YourIPaddress);
+                    if (id == -1)
+                    {
+                        RadMessageBox.Show("Gateway IP not present in DB\n\r Please go to Administrative module and register this GW with IP:!!!" + YourIPaddress, "IP missing", MessageBoxButtons.OK, RadMessageIcon.Error);
+                        System.Environment.Exit(0);
+                    }
+                    else
+                    {
+                        GWID = id;
+                        source = new IniConfigSource(Main.CFG_FILE);
+                        source.Configs["Gateway"].Set("id", id);                      
+                        source.Save();
+                        SafeMobileLib.Utils.WriteLine("ID:" + id +" saved to config file.");
+                    }
+                }*/
 
+                //new code 
+                List <Gateway> listGW = new List<Gateway>();
+                try
+                {
+                    listGW = getGWidFromDB(YourIPaddress);
+
+                    if (listGW.Count == 0)
+                    {
+                        if (DBServer.Contains("127.0.0.1") || (DBServer.ToUpper().Contains("LOCALHOST")))
+                            listGW = getGWidFromDB("127.0.0.1");
+                    }
+                    else
+                    {
+                        if (GWID != -1)
+                        {
+                            Boolean find = false;
+                            foreach (Gateway obj in listGW)
+                                if (obj.Id == GWID) { find = true; break; }
+                            if ((!find) && (DBServer.Contains("127.0.0.1") || (DBServer.ToUpper().Contains("LOCALHOST"))))
+                                listGW = getGWidFromDB("127.0.0.1");
+                        }
+                    }
+
+                }
+                catch (Exception ex)
+                {
+                    SafeMobileLib.Utils.WriteLine("Ex on find automat the gateway ID:" + ex.ToString());
+                }
+
+                try
+                {
+                    if (listGW.Count == 0)
+                    {
+                        FeedbackRadMessageBox.ShowError("Gateway IP not present in DB\n\r Please go to Administrative module and register this GW with IP:!!!" + YourIPaddress, "IP missing");
+
+                        System.Environment.Exit(0);
+                        return;
+                    }
+                    else
+                    {
+                        GWID = ((Gateway)listGW[0]).Id;
+                        source = new IniConfigSource(Main.CFG_FILE);
+                        source.Configs["Gateway"].Set("id", GWID);
+                        // source.Configs["NAI"].Set("peerID", ((Gateway)listGW[0]).Peer_id);
+                        source.Save();
+
+                        SafeMobileLib.Utils.WriteLine("Gateway ID is " + GWID, ConsoleColor.Cyan);
+
+                        //SafeMobileLib.Utils.WriteLine("ID:" + GWID + " saved to config file.");
+                        btGWID.Text = GWID.ToString();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    SafeMobileLib.Utils.WriteLine("DB error!!!");
+                    SafeMobileLib.Utils.WriteLine(ex.ToString());
+
+                    FeedbackRadMessageBox.ShowError("DB error.\n\rPlease turn down the firewall or add an exception for the Datebase in the firewall and try again!!!\n\r DB ip:" + YourIPaddress,
+                        "DB error");
+                    
+
+                    System.Environment.Exit(0);
+                    //System.Windows.Forms.Application.Exit();
+                    return;
+                }
+                //end of new code
 
                 /*try
                 {
@@ -1257,7 +1274,7 @@ because base station {radioGwID} failed to send PTT", ConsoleColor.Red);
                 IPEndPoint serverEndPoint = new IPEndPoint(IPAddress.Parse(Main.ApplicationServer), registrationPort);
                 client.Connect(serverEndPoint);
                 NetworkStream clientStream = client.GetStream();
-                YourIPaddress = (client.Client.LocalEndPoint.ToString().Split(":".ToCharArray()))[0];
+                YourIPaddress = (client.Client.LocalEndPoint.ToString().Split(':'))[0];
 
                 Version v = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
 

SafeMobileLIB_DLL/DBmanagers/DBReportingManager.cs

@@ -452,34 +452,32 @@ namespace SafeMobileLib
 
             BatchHistoryData batchHistObj = null;
 
+
+
             try
             {
 
+             
+
                     lat = Convert.ToDouble(dr["lat"]);
                     lng = Convert.ToDouble(dr["lng"]);
                     timegmt = Convert.ToInt32(dr["timegmt"]);
 
-                batchHistObj = new BatchHistoryData
+                    batchHistObj = new BatchHistoryData
-                {
+                    {
 
                         Department = dr["department"].ToString(),
                         Unit = dr["unit"].ToString(),
+                        Location = ((getAddress && dr["address"] != DBNull.Value) ? dr["address"].ToString() : "LAT:" + Math.Round(lat, 5).ToString() + " , LNG:" + Math.Round(lat, 5).ToString()),
                         Speed = (isInMile) ? ((int)(Convert.ToInt32(dr["speed"]) * 0.621371192)).ToString() : Convert.ToInt32(dr["speed"]).ToString(),
                         Lat = lat,
                         Lng = lng,
-                        Address = string.Empty,
+                        Address = dr["address"].ToString(),
                         Time = timegmt.TimeOfDayHHMMSSLocal(!is24hours),
                         Date = timegmt.GetDTLocalFromSeconds().Date.ToShortDateString()
 
                     };
 
-                    if (getAddress)
-                    {
-                        batchHistObj.Location = dr["address"].ToString();
-                        batchHistObj.Address = dr["address"].ToString();
-                    }
-                    else
-                        batchHistObj.Location = "LAT:" + Math.Round(lat, 5).ToString() + " , LNG:" + Math.Round(lat, 5).ToString();
 
                 
             }

SafeMobileLIB_DLL/EmailServerSSL.cs

@@ -25,8 +25,6 @@ namespace SafeMobileLib
         private bool isSSL = true;
         private Int64 lastEmailTime = 0;
         private Int64 startEmailServiceTime = 0;
-        public static Dictionary<string, int> blackList = new Dictionary<string, int>();
-        public const int MAX_ATTEMPTS = 100;
 
         // blank constructor in order to be used in Email Checking
         public EmailServerSSL()
@@ -380,46 +378,11 @@ namespace SafeMobileLib
             return ret;
         }
 
-
-        public static void HandleBlacklist(string key)
-        {
-            // add key to backlist 
-            if (!blackList.ContainsKey(key))
-                blackList.Add(key, MAX_ATTEMPTS);
-        }
-
-        public static bool IsBlacklisted(string key)
-        {
-
-            if (!blackList.ContainsKey(key))
-                return false;
-
-            // avoid to connect to pop3 MAX_ATTEMPTS times => give another chance to try to connect to pop 3 when count = 0
-            int count = blackList[key];
-            if (count == 0)
-            {
-                blackList.Remove(key);
-                return false;
-            }
-
-            blackList[key] = count - 1;
-            return true;
-        }
-
-
         /// <summary>
         /// Connect to the Pop Server in order to be used to get the emails
         /// </summary>
         private void ConnectEmailPopServer()
         {
-            if (IsBlacklisted(serverIP))
-            {
-
-                Utils.WriteLine($"ConnectEmailPopServer : Could not conenct to the pop server '{serverIP}'. The pop server '{serverIP}' is in blacklist count = {blackList[serverIP]}");
-                return;
-            }
-
-
             Thread t = new Thread(() =>
             {
                 ConnectAsync();
@@ -430,17 +393,8 @@ namespace SafeMobileLib
 
         private void ConnectAsync()
         {
-            try
+            if (popClient != null && popClient.Connected)
-            {
+                popClient.Disconnect();
-
-                if (popClient != null && popClient.Connected)
-                    popClient.Disconnect();
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine(ex.ToString());
-
-            }
 
             popClient = null;
             popClient = new Pop3Client();
@@ -458,25 +412,18 @@ namespace SafeMobileLib
                 Console.ForegroundColor = ConsoleColor.Yellow;
                 Console.WriteLine("PopServerNotFoundException -> " + ee.ToString());
                 Console.ForegroundColor = ConsoleColor.Gray;
-
-                HandleBlacklist(serverIP);
-
             }
             catch (InvalidLoginException e)
             {
                 Console.ForegroundColor = ConsoleColor.Yellow;
                 Console.WriteLine("InvalidLoginException -> " + e.ToString());
                 Console.ForegroundColor = ConsoleColor.Gray;
-
-                HandleBlacklist(serverIP);
             }
             catch (Exception ex)
             {
                 Console.ForegroundColor = ConsoleColor.Red;
                 Console.WriteLine("ConnectEmailPopServer -> " + ex.ToString());
                 Console.ForegroundColor = ConsoleColor.Gray;
-
-                HandleBlacklist(serverIP);
             }
         }
 

SafeMobileLIB_DLL/GeneralLocationManager.cs

@@ -91,8 +91,7 @@ namespace SafeMobileLib
         {
             if (udpMulticast != null)
             {                
-               byte[] dataToSend = Utils.Convert_text_For_multicast("#" + seqID + test);
+                udpMulticast.Send(Utils.Convert_text_For_multicast("#" + seqID + test), Utils.Convert_text_For_multicast("#" + seqID + test).Length);                
-               udpMulticast.Send(dataToSend, dataToSend.Length);                
             }
             else
             {

SafeMobileLIB_DLL/UdpMulticast.cs

@@ -42,28 +42,36 @@ namespace SafeMobileLib
                         recv = s.Receive(b);
                     else
                         break;//break if socket == null
-
                     if (recv == 0)
                         continue;//continue if return nr bytes == 0
 
-                    
+                    if (OnNewDataRecv != null)
-                    byte[] tmp = new byte[recv];
-                    for (int i = 0; i < recv; i++)
                     {
-                        tmp[i] = b[i];
+                        byte[] tmp = new byte[recv];
+                        for (int i = 0; i < recv; i++)
+                        {
+                            tmp[i] = b[i];
+                        }
+
+                        byte[] decByte = Encrypted ? Encryption.Decrypt(tmp, EncryptionAlgorithm.Des64) : tmp;
+                        
+                        // trigger event
+                        OnNewDataRecv(decByte, decByte.Length);
                     }
 
-                    byte[] decByte = Encrypted ? Encryption.Decrypt(tmp, EncryptionAlgorithm.Des64) : tmp;
-
-                    // trigger event
-                    if (OnNewDataRecv != null)
-                        OnNewDataRecv(decByte, decByte.Length);
-                    
-
-                    // trigger event
                     if (OnNewDataReceived != null)
-                        OnNewDataReceived(mcastGroup, decByte, decByte.Length);
+                    {
+                        byte[] tmp = new byte[recv];
+                        for (int i = 0; i < recv; i++)
+                        {
+                            tmp[i] = b[i];
+                        }
 
+                        byte[] decByte = Encrypted ? Encryption.Decrypt(tmp, EncryptionAlgorithm.Des64) : tmp;
+
+                        // trigger event
+                        OnNewDataReceived(mcastGroup, decByte, decByte.Length);
+                    }
 
 
                     if (s == null)
@@ -100,19 +108,27 @@ namespace SafeMobileLib
                     byte[] b = new byte[65507];
                     Thread.Sleep(1);
                     int recv = s.Receive(b);
-                    
+                    if (OnNewDataRecv != null)
-                    byte[] tmp = new byte[recv];
-                    for (int i = 0; i < recv; i++)
                     {
-                        tmp[i] = b[i];
+                        byte[] tmp = new byte[recv];
+                        for (int i = 0; i < recv; i++)
+                        {
+                            tmp[i] = b[i];
+                        }
+                        if (this.OnNewDataRecv != null)
+                            this.OnNewDataRecv(tmp, tmp.Length);
                     }
 
-                    if (this.OnNewDataRecv != null)
+                    if (OnNewDataReceived != null)
-                        this.OnNewDataRecv(tmp, tmp.Length);
+                    {
-
+                        byte[] tmp = new byte[recv];
-                    if (this.OnNewDataReceived != null)
+                        for (int i = 0; i < recv; i++)
-                        this.OnNewDataReceived(mcastGroup, tmp, tmp.Length);
+                        {
-
+                            tmp[i] = b[i];
+                        }
+                        if (this.OnNewDataReceived != null)
+                            this.OnNewDataReceived(mcastGroup, tmp, tmp.Length);
+                    }
 
                     if (s == null)
                     {
@@ -201,17 +217,16 @@ namespace SafeMobileLib
                     IPEndPoint ipep = new IPEndPoint(myIP, port);
                     s.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, 1);
                     s.Bind(ipep);
-
                     IPAddress ip = IPAddress.Parse(mcastGroup);
                     s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(ip, myIP));
-                    s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.MulticastTimeToLive, int.Parse("1"));
+                    s.SetSocketOption(SocketOptionLevel.IP,
+                            SocketOptionName.MulticastTimeToLive, int.Parse("1"));
                     listenThread = new Thread(new ThreadStart(Listen));
                     listenThread.IsBackground = true;
                 }
 
                 if (listenThread != null)
                     listenThread.Start();
-
                 ret = true;
 
                 Utils.WriteLine($"++++++++++++++++++++++++++++++++++++++++++\nUdpMulticast bind on {mcastGroup}:{port} Ethernet: {myIP}\n+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
@@ -228,14 +243,12 @@ namespace SafeMobileLib
             bool ret = false;
             working = true;
             useThreadPool = true;
-
             try
             {
                 if (s == null)
                 {
                     s = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
                 }
-
                 if (s != null)
                 {
                     Utils.WriteLine(String.Format("[### {0:H:mm:ss} ###] Port multi cast {1}", DateTime.Now, port));
@@ -244,7 +257,8 @@ namespace SafeMobileLib
                     s.Bind(ipep);
                     IPAddress ip = IPAddress.Parse(mcastGroup);
                     s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(ip, IPAddress.Any));
-                    s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.MulticastTimeToLive, int.Parse("1"));
+                    s.SetSocketOption(SocketOptionLevel.IP,
+                            SocketOptionName.MulticastTimeToLive, int.Parse("1"));
 
                     ThreadPool.QueueUserWorkItem(new WaitCallback(Listen_pool));
                     
@@ -268,7 +282,6 @@ namespace SafeMobileLib
                 {
                     s = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
                 }
-
                 if (s != null)
                 {
                     Utils.WriteLine(String.Format("[### {0:H:mm:ss} ###] Port multi cast {1}", DateTime.Now, port));
@@ -277,14 +290,13 @@ namespace SafeMobileLib
                     s.Bind(ipep);
                     IPAddress ip = IPAddress.Parse(mcastGroup);
                     s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(ip, IPAddress.Any));
-                    s.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.MulticastTimeToLive, int.Parse("1"));
+                    s.SetSocketOption(SocketOptionLevel.IP,
+                            SocketOptionName.MulticastTimeToLive, int.Parse("1"));
                     listenThread = new Thread(new ThreadStart(Listen_Decoded));
                     listenThread.IsBackground = true;
                 }
-
                 if (listenThread != null)
                     listenThread.Start();
-
                 ret = true;
             }
             catch (Exception ex)

SafeMobileLIB_DLL/Utils.cs

@@ -441,10 +441,8 @@ namespace SafeMobileLib
             Int32 tmp = cmdok.Length + 1;
             tmp += tmp.ToString().Length;
             String TMPcmdok = "#" + tmp.ToString() + cmdok;
-            if (tmp != TMPcmdok.Length)
+            if (tmp != TMPcmdok.Length) cmdok = "#" + TMPcmdok.Length + cmdok;
-                cmdok = "#" + TMPcmdok.Length + cmdok;
+            else cmdok = TMPcmdok;
-            else
-                cmdok = TMPcmdok;
 
             System.Text.Encoding enc = System.Text.Encoding.ASCII;
             byte[] buf = enc.GetBytes(cmdok);

SipComponent/SipClientClass2.cs

@@ -263,24 +263,19 @@ namespace SipComponent
             }
             else
                 _localIPaddress = localIPAddress;
-
             _sipDomainPort = sipDomainPort;
             _sipClient = CreateSipClientClass(sipDomain, _sipDomainPort, _localIPaddress, localSipPort, userName, password, requestTimeout);
             _bufferMiliseconds = bufferMiliseconds;
-            
             // Registration Timer
             _registrationInterval = registrationInterval;
             _registrationData = new RegistrationData(userName, _registrationInterval + 2);
-
             System.Timers.Timer registrationTimer = new System.Timers.Timer();
             // Set up the registration timer
             registrationTimer.Interval = _registrationInterval * 1000;
             registrationTimer.Elapsed += _registrationTimer_Elapsed;
-            
             _sipID_regTimer_regStatus_Dict.Add(userName,
                 new Tuple<System.Timers.Timer, RegistrationStatus>(registrationTimer, RegistrationStatus.RegistrationNotStarted
             ));
-
             _IDsregisteredList.Add(userName);
             StartRegistrationTimer();
 
@@ -309,7 +304,6 @@ namespace SipComponent
                 throw new ObjectDisposedException("SipClientClass");
             if (idToInvite == null)
                 throw new ArgumentNullException("idToInvite");
-
             lock (_lockerSipDialog)
             {
                 if (!_IDsentInviteDict.ContainsKey(idToInvite) && !_IDreceivedInviteDict.ContainsKey(idToInvite)
@@ -330,7 +324,6 @@ namespace SipComponent
                 throw new ObjectDisposedException("SipClientClass");
             if (groupIDtoInvite == null)
                 throw new ArgumentNullException("groupIDtoInvite");
-
             // Check if registered to the group id
             lock (_lockerSipDialog)
             {
@@ -349,7 +342,6 @@ namespace SipComponent
         {
             if (_sipClassClosed)
                 throw new ObjectDisposedException("SipClientClass");
-
             Task t = null;
             CancelInvite_private(idToCancel, out t);
         }
@@ -378,7 +370,6 @@ namespace SipComponent
                 {
                     return dialog.CallID == _IDsentInviteDict[idToCancel].CallID;
                 });
-
                 if (d != null)
                 {
                     //Send Cancel Request
@@ -396,7 +387,6 @@ namespace SipComponent
                         }
                     }, d);
                 }
-
                 // Remove from dict
                 _IDsentInviteDict.Remove(idToCancel);
                 _IDsCalledByMeList.Remove(idToCancel);
@@ -595,7 +585,6 @@ namespace SipComponent
         {
             if (_sipClassClosed)
                 throw new ObjectDisposedException("SipClientClass");
-
             lock (_lockerSipDialog)
             {
                 if (_IDdialogTuple.ContainsKey(idToSendVoice))
@@ -614,28 +603,28 @@ namespace SipComponent
         {
             if (_sipClassClosed)
                 throw new ObjectDisposedException("SipClientClass");
-
+            if (idToRequestGps != null)
-            if (idToRequestGps == null)
-                throw new ArgumentNullException("idToRequestGps");
-
-
-            // Send Gps request for Linx
-            // [#msgLen]#seqID#154#
-            string cmdText = string.Format("#{0}#154#", seqID);
-            string cmd = AddMsgLenForMBus(cmdText);
-            Message pollRequestForLinx = GenerateSipMessage(idToRequestGps, UserName, _sipClient.Domain, _sipDomainPort, cmd);
-            pollRequestForLinx.Header.Add("Ais-Service", "mbus");
-            Task.Factory.StartNew(() =>
             {
-                try
+                // Send Gps request for Linx
+                // [#msgLen]#seqID#154#
+                string cmdText = string.Format("#{0}#154#", seqID);
+                string cmd = AddMsgLenForMBus(cmdText);
+                Message pollRequestForLinx = GenerateSipMessage(idToRequestGps, UserName, _sipClient.Domain, _sipDomainPort, cmd);
+                pollRequestForLinx.Header.Add("Ais-Service", "mbus");
+                Task.Factory.StartNew(() =>
                 {
-                    _sipClient.SendRequest(pollRequestForLinx);
+                    try
-                }
+                    {
-                catch (Exception)
+                        _sipClient.SendRequest(pollRequestForLinx);
-                {
+                    }
-                    ; // Probably timeout exception, do not do anything
+                    catch (Exception)
-                }
+                    {
-            });
+                        ; // Probably timeout exception, do not do anything
+                    }
+                });
+            }
+            else
+                throw new ArgumentNullException("idToRequestGps");
 
         }
 
@@ -647,26 +636,26 @@ namespace SipComponent
         {
             if (_sipClassClosed)
                 throw new ObjectDisposedException("SipClientClass");
-
+            if (linxID != null)
-            if (linxID == null)
-                throw new ArgumentNullException("linxID");
-            
-            // Send [#msgLen]#seqID#238#
-            string textToSend = string.Format("#{0}#238#", _rand.Next().ToString());
-            string cmdToSend = AddMsgLenForMBus(textToSend);
-            Message sipMessage = GenerateSipMessage(linxID, UserName, _sipClient.Domain, _sipDomainPort, cmdToSend);
-            Task.Factory.StartNew(() =>
             {
-                try
+                // Send [#msgLen]#seqID#238#
+                string textToSend = string.Format("#{0}#238#", _rand.Next().ToString());
+                string cmdToSend = AddMsgLenForMBus(textToSend);
+                Message sipMessage = GenerateSipMessage(linxID, UserName, _sipClient.Domain, _sipDomainPort, cmdToSend);
+                Task.Factory.StartNew(() =>
                 {
-                    _sipClient.SendRequest(sipMessage);
+                    try
-                }
+                    {
-                catch (Exception)
+                        _sipClient.SendRequest(sipMessage);
-                {
+                    }
-                    // Do nothing
+                    catch (Exception)
-                }
+                    {
-            });
+                        // Do nothing
-                            
+                    }
+                });
+            }
+            else
+                throw new ArgumentNullException("linxID");
         }
 
         /// <summary>
@@ -680,12 +669,10 @@ namespace SipComponent
         {
             if (_sipClassClosed)
                 throw new ObjectDisposedException("SipClientClass");
-
             if (idToSendSMS != null && text != null)
             {
                 bool sendSipMessage = true;
                 string unconfirmedSmsKey = null;
-
                 if (_smsConfirmationFromServer)
                 {
                     unconfirmedSmsKey = idToSendSMS + text.GetHashCode();
@@ -704,7 +691,6 @@ namespace SipComponent
                         }
                     }
                 }
-
                 if (sendSipMessage)
                 {
                     // Create a new thread on which:
@@ -757,16 +743,15 @@ namespace SipComponent
                 throw new ArgumentNullException("text");
         }
 
-        private Message GenerateSipMessage(string destinationID, string senderID, string sipServer, int sipServerPort, string text)
+        private Message GenerateSipMessage(string destinationID, string senderID, string sipServer,
+            int sipServerPort, string text)
         {
-            Message sipMessage = new Message()
+            Message sipMessage = new Message();
-            {
+            sipMessage.Uri = "sip:" + destinationID + "@" + sipServer + ":" + sipServerPort;
-                Uri = $"sip:{destinationID}@{sipServer}:{sipServerPort}",
+            sipMessage.From = new ContactInfo(string.Format("sip:{0}@{1}", senderID, sipServer));
-                From = new ContactInfo($"sip:{senderID}@{sipServer}"),
+            sipMessage.To = new ContactInfo(string.Format("sip:{0}@{1}", destinationID, sipServer));
-                To   = new ContactInfo($"sip:{destinationID}@{sipServer}"),
+            sipMessage.ContentType = "text/plain;charset=UTF-8";
-                ContentType = "text/plain;charset=UTF-8",
+            sipMessage.Body = text;
-                Body = text
-            };
             
             return sipMessage;
         }
@@ -848,12 +833,10 @@ namespace SipComponent
             if (!_sipClassClosed)
             {
                 _sipClassClosed = true;
-                
                 // Send ARS OFF and disconnect from socket IO
                 if (_sendArsOnOff)
                     _socketIOClass.SendArs(new ArsInfo(false, "0", UserName));
                 _socketIOClass.Disconect(); 
-                 
                 //
                 List<string> sipIDs = new List<string>();
                 Task task = null;
@@ -909,7 +892,6 @@ namespace SipComponent
                     // Stop sip class
                     _sipClient.Disconnect();
                 });
-
                 if (!async)
                     t.Wait();
             }
@@ -929,8 +911,6 @@ namespace SipComponent
                     zeroRegistrationData = new RegistrationData(id, 0, true);
                 else
                     zeroRegistrationData = new RegistrationData(id, 0);
-
-
                 _sipID_regTimer_regStatus_Dict[id].Item1.Stop();
                 SendSipRegister(zeroRegistrationData);
             }
@@ -1418,11 +1398,10 @@ namespace SipComponent
             string lastWord = source.Substring(source.LastIndexOf(' ') + 1);
             if (lastWord.Contains("delivered"))
                 return true;
-
+            else if (lastWord.Contains("failed"))
-            if (lastWord.Contains("failed"))
                 return false;
-            
+            else
-            throw new ApplicationException("Error on parsing the sms confirmation from sip server");
+                throw new ApplicationException("Error on parsing the sms confirmation from sip server");
         }
 
         #endregion
@@ -1439,13 +1418,11 @@ namespace SipComponent
                     // Extract ip and port where to send voice to simoco
                     IPAddress ipToSendAudio = null;
                     int portToSendAudio;
-
                     if (IPAddress.TryParse(receivedSDP.Connection.Address, out ipToSendAudio))
                     {
                         portToSendAudio = receivedSDP.Media[0].Port;
                     }
-                    else
+                    else throw new ApplicationException("Canot determine ip where to send audio");
-                        throw new ApplicationException("Canot determine ip where to send audio");
 
                     // Creez clientul de UDP conectat la portul pe care voi primi voce
                     UdpClient udpClient = new UdpClient(localRTPport);
@@ -1586,9 +1563,9 @@ namespace SipComponent
 
         private SipClient CreateSipClientClass(string sipDomain, int sipDomainPort, string localIPaddress, int localSipPort, string userName, string password, int requestTimeout)
         {
-            
+            SipClient sipClient;
             // Set up the master SIP class
-            SipClient  sipClient = new SipClient(sipDomain, sipDomainPort, Independentsoft.Sip.ProtocolType.Udp, userName, password);
+            sipClient = new SipClient(sipDomain, sipDomainPort, Independentsoft.Sip.ProtocolType.Udp, userName, password);
             sipClient.LocalIPEndPoint = new IPEndPoint(IPAddress.Parse(localIPaddress), localSipPort);
             // Turn on logging
             //sipClient.Logger = new Logger(AppDomain.CurrentDomain.BaseDirectory + "\\sipLog.txt");
@@ -1613,7 +1590,6 @@ namespace SipComponent
 
                     int rtpPort = ReturnAvailablePort();
                     SessionDescription sdp = CreateSDP(rtpPort);
-
                     Invite inv = new Invite();
                     inv.Uri = "sip:" + idToCall + "@" + sipServerIP;
                     inv.From = new ContactInfo("sip:" + sipID.ToString() + "@" + sipServerIP);
@@ -1674,17 +1650,20 @@ namespace SipComponent
         private void SendSipRegister(object registrationDataObj)
         {
             string sipServerIP = _sipClient.Domain;
-
             RegistrationData regData = (RegistrationData)registrationDataObj;
             string sipIDfrom = _sipClient.Username;
-            string sipIDto   = regData.SipID;
+            string sipIDto = regData.SipID;
             int expiresValue = regData.Expires;
             bool isUnregisterRequest = (expiresValue == 0);
 
             Register reg = new Register();
             reg.Uri = "sip:" + sipServerIP;
-            reg.From = new ContactInfo( sipIDfrom.ToString(),  $"sip:{sipIDfrom}@{sipServerIP}");
+            reg.From = new ContactInfo(
-            reg.To   = new ContactInfo( sipIDto.ToString(),    $"sip:{sipIDto}@{sipServerIP}");
+                sipIDfrom.ToString(),
+                "sip:" + sipIDfrom + "@" + sipServerIP);
+            reg.To = new ContactInfo(
+                sipIDto.ToString(),
+                "sip:" + sipIDto.ToString() + "@" + sipServerIP);
             reg.Contact = new Contact("sip:" + sipIDfrom.ToString() + "@" + _sipClient.LocalIPEndPoint.ToString());
             reg.Expires = expiresValue;
 
@@ -1784,7 +1763,6 @@ namespace SipComponent
             {
                 SendSipRegister(state);
             }, _registrationData);
-
             // Start registration timer
             _sipID_regTimer_regStatus_Dict[UserName].Item1.Start();
         }
@@ -1829,12 +1807,10 @@ namespace SipComponent
                 {
                     rtpPort += 2;
                 }
-
                 if (rtpPort < MaxRtpPortNumber)
                     return rtpPort;
-
+                else
-
+                    throw new SipClassException(
-                throw new SipClassException(
                         string.Format("Nu gasesc port liber in range-ul {0} - {1}", MinRtpPortNumber, MaxRtpPortNumber));
             }
         }
@@ -1845,8 +1821,10 @@ namespace SipComponent
             {
                 return invite.SessionDescription.Media[0].Port == portNb;
             });
-
+            if (inv != null)
-            return (inv != null);
+                return true;
+            else
+                return false;
         }
 
         private bool IsPortAllreadyInUse(int portNumber)
@@ -1865,12 +1843,15 @@ namespace SipComponent
         public static bool ValidRtpPort(int rtpPort)
         {
             if (rtpPort < 1024 || rtpPort > 65534)
+            {
                 return false;
-            
+            }
-            if (rtpPort % 2 == 1)
+            else if (rtpPort % 2 == 1)
+            {
                 return false;
-            
+            }
-            return true;
+            else
+                return true;
         }
 
         /// <summary>
@@ -1889,6 +1870,11 @@ namespace SipComponent
 
 
 
+
+
+
+
+
         private bool IsInSameSubnet(IPAddress address2, IPAddress address, IPAddress subnetMask)
         {
             IPAddress network1 = GetNetworkAddress(address, subnetMask);

SubscriberAndUserManager/controlSettings.cs

@@ -836,27 +836,18 @@ namespace SubscriberAndUserManager
 
         private void SendBackupListRequest()
         {            
-            if (MainForm.udp != null)
+            if(MainForm.udp != null)
-            {
+                MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0#53#1#"), Utils.Convert_text_For_multicast("#0.0#53#1#").Length);
-               byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#53#1#");
-               MainForm.udp.Send(dataToSend, dataToSend.Length);
-            }
         }
         private void SendBackupRequest()
         {            
             if (MainForm.udp != null)
-            {
+                MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0#51#1#"), Utils.Convert_text_For_multicast("#0.0#51#1#").Length);
-                byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#51#1#");
-                MainForm.udp.Send(dataToSend, dataToSend.Length);
-            }
         }
         private void SendRestoreRequest(string filename)
         {            
             if (MainForm.udp != null)
-            {
+                MainForm.udp.Send(Utils.Convert_text_For_multicast("#0.0#52#" + filename + "#"), Utils.Convert_text_For_multicast("#0.0#52#" + filename + "#").Length);
-                byte[] dataToSend = Utils.Convert_text_For_multicast("#0.0#52#" + filename + "#");
-                MainForm.udp.Send(dataToSend, dataToSend.Length);
-            }
         }
 
         delegate void UpdateList(string fileNames);

UpdateHelper/UpdateHelper.csproj

@@ -112,9 +112,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="prebuild.sh" />
-    <None Include="RunMessagesPartitioning.bat">
+    <None Include="RunMessagesPartitioning.bat" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5">
@@ -146,9 +144,7 @@
     <Content Include="7toLatest7.sql">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="call_messages_partitioning.sql">
+    <Content Include="call_messages_partitioning.sql" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="CreateMissingForeignKeys.sql">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -158,12 +154,8 @@
     <Content Include="CreateMissingPrimaryKeys.sql">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="generate_partitioning_of_an_existing_table_by_date_unix_time.sql">
+    <Content Include="generate_partitioning_of_an_existing_table_by_date_unix_time.sql" />
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <Content Include="get_query_partitioning_of_an_existing_table_by_date_unix_time.sql" />
-    </Content>
-    <Content Include="get_query_partitioning_of_an_existing_table_by_date_unix_time.sql">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="NewFields.sql">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>