diff options
author | Niraj Kumar Goit <niraj.g@samsung.com> | 2016-06-14 22:24:37 +0530 |
---|---|---|
committer | Niraj Kumar Goit <niraj.g@samsung.com> | 2016-06-15 01:26:32 +0530 |
commit | 535e7f69c650dd1701cdb94152a88e644d079afb (patch) | |
tree | 0143a3631860fe7d3c15453b2311312de270bd3d /src | |
parent | 8bf82d09ca26e4d463314948de7154aac1806d37 (diff) | |
download | connman-535e7f69c650dd1701cdb94152a88e644d079afb.tar.gz connman-535e7f69c650dd1701cdb94152a88e644d079afb.tar.bz2 connman-535e7f69c650dd1701cdb94152a88e644d079afb.zip |
[SPIN] gsupplicant: fix stucking in scanning state when scan failed.
- gsupplicant: fix stucking in scanning state when scan failed.
- Apply ASLR option.
- Add ""TIZEN_WEARABLE"" check in service file.
- change the dhcp client device name.
- default internet service: fix not cleared if pdp activation failed.
- Change Russia cert build feature.
- Update the Connman.service.in file.
- Remove connection retry when association fail.
Change-Id: I3ac8e49d0a3c229b298296f8e7cbf34845c2c90d
Signed-off-by: Niraj Kumar Goit <niraj.g@samsung.com>
Diffstat (limited to 'src')
-rwxr-xr-x | src/connman.service.in | 9 | ||||
-rwxr-xr-x | src/service.c | 12 |
2 files changed, 16 insertions, 5 deletions
diff --git a/src/connman.service.in b/src/connman.service.in index ae7cbea8..1df16701 100755 --- a/src/connman.service.in +++ b/src/connman.service.in @@ -1,15 +1,14 @@ [Unit] Description=Connection service -After=net-config.service -DefaultDependencies=no +Requires=dbus.socket +After=dbus.socket [Service] Type=dbus BusName=net.connman +ExecStartPre=/usr/bin/dbus-send --system --dest=net.netconfig / net.netconfig.auto.activate Restart=on-failure -ExecStart=@sbindir@/connmand -n --noplugin vpn -StandardOutput=null -CapabilityBoundingSet=~CAP_MAC_ADMIN +ExecStart=/usr/sbin/connmand -n [Install] WantedBy=multi-user.target diff --git a/src/service.c b/src/service.c index 22da1e29..9149dd24 100755 --- a/src/service.c +++ b/src/service.c @@ -6602,6 +6602,18 @@ int __connman_service_indicate_error(struct connman_service *service, set_error(service, error); +/* default internet service: fix not cleared if pdp activation*/ +#if defined TIZEN_EXT + /* + * If connection failed for default service(DefaultInternet), + * default_connecting_device should be cleared. + */ + if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR && + service->error == CONNMAN_SERVICE_ERROR_CONNECT_FAILED) + __connman_service_disconnect_default(service); + +#endif + __connman_service_ipconfig_indicate_state(service, CONNMAN_SERVICE_STATE_FAILURE, CONNMAN_IPCONFIG_TYPE_IPV4); |