Fix 'occurred' typo

[bpdyndnsd] / src / serviceholder.cpp

diff --git a/src/serviceholder.cpp b/src/serviceholder.cpp
index 2e5c395..e4041a8 100644 (file)
--- a/src/serviceholder.cpp
+++ b/src/serviceholder.cpp
@@ -7,14 +7,14 @@
  * @license GPLv2
 */
 
-#include "serviceholder.h"
+#include "serviceholder.hpp"
 
 #include <fstream>
 
 #include <boost/foreach.hpp>
 #include <boost/filesystem.hpp>
 
-#define OBJECT_FILE "/home/bjoern/intranator/bpdyndnsd/objects.ser"
+#define OBJECT_FILE "/var/state/bpdyndnsd/bpdyndnsd.state"
 
 using namespace std;
 
@@ -22,10 +22,21 @@ namespace fs = boost::filesystem;
 
 
 /**
- * Default constructor with Logger object.
+ * Default constructor.
+ */
+Serviceholder::Serviceholder()
+    :Log(new Logger)
+    ,IPAddrHelp()
+{
+}
+
+
+/**
+ * Constructor with Logger object.
  */
 Serviceholder::Serviceholder(Logger::Ptr _log)
     :Log(_log)
+    ,IPAddrHelp()
 {
 }
 
@@ -42,35 +53,37 @@ Serviceholder::~Serviceholder()
  * This function serializes all Service objects in Services and OldServices (where the update Timeout isn't expired) into a specified file.
  * @return 0 if all is fine, -1 if output file could not be opened for reading or error while serializing.
  */
-int Serviceholder::serialize_services()
+int Serviceholder::serialize_services() const
 {
     // Put Services and OldServices into Serviceholder.
     SerializeServiceContainer::Ptr service_container(new SerializeServiceContainer);
 
-    BOOST_FOREACH(Service::Ptr &service, Services)
+    BOOST_FOREACH(const Service::Ptr &service, Services)
     {
         service_container->add_service(service);
     }
 
-    int current_time = time(NULL);
+    time_t current_time = time(NULL);
 
-    BOOST_FOREACH(Service::Ptr &service, OldServices)
+    BOOST_FOREACH(const Service::Ptr &service, OldServices)
     {
-        if ( ( service->get_last_updates().front() + (service->get_update_interval()*60) ) >= current_time )  // UpdateInterval timeout of service isn't expired.
+        if ( !service->get_last_updates().empty() &&
+             ( service->get_last_update_time() + ((time_t)service->get_update_interval()*60) ) >= current_time )  /*lint !e1793 */ // UpdateInterval timeout of service isn't expired.
             service_container->add_service(service);
     }
 
-    // Serialize Serviceholder into file.
+    // Serialize SerializeServiceContainer and IPAddrHelper into file.
     ofstream ofs(OBJECT_FILE);
     if ( ofs.is_open() )
     {
         SerializeServiceContainer* _service_container = service_container.get();
+        IPAddrHelper* _ip_addr_helper = IPAddrHelp.get();
         try
         {
             boost::archive::text_oarchive oa(ofs);
-            oa << _service_container;
+            oa << _service_container << _ip_addr_helper;
         }
-        catch( boost::archive::archive_exception e )
+        catch( const boost::archive::archive_exception& e )
         {
             Log->print_exception_serialize(e.what());
             ofs.close();
@@ -111,18 +124,22 @@ int Serviceholder::deserialize_services()
     {
         // deserialize SerializeServiceContainer
         SerializeServiceContainer* _service_container;
+        IPAddrHelper* _ip_addr_helper;
         try
         {
             boost::archive::text_iarchive ia(ifs);
-            ia >> _service_container;
+            ia >> _service_container >> _ip_addr_helper;
         }
-        catch( boost::archive::archive_exception e )
+        catch( const std::exception& e )
         {
+            // There is a corrupted object file, continue without recovering old Services' state.
             Log->print_exception_deserialize(e.what());
             ifs.close();
-            return -1;
+            return 0;
         }
+
         SerializeServiceContainer::Ptr service_container(_service_container);
+        IPAddrHelp = IPAddrHelper::Ptr(_ip_addr_helper);
         ifs.close();
 
         // Get the list of old Services from de-serialized SerializeServiceContainer object.
@@ -134,14 +151,17 @@ int Serviceholder::deserialize_services()
         BOOST_FOREACH(Service::Ptr &old_service, _old_services)
         {
             OldServices.push_back(old_service);
-            Log->print_service_object("Deserialized following Service object:", old_service->get_protocol(), old_service->get_hostname(), old_service->get_login() ,old_service->get_password(), old_service->get_update_interval(), old_service->get_max_updates_within_interval(), old_service->get_dns_cache_ttl() , old_service->get_actual_ip(), old_service->get_last_updates());
+            Log->print_service_object("Deserialized following Service object:", old_service->get_protocol(), old_service->get_hostname(), old_service->get_login() ,old_service->get_password(), old_service->get_update_interval(), old_service->get_max_updates_within_interval(), old_service->get_max_equal_updates_in_succession(), old_service->get_dns_cache_ttl() , old_service->get_actual_ip(), old_service->get_last_updates(), old_service->get_activated());
             BOOST_FOREACH(Service::Ptr &service, Services)
             {
                 if ( *service == *old_service )
                 {
                     service->set_last_updates(old_service->get_last_updates());
                     service->set_actual_ip(old_service->get_actual_ip());
-                    Log->print_service_object("New Service object with adopted values:", service->get_protocol(), service->get_hostname(), service->get_login() ,service->get_password(), service->get_update_interval(), service->get_max_updates_within_interval(), service->get_dns_cache_ttl() , service->get_actual_ip(), service->get_last_updates());
+                    if ( old_service->get_activated() )
+                        service->set_activated();
+
+                    Log->print_service_object("New Service object with adopted values:", service->get_protocol(), service->get_hostname(), service->get_login() ,service->get_password(), service->get_update_interval(), service->get_max_updates_within_interval(), service->get_max_equal_updates_in_succession(), service->get_dns_cache_ttl() , service->get_actual_ip(), service->get_last_updates(), service->get_activated());
                     // We have adopted the values of the old_service. Just set lastupdated and timeout to 0, so this old_service wont be serialized.
                     old_service->set_update_interval(0);
                 }
@@ -185,6 +205,8 @@ void Serviceholder::delete_services()
         service.reset();
     }
     OldServices.clear();
+
+    IPAddrHelp.reset();
 }
 
 
@@ -196,3 +218,23 @@ std::list<Service::Ptr> Serviceholder::get_services() const
 {
     return Services;
 }
+
+
+/**
+ * Set member IPAddrHelp
+ * @param _ip_addr_helper The IPAddrHelper.
+ */
+void Serviceholder::set_ip_addr_helper(IPAddrHelper::Ptr _ip_addr_helper)
+{
+    IPAddrHelp = _ip_addr_helper;
+}
+
+
+/**
+ * Get member IPAddrHelp
+ * @return IPAddrHelp
+ */
+IPAddrHelper::Ptr Serviceholder::get_ip_addr_helper() const
+{
+    return IPAddrHelp;
+}