Send message received event with pubsub Id

Change-Id: I977ff5385fe5f81b7b105891965c7f7dfc4cc04b

diff --git a/include/NanDbusHandler.h b/include/NanDbusHandler.h
index 9abc4e9ae53a51635d7b70a73adbd0f3b08ef4b0..436284f8aad45fa3e0d611f176a15373bd1a4689 100644 (file)
--- a/include/NanDbusHandler.h
+++ b/include/NanDbusHandler.h
@@ -116,7 +116,7 @@ public:
                        uint16_t subscribeId, uint32_t peerId, const uint8_t *mac,
                        const uint8_t *specificInfo, uint16_t specificInfoLen, int distance);
        static void messageReceivedEvent(const std::string &clientPath,
-                       uint32_t peerId, const uint8_t *mac,
+                       uint16_t pubSubId, uint32_t peerId, const uint8_t *mac,
                        const uint8_t *message, uint16_t messageLen);
        static void dataPathOpenResultEvent(const std::string &clientPath,
                        uint32_t dataPathId, const std::string &interface,

diff --git a/interface/nan-manager-iface-discovery.xml b/interface/nan-manager-iface-discovery.xml
index 40b9d5302b19cd6ba5e5da6eda650d944e32245a..2fd4b6a5188ca2c9cb3d41e35acaf8b9346a4c41 100644 (file)
--- a/interface/nan-manager-iface-discovery.xml
+++ b/interface/nan-manager-iface-discovery.xml
@@ -104,6 +104,7 @@
                        <arg type="i" name="distance"/>
                </signal>
                <signal name="MessageReceived">
+                       <arg type="q" name="pub_sub_id"/>
                        <arg type="i" name="peer_id"/>
                        <arg type="ay" name="mac"/>
                        <arg type="q" name="message_len"/>

diff --git a/packaging/nan-manager.spec b/packaging/nan-manager.spec
index 60b1ca443b354ef8e8c4e050c98717116760fcaf..ba8e5b89b35d56179dfa7f8d4b1254cb5142ac3b 100644 (file)
--- a/packaging/nan-manager.spec
+++ b/packaging/nan-manager.spec
@@ -2,7 +2,7 @@
 
 Name:          nan-manager
 Summary:       NAN (Neighbor Awareness Networking) manager (Wi-Fi Aware)
-Version:       0.1.6
+Version:       0.1.7
 Release:       1
 Group:         Network & Connectivity
 License:       Apache-2.0

diff --git a/resources/dbus/dbus-nan-manager.conf b/resources/dbus/dbus-nan-manager.conf
index 2b5ddddd8f0c902f3a3a0033634e74eadbc677fd..4993a82d495fc669a68936b15e3d0aebead32674 100644 (file)
--- a/resources/dbus/dbus-nan-manager.conf
+++ b/resources/dbus/dbus-nan-manager.conf
@@ -1,17 +1,17 @@
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+               "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
-    <policy user="network_fw">
-        <allow own="net.nan"/>
-        <allow send_destination="net.nan"/>
-    </policy>
-    <policy user="root">
-        <allow own="net.nan"/>
-        <allow send_destination="net.nan"/>
-    </policy>
-    <policy context="default">
-        <deny own="net.nan"/>
-        <deny send_destination="net.nan" send_type="signal"/>
+       <policy user="network_fw">
+               <allow own="net.nan"/>
+               <allow send_destination="net.nan"/>
+       </policy>
+       <policy user="root">
+               <allow own="net.nan"/>
+               <allow send_destination="net.nan"/>
+       </policy>
+       <policy context="default">
+               <deny own="net.nan"/>
+               <deny send_destination="net.nan" send_type="signal"/>
                <check send_destination="net.nan" send_interface="net.nan.discovery" send_member="Enable" privilege="http://tizen.org/privilege/network.set"/>
                <check send_destination="net.nan" send_interface="net.nan.discovery" send_member="Disable" privilege="http://tizen.org/privilege/network.set"/>
                <check send_destination="net.nan" send_interface="net.nan.discovery" send_member="Publish" privilege="http://tizen.org/privilege/network.set"/>
@@ -25,5 +25,5 @@
                <check send_destination="net.nan" send_interface="net.nan.discovery" send_member="OpenDataPathPsk" privilege="http://tizen.org/privilege/network.set"/>
                <check send_destination="net.nan" send_interface="net.nan.discovery" send_member="OpenDataPathPmk" privilege="http://tizen.org/privilege/network.set"/>
                <check send_destination="net.nan" send_interface="net.nan.discovery" send_member="CloseDataPath" privilege="http://tizen.org/privilege/network.set"/>
-    </policy>
+       </policy>
 </busconfig>

diff --git a/src/NanDbusHandler.cpp b/src/NanDbusHandler.cpp
index f4f7b501d8b7478bf5fe4cb98fe01ee4d5880cec..4f129cf34d9d5e494765bdb084c2972ea413a8e7 100644 (file)
--- a/src/NanDbusHandler.cpp
+++ b/src/NanDbusHandler.cpp
@@ -800,11 +800,11 @@ void NanDbusHandler::serviceDiscoveredEvent(const std::string &clientPath,
 }
 
 void NanDbusHandler::messageReceivedEvent(const std::string &clientPath,
-               uint32_t peerId, const uint8_t *mac,
+               uint16_t pubSubId, uint32_t peerId, const uint8_t *mac,
                const uint8_t *message, uint16_t messageLen)
 {
        NAN_LOGD("MessageReceived Event. peerId: %d", peerId);
-       GVariant *params = g_variant_new("(uvqv)", peerId,
+       GVariant *params = g_variant_new("(quvqv)", pubSubId, peerId,
                        packByteArray(mac, NAN_MAC_ADDR_LEN),
                        messageLen, packByteArray(message, messageLen));
        emitUnicastEvent(clientPath.c_str(), "MessageReceived", params);

diff --git a/src/NanServiceProvider.cpp b/src/NanServiceProvider.cpp
index b9ef1455a4265514298c73d7b0988ceb1e86b829..329101e443689c4d22dccb5ec89749aee1bcc7b3 100644 (file)
--- a/src/NanServiceProvider.cpp
+++ b/src/NanServiceProvider.cpp
@@ -1260,7 +1260,7 @@ void NanServiceProvider::receiveMessageReceivedEvent(const NanFollowupEvent& eve
                return;
        }
 
-       NanDbusHandler::messageReceivedEvent(client->getClientPath(),
+       NanDbusHandler::messageReceivedEvent(client->getClientPath(), pubSubId,
                        peer->getPeerId(), peer->getMacAddr(),
                        event.message, event.messageLen);
 }