diff options
-rw-r--r-- | include/service.h | 3 | ||||
-rw-r--r-- | plugins/iospm.c | 1 | ||||
-rw-r--r-- | src/element.c | 3 | ||||
-rw-r--r-- | src/notifier.c | 7 | ||||
-rw-r--r-- | src/service.c | 10 |
5 files changed, 23 insertions, 1 deletions
diff --git a/include/service.h b/include/service.h index dee3c932..3368ba05 100644 --- a/include/service.h +++ b/include/service.h @@ -42,7 +42,8 @@ enum connman_service_type { CONNMAN_SERVICE_TYPE_WIMAX = 4, CONNMAN_SERVICE_TYPE_BLUETOOTH = 5, CONNMAN_SERVICE_TYPE_CELLULAR = 6, - CONNMAN_SERVICE_TYPE_VPN = 7, + CONNMAN_SERVICE_TYPE_GPS = 7, + CONNMAN_SERVICE_TYPE_VPN = 8, }; enum connman_service_mode { diff --git a/plugins/iospm.c b/plugins/iospm.c index bf25cecc..20c9b46b 100644 --- a/plugins/iospm.c +++ b/plugins/iospm.c @@ -71,6 +71,7 @@ static void iospm_service_enabled(enum connman_service_type type, case CONNMAN_SERVICE_TYPE_WIFI: case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: break; case CONNMAN_SERVICE_TYPE_BLUETOOTH: diff --git a/src/element.c b/src/element.c index 06d8d04c..6dc0a714 100644 --- a/src/element.c +++ b/src/element.c @@ -358,6 +358,7 @@ static gboolean request_scan(GNode *node, gpointer user_data) case CONNMAN_SERVICE_TYPE_ETHERNET: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: return FALSE; case CONNMAN_SERVICE_TYPE_WIFI: @@ -400,6 +401,7 @@ static gboolean enable_technology(GNode *node, gpointer user_data) switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: return FALSE; case CONNMAN_SERVICE_TYPE_ETHERNET: @@ -445,6 +447,7 @@ static gboolean disable_technology(GNode *node, gpointer user_data) switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: return FALSE; case CONNMAN_SERVICE_TYPE_ETHERNET: diff --git a/src/notifier.c b/src/notifier.c index f9fc7386..d2d33428 100644 --- a/src/notifier.c +++ b/src/notifier.c @@ -170,6 +170,7 @@ void __connman_notifier_register(enum connman_service_type type) switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: return; case CONNMAN_SERVICE_TYPE_ETHERNET: @@ -191,6 +192,7 @@ void __connman_notifier_unregister(enum connman_service_type type) switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: return; case CONNMAN_SERVICE_TYPE_ETHERNET: @@ -212,6 +214,7 @@ void __connman_notifier_enable(enum connman_service_type type) switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: return; case CONNMAN_SERVICE_TYPE_ETHERNET: @@ -233,6 +236,7 @@ void __connman_notifier_disable(enum connman_service_type type) switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: return; case CONNMAN_SERVICE_TYPE_ETHERNET: @@ -254,6 +258,7 @@ void __connman_notifier_connect(enum connman_service_type type) switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: return; case CONNMAN_SERVICE_TYPE_ETHERNET: @@ -275,6 +280,7 @@ void __connman_notifier_disconnect(enum connman_service_type type) switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: return; case CONNMAN_SERVICE_TYPE_ETHERNET: @@ -351,6 +357,7 @@ connman_bool_t __connman_notifier_is_enabled(enum connman_service_type type) switch (type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: return FALSE; case CONNMAN_SERVICE_TYPE_ETHERNET: diff --git a/src/service.c b/src/service.c index 841ef85f..57a03d9d 100644 --- a/src/service.c +++ b/src/service.c @@ -139,6 +139,8 @@ const char *__connman_service_type2string(enum connman_service_type type) return "bluetooth"; case CONNMAN_SERVICE_TYPE_CELLULAR: return "cellular"; + case CONNMAN_SERVICE_TYPE_GPS: + return "gps"; case CONNMAN_SERVICE_TYPE_VPN: return "vpn"; } @@ -342,6 +344,7 @@ static void passphrase_changed(struct connman_service *service) case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: return; case CONNMAN_SERVICE_TYPE_WIFI: @@ -379,6 +382,7 @@ static void apn_changed(struct connman_service *service) case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_WIFI: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: return; case CONNMAN_SERVICE_TYPE_CELLULAR: @@ -546,6 +550,7 @@ static DBusMessage *get_properties(DBusConnection *conn, case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: break; case CONNMAN_SERVICE_TYPE_CELLULAR: @@ -1355,6 +1360,7 @@ static gint service_compare(gconstpointer a, gconstpointer b, case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: break; case CONNMAN_SERVICE_TYPE_WIFI: @@ -1681,6 +1687,7 @@ int __connman_service_connect(struct connman_service *service) switch (service->type) { case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: return -EINVAL; case CONNMAN_SERVICE_TYPE_ETHERNET: @@ -2370,6 +2377,7 @@ struct connman_service *__connman_service_create_from_network(struct connman_net case CONNMAN_SERVICE_TYPE_ETHERNET: case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: service->autoconnect = FALSE; break; @@ -2501,6 +2509,7 @@ static int service_load(struct connman_service *service) case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: break; case CONNMAN_SERVICE_TYPE_WIFI: @@ -2647,6 +2656,7 @@ update: case CONNMAN_SERVICE_TYPE_UNKNOWN: case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: break; case CONNMAN_SERVICE_TYPE_WIFI: |