Corrected datatype for parameter shutdown mode in dbus message register/unregister...

diff --git a/src/persistence_client_library_dbus_service.c b/src/persistence_client_library_dbus_service.c
index f5362a5..74fd874 100644 (file)
--- a/src/persistence_client_library_dbus_service.c
+++ b/src/persistence_client_library_dbus_service.c
@@ -286,7 +286,7 @@ int setup_dbus_mainloop(void)
    {
       DLT_LOG(gDLTContext, DLT_LOG_INFO, DLT_STRING("Use default dbus bus (DBUS_BUS_SYSTEM)"));
 
-      gDbusConn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
+      gDbusConn = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);
    }
 
    // create here the dbus connection and pass to main loop
@@ -616,7 +616,7 @@ int mainLoop(DBusObjectPathVTable vtable, DBusObjectPathVTable vtable2,
          }
          close(gEfds);
       }
-      //dbus_connection_close(conn);
+      dbus_connection_close(conn);
       dbus_connection_unref(conn);
       dbus_shutdown();
    }

diff --git a/src/persistence_client_library_lc_interface.c b/src/persistence_client_library_lc_interface.c
index 4302165..4f6ef2e 100644 (file)
--- a/src/persistence_client_library_lc_interface.c
+++ b/src/persistence_client_library_lc_interface.c
@@ -173,14 +173,14 @@ int send_lifecycle_register(const char* method, int shutdownMode, int reg)
          {
             dbus_message_append_args(message, DBUS_TYPE_STRING, &busName,
                                               DBUS_TYPE_STRING, &objName,
-                                              DBUS_TYPE_INT32, &shutdownMode,
+                                              DBUS_TYPE_UINT32, &shutdownMode,
                                               DBUS_TYPE_UINT32, &gTimeoutMs, DBUS_TYPE_INVALID);
          }
          else           // unregister
          {
             dbus_message_append_args(message, DBUS_TYPE_STRING, &busName,
                                               DBUS_TYPE_STRING, &objName,
-                                              DBUS_TYPE_INT32, &shutdownMode, DBUS_TYPE_INVALID);
+                                              DBUS_TYPE_UINT32, &shutdownMode, DBUS_TYPE_INVALID);
 
          }
 

diff --git a/test/persistence_admin_service_mockup.c b/test/persistence_admin_service_mockup.c
index d714e55..0d1784a 100644 (file)
--- a/test/persistence_admin_service_mockup.c
+++ b/test/persistence_admin_service_mockup.c
@@ -421,7 +421,7 @@ int mainLoop(DBusObjectPathVTable vtable, DBusObjectPathVTable vtableFallback, v
          }
          close(gEfds);
       }
-      //dbus_connection_close(conn);
+      dbus_connection_close(conn);
       dbus_connection_unref(conn);
       dbus_shutdown();
    }
@@ -490,7 +490,7 @@ int setup_dbus_mainloop(void)
    else
    {
       printf("Use default dbus bus!!!!!!\n");
-      gDbusConn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
+      gDbusConn = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);
    }
 
    // wain until dbus main loop has been setup and running

diff --git a/test/persistence_client_library_test.c b/test/persistence_client_library_test.c
index 836f313..4db6527 100644 (file)
--- a/test/persistence_client_library_test.c
+++ b/test/persistence_client_library_test.c
@@ -252,7 +252,6 @@ START_TEST (test_GetDataHandle)
 END_TEST
 
 
-
 /*
  * Write data to a key using the key interface.
  * First write data to different keys and after
@@ -285,9 +284,10 @@ START_TEST(test_SetData)
     *       ==> local USER value (user 1, seat 2)
     * Resource ID: 69
     */
+
    ret = pclKeyWriteData(0xFF, "69", 1, 2, (unsigned char*)sysTimeBuffer, strlen(sysTimeBuffer));
    fail_unless(ret == strlen(sysTimeBuffer), "Wrong write size");
-
+#if 1
    snprintf(write1, 128, "%s %s", "/70",  sysTimeBuffer);
    /**
     * Logical DB ID: 0xFF with user 1 and seat 2
@@ -361,7 +361,7 @@ START_TEST(test_SetData)
    ret = pclKeyReadData(0xFF, "key_70", 1, 2, buffer, READ_SIZE);
    fail_unless(strncmp((char*)buffer, write2, strlen(write2)) == 0, "Buffer not correctly read");
    fail_unless(ret == strlen(write2), "Wrong read size");
-
+#endif
    pclDeinitLibrary();
 }
 END_TEST

diff --git a/test/persistence_lifeCycle_mockup.c b/test/persistence_lifeCycle_mockup.c
index 630d86a..8e0fd6a 100644 (file)
--- a/test/persistence_lifeCycle_mockup.c
+++ b/test/persistence_lifeCycle_mockup.c
@@ -106,7 +106,7 @@ int checkAdminMsg(DBusConnection *connection, DBusMessage *message, int reg)
    {
       if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &busName,  // bus name
                                                    DBUS_TYPE_STRING, &objName,
-                                                   DBUS_TYPE_INT32,  &notificationFlag,
+                                                   DBUS_TYPE_UINT32,  &notificationFlag,
                                                    DBUS_TYPE_UINT32, &gTimeoutMs,
                                                    DBUS_TYPE_INVALID))
       {
@@ -133,7 +133,7 @@ int checkAdminMsg(DBusConnection *connection, DBusMessage *message, int reg)
    {
       if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &busName,  // bus name
                                                    DBUS_TYPE_STRING, &objName,
-                                                   DBUS_TYPE_INT32,  &notificationFlag,
+                                                   DBUS_TYPE_UINT32,  &notificationFlag,
                                                    DBUS_TYPE_INVALID))
       {
          reply = dbus_message_new_error(message, error.name, error.message);
@@ -458,7 +458,7 @@ int mainLoop(DBusObjectPathVTable vtable, DBusObjectPathVTable vtableFallback, v
          }
          close(gEfds);
       }
-      //dbus_connection_close(conn);
+      dbus_connection_close(conn);
       dbus_connection_unref(conn);
       dbus_shutdown();
    }
@@ -527,7 +527,7 @@ int setup_dbus_mainloop(void)
    else
    {
       printf("Use default dbus bus!!!!!!\n");
-      gDbusConn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
+      gDbusConn = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err);
    }
 
    // wain until dbus main loop has been setup and running