diff options
author | Seonah Moon <seonah1.moon@samsung.com> | 2018-01-23 14:50:50 +0900 |
---|---|---|
committer | Seonah Moon <seonah1.moon@samsung.com> | 2018-01-23 14:50:55 +0900 |
commit | 30602f521a85820a9f6b7ac04876400e00c68b15 (patch) | |
tree | f035a4fcc014a034f3b492886d1e8395f327fd25 /include | |
parent | a079cfe6f815f8c69055de834d1ccbdf1fd94ba7 (diff) | |
parent | 9362752a471a5c892d679548fbf2828d5fc5684b (diff) | |
download | connman-30602f521a85820a9f6b7ac04876400e00c68b15.tar.gz connman-30602f521a85820a9f6b7ac04876400e00c68b15.tar.bz2 connman-30602f521a85820a9f6b7ac04876400e00c68b15.zip |
Updated connman to version 1.35
Change-Id: I13526fbf80296a79be15548fc226a308941ac9ec
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
Diffstat (limited to 'include')
-rwxr-xr-x | include/device.h | 4 | ||||
-rwxr-xr-x | include/network.h | 4 | ||||
-rwxr-xr-x | include/provider.h | 3 | ||||
-rwxr-xr-x | include/service.h | 1 | ||||
-rwxr-xr-x | include/session.h | 14 | ||||
-rwxr-xr-x | include/technology.h | 4 |
6 files changed, 19 insertions, 11 deletions
diff --git a/include/device.h b/include/device.h index dafdca25..36b2f550 100755 --- a/include/device.h +++ b/include/device.h @@ -85,10 +85,6 @@ int connman_device_set_scanning(struct connman_device *device, bool connman_device_get_scanning(struct connman_device *device); void connman_device_reset_scanning(struct connman_device *device); -int connman_device_set_disconnected(struct connman_device *device, - bool disconnected); -bool connman_device_get_disconnected(struct connman_device *device); - int connman_device_set_string(struct connman_device *device, const char *key, const char *value); const char *connman_device_get_string(struct connman_device *device, diff --git a/include/network.h b/include/network.h index baf1c01d..4be5fbf0 100755 --- a/include/network.h +++ b/include/network.h @@ -183,10 +183,6 @@ int connman_network_set_blob(struct connman_network *network, const char *key, const void *data, unsigned int size); const void *connman_network_get_blob(struct connman_network *network, const char *key, unsigned int *size); -#if defined TIZEN_EXT -void connman_network_set_vsie_list(struct connman_network *network, GSList *vsie_list); -void *connman_network_get_vsie_list(struct connman_network *network); -#endif struct connman_device *connman_network_get_device(struct connman_network *network); diff --git a/include/provider.h b/include/provider.h index d1a8983b..d28651ad 100755 --- a/include/provider.h +++ b/include/provider.h @@ -124,7 +124,8 @@ struct connman_provider_driver { enum connman_provider_type type; int (*probe) (struct connman_provider *provider); int (*remove) (struct connman_provider *provider); - int (*connect) (struct connman_provider *provider); + int (*connect) (struct connman_provider *provider, + const char *dbus_sender); int (*disconnect) (struct connman_provider *provider); int (*save) (struct connman_provider *provider, GKeyFile *keyfile); int (*set_property) (struct connman_provider *provider, diff --git a/include/service.h b/include/service.h index ff296138..30550233 100755 --- a/include/service.h +++ b/include/service.h @@ -134,6 +134,7 @@ bool connman_service_get_favorite(struct connman_service *service); bool connman_service_get_autoconnect(struct connman_service *service); struct connman_service *connman_service_lookup_from_network(struct connman_network *network); +struct connman_service *connman_service_lookup_from_identifier(const char* identifier); void connman_service_create_ip4config(struct connman_service *service, int index); diff --git a/include/session.h b/include/session.h index 37dfc4e4..5106e886 100755 --- a/include/session.h +++ b/include/session.h @@ -22,6 +22,7 @@ #ifndef __CONNMAN_SESSION_H #define __CONNMAN_SESSION_H +#include <stdint.h> #include <connman/service.h> #ifdef __cplusplus @@ -55,6 +56,12 @@ enum connman_session_id_type { CONNMAN_SESSION_ID_TYPE_LSM = 3, }; +enum connman_session_state { + CONNMAN_SESSION_STATE_DISCONNECTED = 0, + CONNMAN_SESSION_STATE_CONNECTED = 1, + CONNMAN_SESSION_STATE_ONLINE = 2, +}; + struct connman_session; struct connman_session_config { @@ -65,6 +72,8 @@ struct connman_session_config { enum connman_session_type type; bool ecall; GSList *allowed_bearers; + char *allowed_interface; + bool source_ip_rule; }; typedef int (* connman_session_config_func_t) (struct connman_session *session, @@ -83,8 +92,13 @@ struct connman_session_policy { GSList *bearers); bool (*allowed)(struct connman_session *session, struct connman_service *service); + void (*update_session_state)(struct connman_session* session, + enum connman_session_state state); + struct connman_service* (*get_service_for_session)(struct connman_session* session, + GSList* services); }; +uint32_t connman_session_firewall_get_fwmark(struct connman_session *session); int connman_session_policy_register(struct connman_session_policy *config); void connman_session_policy_unregister(struct connman_session_policy *config); diff --git a/include/technology.h b/include/technology.h index 8efe9e74..55bb3dd5 100755 --- a/include/technology.h +++ b/include/technology.h @@ -40,7 +40,7 @@ int connman_technology_tethering_add_station(enum connman_service_type type, const char *mac); int connman_technology_tethering_remove_station(const char *mac); -void connman_technology_tethering_notify(struct connman_technology *technology, +int connman_technology_tethering_notify(struct connman_technology *technology, bool enabled); int connman_technology_set_regdom(const char *alpha2); void connman_technology_regdom_notify(struct connman_technology *technology, @@ -63,7 +63,7 @@ struct connman_technology_driver { int index); int (*set_tethering) (struct connman_technology *technology, const char *identifier, const char *passphrase, - const char *bridge, bool enabled, bool hidden); + const char *bridge, bool enabled); int (*set_regdom) (struct connman_technology *technology, const char *alpha2); }; |