diff options
| author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2012-11-13 09:01:48 +0100 |
|---|---|---|
| committer | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2012-11-23 13:47:24 +0100 |
| commit | 2882f67ff02adbb2ce64b74cb4fe25e834b2021e (patch) | |
| tree | b7595322758bb8b35b41551467a2dbfbf435d67a | |
| parent | 0fdbc9ad6df05ff942afe1bb2f665742987422b8 (diff) | |
| download | connman-2882f67ff02adbb2ce64b74cb4fe25e834b2021e.tar.gz connman-2882f67ff02adbb2ce64b74cb4fe25e834b2021e.tar.bz2 connman-2882f67ff02adbb2ce64b74cb4fe25e834b2021e.zip | |
session: Factor out set default config helper
Whenever a configuration gets invalid (e.g. a configuration
is removed) then we need to be able to drop back to the
default configutation.
| -rw-r--r-- | include/session.h | 1 | ||||
| -rw-r--r-- | src/session.c | 24 |
2 files changed, 18 insertions, 7 deletions
diff --git a/include/session.h b/include/session.h index a4229522..4aca5d01 100644 --- a/include/session.h +++ b/include/session.h @@ -78,6 +78,7 @@ void connman_session_policy_unregister(struct connman_session_policy *config); int connman_session_config_update(struct connman_session *session); void connman_session_destroy(struct connman_session *session); +int connman_session_set_default_config(struct connman_session_config *config); struct connman_session_config *connman_session_create_default_config(void); enum connman_session_roaming_policy connman_session_parse_roaming_policy(const char *policy); diff --git a/src/session.c b/src/session.c index 0b0321fc..c2327886 100644 --- a/src/session.c +++ b/src/session.c @@ -352,6 +352,22 @@ void connman_session_policy_unregister(struct connman_session_policy *policy) remove_policy(policy); } +int connman_session_set_default_config(struct connman_session_config *config) +{ + config->priority = FALSE; + config->roaming_policy = CONNMAN_SESSION_ROAMING_POLICY_DEFAULT; + config->type = CONNMAN_SESSION_TYPE_ANY; + config->ecall = FALSE; + + g_slist_free(config->allowed_bearers); + config->allowed_bearers = g_slist_prepend(NULL, + GINT_TO_POINTER(CONNMAN_SERVICE_TYPE_UNKNOWN)); + if (config->allowed_bearers == NULL) + return -ENOMEM; + + return 0; +} + struct connman_session_config *connman_session_create_default_config(void) { struct connman_session_config *config; @@ -360,13 +376,7 @@ struct connman_session_config *connman_session_create_default_config(void) if (config == NULL) return NULL; - config->priority = FALSE; - config->roaming_policy = CONNMAN_SESSION_ROAMING_POLICY_DEFAULT; - config->type = CONNMAN_SESSION_TYPE_ANY; - config->ecall = FALSE; - config->allowed_bearers = g_slist_prepend(NULL, - GINT_TO_POINTER(CONNMAN_SERVICE_TYPE_UNKNOWN)); - if (config->allowed_bearers == NULL) { + if (connman_session_set_default_config(config) < 0) { g_free(config); return NULL; } |