Using Clatd Dbus path and interface prefix values as 'org.tizen' and '/org/tizen'

Change-Id: I32d39033bc124489c32cec391a70887d00889ccc
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 519b63b..cac77fa 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 ADD_CUSTOM_COMMAND(
        WORKING_DIRECTORY
        OUTPUT ${CMAKE_BINARY_DIR}/generated-code.c
-       COMMAND gdbus-codegen --interface-prefix com.samsung.clatd.
+       COMMAND gdbus-codegen --interface-prefix org.tizen.clatd.
        --generate-c-code generated-code
        --c-namespace Clatd
        --c-generate-object-manager

diff --git a/include/dbus.h b/include/dbus.h
index 21716e1..54a9599 100644 (file)
--- a/include/dbus.h
+++ b/include/dbus.h
@@ -4,10 +4,9 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-#define CLAT_DBUS_SERVICE "com.samsung.clatd"
+#define CLAT_DBUS_SERVICE "org.tizen.clatd"
 
 #define CLAT_DBUS_PATH "/"
-#define CLAT_DBUS_CONTROL_PATH "/Control"
 
 typedef struct _clat_dbus ClatDBus;
 

diff --git a/introspection/control.xml b/introspection/control.xml
index c26990e..6e7c753 100644 (file)
--- a/introspection/control.xml
+++ b/introspection/control.xml
@@ -1,5 +1,5 @@
 <node>
-       <interface name="com.samsung.clatd.Control">
+       <interface name="org.tizen.clatd.Control">
                <method name="Start">
                        <arg direction="in"  type="a{is}" name="list" />
                        <arg direction="out" type="i" name="result" />

diff --git a/packaging/clat.spec b/packaging/clat.spec
index fd7b884..93f9d34 100644 (file)
--- a/packaging/clat.spec
+++ b/packaging/clat.spec
@@ -3,8 +3,8 @@ Summary:       CLAT Daemon
 Version:       1.4
 Release:       1
 Source:        %{name}-%{version}.tar.gz
-Source1:       dbus-1/com.samsung.clatd.service
-Source2:       dbus-1/com.samsung.clatd.conf
+Source1:       dbus-1/org.tizen.clatd.service
+Source2:       dbus-1/org.tizen.clatd.conf
 License:       Apache-2.0
 Group:         System/Network
 BuildRequires: cmake
@@ -52,19 +52,15 @@ cp -v res/clatd.conf %{buildroot}%{_sysconfdir}/clatd.conf
 %make_install
 
 mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services
-#cp %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/mobileap-agent.service
-#cp com.samsung.clatd.service %{buildroot}%{_datadir}/dbus-1/system-services/com.samsung.clatd.service
-cp %{SOURCE1} %{buildroot}%{_datadir}/dbus-1/system-services/com.samsung.clatd.service
+cp %{SOURCE1} %{buildroot}%{_datadir}/dbus-1/system-services/org.tizen.clatd.service
 
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d/
-cp -v %{SOURCE2} %{buildroot}%{_sysconfdir}/dbus-1/system.d/com.samsung.clatd.conf
-#cp -v com.samsung.clatd.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/com.samsung.clatd.conf
-
+cp -v %{SOURCE2} %{buildroot}%{_sysconfdir}/dbus-1/system.d/org.tizen.clatd.conf
 
 %files
 %manifest clatd.manifest
 %attr(644,-,-) %{_sysconfdir}/*.conf
 %attr(644,root,root) %{_datadir}/dbus-1/system-services/*
-%attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/com.samsung.clatd.conf
+%attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/org.tizen.clatd.conf
 %{_bindir}/clatd
 %license LICENSE

diff --git a/packaging/com.samsung.clatd.conf b/packaging/com.samsung.clatd.conf
deleted file mode 100644 (file)
index 8a8ecab..0000000
--- a/packaging/com.samsung.clatd.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-    <policy user="root">
-        <allow own="com.samsung.clatd"/>
-        <allow send_destination="com.samsung.clatd"/>
-    </policy>
-       <policy user="network_fw">
-        <allow own="com.samsung.clatd"/>
-        <allow send_destination="com.samsung.clatd"/>
-       </policy>
-    <policy context="default">
-        <deny own="com.samsung.clatd"/>
-        <deny send_destination="com.samsung.clatd" send_type="method_call"/>
-    </policy>
-</busconfig>

diff --git a/packaging/org.tizen.clatd.conf b/packaging/org.tizen.clatd.conf
new file mode 100644 (file)
index 0000000..ccffdfb
--- /dev/null
+++ b/packaging/org.tizen.clatd.conf
@@ -0,0 +1,16 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+    <policy user="root">
+        <allow own="org.tizen.clatd"/>
+        <allow send_destination="org.tizen.clatd"/>
+    </policy>
+       <policy user="network_fw">
+        <allow own="org.tizen.clatd"/>
+        <allow send_destination="org.tizen.clatd"/>
+       </policy>
+    <policy context="default">
+        <deny own="org.tizen.clatd"/>
+        <deny send_destination="org.tizen.clatd" send_type="method_call"/>
+    </policy>
+</busconfig>

diff --git a/packaging/com.samsung.clatd.service b/packaging/org.tizen.clatd.service
similarity index 66%
rename from packaging/com.samsung.clatd.service
rename to packaging/org.tizen.clatd.service
index 2c71db6..6ccd599 100644 (file)
--- a/packaging/com.samsung.clatd.service
+++ b/packaging/org.tizen.clatd.service
@@ -1,4 +1,4 @@
 [D-BUS Service]
-Name=com.samsung.clatd
+Name=org.tizen.clatd
 Exec=/usr/bin/clatd
 User=root

diff --git a/src/main.c b/src/main.c
index 9c5baa9..065dd0b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -300,7 +300,9 @@ static void on_init(ClatDBus *cdbus, gpointer user_data)
        g_signal_connect(cl->di, "handle-start", G_CALLBACK(_method_start), cl);
        g_signal_connect(cl->di, "handle-stop", G_CALLBACK(_method_stop), cl);
 
-       ret = g_dbus_interface_skeleton_export(cl->di, clat_dbus_get_connection(cl->cdbus), "/com/samsung/clatd", &error);
+       ret = g_dbus_interface_skeleton_export(cl->di,
+                                              clat_dbus_get_connection(cl->cdbus),
+                                              "/org/tizen/clatd", &error);
        if (!ret) {
                if (error) {
                        CLATD_LOG(LOG_FATAL, "dbus err msg (%s)", error->message);