diff options
author | Maneesh Jain <maneesh.jain@samsung.com> | 2017-02-16 17:04:14 +0530 |
---|---|---|
committer | Maneesh Jain <maneesh.jain@samsung.com> | 2017-02-16 17:04:14 +0530 |
commit | 2e8645c8115381bd1b76876f8a4a7b31640cc239 (patch) | |
tree | 2f59433b3ad209449cc5180e7f1782d4e3d646fa /gsupplicant | |
parent | 732b356621f0b54de4608696e7e9d23416eb2bc6 (diff) | |
download | connman-2e8645c8115381bd1b76876f8a4a7b31640cc239.tar.gz connman-2e8645c8115381bd1b76876f8a4a7b31640cc239.tar.bz2 connman-2e8645c8115381bd1b76876f8a4a7b31640cc239.zip |
[tizen 4.0]: Add support of Disconnect Reason Event Handler
Description: Merged the following upstream patch and modified the
connMan accordingly.
http://git.kernel.org/cgit/network/connman/connman.git/commit/?id=6245582d0dc9a3f47a6880dabf437ee7c351caef
Change-Id: Id90b6d83849c62c2842c038aec516354a2b74060
Signed-off-by: Maneesh Jain <maneesh.jain@samsung.com>
Diffstat (limited to 'gsupplicant')
-rwxr-xr-x | gsupplicant/gsupplicant.h | 3 | ||||
-rwxr-xr-x | gsupplicant/supplicant.c | 46 |
2 files changed, 21 insertions, 28 deletions
diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h index ffd07b25..fe693cdb 100755 --- a/gsupplicant/gsupplicant.h +++ b/gsupplicant/gsupplicant.h @@ -293,7 +293,6 @@ int g_supplicant_interface_disconnect(GSupplicantInterface *interface, #if defined TIZEN_EXT int g_supplicant_interface_remove_network(GSupplicantInterface *interface); -int g_supplicant_interface_get_disconnect_reason(GSupplicantInterface *interface); #endif int g_supplicant_interface_set_apscan(GSupplicantInterface *interface, unsigned int ap_scan); @@ -407,6 +406,8 @@ struct _GSupplicantCallbacks { GSupplicantPeerState state); void (*peer_request) (GSupplicantPeer *peer); void (*debug) (const char *str); + void (*disconnect_reasoncode)(GSupplicantInterface *interface, + int reasoncode); }; typedef struct _GSupplicantCallbacks GSupplicantCallbacks; diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c index c596619a..50b0e67a 100755 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -559,6 +559,20 @@ static void callback_peer_request(GSupplicantPeer *peer) callbacks_pointer->peer_request(peer); } +static void callback_disconnect_reason_code(GSupplicantInterface *interface, + int reason_code) +{ + if (!callbacks_pointer) + return; + + if (!callbacks_pointer->disconnect_reasoncode) + return; + + if (reason_code != 0) + callbacks_pointer->disconnect_reasoncode(interface, + reason_code); +} + static void remove_group(gpointer data) { GSupplicantGroup *group = data; @@ -2288,17 +2302,12 @@ static void interface_property(const char *key, DBusMessageIter *iter, } else if (g_strcmp0(key, "Networks") == 0) { supplicant_dbus_array_foreach(iter, interface_network_added, interface); -#if defined TIZEN_EXT } else if (g_strcmp0(key, "DisconnectReason") == 0) { - int disconnect_reason = 0; - - dbus_message_iter_get_basic(iter, &disconnect_reason); - interface->disconnect_reason = disconnect_reason; - - SUPPLICANT_DBG("disconnect reason (%d)", - interface->disconnect_reason); - -#endif + int reason_code; + if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_INVALID) { + dbus_message_iter_get_basic(iter, &reason_code); + callback_disconnect_reason_code(interface, reason_code); + } } else SUPPLICANT_DBG("key %s type %c", key, dbus_message_iter_get_arg_type(iter)); @@ -5705,23 +5714,6 @@ int g_supplicant_interface_remove_network(GSupplicantInterface *interface) return network_remove(data); } - -int g_supplicant_interface_get_disconnect_reason(GSupplicantInterface *interface) -{ - int reason_code = 0; - - SUPPLICANT_DBG(""); - - if (interface == NULL) - return -EINVAL; - - if (system_available == FALSE) - return -EFAULT; - - reason_code = interface->disconnect_reason; - - return reason_code; -} #endif static const char *g_supplicant_rule0 = "type=signal," |