include: Remove definition for connman_uint16_t

[platform/upstream/connman.git] / include / session.h

diff --git a/include/session.h b/include/session.h
index 63e077b..5b7e07b 100644 (file)
--- a/include/session.h
+++ b/include/session.h
@@ -49,14 +49,25 @@ enum connman_session_type {
        CONNMAN_SESSION_TYPE_INTERNET = 3,
 };
 
-struct connman_session;
-
-struct connman_session_bearer {
-       char *name;
-       connman_bool_t match_all;
-       enum connman_service_type service_type;
+struct cb_data {
+       void *cb;
+       void *user_data;
+       void *data;
 };
 
+static inline struct cb_data *cb_data_new(void *cb, void *user_data)
+{
+       struct cb_data *ret;
+
+       ret = g_new0(struct cb_data, 1);
+       ret->cb = cb;
+       ret->user_data = user_data;
+
+       return ret;
+}
+
+struct connman_session;
+
 struct connman_session_config {
        connman_bool_t priority;
        enum connman_session_roaming_policy roaming_policy;
@@ -65,22 +76,34 @@ struct connman_session_config {
        GSList *allowed_bearers;
 };
 
+typedef int (* connman_session_config_func_t) (struct connman_session *session,
+                                       struct connman_session_config *config,
+                                       void *user_data, int err);
+
 struct connman_session_policy {
        const char *name;
        int priority;
-       struct connman_session_config *(*create)(
-                                       struct connman_session *session);
+       int (*create)(struct connman_session *session,
+                       connman_session_config_func_t cb,
+                       void *user_data);
        void (*destroy)(struct connman_session *session);
 };
 
 int connman_session_policy_register(struct connman_session_policy *config);
 void connman_session_policy_unregister(struct connman_session_policy *config);
 
-GSList *connman_session_allowed_bearers_any(void);
-void connman_session_free_bearers(GSList *bearers);
+int connman_session_config_update(struct connman_session *session);
+void connman_session_destroy(struct connman_session *session);
 
+void 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);
+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
 }
 #endif