summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortaesub kim <taesub.kim@samsung.com>2017-11-08 07:05:48 +0000
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>2017-11-08 07:05:48 +0000
commit0781e38143aee18ae14627f47105c1c44120f1dd (patch)
treee969b0e5447c8ee68db8a793438aa0c679e0b7ec /src
parent84939c873fa52437482cc3a3731a10b5676f05d7 (diff)
parent5b04daf30f54e0728d91a65d71e1dc6a47075a11 (diff)
downloadconnman-0781e38143aee18ae14627f47105c1c44120f1dd.tar.gz
connman-0781e38143aee18ae14627f47105c1c44120f1dd.tar.bz2
connman-0781e38143aee18ae14627f47105c1c44120f1dd.zip
Merge "Added handling of "AssocStatusCode" signal" into tizen
Diffstat (limited to 'src')
-rwxr-xr-xsrc/network.c21
-rwxr-xr-xsrc/service.c4
2 files changed, 25 insertions, 0 deletions
diff --git a/src/network.c b/src/network.c
index 546479c2..08b1319a 100755
--- a/src/network.c
+++ b/src/network.c
@@ -101,6 +101,7 @@ struct connman_network {
char *keymgmt_type;
bool rsn_mode;
int disconnect_reason;
+ int assoc_status_code;
void *wifi_vsie;
unsigned int wifi_vsie_len;
#endif
@@ -2092,6 +2093,26 @@ int connman_network_get_disconnect_reason(struct connman_network *network)
return network->wifi.disconnect_reason;
}
+
+int connman_network_set_assoc_status_code(struct connman_network *network,
+ int assoc_status_code)
+{
+
+ if (network == NULL)
+ return 0;
+
+ network->wifi.assoc_status_code = assoc_status_code;
+ return 0;
+}
+
+int connman_network_get_assoc_status_code(struct connman_network *network)
+{
+ if (network == NULL)
+ return 0;
+
+ return network->wifi.assoc_status_code;
+}
+
#endif
int connman_network_set_nameservers(struct connman_network *network,
diff --git a/src/service.c b/src/service.c
index 377582b2..a678e0df 100755
--- a/src/service.c
+++ b/src/service.c
@@ -160,6 +160,7 @@ struct connman_service {
*/
char *keymgmt_type;
int disconnect_reason;
+ int assoc_status_code;
#endif
#ifdef TIZEN_EXT
enum connman_dnsconfig_method dns_config_method_ipv4;
@@ -7133,6 +7134,9 @@ static int service_indicate_state(struct connman_service *service)
case CONNMAN_SERVICE_STATE_FAILURE:
#if defined TIZEN_EXT
+
+ service->assoc_status_code = connman_network_get_assoc_status_code(service->network);
+
if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
service->order = 5;
__connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO);