Delete event notify function

Change-Id: Ic6efdf3b5741843216fabc9f3c93d00ba592c4c4
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/include/wifi-direct-event.h b/include/wifi-direct-event.h
index 5447c08..4f7f623 100644 (file)
--- a/include/wifi-direct-event.h
+++ b/include/wifi-direct-event.h
@@ -30,7 +30,6 @@
 
 
 
-int wfd_event_notify_clients(wfd_manager_s *manager, wifi_direct_client_noti_s *noti);
 int wfd_process_event(void *user_data, void *data);
 
 #endif /* __WIFI_DIRECT_EVENT_H__ */

diff --git a/packaging/wifi-direct-manager.changes b/packaging/wifi-direct-manager.changes
index 76c9bcb..536559d 100644 (file)
--- a/packaging/wifi-direct-manager.changes
+++ b/packaging/wifi-direct-manager.changes
@@ -1,3 +1,6 @@
+Tue, 15 Jan 2014 Jiung Yu <jiung.yu@samaung.com> (1.0.4)
+  * Delete event notify function
+
 Tue, 15 Jan 2014 Jiung Yu <jiung.yu@samaung.com> (1.0.3)
   * Add wps_cancel operation
   * Add session type and session management related operation

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index f06e0ba..375c80e 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -1,6 +1,6 @@
 Name:       wifi-direct-manager
 Summary:    Wi-Fi Direct manger
-Version:    1.0.3
+Version:    1.0.4
 Release:    1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0

diff --git a/src/wifi-direct-event.c b/src/wifi-direct-event.c
index 55388f4..82403bd 100644 (file)
--- a/src/wifi-direct-event.c
+++ b/src/wifi-direct-event.c
@@ -135,43 +135,6 @@ static int _wfd_event_send_to_client(int sock, char *data, int data_len)
                return 0;
 }
 
-int wfd_event_notify_clients(wfd_manager_s *manager, wifi_direct_client_noti_s *noti)
-{
-       __WDS_LOG_FUNC_ENTER__;
-       GList *temp = NULL;
-       wfd_client_s *client = NULL;
-       int noti_cnt = 0;
-       int res = 0;
-
-       if (!manager || !noti) {
-               WDS_LOGE("Invalid parameter");
-               __WDS_LOG_FUNC_EXIT__;
-               return -1;
-       }
-
-       temp = g_list_first(manager->clients);
-       while (temp) {
-               client = temp->data;
-               if (!client) {
-                       WDS_LOGE("Invalid client");
-                       goto next_client;
-               }
-               res = _wfd_event_send_to_client(client->asock, (char*) noti, sizeof(wifi_direct_client_noti_s));
-               if (res < 0) {
-                       WDS_LOGE("Failed to send notification to client[%d]", client->client_id);
-                       goto next_client;
-               }
-               noti_cnt++;
-next_client:
-               temp = g_list_next(temp);
-               client = NULL;
-       }
-       WDS_LOGD("Notification[%d:%d] sent to %d clients", noti->event, noti->error, noti_cnt);
-
-       __WDS_LOG_FUNC_EXIT__;
-       return 0;
-}
-
 static int _wfd_event_update_peer(wfd_manager_s *manager, wfd_oem_dev_data_s *data)
 {
        __WDS_LOG_FUNC_ENTER__;
@@ -248,7 +211,7 @@ int wfd_process_event(void *user_data, void *data)
                        memset(&noti, 0x0, sizeof(wifi_direct_client_noti_s));
                        noti.event = WIFI_DIRECT_CLI_EVENT_DISCOVER_FOUND_PEERS;
                        noti.error = WIFI_DIRECT_ERROR_NONE;
-                       wfd_event_notify_clients(manager, &noti);
+                       wfd_client_send_event(manager, &noti);
                }
        }
        break;
@@ -284,7 +247,7 @@ int wfd_process_event(void *user_data, void *data)
                memset(&noti, 0x0, sizeof(wifi_direct_client_noti_s));
                noti.event = WIFI_DIRECT_CLI_EVENT_DISCOVER_FOUND_PEERS;
                noti.error = WIFI_DIRECT_ERROR_NONE;
-               wfd_event_notify_clients(manager, &noti);
+               wfd_client_send_event(manager, &noti);
        }
        break;
        case WFD_OEM_EVENT_DISCOVERY_FINISHED:
@@ -308,7 +271,7 @@ int wfd_process_event(void *user_data, void *data)
                memset(&noti, 0x0, sizeof(wifi_direct_client_noti_s));
                noti.event = WIFI_DIRECT_CLI_EVENT_DISCOVER_END;
                noti.error = WIFI_DIRECT_ERROR_NONE;
-               wfd_event_notify_clients(manager, &noti);
+               wfd_client_send_event(manager, &noti);
        }
        break;
        case WFD_OEM_EVENT_INVITATION_REQ:
@@ -346,7 +309,7 @@ int wfd_process_event(void *user_data, void *data)
                noti.event = WIFI_DIRECT_CLI_EVENT_INVITATION_REQ;
                noti.error = WIFI_DIRECT_ERROR_NONE;
                snprintf(noti.param1, sizeof(noti.param1), MACSTR, MAC2STR(event->dev_addr));
-               wfd_event_notify_clients(manager, &noti);
+               wfd_client_send_event(manager, &noti);
        }
        break;
        case WFD_OEM_EVENT_GO_NEG_REQ:
@@ -403,7 +366,7 @@ int wfd_process_event(void *user_data, void *data)
                        noti.event = WIFI_DIRECT_CLI_EVENT_CONNECTION_RSP;
                        noti.error = WIFI_DIRECT_ERROR_NONE;
                        snprintf(noti.param1, MACSTR_LEN, MACSTR, MAC2STR(peer->dev_addr));
-                       wfd_event_notify_clients(manager, &noti);
+                       wfd_client_send_event(manager, &noti);
 
                        wfd_util_dhcps_wait_ip_leased(peer);
                        wfd_state_set(manager, WIFI_DIRECT_STATE_GROUP_OWNER);
@@ -442,12 +405,12 @@ int wfd_process_event(void *user_data, void *data)
                                noti.event = WIFI_DIRECT_CLI_EVENT_DISCONNECTION_IND;
                        noti.error = WIFI_DIRECT_ERROR_NONE;
                        snprintf(noti.param1, MACSTR_LEN, MACSTR, MAC2STR(peer->dev_addr));
-                       wfd_event_notify_clients(manager, &noti);
+                       wfd_client_send_event(manager, &noti);
                } else if (manager->state == WIFI_DIRECT_STATE_DISCONNECTING) {
                        noti.event = WIFI_DIRECT_CLI_EVENT_DISCONNECTION_RSP;
                        noti.error = WIFI_DIRECT_ERROR_NONE;
                        snprintf(noti.param1, MACSTR_LEN, MACSTR, MAC2STR(peer->dev_addr));
-                       wfd_event_notify_clients(manager, &noti);
+                       wfd_client_send_event(manager, &noti);
                }
 
                if (group->role == WFD_DEV_ROLE_GO) {
@@ -513,7 +476,7 @@ int wfd_process_event(void *user_data, void *data)
                } else {
                        if (group->flags & WFD_GROUP_FLAG_AUTONOMOUS) {
                                noti.event = WIFI_DIRECT_CLI_EVENT_GROUP_CREATE_RSP;
-                               wfd_event_notify_clients(manager, &noti);
+                               wfd_client_send_event(manager, &noti);
                        } else if (!manager->session) {
                                WDS_LOGE("Unexpected Event. Group should be removed(Owner)");
                                wfd_oem_destroy_group(manager->oem_ops, group->ifname);
@@ -541,13 +504,13 @@ int wfd_process_event(void *user_data, void *data)
                        memset(&noti, 0x0, sizeof(wifi_direct_client_noti_s));
                        noti.event = WIFI_DIRECT_CLI_EVENT_DISCONNECTION_RSP;
                        noti.error = WIFI_DIRECT_ERROR_NONE;
-                       wfd_event_notify_clients(manager, &noti);
+                       wfd_client_send_event(manager, &noti);
                } else {
                        wifi_direct_client_noti_s noti;
                        memset(&noti, 0x0, sizeof(wifi_direct_client_noti_s));
                        noti.event = WIFI_DIRECT_CLI_EVENT_GROUP_DESTROY_RSP;
                        noti.error = WIFI_DIRECT_ERROR_NONE;
-                       wfd_event_notify_clients(manager, &noti);
+                       wfd_client_send_event(manager, &noti);
                }
 
                res = wfd_destroy_group(manager, event->ifname);

diff --git a/src/wifi-direct-session.c b/src/wifi-direct-session.c
index 563d285..c167d47 100644 (file)
--- a/src/wifi-direct-session.c
+++ b/src/wifi-direct-session.c
@@ -39,7 +39,7 @@
 #include "wifi-direct-oem.h"
 #include "wifi-direct-util.h"
 #include "wifi-direct-session.h"
-#include "wifi-direct-event.h"
+#include "wifi-direct-client.h"
 #include "wifi-direct-state.h"
 
 
@@ -65,7 +65,7 @@ static gboolean _session_timeout_cb(gpointer *user_data)
        noti.event = WIFI_DIRECT_CLI_EVENT_CONNECTION_RSP;
        noti.error = WIFI_DIRECT_ERROR_CONNECTION_CANCELED;
        snprintf(noti.param1, MACSTR_LEN, MACSTR, MAC2STR(peer_addr));
-       wfd_event_notify_clients(manager, &noti);
+       wfd_client_send_event(manager, &noti);
 
        wfd_session_cancel(session, peer_addr);
 
@@ -652,7 +652,7 @@ int wfd_session_process_event(wfd_manager_s *manager, wfd_oem_event_s *event)
                        noti.event = WIFI_DIRECT_CLI_EVENT_CONNECTION_REQ;
                        noti.error = WIFI_DIRECT_ERROR_NONE;
                        snprintf(noti.param1, sizeof(noti.param1), MACSTR, MAC2STR(event->dev_addr));
-                       wfd_event_notify_clients(manager, &noti);
+                       wfd_client_send_event(manager, &noti);
                } else {
                        if (session->state > SESSION_STATE_STARTED ||
                                        session->direction == SESSION_DIRECTION_INCOMING) {
@@ -681,7 +681,7 @@ int wfd_session_process_event(wfd_manager_s *manager, wfd_oem_event_s *event)
                                memset(&noti, 0x0, sizeof(wifi_direct_client_noti_s));
                                noti.event = WIFI_DIRECT_CLI_EVENT_CONNECTION_WPS_REQ;
                                snprintf(noti.param1, sizeof(noti.param1), MACSTR, MAC2STR(event->dev_addr));
-                               wfd_event_notify_clients(manager, &noti);
+                               wfd_client_send_event(manager, &noti);
                                if (session->wps_mode == WFD_WPS_MODE_KEYPAD)
                                        break;
                        }

diff --git a/src/wifi-direct-util.c b/src/wifi-direct-util.c
index 33417ba..c3747a8 100644 (file)
--- a/src/wifi-direct-util.c
+++ b/src/wifi-direct-util.c
@@ -44,7 +44,7 @@
 
 #include "wifi-direct-manager.h"
 #include "wifi-direct-state.h"
-#include "wifi-direct-event.h"
+#include "wifi-direct-client.h"
 #include "wifi-direct-util.h"
 
 static int _txt_to_mac(char *txt, unsigned char *mac)
@@ -120,7 +120,7 @@ int wfd_util_get_phone_name(char *phone_name)
 void _wfd_util_dev_name_changed_cb(keynode_t *key, void* data)
 {
        __WDS_LOG_FUNC_ENTER__;
-       char dev_name[DEV_NAME_LEN] = {0, };
+       char dev_name[DEV_NAME_LEN+1] = {0, };
        int res = 0;
 
        res = wfd_util_get_phone_name(dev_name);
@@ -395,7 +395,7 @@ static void _dhcps_ip_leased_cb(keynode_t *key, void* data)
                        noti.event = WIFI_DIRECT_CLI_EVENT_IP_LEASED_IND;
                        snprintf(noti.param1, MACSTR_LEN, MACSTR, MAC2STR(peer->dev_addr));
                        snprintf(noti.param2, IPSTR_LEN, IPSTR, IP2STR(peer->ip_addr));
-                       wfd_event_notify_clients(manager, &noti);
+                       wfd_client_send_event(manager, &noti);
                        break;
                } else {
                        WDS_LOGE("Different interface address peer[" MACSTR "] vs dhcp[" MACSTR "]", MAC2STR(peer->intf_addr), MAC2STR(intf_addr));
@@ -454,7 +454,7 @@ static gboolean _polling_ip(gpointer user_data)
        noti.event = WIFI_DIRECT_CLI_EVENT_CONNECTION_RSP;
        noti.error = WIFI_DIRECT_ERROR_NONE;
        snprintf(noti.param1, MACSTR_LEN, MACSTR, MAC2STR(peer->dev_addr));
-       wfd_event_notify_clients(manager, &noti);
+       wfd_client_send_event(manager, &noti);
 
        __WDS_LOG_FUNC_EXIT__;
        return FALSE;