diff options
author | taesub kim <taesub.kim@samsung.com> | 2017-02-07 02:24:21 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2017-02-07 02:24:21 -0800 |
commit | 074b6f009a49abab5e55e3bddd3bd90e59c27bc6 (patch) | |
tree | 2d8e82ac954ee13f0a817966237184cdae4f0462 /src | |
parent | dab24ad2d7cd118d10099ab0bc6d3c96b14988a5 (diff) | |
parent | 77076d221356867d576bba8084614f1b15700597 (diff) | |
download | connman-074b6f009a49abab5e55e3bddd3bd90e59c27bc6.tar.gz connman-074b6f009a49abab5e55e3bddd3bd90e59c27bc6.tar.bz2 connman-074b6f009a49abab5e55e3bddd3bd90e59c27bc6.zip |
Merge "[connman]: Fixed: ConnMan keep trying connection infintely" into tizen
Diffstat (limited to 'src')
-rwxr-xr-x | src/network.c | 16 | ||||
-rwxr-xr-x | src/service.c | 2 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/network.c b/src/network.c index 715c8ea9..86876192 100755 --- a/src/network.c +++ b/src/network.c @@ -1403,6 +1403,17 @@ static void set_connect_error(struct connman_network *network) CONNMAN_SERVICE_ERROR_CONNECT_FAILED); } +static void set_blocked_error(struct connman_network *network) +{ + struct connman_service *service; + + service = connman_service_lookup_from_network(network); + + __connman_service_indicate_error(service, + CONNMAN_SERVICE_ERROR_BLOCKED); +} + + #if defined TIZEN_EXT static void set_dhcp_error(struct connman_network *network) { @@ -1477,6 +1488,11 @@ void connman_network_set_error(struct connman_network *network, set_dhcp_error(network); break; #endif + + case CONNMAN_NETWORK_ERROR_BLOCKED: + set_blocked_error(network); + break; + } __connman_network_disconnect(network); diff --git a/src/service.c b/src/service.c index f24f4913..f5611705 100755 --- a/src/service.c +++ b/src/service.c @@ -412,6 +412,8 @@ static const char *error2string(enum connman_service_error error) return "auth-failed"; case CONNMAN_SERVICE_ERROR_INVALID_KEY: return "invalid-key"; + case CONNMAN_SERVICE_ERROR_BLOCKED: + return "blocked"; } return NULL; |