From: Daniel Wagner <[email protected]>
We want to reuse these functions.
---
include/session.h | 4 ++++
src/session.c | 54 ++++++++++++++++++++++++++++++++++++++----------------
2 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/include/session.h b/include/session.h
index 8fbf88e..2b83e49 100644
--- a/include/session.h
+++ b/include/session.h
@@ -79,6 +79,10 @@ void connman_session_config_update(struct connman_session
*session);
struct connman_session_config *connman_session_create_default_config(void);
+enum connman_session_roaming_policy connman_session_parse_roaming_policy(const
char *policy);
+enum connman_session_type connman_session_parse_connection_type(const char
*type);
+int connman_session_parse_bearers(const char *token, GSList **list);
+
const char *connman_session_get_owner(struct connman_session *session);
#ifdef __cplusplus
diff --git a/src/session.c b/src/session.c
index 6ae3857..a7dbe50 100644
--- a/src/session.c
+++ b/src/session.c
@@ -160,7 +160,23 @@ static const char *type2string(enum connman_session_type
type)
return NULL;
}
-static enum connman_session_type string2type(const char *type)
+enum connman_session_roaming_policy connman_session_parse_roaming_policy(const
char *policy)
+{
+ if (g_strcmp0(policy, "default") == 0)
+ return CONNMAN_SESSION_ROAMING_POLICY_DEFAULT;
+ else if (g_strcmp0(policy, "always") == 0)
+ return CONNMAN_SESSION_ROAMING_POLICY_ALWAYS;
+ else if (g_strcmp0(policy, "forbidden") == 0)
+ return CONNMAN_SESSION_ROAMING_POLICY_FORBIDDEN;
+ else if (g_strcmp0(policy, "national") == 0)
+ return CONNMAN_SESSION_ROAMING_POLICY_NATIONAL;
+ else if (g_strcmp0(policy, "international") == 0)
+ return CONNMAN_SESSION_ROAMING_POLICY_INTERNATIONAL;
+ else
+ return CONNMAN_SESSION_ROAMING_POLICY_UNKNOWN;
+}
+
+enum connman_session_type connman_session_parse_connection_type(const char
*type)
{
if (g_strcmp0(type, "any") == 0)
return CONNMAN_SESSION_TYPE_ANY;
@@ -374,9 +390,25 @@ static enum connman_session_type apply_policy_on_type(
return CONNMAN_SESSION_TYPE_INTERNET;
}
-static int parse_bearers(DBusMessageIter *iter, GSList **list)
+int connman_session_parse_bearers(const char *token, GSList **list)
{
enum connman_service_type bearer;
+ int err;
+
+ if (g_strcmp0(token, "") == 0)
+ return 0;
+
+ err = bearer2service(token, &bearer);
+ if (err < 0)
+ return err;
+
+ *list = g_slist_append(*list, GINT_TO_POINTER(bearer));
+
+ return 0;
+}
+
+static int parse_bearers(DBusMessageIter *iter, GSList **list)
+{
DBusMessageIter array;
int type, err;
@@ -396,24 +428,13 @@ static int parse_bearers(DBusMessageIter *iter, GSList
**list)
dbus_message_iter_get_basic(&array, &bearer_name);
- if (g_strcmp0(bearer_name, "") == 0) {
- /*
- * An empty string means 'no match' which
- * translates to allowed_bearers == NULL
- */
- goto next;
- }
-
- err = bearer2service(bearer_name, &bearer);
+ err = connman_session_parse_bearers(bearer_name, list);
if (err < 0) {
g_slist_free(*list);
*list = NULL;
return err;
}
- *list = g_slist_append(*list, GINT_TO_POINTER(bearer));
-
- next:
dbus_message_iter_next(&array);
}
@@ -1473,7 +1494,7 @@ static DBusMessage *change_session(DBusConnection *conn,
dbus_message_iter_get_basic(&value, &val);
info->config.type = apply_policy_on_type(
session->policy_config->type,
- string2type(val));
+ connman_session_parse_connection_type(val));
} else {
goto err;
}
@@ -1714,7 +1735,8 @@ int __connman_session_create(DBusMessage *msg)
case DBUS_TYPE_STRING:
if (g_str_equal(key, "ConnectionType") == TRUE) {
dbus_message_iter_get_basic(&value, &val);
- user_config->type = string2type(val);
+ user_config->type =
+
connman_session_parse_connection_type(val);
user_connection_type = TRUE;
} else {
--
1.7.11.7
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
