{
struct connman_session_bearer *bearer = data;
- g_free(bearer->name);
g_free(bearer);
}
return -ENOMEM;
}
- bearer->name = g_strdup(bearer_name);
- bearer->service_type = bearer2service(bearer->name);
+ bearer->service_type = bearer2service(bearer_name);
if (bearer->service_type == CONNMAN_SERVICE_TYPE_UNKNOWN &&
- g_strcmp0(bearer->name, "*") == 0) {
+ g_strcmp0(bearer_name, "*") == 0) {
bearer->match_all = TRUE;
} else {
bearer->match_all = FALSE;
if (bearer == NULL)
return NULL;
- bearer->name = g_strdup(orig->name);
bearer->match_all = orig->match_all;
bearer->service_type = orig->service_type;
if (bearer == NULL)
return NULL;
- bearer->name = g_strdup("");
bearer->match_all = TRUE;
bearer->service_type = CONNMAN_SERVICE_TYPE_UNKNOWN;
for (list = info->config.allowed_bearers;
list != NULL; list = list->next) {
struct connman_session_bearer *bearer = list->data;
+ const char *name =
+ __connman_service_type2string(bearer->service_type);
+
+ if (name == NULL)
+ name = "*";
dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING,
- &bearer->name);
+ &name);
}
}