From f778433f567d5d6ab84da0ce1d720e6ab3b903b5 Mon Sep 17 00:00:00 2001 From: Jihoon Jung Date: Thu, 4 Oct 2018 16:53:28 +0900 Subject: [PATCH] apply indentation Signed-off-by: Jihoon Jung --- src/mdg-manager/include/mdgd_context.h | 3 +- src/mdg-manager/include/mdgd_db.h | 5 +- src/mdg-manager/include/mdgd_gdbus.h | 9 +- src/mdg-manager/include/mdgd_group.h | 20 +-- src/mdg-manager/include/mdgd_iot.h | 15 +- src/mdg-manager/include/mdgd_log.h | 75 ++++----- src/mdg-manager/include/mdgd_resource.h | 3 +- src/mdg-manager/include/mdgd_typedef.h | 90 +++++----- src/mdg-manager/include/mdgd_util.h | 25 +-- src/mdg-manager/src/mdgd_context.c | 1 - src/mdg-manager/src/mdgd_db.c | 53 +++--- src/mdg-manager/src/mdgd_gdbus.c | 218 ++++++++++++------------- src/mdg-manager/src/mdgd_group.c | 24 +-- src/mdg-manager/src/mdgd_iot.cpp | 133 +++++++-------- src/mdg-manager/src/mdgd_iot_client.cpp | 159 +++++++++--------- src/mdg-manager/src/mdgd_iot_server.cpp | 167 ++++++++++--------- src/mdg-manager/src/mdgd_log.c | 112 ++++++------- src/mdg-manager/src/mdgd_manager.c | 4 +- src/mdg-manager/src/mdgd_util.c | 280 ++++++++++++++++---------------- 19 files changed, 681 insertions(+), 715 deletions(-) diff --git a/src/mdg-manager/include/mdgd_context.h b/src/mdg-manager/include/mdgd_context.h index cce1581..c49d356 100644 --- a/src/mdg-manager/include/mdgd_context.h +++ b/src/mdg-manager/include/mdgd_context.h @@ -21,8 +21,7 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif int mdgd_context_create(); diff --git a/src/mdg-manager/include/mdgd_db.h b/src/mdg-manager/include/mdgd_db.h index 0f791ba..54aa89c 100644 --- a/src/mdg-manager/include/mdgd_db.h +++ b/src/mdg-manager/include/mdgd_db.h @@ -19,12 +19,11 @@ #define __MDGD_DB_H__ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif -#include #include +#include #define MDGD_DB_FILE "/opt/usr/dbspace/.mdgd.db" #define MDGD_DB_GROUP_TABLE "mdgd_group" diff --git a/src/mdg-manager/include/mdgd_gdbus.h b/src/mdg-manager/include/mdgd_gdbus.h index ec30f01..f9d6ff7 100644 --- a/src/mdg-manager/include/mdgd_gdbus.h +++ b/src/mdg-manager/include/mdgd_gdbus.h @@ -21,16 +21,15 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #define MDGD_DBUS_SERVICE "org.tizen.mdg" /**< For mdg dbus */ #define MDGD_DBUS_GROUP_INTERFACE "org.tizen.mdg.group" -#define MDGD_DBUS_GROUP_PATH "/org/tizen/mdg/group" /**< For group commands */ +#define MDGD_DBUS_GROUP_PATH "/org/tizen/mdg/group" /**< For group commands */ #define MDGD_DBUS_ENABLER_PATH "/org/tizen/mdg/enabler" /**< For d-bus activation */ -#define DBUS_SERVICE_DBUS "org.freedesktop.DBus" -#define DBUS_INTERFACE_DBUS "org.freedesktop.DBus" +#define DBUS_SERVICE_DBUS "org.freedesktop.DBus" +#define DBUS_INTERFACE_DBUS "org.freedesktop.DBus" void mdgd_gdbus_emit_event(char *sender, mdgd_event_type_e type, int ret, GVariant *data); int mdgd_gdbus_init(); diff --git a/src/mdg-manager/include/mdgd_group.h b/src/mdg-manager/include/mdgd_group.h index 71dba06..0808599 100644 --- a/src/mdg-manager/include/mdgd_group.h +++ b/src/mdg-manager/include/mdgd_group.h @@ -21,36 +21,30 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* Group Manangement */ -int mdgd_group_create(const char* name); -int mdgd_group_delete(char* name); +int mdgd_group_create(const char *name); +int mdgd_group_delete(char *name); int mdgd_group_find(char *sender, int timeout); int mdgd_group_find_device(char *sender, int timeout, bool is_invited); -int mdgd_group_invite_device(char *sender, char *group_name, - mdgd_device_t *device, char *pin); +int mdgd_group_invite_device(char *sender, char *group_name, mdgd_device_t *device, char *pin); int mdgd_group_eject_device(char *sender, char *group_name, char *uuid); int mdgd_group_regist_channel(char *sender, char *channel_id); int mdgd_group_unregist_channel(char *sender, char *channel_id); -int mdgd_group_send_data(char *sender, char *uuid, char *channel_id, - unsigned char *data, int len, int *msg_id); -int mdgd_group_send_response(char *sender, char *uuid, char *channel_id, - int msg_id, unsigned char *data, int len); +int mdgd_group_send_data(char *sender, char *uuid, char *channel_id, unsigned char *data, int len, int *msg_id); +int mdgd_group_send_response(char *sender, char *uuid, char *channel_id, int msg_id, unsigned char *data, int len); int mdgd_group_set_preconfigured_pin(char *pin); /* Group Request to remote */ -int mdgd_group_request(mdgd_request_type_e type, char *sender, char *uuid, - char *arg1, char *arg2, char *arg3, void *user_data); +int mdgd_group_request(mdgd_request_type_e type, char *sender, char *uuid, char *arg1, char *arg2, char *arg3, void *user_data); /* send signal to client */ int mdgd_group_notify_event(char *sender, mdgd_event_type_e type, int result, void *user_data); - #ifdef __cplusplus } #endif diff --git a/src/mdg-manager/include/mdgd_iot.h b/src/mdg-manager/include/mdgd_iot.h index bd2f1cf..77b8ee3 100644 --- a/src/mdg-manager/include/mdgd_iot.h +++ b/src/mdg-manager/include/mdgd_iot.h @@ -18,12 +18,11 @@ #ifndef __MDGD_IOT_H__ #define __MDGD_IOT_H__ -#include #include +#include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #define MAX_FILE_PATH_LEN 1024 @@ -43,15 +42,15 @@ int mdgd_iot_delete_resource(mdgd_resource_type_e resource_type, const char *uri int mdgd_iot_discovery_resource(mdgd_resource_type_e resource_type, void *user_data); int mdgd_iot_get_device_description(mdgd_command_t *cmd, char *host_addr, int conn_type); int mdgd_iot_send_response(char *sender, char *uuid, char *channel_id, - int msg_id, unsigned char *data, int len, bool timeout); + int msg_id, unsigned char *data, int len, bool timeout); int mdgd_iot_set_preconfigured_pin(char *pin); int mdgd_iot_remove_subowner(char *subject_id); int mdgd_iot_deinitialize(); -int mdgd_iot_find_devices(char* sender, int timeout, bool is_invited); -int mdgd_iot_pair(char *group_name, char *pin, char* target1, char *subject1, char *uri1, - char *rt1, char *interface1, int permission1, char* target2, - char *subject2, char *uri2, char *rt2, char *interface2, int permission2); +int mdgd_iot_find_devices(char *sender, int timeout, bool is_invited); +int mdgd_iot_pair(char *group_name, char *pin, char *target1, char *subject1, char *uri1, + char *rt1, char *interface1, int permission1, char *target2, + char *subject2, char *uri2, char *rt2, char *interface2, int permission2); int mdgd_iot_unpair(char *group_name, char *subowner_id, char *subowned_id); #ifdef __cplusplus diff --git a/src/mdg-manager/include/mdgd_log.h b/src/mdg-manager/include/mdgd_log.h index 228fc71..dc168b6 100644 --- a/src/mdg-manager/include/mdgd_log.h +++ b/src/mdg-manager/include/mdgd_log.h @@ -21,64 +21,65 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #ifdef LOG_TAG #undef LOG_TAG #endif -#define COLOR_RED "\033[0;31m" -#define COLOR_GREEN "\033[0;32m" -#define COLOR_BROWN "\033[0;33m" -#define COLOR_BLUE "\033[0;34m" -#define COLOR_PURPLE "\033[0;35m" -#define COLOR_CYAN "\033[0;36m" -#define COLOR_LIGHTBLUE "\033[0;37m" -#define COLOR_END "\033[0;m" +#define COLOR_RED "\033[0;31m" +#define COLOR_GREEN "\033[0;32m" +#define COLOR_BROWN "\033[0;33m" +#define COLOR_BLUE "\033[0;34m" +#define COLOR_PURPLE "\033[0;35m" +#define COLOR_CYAN "\033[0;36m" +#define COLOR_LIGHTBLUE "\033[0;37m" +#define COLOR_END "\033[0;m" #define LOG_TAG "MDGD" -#define LOG_DEBUG(fmt, ...) \ - do { \ - LOGD(COLOR_BROWN" " fmt COLOR_END, ##__VA_ARGS__); \ +#define LOG_DEBUG(fmt, ...) \ + do { \ + LOGD(COLOR_BROWN " " fmt COLOR_END, ##__VA_ARGS__); \ } while (0) -#define LOG_ERR(fmt, ...) \ - do { \ - LOGE(COLOR_RED" " fmt COLOR_END, ##__VA_ARGS__); \ +#define LOG_ERR(fmt, ...) \ + do { \ + LOGE(COLOR_RED " " fmt COLOR_END, ##__VA_ARGS__); \ } while (0) -#define LOG_BEGIN() \ - do { \ +#define LOG_BEGIN() \ + do { \ LOGD(COLOR_BLUE "BEGIN" COLOR_END); \ } while (0) -#define LOG_END() \ - do { \ +#define LOG_END() \ + do { \ LOGD(COLOR_BLUE "END" COLOR_END); \ } while (0) #define NOTUSED(var) (var = var) -#define mdgd_check_null_ret_error(name, value, error) do { \ - /* LCOV_EXCL_START */ \ - if (G_UNLIKELY(NULL == (value))) { \ - LOGE("%s is NULL", name); \ - return error; \ - } \ - /* LCOV_EXCL_STOP */ \ -} while (FALSE) +#define mdgd_check_null_ret_error(name, value, error) \ + do { \ + /* LCOV_EXCL_START */ \ + if (G_UNLIKELY(NULL == (value))) { \ + LOGE("%s is NULL", name); \ + return error; \ + } \ + /* LCOV_EXCL_STOP */ \ + } while (FALSE) -#define mdgd_check_null_ret(name, value) do { \ - /* LCOV_EXCL_START */ \ - if (G_UNLIKELY(NULL == (value))) { \ - LOGE("%s is NULL", name); \ - return; \ - } \ - /* LCOV_EXCL_STOP */ \ -} while (FALSE) +#define mdgd_check_null_ret(name, value) \ + do { \ + /* LCOV_EXCL_START */ \ + if (G_UNLIKELY(NULL == (value))) { \ + LOGE("%s is NULL", name); \ + return; \ + } \ + /* LCOV_EXCL_STOP */ \ + } while (FALSE) const char *mdgd_log_get_error_string(int result); -const char* mdgd_log_get_iot_error_string(int result); +const char *mdgd_log_get_iot_error_string(int result); #ifdef __cplusplus } diff --git a/src/mdg-manager/include/mdgd_resource.h b/src/mdg-manager/include/mdgd_resource.h index b00c8cc..5960c3d 100644 --- a/src/mdg-manager/include/mdgd_resource.h +++ b/src/mdg-manager/include/mdgd_resource.h @@ -22,8 +22,7 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif char *mdgd_resource_get_type(mdgd_resource_type_e resource_type); diff --git a/src/mdg-manager/include/mdgd_typedef.h b/src/mdg-manager/include/mdgd_typedef.h index 11505c1..36742cd 100644 --- a/src/mdg-manager/include/mdgd_typedef.h +++ b/src/mdg-manager/include/mdgd_typedef.h @@ -18,22 +18,22 @@ #ifndef __MDGD_TYPEDEF_H__ #define __MDGD_TYPEDEF_H__ -#include -#include -#include +#include +#include +#include +#include #include +#include #include -#include -#include +#include #include #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include #define NOTUSED(var) (var = var) /**< It is used to avoid generating build warning */ @@ -47,47 +47,47 @@ * @since_tizen 5.0 */ typedef enum { - MDGD_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */ - MDGD_ERROR_IO_ERROR = TIZEN_ERROR_IO_ERROR, /**< I/O error */ + MDGD_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */ + MDGD_ERROR_IO_ERROR = TIZEN_ERROR_IO_ERROR, /**< I/O error */ MDGD_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */ - MDGD_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */ + MDGD_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */ MDGD_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED, /**< Permission denied */ - MDGD_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< Not supported */ - MDGD_ERROR_OPERATION_FAILED = TIZEN_ERROR_MDG | 0x01, /**< operation failed */ - MDGD_ERROR_NO_DATA = TIZEN_ERROR_MDG | 0x02, /**< Data not exists */ - MDGD_ERROR_ALREADY_REGISTERED = TIZEN_ERROR_MDG | 0x03, /**< Request already registered */ - MDGD_ERROR_IN_PROGRESS = TIZEN_ERROR_MDG | 0x04,/**< operation is in progress */ - MDGD_ERROR_COMM_ERROR = TIZEN_ERROR_MDG | 0x05, /**< communication error */ - MDGD_ERROR_PLUGIN_FAIL = TIZEN_ERROR_MDG | 0x06, /**< Plugin failed */ - MDGD_ERROR_NOT_STARTED = TIZEN_ERROR_MDG | 0x07, /**< Service Not Started */ - MDGD_ERROR_DB = TIZEN_ERROR_MDG | 0x08, /**< Internal DB error */ + MDGD_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< Not supported */ + MDGD_ERROR_OPERATION_FAILED = TIZEN_ERROR_MDG | 0x01, /**< operation failed */ + MDGD_ERROR_NO_DATA = TIZEN_ERROR_MDG | 0x02, /**< Data not exists */ + MDGD_ERROR_ALREADY_REGISTERED = TIZEN_ERROR_MDG | 0x03, /**< Request already registered */ + MDGD_ERROR_IN_PROGRESS = TIZEN_ERROR_MDG | 0x04, /**< operation is in progress */ + MDGD_ERROR_COMM_ERROR = TIZEN_ERROR_MDG | 0x05, /**< communication error */ + MDGD_ERROR_PLUGIN_FAIL = TIZEN_ERROR_MDG | 0x06, /**< Plugin failed */ + MDGD_ERROR_NOT_STARTED = TIZEN_ERROR_MDG | 0x07, /**< Service Not Started */ + MDGD_ERROR_DB = TIZEN_ERROR_MDG | 0x08, /**< Internal DB error */ MDGD_ERROR_NETWORK_UNREACHABLE = TIZEN_ERROR_MDG | 0x09, } mdg_error_e; typedef enum { MDGD_RESOURCE_TYPE_GROUP = 0, /**< Group resource type */ - MDGD_RESOURCE_TYPE_DEVICE, /**< Device resource type */ - MDGD_RESOURCE_TYPE_DATA, /**< Data resource type */ + MDGD_RESOURCE_TYPE_DEVICE, /**< Device resource type */ + MDGD_RESOURCE_TYPE_DATA, /**< Data resource type */ MDGD_RESOURCE_TYPE_MAX } mdgd_resource_type_e; typedef enum { - MDGD_GROUP_TYPE_LOCAL = 1, /**< Local group type */ + MDGD_GROUP_TYPE_LOCAL = 1, /**< Local group type */ MDGD_GROUP_TYPE_REMOTE = 2, /**< Remote group type */ } mdgd_group_type_e; typedef enum { - MDGD_DEVICE_TYPE_LOCAL = 1, /**< Local group type */ + MDGD_DEVICE_TYPE_LOCAL = 1, /**< Local group type */ MDGD_DEVICE_TYPE_REMOTE = 2, /**< Remote group type */ } mdgd_device_type_e; typedef enum { MDGD_REQ_CREATE_GROUP = 0, /**< Create Group */ - MDGD_REQ_INVITE_DEVICE, /**< Invite Device */ - MDGD_REQ_EJECT_DEVICE, /**< Eject Device */ - MDGD_REQ_CHANNEL_LIST, /**< Channel List */ - MDGD_REQ_SEND_DATA, /**< Send data */ - MDGD_REQ_SEND_FILE, /**< Send File */ + MDGD_REQ_INVITE_DEVICE, /**< Invite Device */ + MDGD_REQ_EJECT_DEVICE, /**< Eject Device */ + MDGD_REQ_CHANNEL_LIST, /**< Channel List */ + MDGD_REQ_SEND_DATA, /**< Send data */ + MDGD_REQ_SEND_FILE, /**< Send File */ MDGD_REQ_EVENT_INVITED, MDGD_REQ_EVENT_EJECTED, } mdgd_request_type_e; @@ -114,19 +114,19 @@ typedef enum { } mdgd_event_type_e; typedef struct { - char *device_id; /**< Device ID */ - char *group_name; /**< Group name */ + char *device_id; /**< Device ID */ + char *group_name; /**< Group name */ mdgd_group_type_e type; /**< Group type */ char *sender; } mdgd_group_t; typedef struct { - char *device_id; /**< Device Id */ - char *model_name; /**< Device ID */ - char *device_name; /**< Host address */ + char *device_id; /**< Device Id */ + char *model_name; /**< Device ID */ + char *device_name; /**< Host address */ char *platform_ver; /**< Group name */ - char *vendor_id; /**< Resource type */ - char *profile; /**< Group yype */ + char *vendor_id; /**< Resource type */ + char *profile; /**< Group yype */ bool is_invited; mdgd_device_type_e type; /**< Group type */ } mdgd_device_t; @@ -172,14 +172,14 @@ typedef struct { } mdgd_conn_destroy_data; typedef struct { - int resource_type; /**< OCF resource type */ + int resource_type; /**< OCF resource type */ mdgd_request_type_e type; /**< Comments set for group management */ - gchar *uuid; /**< Device UUID */ - gchar *addr; /**< Host address + Port */ - gchar *sender; /**< Dbus Sender */ - gchar *arg1; /**< Arguement #1 */ - gchar *arg2; /**< Arguement #2 */ - gchar *arg3; /**< Arguement #3 */ + gchar *uuid; /**< Device UUID */ + gchar *addr; /**< Host address + Port */ + gchar *sender; /**< Dbus Sender */ + gchar *arg1; /**< Arguement #1 */ + gchar *arg2; /**< Arguement #2 */ + gchar *arg3; /**< Arguement #3 */ #ifdef SUPPORT_BASE64_ENCODING unsigned char *data; int data_len; diff --git a/src/mdg-manager/include/mdgd_util.h b/src/mdg-manager/include/mdgd_util.h index e2a46ee..c1ef73c 100644 --- a/src/mdg-manager/include/mdgd_util.h +++ b/src/mdg-manager/include/mdgd_util.h @@ -19,20 +19,19 @@ #define __MDGD_UTIL_H__ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif +#include +#include #include #include -#include -#include -const char* mdgd_ocf_error_to_string(int err); -char* mdgd_get_readable_uuid(const OicUuid_t* uuid); +const char *mdgd_ocf_error_to_string(int err); +char *mdgd_get_readable_uuid(const OicUuid_t *uuid); char *mdgd_addr2host(char *addr, int port, bool is_secure); -int mdgd_uuid_to_str(const OicUuid_t* uuid, char** strUuid); -int mdgd_str_to_uuid(const char *strUuid, OicUuid_t* uuid); +int mdgd_uuid_to_str(const OicUuid_t *uuid, char **strUuid); +int mdgd_str_to_uuid(const char *strUuid, OicUuid_t *uuid); void mdgd_clean_user_data(void *user_data); GVariant *mdgd_create_variant_group(mdgd_group_t *group); GVariant *mdgd_create_variant_device(mdgd_device_t *device); @@ -40,17 +39,11 @@ GVariant *mdgd_create_variant_receive_file(mdgd_receive_file_t *receive_file); GVariant *mdgd_create_variant_channel(mdgd_channel_t *channel); GVariant *mdgd_create_variant_data(mdgd_data_t *data); GVariant *mdgd_create_variant_device_list(char *group_name); -GVariant *mdgd_create_variant_progress(char *file_path, - long send_size, long total_size, int percent); +GVariant *mdgd_create_variant_progress(char *file_path, long send_size, long total_size, int percent); GVariant *mdgd_create_variant_dummy(); mdgd_device_t *mdgd_get_device_from_variant(GVariant *va); int mdgd_util_get_msg_id(); -void mdgd_util_data_encode(const char *data, int data_len, - char **encoded_data, int *encoded_len); - -void mdgd_util_data_decode(const char *data, int data_len, - char **decoded_data, int *decoded_len); - +void mdgd_util_data_encode(const char *data, int data_len, char **encoded_data, int *encoded_len); #ifdef __cplusplus } diff --git a/src/mdg-manager/src/mdgd_context.c b/src/mdg-manager/src/mdgd_context.c index 3715218..020d285 100644 --- a/src/mdg-manager/src/mdgd_context.c +++ b/src/mdg-manager/src/mdgd_context.c @@ -60,4 +60,3 @@ mdgd_context_t *mdgd_context_get_context() { return mdgd_ctx; } - diff --git a/src/mdg-manager/src/mdgd_db.c b/src/mdg-manager/src/mdgd_db.c index 18f5b8d..9cc5e87 100644 --- a/src/mdg-manager/src/mdgd_db.c +++ b/src/mdg-manager/src/mdgd_db.c @@ -15,8 +15,8 @@ * */ -#include #include +#include #include static bool __is_table_existing(const char *table) @@ -80,7 +80,7 @@ static int __create_group_table() } sql = sqlite3_mprintf("CREATE TABLE %s(id INTEGER PRIMARY KEY, group_name TEXT);", - MDGD_DB_GROUP_TABLE); + MDGD_DB_GROUP_TABLE); if (sql != NULL) { sql_ret = sqlite3_exec(mdgd_ctx->db, sql, NULL, NULL, &error); @@ -113,7 +113,7 @@ static int __create_device_table() } sql = sqlite3_mprintf("CREATE TABLE %s(id INTEGER PRIMARY KEY, group_name TEXT, device_id TEXT, model_name TEXT, device_name TEXT, platform_ver TEXT, vendor_id TEXT, profile TEXT, is_invited INTEGER, type INTEGER);", - MDGD_DB_DEVICE_TABLE); + MDGD_DB_DEVICE_TABLE); if (sql != NULL) { sql_ret = sqlite3_exec(mdgd_ctx->db, sql, NULL, NULL, &error); @@ -186,7 +186,7 @@ int mdgd_db_init() if (mdgd_ctx->db == NULL) { sql_ret = sqlite3_open_v2(MDGD_DB_FILE, &(mdgd_ctx->db), - SQLITE_OPEN_FULLMUTEX | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL); + SQLITE_OPEN_FULLMUTEX | SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL); if (sql_ret != SQLITE_OK) { LOG_ERR("sqlite3_open_v2 failed, (%d)", sql_ret); goto ERR; @@ -269,8 +269,8 @@ int mdgd_db_group_insert(const char *group_name) } sql = sqlite3_mprintf("INSERT INTO %s (group_name) values(%Q);", - MDGD_DB_GROUP_TABLE, - group_name); + MDGD_DB_GROUP_TABLE, + group_name); if (sql != NULL) { sql_ret = sqlite3_exec(mdgd_ctx->db, sql, NULL, NULL, &error); @@ -307,16 +307,16 @@ int mdgd_db_device_insert(const char *group_name, mdgd_device_t *device) } sql = sqlite3_mprintf("INSERT INTO %s (group_name, device_id, model_name, device_name, platform_ver, vendor_id, profile, is_invited, type) values(%Q, %Q, %Q, %Q, %Q, %Q, %Q, %d, %d);", - MDGD_DB_DEVICE_TABLE, - group_name, - device->device_id, - device->model_name, - device->device_name, - device->platform_ver, - device->vendor_id, - device->profile, - device->is_invited, - device->type); + MDGD_DB_DEVICE_TABLE, + group_name, + device->device_id, + device->model_name, + device->device_name, + device->platform_ver, + device->vendor_id, + device->profile, + device->is_invited, + device->type); if (sql != NULL) { sql_ret = sqlite3_exec(mdgd_ctx->db, sql, NULL, NULL, &error); @@ -358,8 +358,8 @@ int mdgd_db_group_delete(char *group_name) } sql = sqlite3_mprintf("DELETE FROM %s WHERE group_name=%Q", - MDGD_DB_GROUP_TABLE, - group_name); + MDGD_DB_GROUP_TABLE, + group_name); if (sql != NULL) { sql_ret = sqlite3_exec(mdgd_ctx->db, sql, NULL, NULL, &error); @@ -406,9 +406,9 @@ int mdgd_db_device_delete(char *group_name, char *device_id) } sql = sqlite3_mprintf("DELETE FROM %s WHERE group_name=%Q and device_id=%Q", - MDGD_DB_DEVICE_TABLE, - group_name, - device_id); + MDGD_DB_DEVICE_TABLE, + group_name, + device_id); if (sql != NULL) { sql_ret = sqlite3_exec(mdgd_ctx->db, sql, NULL, NULL, &error); @@ -424,7 +424,6 @@ int mdgd_db_device_delete(char *group_name, char *device_id) } return ret; - } bool mdgd_db_check_device_exist(char *device_id) @@ -438,7 +437,7 @@ bool mdgd_db_check_device_exist(char *device_id) mdgd_context_t *mdgd_ctx = mdgd_context_get_context(); sql = sqlite3_mprintf("SELECT count(*) FROM %s WHERE device_id=%Q;", - MDGD_DB_DEVICE_TABLE, device_id); + MDGD_DB_DEVICE_TABLE, device_id); if (sql != NULL) { sqlite3_stmt *stmt = NULL; @@ -489,7 +488,7 @@ bool mdgd_db_check_device_exist_in_group(char *group_name, char *device_id) mdgd_context_t *mdgd_ctx = mdgd_context_get_context(); sql = sqlite3_mprintf("SELECT count(*) FROM %s WHERE group_name=%Q and device_id=%Q;", - MDGD_DB_DEVICE_TABLE, group_name, device_id); + MDGD_DB_DEVICE_TABLE, group_name, device_id); if (sql != NULL) { sqlite3_stmt *stmt = NULL; @@ -540,7 +539,7 @@ bool mdgd_db_check_group_exist(const char *group_name) mdgd_context_t *mdgd_ctx = mdgd_context_get_context(); sql = sqlite3_mprintf("SELECT count(*) FROM %s WHERE group_name=%Q;", - MDGD_DB_GROUP_TABLE, group_name); + MDGD_DB_GROUP_TABLE, group_name); if (sql != NULL) { sqlite3_stmt *stmt = NULL; @@ -623,7 +622,7 @@ void mdgd_db_get_devices_in_group(char *group_name, mdgd_device_t **devices, int mdgd_context_t *mdgd_ctx = mdgd_context_get_context(); sql = sqlite3_mprintf("SELECT * FROM %s WHERE group_name=%Q;", - MDGD_DB_DEVICE_TABLE, group_name); + MDGD_DB_DEVICE_TABLE, group_name); if (sql != NULL) { sqlite3_stmt *stmt = NULL; @@ -658,7 +657,6 @@ void mdgd_db_get_devices_in_group(char *group_name, mdgd_device_t **devices, int LOG_END(); } - int mdgd_db_group_print() { int ret, i = 0; @@ -732,4 +730,3 @@ int mdgd_db_device_print() return 0; } - diff --git a/src/mdg-manager/src/mdgd_gdbus.c b/src/mdg-manager/src/mdgd_gdbus.c index 98b0150..63cd8ed 100644 --- a/src/mdg-manager/src/mdgd_gdbus.c +++ b/src/mdg-manager/src/mdgd_gdbus.c @@ -18,15 +18,15 @@ #include #include -#include #include #include +#include static Group *group_skeleton; static Enabler *enabler_skeleton; gboolean group_create(Group *group, GDBusMethodInvocation *invocation, - gchar *group_name, gpointer user_data) + gchar *group_name, gpointer user_data) { gint result = MDGD_ERROR_NONE; @@ -41,7 +41,7 @@ gboolean group_create(Group *group, GDBusMethodInvocation *invocation, } gboolean group_find(Group *group, GDBusMethodInvocation *invocation, gint timeout, - gpointer user_data) + gpointer user_data) { gint result = MDGD_ERROR_NONE; const gchar *sender = g_dbus_method_invocation_get_sender(invocation); @@ -57,7 +57,7 @@ gboolean group_find(Group *group, GDBusMethodInvocation *invocation, gint timeou } gboolean group_delete(Group *group, GDBusMethodInvocation *invocation, - gchar *group_name, gpointer user_data) + gchar *group_name, gpointer user_data) { gint result = MDGD_ERROR_NONE; @@ -72,7 +72,7 @@ gboolean group_delete(Group *group, GDBusMethodInvocation *invocation, } gboolean group_find_device(Group *group, GDBusMethodInvocation *invocation, - gint timeout, gint is_invited, gpointer user_data) + gint timeout, gint is_invited, gpointer user_data) { int result = MDGD_ERROR_NONE; const gchar *sender = g_dbus_method_invocation_get_sender(invocation); @@ -88,7 +88,7 @@ gboolean group_find_device(Group *group, GDBusMethodInvocation *invocation, } gboolean group_invite_device(Group *group, GDBusMethodInvocation *invocation, gchar *group_name, - GVariant *va, gchar *pin, gpointer user_data) + GVariant *va, gchar *pin, gpointer user_data) { gint result = MDGD_ERROR_NONE; const gchar *sender = g_dbus_method_invocation_get_sender(invocation); @@ -107,7 +107,7 @@ gboolean group_invite_device(Group *group, GDBusMethodInvocation *invocation, gc } gboolean group_eject_device(Group *group, GDBusMethodInvocation *invocation, gchar *group_name, - gchar *uuid, gpointer user_data) + gchar *uuid, gpointer user_data) { gint result = MDGD_ERROR_NONE; const gchar *sender = g_dbus_method_invocation_get_sender(invocation); @@ -123,7 +123,7 @@ gboolean group_eject_device(Group *group, GDBusMethodInvocation *invocation, gch } gboolean group_get_local_device(Group *group, - GDBusMethodInvocation *invocation, gpointer user_data) + GDBusMethodInvocation *invocation, gpointer user_data) { GVariant *device_data; mdgd_context_t *mdgd_ctx = mdgd_context_get_context(); @@ -139,7 +139,7 @@ gboolean group_get_local_device(Group *group, } gboolean group_get_local_channel_list(Group *group, - GDBusMethodInvocation *invocation, gpointer user_data) + GDBusMethodInvocation *invocation, gpointer user_data) { GVariant *device_data; mdgd_context_t *mdgd_ctx = mdgd_context_get_context(); @@ -155,7 +155,7 @@ gboolean group_get_local_channel_list(Group *group, } gboolean group_foreach_device(Group *group, GDBusMethodInvocation *invocation, - gchar *group_name, gpointer user_data) + gchar *group_name, gpointer user_data) { int ret = MDGD_ERROR_NONE; GVariant *va; @@ -171,7 +171,7 @@ gboolean group_foreach_device(Group *group, GDBusMethodInvocation *invocation, } gboolean group_regist_channel(Group *group, GDBusMethodInvocation *invocation, - gchar *channel_id, gpointer user_data) + gchar *channel_id, gpointer user_data) { int ret = MDGD_ERROR_NONE; const gchar *sender = g_dbus_method_invocation_get_sender(invocation); @@ -188,7 +188,7 @@ gboolean group_regist_channel(Group *group, GDBusMethodInvocation *invocation, } gboolean group_unregist_channel(Group *group, GDBusMethodInvocation *invocation, - gchar *channel_id, gpointer user_data) + gchar *channel_id, gpointer user_data) { int ret = MDGD_ERROR_NONE; const gchar *sender = g_dbus_method_invocation_get_sender(invocation); @@ -205,7 +205,7 @@ gboolean group_unregist_channel(Group *group, GDBusMethodInvocation *invocation, } gboolean group_send_data(Group *group, GDBusMethodInvocation *invocation, - gchar *uuid, gchar *channel_id, GVariant *params, gpointer user_data) + gchar *uuid, gchar *channel_id, GVariant *params, gpointer user_data) { int ret = MDGD_ERROR_NONE; const gchar *sender = g_dbus_method_invocation_get_sender(invocation); @@ -244,7 +244,7 @@ gboolean group_send_data(Group *group, GDBusMethodInvocation *invocation, } gboolean group_send_response(Group *group, GDBusMethodInvocation *invocation, - gchar *uuid, gchar *channel_id, gint msg_id, GVariant *params, gpointer user_data) + gchar *uuid, gchar *channel_id, gint msg_id, GVariant *params, gpointer user_data) { int ret = MDGD_ERROR_NONE; const gchar *sender = g_dbus_method_invocation_get_sender(invocation); @@ -282,7 +282,7 @@ gboolean group_send_response(Group *group, GDBusMethodInvocation *invocation, } gboolean group_send_file(Group *group, GDBusMethodInvocation *invocation, - gchar *uuid, gchar *file_path, gpointer user_data) + gchar *uuid, gchar *file_path, gpointer user_data) { int ret = MDGD_ERROR_NONE; const gchar *sender = g_dbus_method_invocation_get_sender(invocation); @@ -290,7 +290,7 @@ gboolean group_send_file(Group *group, GDBusMethodInvocation *invocation, LOG_BEGIN(); ret = mdgd_group_request(MDGD_REQ_SEND_FILE, (char *)sender, uuid, - file_path, NULL, NULL, NULL); + file_path, NULL, NULL, NULL); group_complete_send_file(group, invocation, ret); @@ -299,8 +299,7 @@ gboolean group_send_file(Group *group, GDBusMethodInvocation *invocation, return ret; } -gboolean group_request_create_group(Group *group, GDBusMethodInvocation - *invocation, gchar *uuid, gchar *group_name, gpointer user_data) +gboolean group_request_create_group(Group *group, GDBusMethodInvocation *invocation, gchar *uuid, gchar *group_name, gpointer user_data) { int ret = MDGD_ERROR_NONE; const gchar *sender = g_dbus_method_invocation_get_sender(invocation); @@ -308,7 +307,7 @@ gboolean group_request_create_group(Group *group, GDBusMethodInvocation LOG_BEGIN(); ret = mdgd_group_request(MDGD_REQ_CREATE_GROUP, (char *)sender, uuid, - group_name, NULL, NULL, NULL); + group_name, NULL, NULL, NULL); group_complete_request_create_group(group, invocation, ret); @@ -318,7 +317,7 @@ gboolean group_request_create_group(Group *group, GDBusMethodInvocation } gboolean group_request_invite(Group *group, GDBusMethodInvocation *invocation, - gchar *uuid, gchar *group_name, gchar *target_uuid, gchar *PIN, gpointer user_data) + gchar *uuid, gchar *group_name, gchar *target_uuid, gchar *PIN, gpointer user_data) { int ret = MDGD_ERROR_NONE; const gchar *sender = g_dbus_method_invocation_get_sender(invocation); @@ -326,7 +325,7 @@ gboolean group_request_invite(Group *group, GDBusMethodInvocation *invocation, LOG_BEGIN(); ret = mdgd_group_request(MDGD_REQ_INVITE_DEVICE, (char *)sender, uuid, - group_name, target_uuid, PIN, NULL); + group_name, target_uuid, PIN, NULL); group_complete_request_invite(group, invocation, ret); @@ -336,7 +335,7 @@ gboolean group_request_invite(Group *group, GDBusMethodInvocation *invocation, } gboolean group_request_eject(Group *group, GDBusMethodInvocation *invocation, - gchar *uuid, gchar *group_name, gchar *target_uuid, gpointer user_data) + gchar *uuid, gchar *group_name, gchar *target_uuid, gpointer user_data) { int ret = MDGD_ERROR_NONE; const gchar *sender = g_dbus_method_invocation_get_sender(invocation); @@ -344,7 +343,7 @@ gboolean group_request_eject(Group *group, GDBusMethodInvocation *invocation, LOG_BEGIN(); ret = mdgd_group_request(MDGD_REQ_EJECT_DEVICE, (char *)sender, uuid, - group_name, target_uuid, NULL, NULL); + group_name, target_uuid, NULL, NULL); group_complete_request_eject(group, invocation, ret); @@ -354,7 +353,7 @@ gboolean group_request_eject(Group *group, GDBusMethodInvocation *invocation, } gboolean group_request_channel_list(Group *group, GDBusMethodInvocation *invocation, - gchar *uuid, gpointer user_data) + gchar *uuid, gpointer user_data) { int ret = MDGD_ERROR_NONE; const gchar *sender = g_dbus_method_invocation_get_sender(invocation); @@ -362,7 +361,7 @@ gboolean group_request_channel_list(Group *group, GDBusMethodInvocation *invocat LOG_BEGIN(); ret = mdgd_group_request(MDGD_REQ_CHANNEL_LIST, (char *)sender, uuid, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL); group_complete_request_channel_list(group, invocation, ret); @@ -372,7 +371,7 @@ gboolean group_request_channel_list(Group *group, GDBusMethodInvocation *invocat } gboolean group_set_preconfigured_pin(Group *group, GDBusMethodInvocation *invocation, - gchar *preconfigured_pin, gpointer user_data) + gchar *preconfigured_pin, gpointer user_data) { int ret = MDGD_ERROR_NONE; @@ -400,12 +399,12 @@ void mdgd_gdbus_emit_event(char *sender, mdgd_event_type_e type, int ret, GVaria signal_variant = g_variant_ref_sink(g_variant_new("(ii@a{sv})", type, ret, data)); ret = g_dbus_connection_emit_signal(mdgd_ctx->connection, - sender, - MDGD_DBUS_GROUP_PATH, - MDGD_DBUS_GROUP_INTERFACE, - "Event", - signal_variant, - &error); + sender, + MDGD_DBUS_GROUP_PATH, + MDGD_DBUS_GROUP_INTERFACE, + "Event", + signal_variant, + &error); if (ret == FALSE) { LOG_DEBUG("g_dbus_connection_emit_signal is failed : %s", error->message); @@ -427,99 +426,99 @@ static bool __group_init(GDBusConnection *connection) // Register for method callbacks as signal callbacks g_signal_connect(group_skeleton, - "handle-create", - G_CALLBACK(group_create), - NULL); + "handle-create", + G_CALLBACK(group_create), + NULL); g_signal_connect(group_skeleton, - "handle-find", - G_CALLBACK(group_find), - NULL); + "handle-find", + G_CALLBACK(group_find), + NULL); g_signal_connect(group_skeleton, - "handle-delete", - G_CALLBACK(group_delete), - NULL); + "handle-delete", + G_CALLBACK(group_delete), + NULL); g_signal_connect(group_skeleton, - "handle-find-device", - G_CALLBACK(group_find_device), - NULL); + "handle-find-device", + G_CALLBACK(group_find_device), + NULL); g_signal_connect(group_skeleton, - "handle-invite-device", - G_CALLBACK(group_invite_device), - NULL); + "handle-invite-device", + G_CALLBACK(group_invite_device), + NULL); g_signal_connect(group_skeleton, - "handle-eject-device", - G_CALLBACK(group_eject_device), - NULL); + "handle-eject-device", + G_CALLBACK(group_eject_device), + NULL); g_signal_connect(group_skeleton, - "handle-regist-channel", - G_CALLBACK(group_regist_channel), - NULL); + "handle-regist-channel", + G_CALLBACK(group_regist_channel), + NULL); g_signal_connect(group_skeleton, - "handle-unregist-channel", - G_CALLBACK(group_unregist_channel), - NULL); + "handle-unregist-channel", + G_CALLBACK(group_unregist_channel), + NULL); g_signal_connect(group_skeleton, - "handle-send-data", - G_CALLBACK(group_send_data), - NULL); + "handle-send-data", + G_CALLBACK(group_send_data), + NULL); g_signal_connect(group_skeleton, - "handle-send-response", - G_CALLBACK(group_send_response), - NULL); + "handle-send-response", + G_CALLBACK(group_send_response), + NULL); g_signal_connect(group_skeleton, - "handle-send-file", - G_CALLBACK(group_send_file), - NULL); + "handle-send-file", + G_CALLBACK(group_send_file), + NULL); g_signal_connect(group_skeleton, - "handle-get-local-device", - G_CALLBACK(group_get_local_device), - NULL); + "handle-get-local-device", + G_CALLBACK(group_get_local_device), + NULL); g_signal_connect(group_skeleton, - "handle-get-local-channel-list", - G_CALLBACK(group_get_local_channel_list), - NULL); + "handle-get-local-channel-list", + G_CALLBACK(group_get_local_channel_list), + NULL); g_signal_connect(group_skeleton, - "handle-foreach-device", - G_CALLBACK(group_foreach_device), - NULL); + "handle-foreach-device", + G_CALLBACK(group_foreach_device), + NULL); g_signal_connect(group_skeleton, - "handle-request-create-group", - G_CALLBACK(group_request_create_group), - NULL); + "handle-request-create-group", + G_CALLBACK(group_request_create_group), + NULL); g_signal_connect(group_skeleton, - "handle-request-invite", - G_CALLBACK(group_request_invite), - NULL); + "handle-request-invite", + G_CALLBACK(group_request_invite), + NULL); g_signal_connect(group_skeleton, - "handle-request-eject", - G_CALLBACK(group_request_eject), - NULL); + "handle-request-eject", + G_CALLBACK(group_request_eject), + NULL); g_signal_connect(group_skeleton, - "handle-request-channel-list", - G_CALLBACK(group_request_channel_list), - NULL); + "handle-request-channel-list", + G_CALLBACK(group_request_channel_list), + NULL); g_signal_connect(group_skeleton, - "handle-set-preconfigured-pin", - G_CALLBACK(group_set_preconfigured_pin), - NULL); + "handle-set-preconfigured-pin", + G_CALLBACK(group_set_preconfigured_pin), + NULL); group = g_dbus_object_manager_server_new(MDGD_DBUS_GROUP_PATH); @@ -528,7 +527,7 @@ static bool __group_init(GDBusConnection *connection) // Export 'group' interface on mdg-manager DBUS ret = g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(group_skeleton), - connection, MDGD_DBUS_GROUP_PATH, &error); + connection, MDGD_DBUS_GROUP_PATH, &error); if (ret == FALSE) { LOG_DEBUG("Can not skeleton_export %s", error->message); @@ -539,8 +538,8 @@ static bool __group_init(GDBusConnection *connection) } static void _app_conn_destroyed_cb(GDBusConnection *conn, const gchar *Name, - const gchar *path, const gchar *interface, const gchar *sig, - GVariant *param, gpointer user_data) + const gchar *path, const gchar *interface, const gchar *sig, + GVariant *param, gpointer user_data) { gchar *name = NULL; gchar *old = NULL; @@ -555,7 +554,7 @@ static void _app_conn_destroyed_cb(GDBusConnection *conn, const gchar *Name, if (g_strcmp0(name, data->conn_name) == 0 && *new == '\0') { LOG_DEBUG("App %s Destroyed: name %s id %d", data->conn_name, name, - data->conn_id); + data->conn_id); mdgd_ctx->ref_count -= 1; @@ -578,13 +577,13 @@ static void _app_conn_destroyed_cb(GDBusConnection *conn, const gchar *Name, } static gboolean _register_mdgd_conn_destroy_signal(Enabler *enabler, - gchar *name) + gchar *name) { mdgd_conn_destroy_data *data; GDBusConnection *connection = NULL; connection = g_dbus_interface_skeleton_get_connection( - (GDBusInterfaceSkeleton *)enabler_skeleton); + (GDBusInterfaceSkeleton *)enabler_skeleton); if (NULL == connection) { LOG_ERR("Failed to get GDbus connection"); return FALSE; @@ -600,16 +599,16 @@ static gboolean _register_mdgd_conn_destroy_signal(Enabler *enabler, data->connection = connection; data->conn_id = g_dbus_connection_signal_subscribe(connection, - DBUS_SERVICE_DBUS, DBUS_INTERFACE_DBUS, - "NameOwnerChanged", NULL, name, - G_DBUS_SIGNAL_FLAGS_NONE, _app_conn_destroyed_cb, - data, NULL); + DBUS_SERVICE_DBUS, DBUS_INTERFACE_DBUS, + "NameOwnerChanged", NULL, name, + G_DBUS_SIGNAL_FLAGS_NONE, _app_conn_destroyed_cb, + data, NULL); return TRUE; } gboolean enabler_add_ref(Enabler *enabler, GDBusMethodInvocation *invocation, - gchar *name, gpointer user_data) + gchar *name, gpointer user_data) { LOG_DEBUG("Add Reference for %s", name); @@ -639,9 +638,9 @@ static bool __enabler_init(GDBusConnection *connection) // Register for method callbacks as signal callbacks g_signal_connect(enabler_skeleton, - "handle-add-ref", - G_CALLBACK(enabler_add_ref), - NULL); + "handle-add-ref", + G_CALLBACK(enabler_add_ref), + NULL); enabler = g_dbus_object_manager_server_new(MDGD_DBUS_ENABLER_PATH); @@ -650,8 +649,8 @@ static bool __enabler_init(GDBusConnection *connection) // Export 'enabler' interface on mdg DBUS ret = g_dbus_interface_skeleton_export( - G_DBUS_INTERFACE_SKELETON(enabler_skeleton), connection, - MDGD_DBUS_ENABLER_PATH, &error); + G_DBUS_INTERFACE_SKELETON(enabler_skeleton), connection, + MDGD_DBUS_ENABLER_PATH, &error); if (ret == FALSE) { LOG_DEBUG("Can not skeleton_export %s", error->message); @@ -661,9 +660,8 @@ static bool __enabler_init(GDBusConnection *connection) return ret; } - static void on_bus_acquired(GDBusConnection *connection, const gchar *path, - gpointer user_data) + gpointer user_data) { mdgd_context_t *mdgd_ctx = mdgd_context_get_context(); mdgd_ctx->connection = connection; @@ -676,13 +674,13 @@ static void on_bus_acquired(GDBusConnection *connection, const gchar *path, } static void on_name_acquired(GDBusConnection *connection, const gchar *name, - gpointer user_data) + gpointer user_data) { LOG_DEBUG("on_name_acquired : %s", name); } static void on_name_lost(GDBusConnection *connnection, const gchar *name, - gpointer user_data) + gpointer user_data) { LOG_DEBUG("on_name_lost : %s", name); } @@ -690,7 +688,7 @@ static void on_name_lost(GDBusConnection *connnection, const gchar *name, int mdgd_gdbus_init() { g_bus_own_name(G_BUS_TYPE_SYSTEM, MDGD_DBUS_SERVICE, G_BUS_NAME_OWNER_FLAGS_NONE, - on_bus_acquired, on_name_acquired, on_name_lost, NULL, NULL); + on_bus_acquired, on_name_acquired, on_name_lost, NULL, NULL); return 0; } diff --git a/src/mdg-manager/src/mdgd_group.c b/src/mdg-manager/src/mdgd_group.c index 0b0e5e4..0b51cc8 100644 --- a/src/mdg-manager/src/mdgd_group.c +++ b/src/mdg-manager/src/mdgd_group.c @@ -15,13 +15,13 @@ * */ -#include -#include #include +#include #include +#include #include -int mdgd_group_create(const char* name) +int mdgd_group_create(const char *name) { int ret = MDGD_ERROR_NONE; @@ -126,7 +126,7 @@ int mdgd_group_find_device(char *sender, int timeout, bool is_invited) ret = mdgd_iot_find_devices(sender, timeout, is_invited); if (ret != MDGD_ERROR_NONE) { LOG_ERR("Failed to find device : %s", - mdgd_log_get_error_string(ret)); + mdgd_log_get_error_string(ret)); } g_timeout_add_seconds(timeout + 1, __timeout_cb, cmd); @@ -139,7 +139,7 @@ int mdgd_group_find_device(char *sender, int timeout, bool is_invited) #define FULL_PERMISSION 31 int mdgd_group_invite_device(char *sender, char *group_name, - mdgd_device_t *device, char *pin) + mdgd_device_t *device, char *pin) { int ret = MDGD_ERROR_NONE; @@ -149,9 +149,9 @@ int mdgd_group_invite_device(char *sender, char *group_name, mdgd_check_null_ret_error("mdgd_ctx", mdgd_ctx, MDGD_ERROR_INVALID_PARAMETER); ret = mdgd_iot_pair(group_name, pin, mdgd_ctx->device_uuid, device->device_id, "/comp/data", - "core.comp.data", "oic.if.baseline", FULL_PERMISSION, device->device_id, - mdgd_ctx->device_uuid, "/comp/data", "core.comp.data", - "oic.if.baseline", FULL_PERMISSION); + "core.comp.data", "oic.if.baseline", FULL_PERMISSION, device->device_id, + mdgd_ctx->device_uuid, "/comp/data", "core.comp.data", + "oic.if.baseline", FULL_PERMISSION); if (ret == MDGD_ERROR_NONE && mdgd_db_check_device_exist_in_group(group_name, device->device_id) == false) { mdgd_db_device_insert(group_name, device); @@ -222,7 +222,7 @@ int mdgd_group_unregist_channel(char *sender, char *channel_id) if (channel_id == NULL) { int removed_count; removed_count = g_hash_table_foreach_remove(mdgd_ctx->channel, - __foreach_hash_table, sender); + __foreach_hash_table, sender); LOG_DEBUG("removed channel count is %d", removed_count); } else { char *value = g_hash_table_lookup(mdgd_ctx->channel, channel_id); @@ -238,7 +238,7 @@ int mdgd_group_unregist_channel(char *sender, char *channel_id) } int mdgd_group_send_data(char *sender, char *uuid, char *channel_id, - unsigned char *data, int len, int *msg_id) + unsigned char *data, int len, int *msg_id) { int ret; @@ -279,7 +279,7 @@ int mdgd_group_send_data(char *sender, char *uuid, char *channel_id, } int mdgd_group_send_response(char *sender, char *uuid, char *channel_id, - int msg_id, unsigned char *data, int len) + int msg_id, unsigned char *data, int len) { int ret; @@ -298,7 +298,7 @@ int mdgd_group_set_preconfigured_pin(char *pin) } int mdgd_group_request(mdgd_request_type_e type, char *sender, char *uuid, - char *arg1, char *arg2, char *arg3, void *user_data) + char *arg1, char *arg2, char *arg3, void *user_data) { int ret; diff --git a/src/mdg-manager/src/mdgd_iot.cpp b/src/mdg-manager/src/mdgd_iot.cpp index 92dee75..1577b7d 100644 --- a/src/mdg-manager/src/mdgd_iot.cpp +++ b/src/mdg-manager/src/mdgd_iot.cpp @@ -17,40 +17,40 @@ #include -#include #include +#include #include #include #include #include +#include #include -#include #include -#include +#include #include -#include #include +#include -#include -#include -#include #include +#include +#include +#include #include -#include "OCProvisioningManager.hpp" -#include "OCPlatform.h" #include "OCApi.h" +#include "OCPlatform.h" +#include "OCProvisioningManager.hpp" #include "credresource.h" using namespace OC; using namespace std; -#define DISCOVERY_TIMEOUT 6 /**< 6 sec */ +#define DISCOVERY_TIMEOUT 6 /**< 6 sec */ #define CALLBACK_TIMEOUT_5S 5 * 1000 /**< 5sec = 5 * 1000 * 1ms */ -#define CALLBACK_MARGIN 10 * 1000 /**< 10sec */ -#define TIME_UNIT 10 /**< Sleep time unit */ +#define CALLBACK_MARGIN 10 * 1000 /**< 10sec */ +#define TIME_UNIT 10 /**< Sleep time unit */ bool g_doneCB; @@ -106,14 +106,16 @@ static OCStackResult _wait_cb_ret(int msec) return ret; } -static FILE* __client_open(const char* /*path*/, const char *mode) +static FILE *__client_open(const char * /*path*/, const char *mode) { - char data_dir[MAX_FILE_PATH_LEN] = {0,}; + char data_dir[MAX_FILE_PATH_LEN] = { + 0, + }; snprintf(data_dir, MAX_FILE_PATH_LEN, "%s/network/%s", - "/opt/usr/data", SVR_DB_FILE_NAME); + "/opt/usr/data", SVR_DB_FILE_NAME); - return fopen(data_dir, mode); + return fopen(data_dir, mode); } static int __get_platform_info(OCPlatformInfo *platform_info) @@ -132,7 +134,7 @@ static int __get_platform_info(OCPlatformInfo *platform_info) LOG_ERR("system_info_get_platform_string() Fail(%d)", ret); snprintf(platform_id, sizeof(platform_id), "%s(%s)", - device_name ? device_name : "", tizen_id ? tizen_id : ""); + device_name ? device_name : "", tizen_id ? tizen_id : ""); free(device_name); free(tizen_id); @@ -142,7 +144,7 @@ static int __get_platform_info(OCPlatformInfo *platform_info) /* Mandatory (oic.wk.p) */ ret = system_info_get_platform_string(SYSTEM_INFO_MANUF_NAME, - &platform_info->manufacturerName); + &platform_info->manufacturerName); if (SYSTEM_INFO_ERROR_NONE != ret) { LOG_ERR("system_info_get_platform_string(manufacturer) Fail(%d)", ret); free(platform_info->platformID); @@ -150,17 +152,17 @@ static int __get_platform_info(OCPlatformInfo *platform_info) } ret = system_info_get_platform_string(SYSTEM_INFO_MODEL_NAME, - &platform_info->modelNumber); + &platform_info->modelNumber); if (SYSTEM_INFO_ERROR_NONE != ret) LOG_ERR("system_info_get_platform_string(model_name) Fail(%d)", ret); ret = system_info_get_platform_string(SYSTEM_INFO_PLATFORM_VERSION, - &platform_info->platformVersion); + &platform_info->platformVersion); if (SYSTEM_INFO_ERROR_NONE != ret) LOG_ERR("system_info_get_platform_string(platform_version) Fail(%d)", ret); ret = system_info_get_platform_string(SYSTEM_INFO_BUILD_STRING, - &platform_info->firmwareVersion); + &platform_info->firmwareVersion); if (SYSTEM_INFO_ERROR_NONE != ret) LOG_ERR("system_info_get_platform_string(build_string) Fail(%d)", ret); @@ -274,7 +276,7 @@ int mdgd_iot_remove_subowner(char *subject_id) return ret; } -int mdgd_iot_find_devices(char* sender, int timeout, bool is_invited) +int mdgd_iot_find_devices(char *sender, int timeout, bool is_invited) { int result = MDGD_ERROR_NONE; DeviceList_t devList; @@ -290,7 +292,7 @@ int mdgd_iot_find_devices(char* sender, int timeout, bool is_invited) devList = g_mowned_list; } - for (unsigned int i = 0; i < devList.size(); i++ ) { + for (unsigned int i = 0; i < devList.size(); i++) { char *uuid_str = NULL; OCProvisionDev_t *selDev = devList[i]->getDevPtr(); @@ -317,7 +319,7 @@ int mdgd_iot_find_devices(char* sender, int timeout, bool is_invited) UuidList_t subOwnerList; devList[i]->getSubOwnerList(subOwnerList); - for(unsigned int j = 0; j < subOwnerList.size(); j++) { + for (unsigned int j = 0; j < subOwnerList.size(); j++) { char *readable_uuid = mdgd_get_readable_uuid(&subOwnerList[j]); LOG_DEBUG("remote owner uuid is %s", readable_uuid); @@ -353,9 +355,9 @@ int mdgd_iot_find_devices(char* sender, int timeout, bool is_invited) return result; } -static OCProvisionDev_t* _get_dev_by_uuid(DeviceList_t &list, OicUuid_t *target) +static OCProvisionDev_t *_get_dev_by_uuid(DeviceList_t &list, OicUuid_t *target) { - for (unsigned int i = 0; i < list.size(); i++ ) { + for (unsigned int i = 0; i < list.size(); i++) { if (list[i]->getDeviceID().compare((const char *)target)) { return list[i]->getDevPtr(); } @@ -366,7 +368,7 @@ static OCProvisionDev_t* _get_dev_by_uuid(DeviceList_t &list, OicUuid_t *target) static int _get_devid_by_uuid(DeviceList_t &list, OicUuid_t *target) { char *t = mdgd_get_readable_uuid(target); - for (unsigned int i = 0; i < list.size(); i++ ) { + for (unsigned int i = 0; i < list.size(); i++) { if (0 == list[i]->getDeviceID().compare(t)) { return i; } @@ -374,7 +376,7 @@ static int _get_devid_by_uuid(DeviceList_t &list, OicUuid_t *target) return -1; } -static OicUuid_t* _convert_uuid(gchar *device_id) +static OicUuid_t *_convert_uuid(gchar *device_id) { OicUuid_t *uuid; @@ -416,18 +418,18 @@ static void _mot_cb(PMResultList_t *result, int has_error) LOG_DEBUG("Multiple Ownership Transfer Result = %d", has_error); for (unsigned int i = 0; result && i < result->size(); i++) { LOG_DEBUG("[%d] %s = [%d][%s]", - i, - mdgd_get_readable_uuid(&result->at(i).deviceId), - result->at(i).res, - mdgd_ocf_error_to_string(result->at(i).res)); + i, + mdgd_get_readable_uuid(&result->at(i).deviceId), + result->at(i).res, + mdgd_ocf_error_to_string(result->at(i).res)); } g_doneCB = true; } -int mdgd_iot_pair(char *group_name, char *pin, char* target1, char *subject1, char *uri1, - char *rt1, char *interface1, int permission1, char* target2, - char *subject2, char *uri2, char *rt2, char *interface2, int permission2) +int mdgd_iot_pair(char *group_name, char *pin, char *target1, char *subject1, char *uri1, + char *rt1, char *interface1, int permission1, char *target2, + char *subject2, char *uri2, char *rt2, char *interface2, int permission2) { int idx1 = -1; int idx2 = -1; @@ -441,8 +443,8 @@ int mdgd_iot_pair(char *group_name, char *pin, char* target1, char *subject1, ch OicUuid_t *uuid_3 = NULL; OicUuid_t *uuid_4 = NULL; - OicSecAcl_t* acl_1 = NULL; - OicSecAcl_t* acl_2 = NULL; + OicSecAcl_t *acl_1 = NULL; + OicSecAcl_t *acl_2 = NULL; OCProvisionDev_t *target_dev_1 = NULL; OCProvisionDev_t *target_dev_2 = NULL; @@ -544,7 +546,7 @@ int mdgd_iot_pair(char *group_name, char *pin, char* target1, char *subject1, ch PV_PAIR_END: /* Restore MOT enabled devices */ if (src_dev) - src_dev->next = next_dev ; + src_dev->next = next_dev; /* Notify pair result */ if (uuid_1) @@ -568,10 +570,10 @@ static void _remove_cb(PMResultList_t *result, int has_error) LOG_DEBUG("Remove Device Result = %d", has_error); for (unsigned int i = 0; result && i < result->size(); i++) { LOG_DEBUG("[%d] %s = [%d][%s]", - i, - mdgd_get_readable_uuid(&result->at(i).deviceId), - result->at(i).res, - mdgd_ocf_error_to_string(result->at(i).res)); + i, + mdgd_get_readable_uuid(&result->at(i).deviceId), + result->at(i).res, + mdgd_ocf_error_to_string(result->at(i).res)); } g_doneCB = true; } @@ -599,13 +601,13 @@ int mdgd_iot_unpair(char *group_name, char *subowner_id, char *subowned_id) ret = OCSecure::removeDeviceWithUuid(CALLBACK_TIMEOUT_5S, str, _remove_cb); if (OC_STACK_OK != ret) { LOG_DEBUG("removeDeviceWithUuid API error = %d (%s)", ret, - mdgd_log_get_iot_error_string(ret)); + mdgd_log_get_iot_error_string(ret)); goto PV_UNPAIR_END; } else { ret = _wait_cb_ret(CALLBACK_TIMEOUT_5S); if (OC_STACK_OK != ret) { LOG_DEBUG("removeDeviceWithUuid Timeout = %d (%s)", ret, - mdgd_log_get_iot_error_string(ret)); + mdgd_log_get_iot_error_string(ret)); goto PV_UNPAIR_END; } } @@ -643,13 +645,12 @@ int mdgd_iot_initialize() ps.close = fclose; ps.unlink = unlink; - PlatformConfig cfg { - OC::ServiceType::InProc, - OC::ModeType::Both, - (OCTransportAdapter)(OCTransportAdapter::OC_ADAPTER_IP), - OC::QualityOfService::LowQos, - &ps - }; + PlatformConfig cfg{ + OC::ServiceType::InProc, + OC::ModeType::Both, + (OCTransportAdapter)(OCTransportAdapter::OC_ADAPTER_IP), + OC::QualityOfService::LowQos, + &ps}; OCPlatform::Configure(cfg); @@ -662,31 +663,29 @@ int mdgd_iot_initialize() ret = OCPlatform::registerPlatformInfo(platform_info); __clean_platform_info(&platform_info); - if (ret != OC_STACK_OK) - { + if (ret != OC_STACK_OK) { LOG_ERR("Platform Registration failed"); return MDGD_ERROR_NONE; - } + } OCDeviceInfo device_info = {0}; device_info.deviceName = g_strdup("UNKNOWN"); ret = OCPlatform::registerDeviceInfo(device_info); g_free(device_info.deviceName); - if (ret != OC_STACK_OK) - { + if (ret != OC_STACK_OK) { LOG_ERR("Device Registration failed"); return MDGD_ERROR_NONE; - } + } OicUuid_t uuid; ret = GetDoxmDeviceID(&uuid); - if (OC_STACK_OK != ret) + if (OC_STACK_OK != ret) LOG_DEBUG("GetDoxmDevOwnerId failed = [%d][%s]", ret, get_error_message(ret)); ret = mdgd_uuid_to_str(&uuid, &device_id); - if (OC_STACK_OK != ret) + if (OC_STACK_OK != ret) LOG_DEBUG("mdgd_uuid_to_str failed = [%d][%s]", ret, get_error_message(ret)); LOG_DEBUG("device_id : %s", device_id); @@ -695,24 +694,26 @@ int mdgd_iot_initialize() /* Do Self-Ownership Transfer */ ret = OCSecure::configSelfOwnership(); - if (OC_STACK_OK != ret ) { + if (OC_STACK_OK != ret) { LOG_ERR("OCConfigSelfOwnership() error = [%d][%s]", ret, get_error_message(ret)); } - mdgd_iot_add_resource(MDGD_RESOURCE_TYPE_GROUP, ""); //For Group + mdgd_iot_add_resource(MDGD_RESOURCE_TYPE_GROUP, ""); //For Group mdgd_iot_add_resource(MDGD_RESOURCE_TYPE_DEVICE, ""); //For Device Description - mdgd_iot_add_resource(MDGD_RESOURCE_TYPE_DATA, ""); //For Secure Data Transfer + mdgd_iot_add_resource(MDGD_RESOURCE_TYPE_DATA, ""); //For Secure Data Transfer - char data_dir[MAX_FILE_PATH_LEN] = {0,}; + char data_dir[MAX_FILE_PATH_LEN] = { + 0, + }; snprintf(data_dir, MAX_FILE_PATH_LEN, "%s/network/%s", - "/opt/usr/data", PRVN_DB_FILE_NAME); + "/opt/usr/data", PRVN_DB_FILE_NAME); ret = OCInitPM(data_dir); if (OC_STACK_OK != ret) LOG_ERR("OCInitPM() error = [%d][%s]", ret, get_error_message(ret)); - OCProvisionDev_t* motdev_list = NULL; + OCProvisionDev_t *motdev_list = NULL; OCDiscoverMultipleOwnerEnabledDevices(1, &motdev_list); OCProvisionDev_t *iter = NULL; @@ -741,7 +742,7 @@ int mdgd_iot_initialize() device->device_id = device_id; device->device_name = g_strdup(device_name); device->model_name = g_strdup(model_name); - device->platform_ver = g_strdup(platform_ver); + device->platform_ver = g_strdup(platform_ver); device->profile = g_strdup(profile); device->vendor_id = g_strdup("6FFF"); device->is_invited = true; diff --git a/src/mdg-manager/src/mdgd_iot_client.cpp b/src/mdg-manager/src/mdgd_iot_client.cpp index 00b6194..efc224c 100644 --- a/src/mdg-manager/src/mdgd_iot_client.cpp +++ b/src/mdg-manager/src/mdgd_iot_client.cpp @@ -17,40 +17,40 @@ #include -#include #include +#include #include #include #include #include +#include #include -#include #include -#include +#include #include -#include #include +#include -#include -#include -#include -#include #include +#include +#include +#include +#include -#include "OCProvisioningManager.hpp" -#include "OCPlatform.h" #include "OCApi.h" +#include "OCPlatform.h" +#include "OCProvisioningManager.hpp" +#include +#include #include -#include +#include #include -#include #include -#include -#include -#include +#include +#include using namespace OC; using namespace std; @@ -74,7 +74,9 @@ static gpointer __file_send_thread_func(gpointer user_data) FILE *fd = NULL; char buf[MAXBUF]; long total_bytes; - char tempaddr[26] = {0,}; + char tempaddr[26] = { + 0, + }; LOG_BEGIN(); @@ -90,7 +92,7 @@ static gpointer __file_send_thread_func(gpointer user_data) else sock = socket(AF_INET, SOCK_STREAM, 0); - if(sock < 0) { + if (sock < 0) { LOG_ERR("socket() error"); ret = MDGD_ERROR_OPERATION_FAILED; goto SEND_THREAD_EXIT; @@ -106,7 +108,7 @@ static gpointer __file_send_thread_func(gpointer user_data) strtok(tempaddr, "%"); inet_pton(AF_INET6, tempaddr, &serveraddr_v6.sin6_addr); - retval = connect(sock, (struct sockaddr*)&serveraddr_v6, sizeof(serveraddr_v6)); + retval = connect(sock, (struct sockaddr *)&serveraddr_v6, sizeof(serveraddr_v6)); } else { serveraddr.sin_family = AF_INET; serveraddr.sin_port = htons(PORT); @@ -115,22 +117,20 @@ static gpointer __file_send_thread_func(gpointer user_data) strtok(tempaddr, ":"); inet_pton(AF_INET, tempaddr, &serveraddr.sin_addr.s_addr); - retval = connect(sock, (struct sockaddr*)&serveraddr, sizeof(serveraddr)); + retval = connect(sock, (struct sockaddr *)&serveraddr, sizeof(serveraddr)); } LOG_DEBUG("Connect to %s. Sending %s file...", tempaddr, cmd->arg1); /* connect */ - if(retval < 0) { + if (retval < 0) { LOG_ERR("connect() error : %s", strerror(errno)); ret = MDGD_ERROR_OPERATION_FAILED; goto SEND_THREAD_EXIT; } - - fd = fopen(cmd->arg1, "rb"); - if(fd == NULL) { + if (fd == NULL) { LOG_ERR("fopen() error : %s", strerror(errno)); ret = MDGD_ERROR_OPERATION_FAILED; goto SEND_THREAD_EXIT; @@ -140,31 +140,29 @@ static gpointer __file_send_thread_func(gpointer user_data) total_bytes = ftell(fd); rewind(fd); - while(1) { + while (1) { num_read = fread(buf, 1, MAXBUF, fd); - if(num_read > 0) { + if (num_read > 0) { prev_percent = cur_percent; retval = write(sock, buf, num_read); - if(retval == -1) { + if (retval == -1) { LOG_ERR("write() error! : %s", strerror(errno)); ret = MDGD_ERROR_OPERATION_FAILED; goto SEND_THREAD_EXIT; } num_total += num_read; - cur_percent = (int)(((gdouble)num_total /(gdouble)total_bytes) * 100); + cur_percent = (int)(((gdouble)num_total / (gdouble)total_bytes) * 100); if (prev_percent != cur_percent) { LOG_DEBUG("The file is %d percent sended", cur_percent); mdgd_gdbus_emit_event(cmd->sender, MDGD_EVENT_SEND_FILE_PROGRESS, MDGD_ERROR_NONE, - mdgd_create_variant_progress(cmd->arg1, num_total, total_bytes, cur_percent)); + mdgd_create_variant_progress(cmd->arg1, num_total, total_bytes, cur_percent)); } - } - else if(num_read == 0 && num_total == total_bytes) { + } else if (num_read == 0 && num_total == total_bytes) { LOG_DEBUG("file trans complete : %d bytes\n", num_total); break; - } - else { + } else { LOG_ERR("file I/O error : %s", strerror(errno)); ret = MDGD_ERROR_OPERATION_FAILED; goto SEND_THREAD_EXIT; @@ -179,7 +177,7 @@ SEND_THREAD_EXIT: close(sock); mdgd_gdbus_emit_event(cmd->sender, MDGD_EVENT_SEND_FILE_FINISH, ret, - mdgd_create_variant_dummy()); + mdgd_create_variant_dummy()); LOG_END(); @@ -187,14 +185,14 @@ SEND_THREAD_EXIT: return NULL; } -static void __get_group_information(const HeaderOptions& headerOptions, - const OCRepresentation& rep, const int eCode, void *user_data) +static void __get_group_information(const HeaderOptions &headerOptions, + const OCRepresentation &rep, const int eCode, void *user_data) { LOG_BEGIN(); try { if (eCode == OC_STACK_OK || eCode == OC_STACK_RESOURCE_CREATED || - eCode == OC_STACK_RESOURCE_CHANGED) { + eCode == OC_STACK_RESOURCE_CHANGED) { mdgd_check_null_ret("user_data", user_data); mdgd_group_t *group = (mdgd_group_t *)user_data; std::vector group_list; @@ -207,21 +205,21 @@ static void __get_group_information(const HeaderOptions& headerOptions, } LOG_DEBUG("Device %s Number of groups %d", group->device_id, - group_list.size()); + group_list.size()); for (i = 0; i < group_list.size(); i++) { group->group_name = g_strdup(group_list[i].c_str()); LOG_DEBUG("Group Found : %s, Type : %d", group->group_name, - group->type); + group->type); mdgd_group_notify_event(group->sender, MDGD_EVENT_GROUP_FOUND, - MDGD_ERROR_NONE, (void *)group); + MDGD_ERROR_NONE, (void *)group); g_free(group->group_name); group->group_name = NULL; } } else { LOG_ERR("__get_device_description Response error %d", eCode); } - } catch(std::exception& e) { + } catch (std::exception &e) { LOG_ERR("Exception %s in on get", e.what()); } @@ -245,7 +243,7 @@ static gboolean _send_data_timeout_cb(gpointer data) mdgd_data_t *tmp_data_t = (mdgd_data_t *)l->data; if (tmp_data_t->msg_id == send_data->msg_id) { mdgd_group_notify_event(tmp_data_t->sender, MDGD_EVENT_SEND_DATA_FINISH, - MDGD_ERROR_NETWORK_UNREACHABLE, tmp_data_t); + MDGD_ERROR_NETWORK_UNREACHABLE, tmp_data_t); mdgd_ctx->send_data = g_slist_remove_link(mdgd_ctx->send_data, l); break; @@ -259,21 +257,21 @@ static gboolean _send_data_timeout_cb(gpointer data) return false; } -static void __send_event_finish(const HeaderOptions&, - const OCRepresentation& rep, const int eCode) +static void __send_event_finish(const HeaderOptions &, + const OCRepresentation &rep, const int eCode) { LOG_DEBUG("Send Event Finished"); } -static void __send_data_finish(const HeaderOptions&, - const OCRepresentation& rep, const int eCode, - void *user_data) +static void __send_data_finish(const HeaderOptions &, + const OCRepresentation &rep, const int eCode, + void *user_data) { int ret = MDGD_ERROR_NONE; std::string channel_id, data; int msg_id; - char* decoded_data; + char *decoded_data; int decoded_len, data_len = 0; bool time_out; @@ -328,9 +326,9 @@ static void __send_data_finish(const HeaderOptions&, LOG_END(); } -static void __request_finish(const HeaderOptions&, - const OCRepresentation& rep, const int eCode, - void *user_data) +static void __request_finish(const HeaderOptions &, + const OCRepresentation &rep, const int eCode, + void *user_data) { int ret = MDGD_ERROR_NONE; @@ -341,7 +339,7 @@ static void __request_finish(const HeaderOptions&, try { if (eCode == OC_STACK_OK || eCode == OC_STACK_RESOURCE_CREATED || - eCode == OC_STACK_RESOURCE_CHANGED) { + eCode == OC_STACK_RESOURCE_CHANGED) { if (cmd->type == MDGD_REQ_CHANNEL_LIST) { std::map channel_list = rep.getValues(); std::map::iterator iter; @@ -360,7 +358,7 @@ static void __request_finish(const HeaderOptions&, } else { LOG_ERR("__get_device_description Response error %d", eCode); } - } catch(std::exception& e) { + } catch (std::exception &e) { LOG_ERR("Exception %s in on get", e.what()); } @@ -368,7 +366,7 @@ static void __request_finish(const HeaderOptions&, } static bool _found_resource(std::shared_ptr resource, - void *user_data) + void *user_data) { char *resource_type = NULL; std::string resourceURI; @@ -382,16 +380,16 @@ static bool _found_resource(std::shared_ptr resource, try { if (resource) { - for(auto &resourceTypes : resource->getResourceTypes()) { + for (auto &resourceTypes : resource->getResourceTypes()) { if (resource_type == NULL) resource_type = g_strdup(resourceTypes.c_str()); } LOG_DEBUG("URI [%s], Host [%s], Device ID [%s], Resource [%s]", - resource->uri().c_str(), resource->host().c_str(), resource->sid().c_str(), resource_type); + resource->uri().c_str(), resource->host().c_str(), resource->sid().c_str(), resource_type); if (g_strcmp0(resource_type, - mdgd_resource_get_type(MDGD_RESOURCE_TYPE_GROUP)) == 0) { + mdgd_resource_get_type(MDGD_RESOURCE_TYPE_GROUP)) == 0) { mdgd_group_t *group = (mdgd_group_t *)g_try_malloc0(sizeof(mdgd_group_t)); group->device_id = g_strdup(resource->sid().c_str()); group->sender = g_strdup(cmd->sender); @@ -402,19 +400,18 @@ static bool _found_resource(std::shared_ptr resource, } resource->get(QueryParamsMap(), std::bind(&__get_group_information, - std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, group)); + std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, group)); } else if (g_strcmp0(resource_type, - mdgd_resource_get_type(MDGD_RESOURCE_TYPE_DEVICE)) == 0 && - g_strcmp0(cmd->uuid, resource->sid().c_str()) == 0) { + mdgd_resource_get_type(MDGD_RESOURCE_TYPE_DEVICE)) == 0 && + g_strcmp0(cmd->uuid, resource->sid().c_str()) == 0) { rep.setValue("CMD", cmd->type); rep.setValue("DeviceID", std::string(mdgd_ctx->device_uuid)); rep.setValue("GroupName", std::string(cmd->arg1)); - resource->put(rep, QueryParamsMap(), std::bind(&__send_event_finish, - std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); + resource->put(rep, QueryParamsMap(), std::bind(&__send_event_finish, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); } else if (g_strcmp0(resource_type, - mdgd_resource_get_type(MDGD_RESOURCE_TYPE_DATA)) == 0 && - g_strcmp0(cmd->uuid, resource->sid().c_str()) == 0) { + mdgd_resource_get_type(MDGD_RESOURCE_TYPE_DATA)) == 0 && + g_strcmp0(cmd->uuid, resource->sid().c_str()) == 0) { rep.setValue("CMD", cmd->type); rep.setValue("DeviceID", std::string(mdgd_ctx->device_uuid)); @@ -442,8 +439,7 @@ static bool _found_resource(std::shared_ptr resource, mdgd_ctx->send_data = g_slist_prepend(mdgd_ctx->send_data, send_data); mdgd_context_mutex_unlock(); - resource->post(rep, QueryParamsMap(), std::bind (&__send_data_finish, - std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, send_data)); + resource->post(rep, QueryParamsMap(), std::bind(&__send_data_finish, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, send_data)); } else { switch (cmd->type) { case MDGD_REQ_SEND_FILE: @@ -479,17 +475,13 @@ static bool _found_resource(std::shared_ptr resource, return FALSE; } - resource->post(rep, QueryParamsMap(), std::bind (&__request_finish, - std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, cmd)); + resource->post(rep, QueryParamsMap(), std::bind(&__request_finish, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, cmd)); } } - } - else { + } else { LOG_ERR("Resource is invalid"); } - } - catch(std::exception& e) - { + } catch (std::exception &e) { LOG_ERR("Exception in foundResource: %s", e.what()); } @@ -499,7 +491,7 @@ static bool _found_resource(std::shared_ptr resource, } int mdgd_iot_discovery_resource(mdgd_resource_type_e resource_type, - void *user_data) + void *user_data) { int ret; std::ostringstream requestURI; @@ -510,10 +502,9 @@ int mdgd_iot_discovery_resource(mdgd_resource_type_e resource_type, LOG_BEGIN(); try { - requestURI << OC_RSRVD_WELL_KNOWN_URI << "?rt=" << - mdgd_resource_get_type(resource_type); + requestURI << OC_RSRVD_WELL_KNOWN_URI << "?rt=" << mdgd_resource_get_type(resource_type); - auto found_cb = std::bind (&_found_resource, std::placeholders::_1, cmd); + auto found_cb = std::bind(&_found_resource, std::placeholders::_1, cmd); ret = OCPlatform::findResource("", requestURI.str(), CT_ADAPTER_IP, found_cb); @@ -529,8 +520,8 @@ int mdgd_iot_discovery_resource(mdgd_resource_type_e resource_type, return ret; } -void __get_device_description(const HeaderOptions& headerOptions, - const OCRepresentation& rep, const int eCode, void *user_data) +void __get_device_description(const HeaderOptions &headerOptions, + const OCRepresentation &rep, const int eCode, void *user_data) { mdgd_check_null_ret("user_data", user_data); @@ -538,7 +529,7 @@ void __get_device_description(const HeaderOptions& headerOptions, try { if (eCode == OC_STACK_OK || eCode == OC_STACK_RESOURCE_CREATED || - eCode == OC_STACK_RESOURCE_CHANGED) { + eCode == OC_STACK_RESOURCE_CHANGED) { mdgd_check_null_ret("user_data", user_data); mdgd_command_t *cmd = (mdgd_command_t *)user_data; mdgd_device_t *device = (mdgd_device_t *)cmd->user_data; @@ -568,7 +559,7 @@ void __get_device_description(const HeaderOptions& headerOptions, } else { LOG_ERR("__get_device_description Response error %d", eCode); } - } catch(std::exception& e) { + } catch (std::exception &e) { LOG_ERR("Exception %s in on get", e.what()); } @@ -584,13 +575,13 @@ int mdgd_iot_get_device_description(mdgd_command_t *cmd, char *host_addr, int co LOG_BEGIN(); - uri_path = std::string(mdgd_resource_get_uri_prefix(MDGD_RESOURCE_TYPE_DEVICE)); + uri_path = std::string(mdgd_resource_get_uri_prefix(MDGD_RESOURCE_TYPE_DEVICE)); OCResource::Ptr device_resource = OCPlatform::constructResourceObject(std::string(host_addr), - uri_path, (OCConnectivityType)conn_type, false, resource_types, ifaces); + uri_path, (OCConnectivityType)conn_type, false, resource_types, ifaces); - ret = device_resource->get(QueryParamsMap(), std::bind (&__get_device_description, std::placeholders::_1, - std::placeholders::_2, std::placeholders::_3, cmd)); + ret = device_resource->get(QueryParamsMap(), std::bind(&__get_device_description, std::placeholders::_1, + std::placeholders::_2, std::placeholders::_3, cmd)); LOG_END(); diff --git a/src/mdg-manager/src/mdgd_iot_server.cpp b/src/mdg-manager/src/mdgd_iot_server.cpp index 8a2d074..39d6e8a 100644 --- a/src/mdg-manager/src/mdgd_iot_server.cpp +++ b/src/mdg-manager/src/mdgd_iot_server.cpp @@ -17,39 +17,39 @@ #include -#include #include +#include #include #include #include #include +#include #include -#include #include -#include +#include #include -#include #include +#include -#include -#include -#include #include +#include +#include +#include -#include "OCProvisioningManager.hpp" -#include "OCPlatform.h" #include "OCApi.h" +#include "OCPlatform.h" +#include "OCProvisioningManager.hpp" +#include +#include #include -#include +#include #include -#include #include -#include -#include -#include +#include +#include using namespace OC; using namespace std; @@ -61,8 +61,7 @@ typedef struct { std::shared_ptr pResponse; } OCResourceResponse_t; - -map addedResList; +map addedResList; /* FILE Receive in thread */ static gpointer __file_receive_thread_func(gpointer user_data) { @@ -78,7 +77,7 @@ static gpointer __file_receive_thread_func(gpointer user_data) socklen_t client_len; struct linger ling; mdgd_receive_file_t *receive_file = (mdgd_receive_file_t *)user_data; - struct timeval tv_timeo = { 3, 0 }; + struct timeval tv_timeo = {3, 0}; if (receive_file == NULL) { LOG_ERR("receive_file is NULL"); @@ -100,7 +99,7 @@ static gpointer __file_receive_thread_func(gpointer user_data) LOG_DEBUG("file path : %s", receive_file->file_path); fd = open(receive_file->file_path, O_WRONLY | O_CREAT | O_EXCL, 0700); - if(!fd || errno == EEXIST) { + if (!fd || errno == EEXIST) { LOG_ERR("file open error : %s", strerror(errno)); goto RECEIVE_THREAD_EXIT; } @@ -113,7 +112,7 @@ static gpointer __file_receive_thread_func(gpointer user_data) else server_sockfd = socket(AF_INET, SOCK_STREAM, 0); - if(server_sockfd == -1) { + if (server_sockfd == -1) { LOG_ERR("socket error : %s", strerror(errno)); goto RECEIVE_THREAD_EXIT; } @@ -161,13 +160,15 @@ static gpointer __file_receive_thread_func(gpointer user_data) LOG_DEBUG("Accepted IP : %s, client socket : %d", client_ipaddr); } - if(client_sockfd == -1) { + if (client_sockfd == -1) { LOG_ERR("socket error : %s", strerror(errno)); goto RECEIVE_THREAD_EXIT; } - while(1) { - char buf[MAXBUF] = {0,}; + while (1) { + char buf[MAXBUF] = { + 0, + }; file_read_len = read(client_sockfd, buf, MAXBUF); write(fd, buf, file_read_len); if (file_read_len == EOF || file_read_len == 0) { @@ -195,7 +196,7 @@ RECEIVE_THREAD_EXIT: } int mdgd_iot_send_response(char *sender, char *uuid, char *channel_id, - int msg_id, unsigned char *data, int data_len, bool timeout) + int msg_id, unsigned char *data, int data_len, bool timeout) { int ret = MDGD_ERROR_NO_DATA; @@ -209,8 +210,8 @@ int mdgd_iot_send_response(char *sender, char *uuid, char *channel_id, for (l = mdg_ctx->receive_data; l != NULL; l = l->next) { mdgd_data_t *tmp_data_t = (mdgd_data_t *)l->data; if ((tmp_data_t->msg_id == msg_id) && - g_strcmp0(tmp_data_t->sender, sender) == 0 && - g_strcmp0(tmp_data_t->device_id, uuid) == 0) { + g_strcmp0(tmp_data_t->sender, sender) == 0 && + g_strcmp0(tmp_data_t->device_id, uuid) == 0) { OCResourceResponse_t *response = (OCResourceResponse_t *)tmp_data_t->user_data; std::shared_ptr pResponse = response->pResponse; @@ -262,7 +263,7 @@ static gboolean _receive_data_timeout_cb(gpointer data) LOG_BEGIN(); ret = mdgd_iot_send_response(receive_data->sender, receive_data->device_id, receive_data->channel_id, - receive_data->msg_id, NULL, 0, true); + receive_data->msg_id, NULL, 0, true); if (ret != MDGD_ERROR_NONE) LOG_ERR("There is not message"); @@ -289,7 +290,7 @@ OCEntityHandlerResult _request_handler(std::shared_ptr reques LOG_DEBUG("Received request from %s:%d", observationInfo.address.c_str(), observationInfo.port); LOG_DEBUG("Request type %s, flag %x", requestType.c_str(), requestFlag); - for (auto& attribute : requestRep) { + for (auto &attribute : requestRep) { LOG_DEBUG("%s of type %d with value %s", attribute.attrname().c_str(), attribute.type(), attribute.getValueToString().c_str()); @@ -297,7 +298,7 @@ OCEntityHandlerResult _request_handler(std::shared_ptr reques if (requestType == "GET") { if (strcmp(resourceUri.c_str(), - mdgd_resource_get_uri_prefix(MDGD_RESOURCE_TYPE_DEVICE)) == 0) { + mdgd_resource_get_uri_prefix(MDGD_RESOURCE_TYPE_DEVICE)) == 0) { char *device_name = NULL; char *model_name = NULL; char *platform_ver = NULL; @@ -314,14 +315,14 @@ OCEntityHandlerResult _request_handler(std::shared_ptr reques responseRep.setValue("device_name", std::string(device_name)); responseRep.setValue("vendor_id", std::string("6FFF")); } else if (strcmp(resourceUri.c_str(), - mdgd_resource_get_uri_prefix(MDGD_RESOURCE_TYPE_GROUP)) == 0) { + mdgd_resource_get_uri_prefix(MDGD_RESOURCE_TYPE_GROUP)) == 0) { int group_count; char *groups[256]; mdgd_db_get_groups(groups, &group_count); std::vector group_list; for (int i = 0; i < group_count; i++) { - LOG_DEBUG("%d. group name : %s", i+1, groups[i]); + LOG_DEBUG("%d. group name : %s", i + 1, groups[i]); group_list.push_back(groups[i]); } responseRep.setValue("GroupList", group_list); @@ -398,9 +399,8 @@ OCEntityHandlerResult _request_handler(std::shared_ptr reques } else { std::string group_name, uuid; - switch(cmd) { - case MDGD_REQ_SEND_FILE: - { + switch (cmd) { + case MDGD_REQ_SEND_FILE: { std::string file_path, conn_type; LOG_DEBUG("Receive File"); if (!requestRep.getValue("FilePath", file_path)) @@ -415,7 +415,7 @@ OCEntityHandlerResult _request_handler(std::shared_ptr reques receive_file->conn_type = g_strdup(conn_type.c_str()); g_thread_try_new("file_receive_thread", - __file_receive_thread_func, receive_file, NULL); + __file_receive_thread_func, receive_file, NULL); break; } @@ -438,7 +438,7 @@ OCEntityHandlerResult _request_handler(std::shared_ptr reques LOG_ERR("UUID not found"); LOG_DEBUG("group name : %s, UUID : %s", group_name.c_str(), - uuid.c_str()); + uuid.c_str()); /* find device, and invite this device. */ /* @@ -446,26 +446,24 @@ OCEntityHandlerResult _request_handler(std::shared_ptr reques uuid.c_str(), "12341234"); */ break; - case MDGD_REQ_EJECT_DEVICE: - { - char *group_name_str = strdup(group_name.c_str()); - char *uuid_str = strdup(uuid.c_str()); - LOG_DEBUG("Request eject device"); - - if (!requestRep.getValue("GroupName", group_name)) - LOG_ERR("Group name not found"); - if (!requestRep.getValue("ID", uuid)) - LOG_ERR("UUID not found"); - - LOG_DEBUG("group name : %s Self UUID : %s Target UUID : %s", - group_name_str, mdgd_ctx->device_uuid, uuid_str); - - result = mdgd_group_eject_device((char *)"tmp", - group_name_str, uuid_str); - free(group_name_str); - free(uuid_str); - } - break; + case MDGD_REQ_EJECT_DEVICE: { + char *group_name_str = strdup(group_name.c_str()); + char *uuid_str = strdup(uuid.c_str()); + LOG_DEBUG("Request eject device"); + + if (!requestRep.getValue("GroupName", group_name)) + LOG_ERR("Group name not found"); + if (!requestRep.getValue("ID", uuid)) + LOG_ERR("UUID not found"); + + LOG_DEBUG("group name : %s Self UUID : %s Target UUID : %s", + group_name_str, mdgd_ctx->device_uuid, uuid_str); + + result = mdgd_group_eject_device((char *)"tmp", + group_name_str, uuid_str); + free(group_name_str); + free(uuid_str); + } break; case MDGD_REQ_CHANNEL_LIST: LOG_DEBUG("Request channel list"); GHashTableIter iter; @@ -494,12 +492,12 @@ OCEntityHandlerResult _request_handler(std::shared_ptr reques LOG_DEBUG("Send response : %d", OC_EH_OK); OCPlatform::sendResponse(pResponse); } - } catch (std::exception& e) { + } catch (std::exception &e) { LOG_ERR("Exception occured %s", e.what()); } } else if (requestType == "PUT") { if (strcmp(resourceUri.c_str(), - mdgd_resource_get_uri_prefix(MDGD_RESOURCE_TYPE_DEVICE)) == 0) { + mdgd_resource_get_uri_prefix(MDGD_RESOURCE_TYPE_DEVICE)) == 0) { int cmd; std::string requester_id, group_name; @@ -525,7 +523,7 @@ OCEntityHandlerResult _request_handler(std::shared_ptr reques group->group_name = g_strdup(group_name.c_str()); group->type = MDGD_GROUP_TYPE_REMOTE; - switch(cmd) { + switch (cmd) { case MDGD_REQ_EVENT_INVITED: mdgd_group_notify_event(NULL, MDGD_EVENT_INVITED, MDGD_ERROR_NONE, (void *)group); break; @@ -564,16 +562,16 @@ int mdgd_iot_add_resource(mdgd_resource_type_e resource_type, const char *uri) LOG_BEGIN(); - uri_path = std::string(mdgd_resource_get_uri_prefix(resource_type)) + - std::string(uri); + uri_path = std::string(mdgd_resource_get_uri_prefix(resource_type)) + + std::string(uri); LOG_DEBUG("[ADD] resource uri is %s", uri_path.c_str()); OCStackResult result = OCPlatform::registerResource(resourceHandle, - uri_path, - std::string(mdgd_resource_get_type(resource_type)), - std::string(DEFAULT_INTERFACE), &_request_handler, - mdgd_resource_get_policies(resource_type)); + uri_path, + std::string(mdgd_resource_get_type(resource_type)), + std::string(DEFAULT_INTERFACE), &_request_handler, + mdgd_resource_get_policies(resource_type)); if (result != OC_STACK_OK) { LOG_ERR("Failed to create resource"); return MDGD_ERROR_NONE; @@ -588,28 +586,27 @@ int mdgd_iot_add_resource(mdgd_resource_type_e resource_type, const char *uri) int mdgd_iot_delete_resource(mdgd_resource_type_e resource_type, const char *uri) { - std::string uri_path; - - LOG_BEGIN(); - - uri_path = std::string(mdgd_resource_get_uri_prefix(resource_type)) + - std::string(uri); + std::string uri_path; - LOG_DEBUG("[Delete] resource uri is %s", uri_path.c_str()); + LOG_BEGIN(); - auto search = addedResList.find(uri_path); - if (search != addedResList.end()) { - LOG_DEBUG("[Saurav] Found resource handle"); - try { - OCPlatform::unregisterResource(search->second); - addedResList.erase(uri_path); - LOG_DEBUG("[Saurav] Number of elements in hash %d", - addedResList.size()); - } catch (std::exception& e) { - LOG_ERR("Exception occured in unregistering %s", e.what()); - } - } + uri_path = std::string(mdgd_resource_get_uri_prefix(resource_type)) + + std::string(uri); + + LOG_DEBUG("[Delete] resource uri is %s", uri_path.c_str()); + + auto search = addedResList.find(uri_path); + if (search != addedResList.end()) { + LOG_DEBUG("[Saurav] Found resource handle"); + try { + OCPlatform::unregisterResource(search->second); + addedResList.erase(uri_path); + LOG_DEBUG("[Saurav] Number of elements in hash %d", + addedResList.size()); + } catch (std::exception &e) { + LOG_ERR("Exception occured in unregistering %s", e.what()); + } + } - return MDGD_ERROR_NONE; + return MDGD_ERROR_NONE; } - diff --git a/src/mdg-manager/src/mdgd_log.c b/src/mdg-manager/src/mdgd_log.c index b5aa851..4fc4938 100644 --- a/src/mdg-manager/src/mdgd_log.c +++ b/src/mdg-manager/src/mdgd_log.c @@ -18,67 +18,69 @@ #include #include -#define CASE_TO_STR(x) case x: return #x; -const char* mdgd_log_get_iot_error_string(int result) +#define CASE_TO_STR(x) \ + case x: \ + return #x; +const char *mdgd_log_get_iot_error_string(int result) { switch (result) { - CASE_TO_STR(OC_STACK_OK) - CASE_TO_STR(OC_STACK_RESOURCE_CREATED) - CASE_TO_STR(OC_STACK_RESOURCE_DELETED) - CASE_TO_STR(OC_STACK_CONTINUE) - CASE_TO_STR(OC_STACK_RESOURCE_CHANGED) - CASE_TO_STR(OC_STACK_INVALID_URI) - CASE_TO_STR(OC_STACK_INVALID_QUERY) - CASE_TO_STR(OC_STACK_INVALID_IP) - CASE_TO_STR(OC_STACK_INVALID_PORT) - CASE_TO_STR(OC_STACK_INVALID_CALLBACK) - CASE_TO_STR(OC_STACK_INVALID_METHOD) - CASE_TO_STR(OC_STACK_INVALID_PARAM) - CASE_TO_STR(OC_STACK_INVALID_OBSERVE_PARAM) + CASE_TO_STR(OC_STACK_OK) + CASE_TO_STR(OC_STACK_RESOURCE_CREATED) + CASE_TO_STR(OC_STACK_RESOURCE_DELETED) + CASE_TO_STR(OC_STACK_CONTINUE) + CASE_TO_STR(OC_STACK_RESOURCE_CHANGED) + CASE_TO_STR(OC_STACK_INVALID_URI) + CASE_TO_STR(OC_STACK_INVALID_QUERY) + CASE_TO_STR(OC_STACK_INVALID_IP) + CASE_TO_STR(OC_STACK_INVALID_PORT) + CASE_TO_STR(OC_STACK_INVALID_CALLBACK) + CASE_TO_STR(OC_STACK_INVALID_METHOD) + CASE_TO_STR(OC_STACK_INVALID_PARAM) + CASE_TO_STR(OC_STACK_INVALID_OBSERVE_PARAM) - CASE_TO_STR(OC_STACK_NO_MEMORY) - CASE_TO_STR(OC_STACK_COMM_ERROR) - CASE_TO_STR(OC_STACK_TIMEOUT) - CASE_TO_STR(OC_STACK_ADAPTER_NOT_ENABLED) - CASE_TO_STR(OC_STACK_NOTIMPL) - CASE_TO_STR(OC_STACK_RESOURCE_ERROR) - CASE_TO_STR(OC_STACK_SLOW_RESOURCE) - CASE_TO_STR(OC_STACK_DUPLICATE_REQUEST) - CASE_TO_STR(OC_STACK_OBSERVER_NOT_FOUND) - CASE_TO_STR(OC_STACK_VIRTUAL_DO_NOT_HANDLE) - CASE_TO_STR(OC_STACK_INVALID_OPTION) - CASE_TO_STR(OC_STACK_MALFORMED_RESPONSE) - CASE_TO_STR(OC_STACK_PERSISTENT_BUFFER_REQUIRED) + CASE_TO_STR(OC_STACK_NO_MEMORY) + CASE_TO_STR(OC_STACK_COMM_ERROR) + CASE_TO_STR(OC_STACK_TIMEOUT) + CASE_TO_STR(OC_STACK_ADAPTER_NOT_ENABLED) + CASE_TO_STR(OC_STACK_NOTIMPL) + CASE_TO_STR(OC_STACK_RESOURCE_ERROR) + CASE_TO_STR(OC_STACK_SLOW_RESOURCE) + CASE_TO_STR(OC_STACK_DUPLICATE_REQUEST) + CASE_TO_STR(OC_STACK_OBSERVER_NOT_FOUND) + CASE_TO_STR(OC_STACK_VIRTUAL_DO_NOT_HANDLE) + CASE_TO_STR(OC_STACK_INVALID_OPTION) + CASE_TO_STR(OC_STACK_MALFORMED_RESPONSE) + CASE_TO_STR(OC_STACK_PERSISTENT_BUFFER_REQUIRED) - CASE_TO_STR(OC_STACK_INVALID_REQUEST_HANDLE) - CASE_TO_STR(OC_STACK_INVALID_DEVICE_INFO) - CASE_TO_STR(OC_STACK_INVALID_JSON) - CASE_TO_STR(OC_STACK_UNAUTHORIZED_REQ) - CASE_TO_STR(OC_STACK_TOO_LARGE_REQ) - CASE_TO_STR(OC_STACK_PDM_IS_NOT_INITIALIZED) - CASE_TO_STR(OC_STACK_DUPLICATE_UUID) - CASE_TO_STR(OC_STACK_INCONSISTENT_DB) - CASE_TO_STR(OC_STACK_SVR_DB_NOT_EXIST) - CASE_TO_STR(OC_STACK_AUTHENTICATION_FAILURE) - CASE_TO_STR(OC_STACK_NOT_ALLOWED_OXM) + CASE_TO_STR(OC_STACK_INVALID_REQUEST_HANDLE) + CASE_TO_STR(OC_STACK_INVALID_DEVICE_INFO) + CASE_TO_STR(OC_STACK_INVALID_JSON) + CASE_TO_STR(OC_STACK_UNAUTHORIZED_REQ) + CASE_TO_STR(OC_STACK_TOO_LARGE_REQ) + CASE_TO_STR(OC_STACK_PDM_IS_NOT_INITIALIZED) + CASE_TO_STR(OC_STACK_DUPLICATE_UUID) + CASE_TO_STR(OC_STACK_INCONSISTENT_DB) + CASE_TO_STR(OC_STACK_SVR_DB_NOT_EXIST) + CASE_TO_STR(OC_STACK_AUTHENTICATION_FAILURE) + CASE_TO_STR(OC_STACK_NOT_ALLOWED_OXM) #ifdef WITH_PRESENCE - CASE_TO_STR(OC_STACK_PRESENCE_STOPPED) - CASE_TO_STR(OC_STACK_PRESENCE_TIMEOUT) - CASE_TO_STR(OC_STACK_PRESENCE_DO_NOT_HANDLE) + CASE_TO_STR(OC_STACK_PRESENCE_STOPPED) + CASE_TO_STR(OC_STACK_PRESENCE_TIMEOUT) + CASE_TO_STR(OC_STACK_PRESENCE_DO_NOT_HANDLE) #endif - CASE_TO_STR(OC_STACK_USER_DENIED_REQ) - CASE_TO_STR(OC_STACK_NOT_ACCEPTABLE) - CASE_TO_STR(OC_STACK_METHOD_NOT_ALLOWED) - CASE_TO_STR(OC_STACK_FORBIDDEN_REQ) - CASE_TO_STR(OC_STACK_TOO_MANY_REQUESTS) - CASE_TO_STR(OC_STACK_INTERNAL_SERVER_ERROR) - CASE_TO_STR(OC_STACK_NOT_IMPLEMENTED) - CASE_TO_STR(OC_STACK_BAD_GATEWAY) - CASE_TO_STR(OC_STACK_SERVICE_UNAVAILABLE) - CASE_TO_STR(OC_STACK_GATEWAY_TIMEOUT) - CASE_TO_STR(OC_STACK_PROXY_NOT_SUPPORTED) - CASE_TO_STR(OC_STACK_ERROR) - default : + CASE_TO_STR(OC_STACK_USER_DENIED_REQ) + CASE_TO_STR(OC_STACK_NOT_ACCEPTABLE) + CASE_TO_STR(OC_STACK_METHOD_NOT_ALLOWED) + CASE_TO_STR(OC_STACK_FORBIDDEN_REQ) + CASE_TO_STR(OC_STACK_TOO_MANY_REQUESTS) + CASE_TO_STR(OC_STACK_INTERNAL_SERVER_ERROR) + CASE_TO_STR(OC_STACK_NOT_IMPLEMENTED) + CASE_TO_STR(OC_STACK_BAD_GATEWAY) + CASE_TO_STR(OC_STACK_SERVICE_UNAVAILABLE) + CASE_TO_STR(OC_STACK_GATEWAY_TIMEOUT) + CASE_TO_STR(OC_STACK_PROXY_NOT_SUPPORTED) + CASE_TO_STR(OC_STACK_ERROR) + default: return "Unknown Error"; } } diff --git a/src/mdg-manager/src/mdgd_manager.c b/src/mdg-manager/src/mdgd_manager.c index 92113ed..c16d3ff 100644 --- a/src/mdg-manager/src/mdgd_manager.c +++ b/src/mdg-manager/src/mdgd_manager.c @@ -16,10 +16,10 @@ */ #include +#include +#include #include #include -#include -#include int main(int argc, char *argv[]) { diff --git a/src/mdg-manager/src/mdgd_util.c b/src/mdg-manager/src/mdgd_util.c index ebe8777..9dc6744 100644 --- a/src/mdg-manager/src/mdgd_util.c +++ b/src/mdg-manager/src/mdgd_util.c @@ -14,86 +14,88 @@ * limitations under the License. * */ -#include #include #include +#include -#define CASE_TO_STR(x) case x: return #x; -const char* mdgd_ocf_error_to_string(int err) +#define CASE_TO_STR(x) \ + case x: \ + return #x; +const char *mdgd_ocf_error_to_string(int err) { switch (err) { - /* CHECK: List all enum values here */ - CASE_TO_STR(OC_STACK_OK) - CASE_TO_STR(OC_STACK_RESOURCE_CREATED) - CASE_TO_STR(OC_STACK_RESOURCE_DELETED) - CASE_TO_STR(OC_STACK_CONTINUE) - CASE_TO_STR(OC_STACK_RESOURCE_CHANGED) - CASE_TO_STR(OC_STACK_INVALID_URI) - CASE_TO_STR(OC_STACK_INVALID_QUERY) - CASE_TO_STR(OC_STACK_INVALID_IP) - CASE_TO_STR(OC_STACK_INVALID_PORT) - CASE_TO_STR(OC_STACK_INVALID_CALLBACK) - CASE_TO_STR(OC_STACK_INVALID_METHOD) - CASE_TO_STR(OC_STACK_INVALID_PARAM) - CASE_TO_STR(OC_STACK_INVALID_OBSERVE_PARAM) - - CASE_TO_STR(OC_STACK_NO_MEMORY) - CASE_TO_STR(OC_STACK_COMM_ERROR) - CASE_TO_STR(OC_STACK_TIMEOUT) - CASE_TO_STR(OC_STACK_ADAPTER_NOT_ENABLED) - CASE_TO_STR(OC_STACK_NOTIMPL) - CASE_TO_STR(OC_STACK_RESOURCE_ERROR) - CASE_TO_STR(OC_STACK_SLOW_RESOURCE) - CASE_TO_STR(OC_STACK_DUPLICATE_REQUEST) - CASE_TO_STR(OC_STACK_OBSERVER_NOT_FOUND) - CASE_TO_STR(OC_STACK_VIRTUAL_DO_NOT_HANDLE) - CASE_TO_STR(OC_STACK_INVALID_OPTION) - CASE_TO_STR(OC_STACK_MALFORMED_RESPONSE) - CASE_TO_STR(OC_STACK_PERSISTENT_BUFFER_REQUIRED) - - CASE_TO_STR(OC_STACK_INVALID_REQUEST_HANDLE) - CASE_TO_STR(OC_STACK_INVALID_DEVICE_INFO) - CASE_TO_STR(OC_STACK_INVALID_JSON) - CASE_TO_STR(OC_STACK_UNAUTHORIZED_REQ) - CASE_TO_STR(OC_STACK_TOO_LARGE_REQ) - CASE_TO_STR(OC_STACK_PDM_IS_NOT_INITIALIZED) - CASE_TO_STR(OC_STACK_DUPLICATE_UUID) - CASE_TO_STR(OC_STACK_INCONSISTENT_DB) - CASE_TO_STR(OC_STACK_SVR_DB_NOT_EXIST) - CASE_TO_STR(OC_STACK_AUTHENTICATION_FAILURE) - CASE_TO_STR(OC_STACK_NOT_ALLOWED_OXM) + /* CHECK: List all enum values here */ + CASE_TO_STR(OC_STACK_OK) + CASE_TO_STR(OC_STACK_RESOURCE_CREATED) + CASE_TO_STR(OC_STACK_RESOURCE_DELETED) + CASE_TO_STR(OC_STACK_CONTINUE) + CASE_TO_STR(OC_STACK_RESOURCE_CHANGED) + CASE_TO_STR(OC_STACK_INVALID_URI) + CASE_TO_STR(OC_STACK_INVALID_QUERY) + CASE_TO_STR(OC_STACK_INVALID_IP) + CASE_TO_STR(OC_STACK_INVALID_PORT) + CASE_TO_STR(OC_STACK_INVALID_CALLBACK) + CASE_TO_STR(OC_STACK_INVALID_METHOD) + CASE_TO_STR(OC_STACK_INVALID_PARAM) + CASE_TO_STR(OC_STACK_INVALID_OBSERVE_PARAM) + + CASE_TO_STR(OC_STACK_NO_MEMORY) + CASE_TO_STR(OC_STACK_COMM_ERROR) + CASE_TO_STR(OC_STACK_TIMEOUT) + CASE_TO_STR(OC_STACK_ADAPTER_NOT_ENABLED) + CASE_TO_STR(OC_STACK_NOTIMPL) + CASE_TO_STR(OC_STACK_RESOURCE_ERROR) + CASE_TO_STR(OC_STACK_SLOW_RESOURCE) + CASE_TO_STR(OC_STACK_DUPLICATE_REQUEST) + CASE_TO_STR(OC_STACK_OBSERVER_NOT_FOUND) + CASE_TO_STR(OC_STACK_VIRTUAL_DO_NOT_HANDLE) + CASE_TO_STR(OC_STACK_INVALID_OPTION) + CASE_TO_STR(OC_STACK_MALFORMED_RESPONSE) + CASE_TO_STR(OC_STACK_PERSISTENT_BUFFER_REQUIRED) + + CASE_TO_STR(OC_STACK_INVALID_REQUEST_HANDLE) + CASE_TO_STR(OC_STACK_INVALID_DEVICE_INFO) + CASE_TO_STR(OC_STACK_INVALID_JSON) + CASE_TO_STR(OC_STACK_UNAUTHORIZED_REQ) + CASE_TO_STR(OC_STACK_TOO_LARGE_REQ) + CASE_TO_STR(OC_STACK_PDM_IS_NOT_INITIALIZED) + CASE_TO_STR(OC_STACK_DUPLICATE_UUID) + CASE_TO_STR(OC_STACK_INCONSISTENT_DB) + CASE_TO_STR(OC_STACK_SVR_DB_NOT_EXIST) + CASE_TO_STR(OC_STACK_AUTHENTICATION_FAILURE) + CASE_TO_STR(OC_STACK_NOT_ALLOWED_OXM) #ifdef WITH_PRESENCE - CASE_TO_STR(OC_STACK_PRESENCE_STOPPED) - CASE_TO_STR(OC_STACK_PRESENCE_TIMEOUT) - CASE_TO_STR(OC_STACK_PRESENCE_DO_NOT_HANDLE) + CASE_TO_STR(OC_STACK_PRESENCE_STOPPED) + CASE_TO_STR(OC_STACK_PRESENCE_TIMEOUT) + CASE_TO_STR(OC_STACK_PRESENCE_DO_NOT_HANDLE) #endif - CASE_TO_STR(OC_STACK_USER_DENIED_REQ) - CASE_TO_STR(OC_STACK_NOT_ACCEPTABLE) - CASE_TO_STR(OC_STACK_METHOD_NOT_ALLOWED) - CASE_TO_STR(OC_STACK_FORBIDDEN_REQ) - CASE_TO_STR(OC_STACK_TOO_MANY_REQUESTS) - CASE_TO_STR(OC_STACK_INTERNAL_SERVER_ERROR) - CASE_TO_STR(OC_STACK_NOT_IMPLEMENTED) - CASE_TO_STR(OC_STACK_BAD_GATEWAY) - CASE_TO_STR(OC_STACK_SERVICE_UNAVAILABLE) - CASE_TO_STR(OC_STACK_GATEWAY_TIMEOUT) - CASE_TO_STR(OC_STACK_PROXY_NOT_SUPPORTED) - CASE_TO_STR(OC_STACK_ERROR) - default : + CASE_TO_STR(OC_STACK_USER_DENIED_REQ) + CASE_TO_STR(OC_STACK_NOT_ACCEPTABLE) + CASE_TO_STR(OC_STACK_METHOD_NOT_ALLOWED) + CASE_TO_STR(OC_STACK_FORBIDDEN_REQ) + CASE_TO_STR(OC_STACK_TOO_MANY_REQUESTS) + CASE_TO_STR(OC_STACK_INTERNAL_SERVER_ERROR) + CASE_TO_STR(OC_STACK_NOT_IMPLEMENTED) + CASE_TO_STR(OC_STACK_BAD_GATEWAY) + CASE_TO_STR(OC_STACK_SERVICE_UNAVAILABLE) + CASE_TO_STR(OC_STACK_GATEWAY_TIMEOUT) + CASE_TO_STR(OC_STACK_PROXY_NOT_SUPPORTED) + CASE_TO_STR(OC_STACK_ERROR) + default: return "Unknown Error"; } } char g_uuid_str[256] = {0}; -char* mdgd_get_readable_uuid(const OicUuid_t* uuid) +char *mdgd_get_readable_uuid(const OicUuid_t *uuid) { memset(g_uuid_str, 0, sizeof(g_uuid_str)); snprintf(g_uuid_str, sizeof(g_uuid_str), - "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", - (*uuid).id[0], (*uuid).id[1], (*uuid).id[2], (*uuid).id[3], - (*uuid).id[4], (*uuid).id[5], (*uuid).id[6], (*uuid).id[7], - (*uuid).id[8], (*uuid).id[9], (*uuid).id[10], (*uuid).id[11], - (*uuid).id[12], (*uuid).id[13], (*uuid).id[14], (*uuid).id[15]); + "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", + (*uuid).id[0], (*uuid).id[1], (*uuid).id[2], (*uuid).id[3], + (*uuid).id[4], (*uuid).id[5], (*uuid).id[6], (*uuid).id[7], + (*uuid).id[8], (*uuid).id[9], (*uuid).id[10], (*uuid).id[11], + (*uuid).id[12], (*uuid).id[13], (*uuid).id[14], (*uuid).id[15]); return g_uuid_str; } @@ -113,19 +115,19 @@ char *mdgd_addr2host(char *addr, int port, bool is_secure) if (is_secure != true) { if (strchr(ip, ':')) /* IPv6 Adress */ return g_strdup_printf("coap://[%s%s%s]:%d", ip, "%25", - percent + 1, port); + percent + 1, port); else /* IPv4 Address */ return g_strdup_printf("coap://%s:%d", ip, port); } else { if (strchr(ip, ':')) /* IPv6 Adress */ return g_strdup_printf("coaps://[%s%s%s]:%d", ip, "%25", - percent + 1, port); + percent + 1, port); else /* IPv4 Address */ return g_strdup_printf("coaps://%s:%d", ip, port); } } -int mdgd_uuid_to_str(const OicUuid_t* uuid, char** strUuid) +int mdgd_uuid_to_str(const OicUuid_t *uuid, char **strUuid) { if (NULL == uuid || NULL == strUuid || NULL != *strUuid) { LOG_ERR("ConvertUuidToStr : Invalid param"); @@ -135,14 +137,14 @@ int mdgd_uuid_to_str(const OicUuid_t* uuid, char** strUuid) size_t uuidIdx = 0; size_t urnIdx = 0; const size_t urnBufSize = (UUID_LENGTH * 2) + 4 + 1; - char* convertedUrn = (char*)calloc(urnBufSize, sizeof(char)); + char *convertedUrn = (char *)calloc(urnBufSize, sizeof(char)); if (NULL == convertedUrn) { LOG_ERR("Memory Allocation Failed"); goto exit; } for (uuidIdx = 0, urnIdx = 0; uuidIdx < UUID_LENGTH && urnIdx < urnBufSize; - uuidIdx++, urnIdx += 2) { + uuidIdx++, urnIdx += 2) { // canonical format for UUID has '8-4-4-4-12' if (uuidIdx == 4 || uuidIdx == 6 || uuidIdx == 8 || uuidIdx == 10) { snprintf(convertedUrn + urnIdx, 2, "%c", '-'); @@ -159,11 +161,11 @@ exit: return OC_STACK_NO_MEMORY; } -int mdgd_str_to_uuid(const char* strUuid, OicUuid_t* uuid) +int mdgd_str_to_uuid(const char *strUuid, OicUuid_t *uuid) { - if(NULL == strUuid || NULL == uuid) { - LOG_ERR("ConvertStrToUuid : Invalid param"); - return OC_STACK_INVALID_PARAM; + if (NULL == strUuid || NULL == uuid) { + LOG_ERR("ConvertStrToUuid : Invalid param"); + return OC_STACK_INVALID_PARAM; } size_t urnIdx = 0; @@ -172,22 +174,22 @@ int mdgd_str_to_uuid(const char* strUuid, OicUuid_t* uuid) char convertedUuid[UUID_LENGTH * 2] = {0}; strUuidLen = strlen(strUuid); - if(0 == strUuidLen) { - LOG_DEBUG("The empty string detected, The UUID will be converted to "\ - "\"00000000-0000-0000-0000-000000000000\""); - } else if(UUID_LENGTH * 2 + 4 == strUuidLen) { - for(uuidIdx=0, urnIdx=0; uuidIdx < UUID_LENGTH ; uuidIdx++, urnIdx+=2) { - if(*(strUuid + urnIdx) == '-') { - urnIdx++; - } - sscanf(strUuid + urnIdx, "%2hhx", &convertedUuid[uuidIdx]); - } + if (0 == strUuidLen) { + LOG_DEBUG("The empty string detected, The UUID will be converted to " + "\"00000000-0000-0000-0000-000000000000\""); + } else if (UUID_LENGTH * 2 + 4 == strUuidLen) { + for (uuidIdx = 0, urnIdx = 0; uuidIdx < UUID_LENGTH; uuidIdx++, urnIdx += 2) { + if (*(strUuid + urnIdx) == '-') { + urnIdx++; + } + sscanf(strUuid + urnIdx, "%2hhx", &convertedUuid[uuidIdx]); + } } else { - LOG_ERR("Invalid string uuid format, Please set the uuid as correct format"); - LOG_ERR("e.g) \"72616E64-5069-6E44-6576-557569643030\" (4-2-2-2-6)"); - LOG_ERR("e.g) \"\""); + LOG_ERR("Invalid string uuid format, Please set the uuid as correct format"); + LOG_ERR("e.g) \"72616E64-5069-6E44-6576-557569643030\" (4-2-2-2-6)"); + LOG_ERR("e.g) \"\""); - return OC_STACK_INVALID_PARAM; + return OC_STACK_INVALID_PARAM; } memcpy(uuid->id, convertedUuid, UUID_LENGTH); @@ -239,11 +241,11 @@ GVariant *mdgd_create_variant_group(mdgd_group_t *group) builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}")); g_variant_builder_add(builder, "{sv}", "DeviceID", - g_variant_new_string(group->device_id)); + g_variant_new_string(group->device_id)); g_variant_builder_add(builder, "{sv}", "GroupName", - g_variant_new_string(group->group_name)); + g_variant_new_string(group->group_name)); g_variant_builder_add(builder, "{sv}", "Type", - g_variant_new_int32(group->type)); + g_variant_new_int32(group->type)); va = g_variant_builder_end(builder); @@ -261,21 +263,21 @@ GVariant *mdgd_create_variant_device(mdgd_device_t *device) builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}")); g_variant_builder_add(builder, "{sv}", "DeviceID", - g_variant_new_string(device->device_id)); + g_variant_new_string(device->device_id)); g_variant_builder_add(builder, "{sv}", "ModelName", - g_variant_new_string(device->model_name)); + g_variant_new_string(device->model_name)); g_variant_builder_add(builder, "{sv}", "DeviceName", - g_variant_new_string(device->device_name)); + g_variant_new_string(device->device_name)); g_variant_builder_add(builder, "{sv}", "PlatformVer", - g_variant_new_string(device->platform_ver)); + g_variant_new_string(device->platform_ver)); g_variant_builder_add(builder, "{sv}", "VendorID", - g_variant_new_string(device->vendor_id)); + g_variant_new_string(device->vendor_id)); g_variant_builder_add(builder, "{sv}", "Profile", - g_variant_new_string(device->profile)); + g_variant_new_string(device->profile)); g_variant_builder_add(builder, "{sv}", "IsInvited", - g_variant_new_int32(device->is_invited)); + g_variant_new_int32(device->is_invited)); g_variant_builder_add(builder, "{sv}", "Type", - g_variant_new_int32(device->type)); + g_variant_new_int32(device->type)); va = g_variant_builder_end(builder); @@ -293,9 +295,9 @@ GVariant *mdgd_create_variant_receive_file(mdgd_receive_file_t *receive_file) builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}")); g_variant_builder_add(builder, "{sv}", "DeviceID", - g_variant_new_string(receive_file->device_id)); + g_variant_new_string(receive_file->device_id)); g_variant_builder_add(builder, "{sv}", "FilePath", - g_variant_new_string(receive_file->file_path)); + g_variant_new_string(receive_file->file_path)); va = g_variant_builder_end(builder); @@ -313,9 +315,9 @@ GVariant *mdgd_create_variant_channel(mdgd_channel_t *channel) builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}")); g_variant_builder_add(builder, "{sv}", "DeviceID", - g_variant_new_string(channel->device_id)); + g_variant_new_string(channel->device_id)); g_variant_builder_add(builder, "{sv}", "ChannelID", - g_variant_new_string(channel->channel_id)); + g_variant_new_string(channel->channel_id)); va = g_variant_builder_end(builder); @@ -331,15 +333,14 @@ GVariant *mdgd_create_variant_data(mdgd_data_t *data) GVariantBuilder *builder; GVariant *params = NULL; - builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}")); g_variant_builder_add(builder, "{sv}", "DeviceID", - g_variant_new_string(data->device_id)); + g_variant_new_string(data->device_id)); g_variant_builder_add(builder, "{sv}", "ChannelID", - g_variant_new_string(data->channel_id)); + g_variant_new_string(data->channel_id)); g_variant_builder_add(builder, "{sv}", "MsgID", - g_variant_new_int32(data->msg_id)); + g_variant_new_int32(data->msg_id)); if (data->data_len > 0) { GVariantBuilder *bytearray_builder = NULL; @@ -349,9 +350,9 @@ GVariant *mdgd_create_variant_data(mdgd_data_t *data) params = g_variant_new("a(y)", bytearray_builder); g_variant_builder_add(builder, "{sv}", "Data", - g_variant_new_variant(params)); + g_variant_new_variant(params)); g_variant_builder_add(builder, "{sv}", "DataLen", - g_variant_new_int32(data->data_len)); + g_variant_new_int32(data->data_len)); g_variant_builder_unref(bytearray_builder); } @@ -363,7 +364,7 @@ GVariant *mdgd_create_variant_data(mdgd_data_t *data) } GVariant *mdgd_create_variant_progress(char *file_path, - long send_size, long total_size, int percent) + long send_size, long total_size, int percent) { GVariant *va; @@ -372,16 +373,16 @@ GVariant *mdgd_create_variant_progress(char *file_path, builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}")); g_variant_builder_add(builder, "{sv}", "FilePath", - g_variant_new_string(file_path)); + g_variant_new_string(file_path)); g_variant_builder_add(builder, "{sv}", "SendSize", - g_variant_new_int64(send_size)); + g_variant_new_int64(send_size)); g_variant_builder_add(builder, "{sv}", "TotalSize", - g_variant_new_int64(total_size)); + g_variant_new_int64(total_size)); g_variant_builder_add(builder, "{sv}", "Percent", - g_variant_new_int32(percent)); + g_variant_new_int32(percent)); va = g_variant_builder_end(builder); @@ -405,28 +406,27 @@ GVariant *mdgd_create_variant_device_list(char *group_name) /* Get all device in group */ mdgd_db_get_devices_in_group(group_name, devices, &device_count); - for (int i = 0; i < device_count; i++) - { + for (int i = 0; i < device_count; i++) { mdgd_device_t *device = devices[i]; g_variant_builder_open(builder, G_VARIANT_TYPE_VARDICT); g_variant_builder_add(builder, "{sv}", "DeviceID", - g_variant_new_string(device->device_id)); + g_variant_new_string(device->device_id)); g_variant_builder_add(builder, "{sv}", "ModelName", - g_variant_new_string(device->model_name)); + g_variant_new_string(device->model_name)); g_variant_builder_add(builder, "{sv}", "DeviceName", - g_variant_new_string(device->device_name)); + g_variant_new_string(device->device_name)); g_variant_builder_add(builder, "{sv}", "PlatformVer", - g_variant_new_string(device->platform_ver)); + g_variant_new_string(device->platform_ver)); g_variant_builder_add(builder, "{sv}", "VendorID", - g_variant_new_string(device->vendor_id)); + g_variant_new_string(device->vendor_id)); g_variant_builder_add(builder, "{sv}", "Profile", - g_variant_new_string(device->profile)); + g_variant_new_string(device->profile)); g_variant_builder_add(builder, "{sv}", "IsInvited", - g_variant_new_int32(device->is_invited)); + g_variant_new_int32(device->is_invited)); g_variant_builder_add(builder, "{sv}", "Type", - g_variant_new_int32(device->type)); + g_variant_new_int32(device->type)); g_variant_builder_close(builder); } @@ -467,10 +467,10 @@ mdgd_device_t *mdgd_get_device_from_variant(GVariant *va) mdgd_device_t *device = calloc(1, sizeof(mdgd_device_t)); if (NULL == device) { - /* LCOV_EXCL_START */ - LOG_ERR("Memory allocation failed"); - return NULL; - /* LCOV_EXCL_STOP */ + /* LCOV_EXCL_START */ + LOG_ERR("Memory allocation failed"); + return NULL; + /* LCOV_EXCL_STOP */ } g_variant_get(va, "a{sv}", &iter); @@ -517,7 +517,7 @@ int mdgd_util_get_msg_id() } void mdgd_util_data_encode(const char *data, int data_len, - char **encoded_data, int *encoded_len) + char **encoded_data, int *encoded_len) { #ifdef SUPPORT_BASE64_ENCODING size_t out_size; @@ -531,11 +531,11 @@ void mdgd_util_data_encode(const char *data, int data_len, } if (B64_OK != b64Encode( - (const uint8_t*)data, - (const size_t)data_len, - out, - (const size_t)out_size, - (uint32_t *)&encoded_len)) { + (const uint8_t *)data, + (const size_t)data_len, + out, + (const size_t)out_size, + (uint32_t *)&encoded_len)) { LOG_ERR("Base64 encoding failed."); g_free(out); return; @@ -554,7 +554,7 @@ void mdgd_util_data_encode(const char *data, int data_len, } void mdgd_util_data_decode(const char *data, int data_len, - char **decoded_data, int *decoded_len) + char **decoded_data, int *decoded_len) { #ifdef SUPPORT_BASE64_ENCODING size_t out_size; @@ -568,10 +568,10 @@ void mdgd_util_data_decode(const char *data, int data_len, } if (B64_OK != b64Decode((const char *)data, - (const size_t)data_len, - (uint8_t *)out, - (const size_t)out_size, - (uint32_t *)&decoded_len)) { + (const size_t)data_len, + (uint8_t *)out, + (const size_t)out_size, + (uint32_t *)&decoded_len)) { LOG_ERR("Base64 decoding failed."); g_free(out); return; @@ -588,5 +588,3 @@ void mdgd_util_data_decode(const char *data, int data_len, LOG_DEBUG("Successfully decoded %s", *decoded_data); } - - -- 2.7.4