diff options
author | Michael Schuldt <michael.schuldt@bmw.de> | 2013-07-03 16:10:17 +0200 |
---|---|---|
committer | Timo Lotterbach <timo.lotterbach@bmw-carit.de> | 2013-07-03 16:31:32 +0200 |
commit | 79f9ba1f86f584dde61a20517ef8d507f969efe9 (patch) | |
tree | 6452db61c73b0df7028802ac994bccbfdd9491e5 | |
parent | 46dd8d5c76cf7845f80a40529d29479341f47efc (diff) | |
download | layer_management-79f9ba1f86f584dde61a20517ef8d507f969efe9.tar.gz |
DbusIpcModule: fixed introspection and configuration
Signed-off-by: Michael Schuldt <michael.schuldt@bmw.de>
-rw-r--r-- | LayerManagerPlugins/IpcModules/DbusIpcModule/include/DBUSConfiguration.h | 7 | ||||
-rw-r--r-- | LayerManagerPlugins/IpcModules/DbusIpcModule/src/introspection.c | 26 | ||||
-rw-r--r-- | RELEASE_NOTES.txt | 10 |
3 files changed, 28 insertions, 15 deletions
diff --git a/LayerManagerPlugins/IpcModules/DbusIpcModule/include/DBUSConfiguration.h b/LayerManagerPlugins/IpcModules/DbusIpcModule/include/DBUSConfiguration.h index 52c6ab0..6a17827 100644 --- a/LayerManagerPlugins/IpcModules/DbusIpcModule/include/DBUSConfiguration.h +++ b/LayerManagerPlugins/IpcModules/DbusIpcModule/include/DBUSConfiguration.h @@ -23,16 +23,13 @@ /* * DBUS configuration */ -#define DBUS_SERVICE_PREFIX "org.genivi.layermanagementservice\0" -/*#define DBUS_SERVICE_OBJECT_PATH "/org/genivi/layermanagementservice\0" */ +#define DBUS_SERVICE_PREFIX "org.genivi.layermanagementservice" #define DBUS_SERVICE_ERROR "org.genivi.layermanagementservice.error" #define DBUS_RECEIVE_TIMEOUT_IN_MS 500 #define ILM_SERVICE_NAME "org.genivi.layermanagementservice" -/*#define ILM_PATH_COMPOSITE_SERVICE "/org/genivi/layermanagementservice" */ -#define ILM_PATH_COMPOSITE_SERVICE "/" +#define ILM_PATH_COMPOSITE_SERVICE "/org/genivi/layermanagementservice" #define ILM_INTERFACE_COMPOSITE_SERVICE "org.genivi.layermanagementservice" #define ILM_INTERFACE_COMPOSITE_CLIENT "org.genivi.layermanagementclient" - #endif /* _DBUSCONFIGURATION_H_ */ diff --git a/LayerManagerPlugins/IpcModules/DbusIpcModule/src/introspection.c b/LayerManagerPlugins/IpcModules/DbusIpcModule/src/introspection.c index 96ed45e..2e7cc39 100644 --- a/LayerManagerPlugins/IpcModules/DbusIpcModule/src/introspection.c +++ b/LayerManagerPlugins/IpcModules/DbusIpcModule/src/introspection.c @@ -151,7 +151,7 @@ void generateIntrospectionString(char* msgBuffer) int i = 0; msgBuffer += addHeader(msgBuffer); - msgBuffer += openNode(msgBuffer, DBUS_SERVICE_PREFIX); + msgBuffer += openNode(msgBuffer, ILM_PATH_COMPOSITE_SERVICE); msgBuffer += openInterface(msgBuffer, "org.freedesktop.DBus.Introspectable"); msgBuffer += openMethod(msgBuffer, "Introspect"); msgBuffer += addArgument(msgBuffer, "data", "out", "s"); @@ -209,45 +209,51 @@ void generateIntrospectionString(char* msgBuffer) unsigned int addHeader(char* msgBuffer) { - return sprintf(msgBuffer, "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\" \"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">"); + return sprintf(msgBuffer, "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\" \"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"); } unsigned int openNode(char* msgBuffer, const char* nodename) { - return sprintf(msgBuffer, "<node name=\"%s\">", nodename); + if (nodename == NULL) + { + return sprintf(msgBuffer, "<node>\n"); + } else + { + return sprintf(msgBuffer, "<node name=\"%s\">\n", nodename); + } } unsigned int openInterface(char* msgBuffer, const char* interfacename) { - return sprintf(msgBuffer, "<interface name=\"%s\">", interfacename); + return sprintf(msgBuffer, "<interface name=\"%s\">\n", interfacename); } unsigned int openMethod(char* msgBuffer, const char* methodname) { - return sprintf(msgBuffer, "<method name=\"%s\">", methodname); + return sprintf(msgBuffer, "<method name=\"%s\">\n", methodname); } unsigned int addArgument(char* msgBuffer, const char* argname, const char* direction, const char* type) { - return sprintf(msgBuffer, "<arg name=\"%s\" direction=\"%s\" type=\"%c\"/>", argname, direction, type[0]); + return sprintf(msgBuffer, "<arg name=\"%s\" direction=\"%s\" type=\"%c\"/>\n", argname, direction, type[0]); } unsigned int addArrayArgument(char* msgBuffer, const char* argname, const char* direction, const char* type) { - return sprintf(msgBuffer, "<arg name=\"%s\" direction=\"%s\" type=\"a%c\"/>", argname, direction, type[0]); + return sprintf(msgBuffer, "<arg name=\"%s\" direction=\"%s\" type=\"a%c\"/>\n", argname, direction, type[0]); } unsigned int closeMethod(char* msgBuffer) { - return sprintf(msgBuffer, "</method>"); + return sprintf(msgBuffer, "</method>\n"); } unsigned int closeInterface(char* msgBuffer) { - return sprintf(msgBuffer, "</interface>"); + return sprintf(msgBuffer, "</interface>\n"); } unsigned int closeNode(char* msgBuffer) { - return sprintf(msgBuffer, "</node>"); + return sprintf(msgBuffer, "</node>\n"); } diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 07a331d..8dea33c 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,3 +1,13 @@ +next version +---------------------- +This version includes the following enhancements. + +Bugfixes: +- Fixing minor memory leaks +- LayerManagerCommands: fixed array handling, memory leak removed +- X11EglImage: fixing a issue which causes memory leak in XServer +- dbusIpcModule: DBUS Interspection result corrected + Version 1.0 ------------------ This version includes the following enhancements. |