Updated Lifecycle interface names; added information about user_no=0 in header files

diff --git a/configure.ac b/configure.ac
index 7d15d43..62f1547 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 
 # create tag version information
 m4_define([pers_client_library_tag_version_major], [0])
-m4_define([pers_client_library_tag_version_minor], [4])
+m4_define([pers_client_library_tag_version_minor], [5])
 m4_define([pers_client_library_tag_version_micro], [0])
 m4_define([pers_client_library_tag_version], [pers_client_library_tag_version_major().pers_client_library_tag_version_minor().pers_client_library_tag_version_micro()])
 
@@ -17,7 +17,7 @@ AC_GNU_SOURCE()
 
 # create library version information
 m4_define([pers_client_library_version_current],  [3])
-m4_define([pers_client_library_version_revision], [0])
+m4_define([pers_client_library_version_revision], [1])
 m4_define([pers_client_library_version_age],      [0])
 m4_define([pers_client_library_version], [pers_client_library_version_current():pers_client_library_version_revision():pers_client_library_version_age()])
 

diff --git a/include/persistence_client_library_file.h b/include/persistence_client_library_file.h
index 25690d0..f56ccd2 100644 (file)
--- a/include/persistence_client_library_file.h
+++ b/include/persistence_client_library_file.h
@@ -78,7 +78,7 @@ void* pclFileMapData(void* addr, long size, long offset, int fd);
  *
  * @param ldbid logical database ID
  * @param resource_id the resource ID
- * @param user_no  the user ID
+ * @param user_no  the user ID; user_no=0 can not be used as user-ID beacause ‘0’ is defined as System/node
  * @param seat_no  the seat number
  *
  * @return positive value: the POSIX file descriptor;
@@ -109,7 +109,7 @@ int pclFileReadData(int fd, void * buffer, int buffer_size);
  *
  * @param ldbid logical database ID
  * @param resource_id the resource ID
- * @param user_no  the user ID
+ * @param user_no  the user ID; user_no=0 can not be used as user-ID beacause ‘0’ is defined as System/node
  * @param seat_no  the seat number
  *
  * @return positive value: success;

diff --git a/include/persistence_client_library_key.h b/include/persistence_client_library_key.h
index 7f6b850..72acf65 100644 (file)
--- a/include/persistence_client_library_key.h
+++ b/include/persistence_client_library_key.h
@@ -41,7 +41,7 @@ extern "C" {
  *
  * @param ldbid logical database ID
  * @param resource_id the resource ID
- * @param user_no  the user ID
+ * @param user_no  the user ID; user_no=0 can not be used as user-ID beacause ‘0’ is defined as System/node
  * @param seat_no  the seat number
  *
  * @return positive value: success; On error a negative value will be returned with th follwoing error codes:
@@ -56,7 +56,7 @@ int pclKeyDelete(unsigned int ldbid, const char* resource_id, unsigned int user_
  *
  * @param ldbid logical database ID
  * @param resource_id the resource ID
- * @param user_no  the user ID
+ * @param user_no  the user ID; user_no=0 can not be used as user-ID beacause ‘0’ is defined as System/node
  * @param seat_no  the seat number
  *
  * @return positive value: the size; On error a negative value will be returned with th follwoing error codes:
@@ -92,7 +92,7 @@ int pclKeyHandleGetSize(int key_handle);
  *
  * @param ldbid logical database ID
  * @param resource_id the resource ID
- * @param user_no  the user ID
+ * @param user_no  the user ID; user_no=0 can not be used as user-ID beacause ‘0’ is defined as System/node
  * @param seat_no  the seat number
  *
  * @return positive value: the key handle to access the value;
@@ -146,7 +146,7 @@ int pclKeyHandleWriteData(int key_handle, unsigned char* buffer, int buffer_size
  *
  * @param ldbid logical database ID
  * @param resource_id the resource ID
- * @param user_no  the user ID
+ * @param user_no  the user ID; user_no=0 can not be used as user-ID beacause ‘0’ is defined as System/node
  * @param seat_no  the seat number
  * @param buffer the buffer to read the persistent data
  * @param buffer_size size of buffer for reading
@@ -162,7 +162,7 @@ int pclKeyReadData(unsigned int ldbid, const char* resource_id, unsigned int use
  *
  * @param ldbid logical database ID of the resource to monitor
  * @param resource_id the resource ID
- * @param user_no  the user ID
+ * @param user_no  the user ID; user_no=0 can not be used as user-ID beacause ‘0’ is defined as System/node
  * @param seat_no  the seat number
  *
  * @return positive value: registration OK; On error a negative value will be returned with th follwoing error codes:
@@ -176,7 +176,7 @@ int pclKeyRegisterNotifyOnChange(unsigned int ldbid, const char* resource_id, un
  *
  * @param ldbid logical database ID
  * @param resource_id the resource ID
- * @param user_no  the user ID
+ * @param user_no  the user ID; user_no=0 can not be used as user-ID beacause ‘0’ is defined as System/node
  * @param seat_no  the seat number
  * @param buffer the buffer containing the persistent data to write
  * @param buffer_size the number of bytes to write (default max size is set to 16kB)

diff --git a/src/persistence_client_library.c b/src/persistence_client_library.c
index 02bd5c2..2f16e43 100644 (file)
--- a/src/persistence_client_library.c
+++ b/src/persistence_client_library.c
@@ -34,7 +34,7 @@
 
 
 
-#define ENABLE_DBUS_INTERFACE 0
+#define ENABLE_DBUS_INTERFACE 1
 
 extern char* __progname;
 

diff --git a/src/persistence_client_library_dbus_service.c b/src/persistence_client_library_dbus_service.c
index 2fc6473..3d4c652 100644 (file)
--- a/src/persistence_client_library_dbus_service.c
+++ b/src/persistence_client_library_dbus_service.c
@@ -332,7 +332,7 @@ int mainLoop(DBusObjectPathVTable vtable, DBusObjectPathVTable vtable2,
 
          // register for messages
          if (   (TRUE==dbus_connection_register_object_path(conn, "/org/genivi/persistence/adminconsumer", &vtable, userData))
-             && (TRUE==dbus_connection_register_object_path(conn, "/com/contiautomotive/NodeStateManager/LifecycleConsumer", &vtable2, userData))
+             && (TRUE==dbus_connection_register_object_path(conn, "/org/genivi/NodeStateManager/LifeCycleConsumer", &vtable2, userData))
              && (TRUE==dbus_connection_register_fallback(conn, "/", &vtableFallback, userData)) )
          {
             if (TRUE!=dbus_connection_set_watch_functions(conn, addWatch, removeWatch, watchToggled, NULL, NULL))
@@ -427,7 +427,7 @@ int mainLoop(DBusObjectPathVTable vtable, DBusObjectPathVTable vtable2,
                while (0!=bContinue);
             }
             dbus_connection_unregister_object_path(conn, "/org/genivi/persistence/adminconsumer");
-            dbus_connection_unregister_object_path(conn, "/com/contiautomotive/NodeStateManager/LifecycleConsumer");
+            dbus_connection_unregister_object_path(conn, "/org/genivi/NodeStateManager/LifeCycleConsumer");
             dbus_connection_unregister_object_path(conn, "/");
          }
          close(gEfds);

diff --git a/src/persistence_client_library_lc_interface.c b/src/persistence_client_library_lc_interface.c
index 149b6e4..22bfae2 100644 (file)
--- a/src/persistence_client_library_lc_interface.c
+++ b/src/persistence_client_library_lc_interface.c
@@ -140,9 +140,9 @@ DBusHandlerResult checkLifecycleMsg(DBusConnection * connection, DBusMessage * m
    DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
    //printf("handleObjectPathMessage '%s' -> '%s'\n", dbus_message_get_interface(message), dbus_message_get_member(message));
-   if((0==strncmp("com.contiautomotive.NodeStateManager.LifecycleConsumer", dbus_message_get_interface(message), 20)))
+   if((0==strncmp("org.genivi.NodeStateManager.LifeCycleConsumer", dbus_message_get_interface(message), 20)))
    {
-      if((0==strncmp("NSMLifecycleRequest", dbus_message_get_member(message), 18)))
+      if((0==strncmp("LifecycleRequest", dbus_message_get_member(message), 18)))
       {
          result = msg_lifecycleRequest(connection, message);
       }
@@ -164,12 +164,12 @@ int send_lifecycle_register(const char* method, int shutdownMode)
    dbus_error_init (&error);
    DBusConnection* conn = get_dbus_connection();
 
-   const char* objName = "/com/contiautomotive/NodeStateManager/LifecycleConsumer";
+   const char* objName = "/org/genivi/NodeStateManager/LifeCycleConsumer";
    const char* busName = dbus_bus_get_unique_name(conn);
 
-   DBusMessage* message = dbus_message_new_method_call("com.contiautomotive.NodeStateManager.Consumer",  // destination
-                                                       "/com/contiautomotive/NodeStateManager/Consumer",  // path
-                                                       "com.contiautomotive.NodeStateManager.Consumer",  // interface
+   DBusMessage* message = dbus_message_new_method_call("org.genivi.NodeStateManager.Consumer",  // destination
+                                                       "/org/genivi/NodeStateManager/Consumer",  // path
+                                                       "org.genivi.NodeStateManager.Consumer",  // interface
                                                        method);                  // method
    if(message != NULL)
    {
@@ -213,9 +213,9 @@ int send_lifecycle_request(const char* method, int requestId, int status)
 
    DBusConnection* conn = get_dbus_connection();
 
-   DBusMessage* message = dbus_message_new_method_call("com.contiautomotive.NodeStateManager.Consumer",  // destination
-                                                      "/com/contiautomotive/NodeStateManager/Consumer",  // path
-                                                       "com.contiautomotive.NodeStateManager.Consumer",  // interface
+   DBusMessage* message = dbus_message_new_method_call("org.genivi.NodeStateManager.Consumer",  // destination
+                                                      "/org/genivi/NodeStateManager/Consumer",  // path
+                                                       "org.genivi.NodeStateManager.Consumer",  // interface
                                                        method);                  // method
    if(message != NULL)
    {