X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tools%2Fsession-api.c;h=e869d19011b6acdfa044edb97205a11751ff4015;hb=5479dad2b3b5f342f51ca6e7ec8a5a501820bd55;hp=72c0b09d801c4fc553d4c637ede98ce4526e6a35;hpb=516813cd4372bef22681137adf9d13c985bb7b99;p=platform%2Fupstream%2Fconnman.git diff --git a/tools/session-api.c b/tools/session-api.c old mode 100644 new mode 100755 index 72c0b09..e869d19 --- a/tools/session-api.c +++ b/tools/session-api.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2011 BWM CarIT GmbH. All rights reserved. + * Copyright (C) 2011-2014 BMW Car IT GmbH. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -73,7 +73,7 @@ static GSList *session_parse_allowed_bearers(DBusMessageIter *iter) dbus_message_iter_get_basic(&array, &bearer); info = g_try_new0(struct test_bearer_info, 1); - if (info == NULL) { + if (!info) { g_slist_foreach(list, bearer_info_cleanup, NULL); g_slist_free(list); @@ -97,7 +97,7 @@ static DBusMessage *notify_release(DBusConnection *conn, LOG("session %p", session); - if (session->notify != NULL) + if (session->notify) session->notify(session); return NULL; @@ -128,7 +128,7 @@ static DBusMessage *notify_update(DBusConnection *conn, switch (dbus_message_iter_get_arg_type(&value)) { case DBUS_TYPE_ARRAY: - if (g_str_equal(key, "AllowedBearers") == TRUE) { + if (g_str_equal(key, "AllowedBearers")) { allowed_bearers = session_parse_allowed_bearers(&value); g_slist_foreach(info->allowed_bearers, @@ -137,10 +137,10 @@ static DBusMessage *notify_update(DBusConnection *conn, info->allowed_bearers = allowed_bearers; - } else if (g_str_equal(key, "IPv4") == TRUE) { + } else if (g_str_equal(key, "IPv4")) { /* XXX */ - } else if (g_str_equal(key, "IPv6") == TRUE) { + } else if (g_str_equal(key, "IPv6")) { /* XXX */ } else { @@ -149,44 +149,64 @@ static DBusMessage *notify_update(DBusConnection *conn, } break; case DBUS_TYPE_STRING: - if (g_str_equal(key, "State") == TRUE) { + if (g_str_equal(key, "State")) { const char *val; dbus_message_iter_get_basic(&value, &val); info->state = string2state(val); - } else if (g_str_equal(key, "Bearer") == TRUE) { + } else if (g_str_equal(key, "Bearer")) { const char *val; dbus_message_iter_get_basic(&value, &val); - if (info->bearer != NULL) - g_free(info->bearer); - + g_free(info->bearer); info->bearer = g_strdup(val); - } else if (g_str_equal(key, "Name") == TRUE) { + } else if (g_str_equal(key, "Name")) { const char *val; dbus_message_iter_get_basic(&value, &val); - if (info->name != NULL) - g_free(info->name); - + g_free(info->name); info->name = g_strdup(val); - } else if (g_str_equal(key, "Interface") == TRUE) { + } else if (g_str_equal(key, "Interface")) { const char *val; dbus_message_iter_get_basic(&value, &val); - if (info->interface != NULL) - g_free(info->interface); - + g_free(info->interface); info->interface = g_strdup(val); - } else if (g_str_equal(key, "ConnectionType") - == TRUE) { + } else if (g_str_equal(key, "ConnectionType")) { const char *val; dbus_message_iter_get_basic(&value, &val); info->type = string2type(val); + + } else if (g_str_equal(key, "Allowedinterface")) { + const char *val; + dbus_message_iter_get_basic(&value, &val); + + g_free(info->allowed_interface); + info->allowed_interface = g_strdup(val); + + } else if (g_str_equal(key, "ContextIdentifier")) { + const char *val; + dbus_message_iter_get_basic(&value, &val); + + g_free(info->context_identifier); + info->context_identifier = g_strdup(val); + + } else { + g_assert(FALSE); + return __connman_error_invalid_arguments(msg); + } + break; + case DBUS_TYPE_BOOLEAN: + if (g_str_equal(key, "SourceIPRule")) { + dbus_bool_t val; + dbus_message_iter_get_basic(&value, &val); + + info->source_ip_rule = val; + } else { g_assert(FALSE); return __connman_error_invalid_arguments(msg); @@ -199,7 +219,7 @@ static DBusMessage *notify_update(DBusConnection *conn, dbus_message_iter_next(&array); } - if (session->notify != NULL) + if (session->notify) session->notify(session); return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); @@ -216,10 +236,7 @@ static const GDBusMethodTable notify_methods[] = { int session_notify_register(struct test_session *session, const char *notify_path) { - if (g_dbus_register_interface(session->connection, notify_path, - CONNMAN_NOTIFICATION_INTERFACE, - notify_methods, NULL, NULL, - session, NULL) == FALSE) { + if (!g_dbus_register_interface(session->connection, notify_path, CONNMAN_NOTIFICATION_INTERFACE, notify_methods, NULL, NULL, session, NULL)) { return -EINVAL; } @@ -229,8 +246,7 @@ int session_notify_register(struct test_session *session, int session_notify_unregister(struct test_session *session, const char *notify_path) { - if (g_dbus_unregister_interface(session->connection, notify_path, - CONNMAN_NOTIFICATION_INTERFACE) == FALSE) { + if (!g_dbus_unregister_interface(session->connection, notify_path, CONNMAN_NOTIFICATION_INTERFACE)) { return -EINVAL; } @@ -243,7 +259,7 @@ static void append_allowed_bearers(DBusMessageIter *iter, void *user_data) GSList *list; for (list = info->allowed_bearers; - list != NULL; list = list->next) { + list; list = list->next) { struct test_bearer_info *bearer_info = list->data; dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, @@ -254,7 +270,7 @@ static void append_allowed_bearers(DBusMessageIter *iter, void *user_data) void session_append_settings(DBusMessageIter *dict, struct test_session_info *info) { - if (info->allowed_bearers == NULL) + if (!info->allowed_bearers) return; connman_dbus_dict_append_array(dict, "AllowedBearers", @@ -273,15 +289,15 @@ DBusMessage *session_connect(DBusConnection *connection, session->session_path, CONNMAN_SESSION_INTERFACE, "Connect"); - if (message == NULL) + if (!message) return NULL; dbus_error_init(&error); reply = dbus_connection_send_with_reply_and_block(connection, message, -1, &error); - if (reply == NULL) { - if (dbus_error_is_set(&error) == TRUE) { + if (!reply) { + if (dbus_error_is_set(&error)) { LOG("%s", error.message); dbus_error_free(&error); } else { @@ -306,15 +322,15 @@ DBusMessage *session_disconnect(DBusConnection *connection, session->session_path, CONNMAN_SESSION_INTERFACE, "Disconnect"); - if (message == NULL) + if (!message) return NULL; dbus_error_init(&error); reply = dbus_connection_send_with_reply_and_block(connection, message, -1, &error); - if (reply == NULL) { - if (dbus_error_is_set(&error) == TRUE) { + if (!reply) { + if (dbus_error_is_set(&error)) { LOG("%s", error.message); dbus_error_free(&error); } else {