From: Jihoon Jung Date: Wed, 1 Aug 2018 04:01:09 +0000 (+0900) Subject: Remove address information X-Git-Tag: submit/tizen/20190131.065036~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f75948ae39227e9c916a95650f92513aa82175c1;p=platform%2Fcore%2Fapi%2Fmulti-device-group.git Remove address information Signed-off-by: Jihoon Jung Change-Id: I5193b2350c820e270c8036629908a2e2929645d7 --- diff --git a/include/mdg.h b/include/mdg.h index 3b437c0..f92b7fc 100755 --- a/include/mdg.h +++ b/include/mdg.h @@ -583,7 +583,6 @@ int mdg_request_channel_list(mdg_h handle, mdg_device_h device, * @see mdg_group_info_get_resource_type() * @see mdg_group_info_get_uri_path() * @see mdg_group_info_get_name() - * @see mdg_group_info_get_host_addr() * */ int mdg_group_info_clone(mdg_group_h *dst, @@ -607,13 +606,11 @@ int mdg_group_info_clone(mdg_group_h *dst, * @see mdg_group_info_get_resource_type() * @see mdg_group_info_get_uri_path() * @see mdg_group_info_get_name() - * @see mdg_group_info_get_host_addr() * */ int mdg_group_info_destroy(mdg_group_h group); int mdg_group_info_get_device_id(mdg_group_h group, char **device_id); -int mdg_group_info_get_host_addr(mdg_group_h group, char **host_addr); /** * @brief Gets group type of the group handle. @@ -634,7 +631,6 @@ int mdg_group_info_get_host_addr(mdg_group_h group, char **host_addr); * @see mdg_group_info_get_resource_type() * @see mdg_group_info_get_uri_path() * @see mdg_group_info_get_name() - * @see mdg_group_info_get_host_addr() * */ int mdg_group_info_get_type(mdg_group_h group, mdg_group_type_e *type); @@ -660,7 +656,6 @@ int mdg_group_info_get_type(mdg_group_h group, mdg_group_type_e *type); * @see mdg_group_info_get_type() * @see mdg_group_info_get_resource_type() * @see mdg_group_info_get_uri_path() - * @see mdg_group_info_get_host_addr() * */ int mdg_group_info_get_name(mdg_group_h group, char **name); @@ -832,13 +827,6 @@ int mdg_device_send_data(mdg_h handle, mdg_device_h device, char *channel_id, unsigned char *data, int len, mdg_device_send_data_finish_cb finish_cb, void *user_data); -typedef void (*mdg_send_file_progress_cb)(const char *file_path, long send_size, - long total_size, int percent, void *user_data); -typedef void (*mdg_send_file_finish_cb)(int result, mdg_device_h device, void *user_data); - -int mdg_device_send_file(mdg_h handle, mdg_device_h device, char *file_path, - mdg_send_file_progress_cb progress_cb, mdg_send_file_finish_cb finish_cb, void *user_data); - /** * @} */ diff --git a/include/mdg_internal.h b/include/mdg_internal.h new file mode 100755 index 0000000..52fd474 --- /dev/null +++ b/include/mdg_internal.h @@ -0,0 +1,47 @@ +/* + * Network Configuration Module + * + * Copyright (c) 2017 Samsung Electronics Co., Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ +#ifndef __TIZEN_NETWORK_MULTI_DEVICE_GROUP_MDG_INTERNAL_H__ +#define __TIZEN_NETWORK_MULTI_DEVICE_GROUP_MDG_INTERNAL_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +/* File transfer for Client Side */ +typedef void (*mdg_send_file_progress_cb)(const char *file_path, long send_size, + long total_size, int percent, void *user_data); +typedef void (*mdg_send_file_finish_cb)(int result, mdg_device_h device, void *user_data); + +int mdg_device_send_file(mdg_h handle, mdg_device_h device, char *file_path, + mdg_send_file_progress_cb progress_cb, mdg_send_file_finish_cb finish_cb, void *user_data); + +/* File transfer for Server Side */ +typedef void (*mdg_receive_file_cb)(int result, char *device_id, + const char *file_path, void *user_data); + +int mdg_set_receive_file_cb(mdg_h handle, mdg_receive_file_cb receive_cb, void *user_data); +int mdg_unset_receive_file_cb(mdg_h handle); + + +#ifdef __cplusplus +} +#endif + +#endif /* __TIZEN_NETWORK_MULTI_DEVICE_GROUP_MDG_H__ */ + diff --git a/src/mdg.c b/src/mdg.c index ef1a477..b84f955 100755 --- a/src/mdg.c +++ b/src/mdg.c @@ -310,8 +310,8 @@ EXPORT_API int mdg_device_send_data(mdg_h handle, _handle->send_data_finish_cb.finish_cb = finish_cb; _handle->send_data_finish_cb.user_data = user_data; - group_call_send_data_sync(_handle->group_proxy, dev->device_id, dev->addr, - dev->secure_port, channel_id, params, &ret, NULL, &error); + group_call_send_data_sync(_handle->group_proxy, dev->device_id, + channel_id, params, &ret, NULL, &error); if (error) { _ERR("Failed DBus call [%s]", error->message); g_error_free(error); @@ -348,8 +348,7 @@ EXPORT_API int mdg_device_send_file(mdg_h handle, mdg_device_h device, _handle->send_file_cb.device = cloned_device; _handle->send_file_cb.user_data = user_data; - group_call_send_file_sync(_handle->group_proxy, dev->device_id, dev->addr, - dev->secure_port, file_path, &ret, NULL, &error); + group_call_send_file_sync(_handle->group_proxy, dev->device_id, file_path, &ret, NULL, &error); if (error) { _ERR("Failed DBus call [%s]", error->message); g_error_free(error); @@ -359,6 +358,39 @@ EXPORT_API int mdg_device_send_file(mdg_h handle, mdg_device_h device, return ret; } +EXPORT_API int mdg_set_receive_file_cb(mdg_h handle, + mdg_receive_file_cb receive_cb, void *user_data) +{ + int ret = MDG_ERROR_NONE; + + CHECK_FEATURE_SUPPORTED(MDG_FEATURE); + + mdg_manager_s *_handle = handle; + mdg_check_null_ret_error("handle", handle, MDG_ERROR_INVALID_PARAMETER); + CHECK_HANDLE_IS_VALID(handle); + + _handle->receive_file_cb.receive_cb = receive_cb; + _handle->receive_file_cb.user_data = user_data; + + return ret; +} + +EXPORT_API int mdg_unset_receive_file_cb(mdg_h handle) +{ + int ret = MDG_ERROR_NONE; + + CHECK_FEATURE_SUPPORTED(MDG_FEATURE); + + mdg_manager_s *_handle = handle; + mdg_check_null_ret_error("handle", handle, MDG_ERROR_INVALID_PARAMETER); + CHECK_HANDLE_IS_VALID(handle); + + _handle->receive_file_cb.receive_cb = NULL; + _handle->receive_file_cb.user_data = NULL; + + return ret; +} + EXPORT_API int mdg_device_get_local_device(mdg_h handle, mdg_device_h *device) { @@ -545,9 +577,6 @@ EXPORT_API int mdg_group_info_clone(mdg_group_h *target, if (src->device_id) dst->device_id = g_strdup(src->device_id); - if (src->host_addr) - dst->host_addr = g_strdup(src->host_addr); - if (src->group_name) dst->group_name = g_strdup(src->group_name); @@ -569,10 +598,6 @@ EXPORT_API int mdg_group_info_destroy(mdg_group_h data) g_free(group->device_id); group->device_id = NULL; } - if (group->host_addr) { - g_free(group->host_addr); - group->host_addr = NULL; - } if (group->group_name) { g_free(group->group_name); group->group_name = NULL; @@ -596,18 +621,6 @@ EXPORT_API int mdg_group_info_get_device_id( return ret; } -EXPORT_API int mdg_group_info_get_host_addr( - mdg_group_h group, char **host_addr) -{ - int ret = MDG_ERROR_NONE; - - CHECK_FEATURE_SUPPORTED(MDG_FEATURE); - - *host_addr = g_strdup(((mdg_group_s *)group)->host_addr); - - return ret; -} - EXPORT_API int mdg_group_info_get_type(mdg_group_h group, mdg_group_type_e *type) { @@ -649,13 +662,6 @@ EXPORT_API int mdg_device_info_clone(mdg_device_h *target, if (src->device_id) dst->device_id = g_strdup(src->device_id); - if (src->addr) - dst->addr = g_strdup(src->addr); - - dst->port = src->port; - dst->secure_port = src->secure_port; - dst->conn_type = src->conn_type; - if (src->model_name) dst->model_name = g_strdup(src->model_name); @@ -691,11 +697,6 @@ EXPORT_API int mdg_device_info_destroy(mdg_device_h data) device->device_id = NULL; } - if (device->addr) { - g_free(device->addr); - device->addr = NULL; - } - if (device->model_name) { g_free(device->model_name); device->model_name = NULL; @@ -739,42 +740,6 @@ EXPORT_API int mdg_device_info_get_device_id( return ret; } -EXPORT_API int mdg_device_info_get_addr( - mdg_device_h device, char **addr) -{ - int ret = MDG_ERROR_NONE; - - CHECK_FEATURE_SUPPORTED(MDG_FEATURE); - - *addr = g_strdup(((mdg_device_s *)device)->addr); - - return ret; -} - -EXPORT_API int mdg_device_info_get_port( - mdg_device_h device, int *port) -{ - int ret = MDG_ERROR_NONE; - - CHECK_FEATURE_SUPPORTED(MDG_FEATURE); - - *port = (((mdg_device_s *)device)->port); - - return ret; -} - -EXPORT_API int mdg_device_info_get_secure_port( - mdg_device_h device, int *secure_port) -{ - int ret = MDG_ERROR_NONE; - - CHECK_FEATURE_SUPPORTED(MDG_FEATURE); - - *secure_port = (((mdg_device_s *)device)->secure_port); - - return ret; -} - EXPORT_API int mdg_device_info_get_model_name( mdg_device_h device, char **model_name) { @@ -882,8 +847,8 @@ EXPORT_API int mdg_request_create_group(mdg_h handle, _DBG("Device id : %s", dev->device_id); - group_call_request_create_group_sync(_handle->group_proxy, dev->device_id, dev->addr, - dev->secure_port, group_name, &ret, NULL, &error); + group_call_request_create_group_sync(_handle->group_proxy, dev->device_id, + group_name, &ret, NULL, &error); return ret; } @@ -914,8 +879,8 @@ EXPORT_API int mdg_request_invite_device(mdg_h handle, _DBG("%s", grp->group_name); _DBG("%s", dev->device_id); - group_call_request_invite(_handle->group_proxy, grp->device_id, dev->addr, - dev->secure_port, grp->group_name, dev->device_id, PIN, NULL, NULL, &error); + group_call_request_invite(_handle->group_proxy, grp->device_id, + grp->group_name, dev->device_id, PIN, NULL, NULL, &error); if (error) { _ERR("Failed DBus call [%s]", error->message); g_error_free(error); @@ -951,8 +916,8 @@ EXPORT_API int mdg_request_eject_device(mdg_h handle, _DBG("%s", grp->group_name); _DBG("%s", dev->device_id); - group_call_request_eject(_handle->group_proxy, grp->device_id, dev->addr, - dev->secure_port, grp->group_name, dev->device_id, NULL, NULL, &error); + group_call_request_eject(_handle->group_proxy, grp->device_id, + grp->group_name, dev->device_id, NULL, NULL, &error); if (error) { _ERR("Failed DBus call [%s]", error->message); g_error_free(error); @@ -981,8 +946,7 @@ EXPORT_API int mdg_request_channel_list(mdg_h handle, mdg_device_h device, _DBG("%s", dev->device_id); - group_call_request_channel_list(_handle->group_proxy, dev->device_id, dev->addr, - dev->secure_port, NULL, NULL, &error); + group_call_request_channel_list(_handle->group_proxy, dev->device_id, NULL, NULL, &error); if (error) { _ERR("Failed DBus call [%s]", error->message); g_error_free(error); diff --git a/src/mdg_dbus.c b/src/mdg_dbus.c index 154f6c1..8e50fc1 100755 --- a/src/mdg_dbus.c +++ b/src/mdg_dbus.c @@ -182,6 +182,18 @@ static void __event_cb(Group *object, } break; } + case MDG_EVENT_RECEIVE_FILE: + { + if (handle->receive_file_cb.receive_cb) { + char *device_id; + char *file_path; + mdg_get_receive_file_from_variant(va, &device_id, &file_path); + handle->receive_file_cb.receive_cb(ret, device_id, file_path, + handle->receive_file_cb.user_data); + } else { + _ERR("The callback not exists"); + } + } default: _ERR("Unknown Event"); break; diff --git a/src/mdg_gdbus.xml b/src/mdg_gdbus.xml index 4424848..bcb0828 100755 --- a/src/mdg_gdbus.xml +++ b/src/mdg_gdbus.xml @@ -59,30 +59,22 @@ - - - - - - - - @@ -90,16 +82,12 @@ - - - - diff --git a/src/mdg_private.h b/src/mdg_private.h index 8f0774e..8e8e245 100755 --- a/src/mdg_private.h +++ b/src/mdg_private.h @@ -21,9 +21,9 @@ #include #include #include +#include #include #include - #include #define MDG_FEATURE "http://tizen.org/feature/network.mdg" @@ -129,6 +129,11 @@ typedef struct _send_file_cb_t { void *user_data; /**< User data pointer */ } send_file_cb_t; +typedef struct _receive_file_cb_t { + mdg_receive_file_cb receive_cb; /**< User callback to be called */ + void *user_data; /**< User data pointer */ +} receive_file_cb_t; + /** * @brief Sending internal commands to the device done callback structure * @since_tizen 5.0 @@ -161,6 +166,7 @@ typedef struct _mdg_manager_s { device_eject_finish_cb_t device_eject_finish_cb; /**< When it called after ejecting the device done or timeout */ send_data_finish_cb_t send_data_finish_cb; /**< When it called after sending the device done or timeout */ send_file_cb_t send_file_cb; /**< When it called after sending the device done or timeout */ + receive_file_cb_t receive_file_cb; /**< When it called after sending the device done or timeout */ request_result_cb_t request_result_cb; /**< When it called after sending private commands or timeout */ request_channel_list_finish_cb_t request_channel_list_finish_cb; /**< When it called after sending private commands or timeout */ } mdg_manager_s; @@ -176,7 +182,6 @@ typedef struct _mdg_manager_s { */ typedef struct _mdg_group_s { char *device_id; /**< Device ID of the device has this group resource */ - char *host_addr; /**< Host address */ char *group_name; /**< Group Name (Friendly name) */ mdg_group_type_e type; /**< Mine or Remote */ } mdg_group_s; @@ -187,10 +192,6 @@ typedef struct _mdg_group_s { */ typedef struct _mdg_device_s { char *device_id; /**< Device ID */ - char *addr; /**< Device IP */ - int port; /**< Port Number */ - int secure_port; /**< Secure Port Number */ - unsigned int conn_type; /**< Connection type */ char *model_name; char *device_name; char *platform_ver; diff --git a/src/mdg_util.c b/src/mdg_util.c index 3291cc5..501d6c0 100755 --- a/src/mdg_util.c +++ b/src/mdg_util.c @@ -23,7 +23,6 @@ mdg_group_s *mdg_get_group_from_variant(GVariant *va) { char *device_id = NULL; - char *host_addr = NULL; char *group_name = NULL; mdg_group_type_e type = MDG_GROUP_TYPE_LOCAL; GVariantIter *iter = NULL; @@ -42,8 +41,6 @@ mdg_group_s *mdg_get_group_from_variant(GVariant *va) while (g_variant_iter_loop(iter, "{sv}", &key, &key_value)) { if (g_strcmp0(key, "DeviceID") == 0) device_id = (char *)g_variant_get_string(key_value, NULL); - else if (g_strcmp0(key, "HostAddr") == 0) - host_addr = (char *)g_variant_get_string(key_value, NULL); else if (g_strcmp0(key, "GroupName") == 0) group_name = (char *)g_variant_get_string(key_value, NULL); else if (g_strcmp0(key, "Type") == 0) @@ -51,7 +48,6 @@ mdg_group_s *mdg_get_group_from_variant(GVariant *va) } group->device_id = g_strdup(device_id); - group->host_addr = g_strdup(host_addr); group->group_name = g_strdup(group_name); group->type = type; @@ -63,10 +59,6 @@ mdg_group_s *mdg_get_group_from_variant(GVariant *va) mdg_device_s *mdg_get_device_from_variant(GVariant *va) { char *device_id = NULL; - char *addr = NULL; - int port; - int secure_port; - int conn_type; char *model_name = NULL; char *device_name = NULL; char *platform_ver = NULL; @@ -90,14 +82,6 @@ mdg_device_s *mdg_get_device_from_variant(GVariant *va) while (g_variant_iter_loop(iter, "{sv}", &key, &key_value)) { if (g_strcmp0(key, "DeviceID") == 0) device_id = (char *)g_variant_get_string(key_value, NULL); - else if (g_strcmp0(key, "Addr") == 0) - addr = (char *)g_variant_get_string(key_value, NULL); - else if (g_strcmp0(key, "Port") == 0) - port = g_variant_get_int32(key_value); - else if (g_strcmp0(key, "SecurePort") == 0) - secure_port = g_variant_get_int32(key_value); - else if (g_strcmp0(key, "ConnType") == 0) - conn_type = g_variant_get_int32(key_value); else if (g_strcmp0(key, "ModelName") == 0) model_name = (char *)g_variant_get_string(key_value, NULL); else if (g_strcmp0(key, "DeviceName") == 0) @@ -115,10 +99,6 @@ mdg_device_s *mdg_get_device_from_variant(GVariant *va) } device->device_id = g_strdup(device_id); - device->addr = g_strdup(addr); - device->port = port; - device->secure_port = secure_port; - device->conn_type = conn_type; device->model_name = g_strdup(model_name); device->device_name = g_strdup(device_name); device->platform_ver = g_strdup(platform_ver); @@ -203,6 +183,23 @@ void mdg_get_progress_from_variant(GVariant *va, char **file_path, g_variant_iter_free(iter); } +void mdg_get_receive_file_from_variant(GVariant *va, char **device_id, char **file_path) +{ + GVariantIter *iter = NULL; + const gchar *key; + GVariant *key_value = NULL; + + g_variant_get(va, "a{sv}", &iter); + while (g_variant_iter_loop(iter, "{sv}", &key, &key_value)) { + if (g_strcmp0(key, "DeviceID") == 0) + *device_id = (char *)g_variant_get_string(key_value, NULL); + if (g_strcmp0(key, "FilePath") == 0) + *file_path = (char *)g_variant_get_string(key_value, NULL); + } + + g_variant_iter_free(iter); +} + GVariant *mdg_create_variant_device(mdg_device_s *device) { GVariant *va; @@ -213,14 +210,6 @@ GVariant *mdg_create_variant_device(mdg_device_s *device) g_variant_builder_add(builder, "{sv}", "DeviceID", g_variant_new_string(device->device_id)); - g_variant_builder_add(builder, "{sv}", "Port", - g_variant_new_int32(device->port)); - g_variant_builder_add(builder, "{sv}", "Addr", - g_variant_new_string(device->addr)); - g_variant_builder_add(builder, "{sv}", "ConnType", - g_variant_new_int32(device->conn_type)); - g_variant_builder_add(builder, "{sv}", "SecurePort", - g_variant_new_int32(device->secure_port)); g_variant_builder_add(builder, "{sv}", "ModelName", g_variant_new_string(device->model_name)); g_variant_builder_add(builder, "{sv}", "DeviceName", diff --git a/src/mdg_util.h b/src/mdg_util.h index df46e2e..ac64c8e 100755 --- a/src/mdg_util.h +++ b/src/mdg_util.h @@ -31,6 +31,7 @@ mdg_group_s *mdg_get_group_from_variant(GVariant *va); void mdg_get_channel_from_variant(GVariant *va, char **device_id, char **channel_id); void mdg_get_data_from_variant(GVariant *va, char **device_id, char **channel_id, unsigned char **data, int *data_len); +void mdg_get_receive_file_from_variant(GVariant *va, char **device_id, char **file_path); void mdg_get_progress_from_variant(GVariant *va, char **file_path, long *send_size, long *total_size, int *percent); diff --git a/test/common.h b/test/common.h index 01eade4..79f3102 100755 --- a/test/common.h +++ b/test/common.h @@ -19,6 +19,7 @@ #define __COMMON_H__ #include +#include __BEGIN_DECLS diff --git a/test/mdg-manager.c b/test/mdg-manager.c index 9637951..d6d40cb 100755 --- a/test/mdg-manager.c +++ b/test/mdg-manager.c @@ -60,6 +60,11 @@ static const char* __device_type_to_string(mdg_device_type_e type) } } +static void _destroy_mdg_device_info(gpointer data) +{ + mdg_device_info_destroy((mdg_device_h)data); +} + void receive_request_result(char *cmd, char *device_id, unsigned char *arg, int len, int ret, void *user_data) { @@ -160,12 +165,12 @@ static int run_device_eject(MManager *mm, struct menu_data *menu) bool __group_foreach_cb(mdg_device_h device, void *user_data) { - char *addr; char *device_id; - mdg_device_info_get_addr(device, &addr); mdg_device_info_get_device_id(device, &device_id); - msgb("\rDevice is [%s], ADDR [%s]", device_id, addr); + msgb("\rDevice is [%s]", device_id); + + found_invited_device_list = g_list_append(found_invited_device_list, device); return true; } @@ -194,6 +199,11 @@ static int run_group_foreach_device(MManager *mm, struct menu_data *menu) } } + if (found_invited_device_list) { + g_list_free_full(found_device_list, _destroy_mdg_device_info); + found_invited_device_list = NULL; + } + ret = mdg_group_foreach_device(handle, group, __group_foreach_cb, NULL); if (MDG_ERROR_NONE != ret) { msgr("Failed to foreach device: [%s(0x%X)]", mdg_error_to_string(ret), ret); @@ -266,10 +276,6 @@ static int run_device_invite(MManager *mm, struct menu_data *menu) return RET_SUCCESS; } -static void _destroy_mdg_device_info(gpointer data) -{ - mdg_device_info_destroy((mdg_device_h)data); -} static int run_devices_show(MManager *mm, struct menu_data *menu) { @@ -289,33 +295,33 @@ static int run_devices_show(MManager *mm, struct menu_data *menu) } char *model_name; - char *addr; + char *device_id; mdg_device_info_get_model_name(device, &model_name); - mdg_device_info_get_addr(device, &addr); + mdg_device_info_get_device_id(device, &device_id); - msgp("[%d] Model : %s, Addr : %s", i+1, model_name, addr); + msgp("[%d] Model : %s, Device ID : %s", i+1, model_name, device_id); mdg_device_h cloned_device; char *cloned_model_name; - char *cloned_addr; + char *cloned_device_id; mdg_device_info_clone(&cloned_device, device); mdg_device_info_get_model_name(cloned_device, &cloned_model_name); - mdg_device_info_get_addr(cloned_device, &cloned_addr); + mdg_device_info_get_device_id(cloned_device, &cloned_device_id); - msgp("*Cloned* [%d] Model : %s, Addr : %s", i+1, cloned_model_name, cloned_addr); + msgp("*Cloned* [%d] Model : %s, Device ID : %s", i+1, cloned_model_name, cloned_device_id); if (model_name) free(model_name); - if (addr) - free(addr); + if (device_id) + free(device_id); if (cloned_model_name) free(cloned_model_name); - if (cloned_addr) - free(cloned_addr); + if (cloned_device_id) + free(cloned_device_id); mdg_device_info_destroy(cloned_device); @@ -345,17 +351,18 @@ static int run_invited_devices_show(MManager *mm, struct menu_data *menu) } char *model_name; - char *addr; + char *device_id; + + mdg_device_info_get_device_id(device, &device_id); mdg_device_info_get_model_name(device, &model_name); - mdg_device_info_get_addr(device, &addr); - msgp("[%d] Model : %s, Addr : %s", i+1, model_name, addr); + msgp("[%d] Device : %s, Model : %s", i+1, device_id, model_name); if (model_name) free(model_name); - if (addr) - free(addr); + if (device_id) + free(device_id); /* Next item */ iter = g_list_next(iter); @@ -504,7 +511,6 @@ bool _device_found_cb(mdg_device_h device, void *user_data) gboolean is_exist = FALSE; mdg_device_info_get_device_id(device, &device_id); - mdg_device_info_get_addr(device, &addr); mdg_device_info_get_model_name(device, &model_name); mdg_device_info_get_type(device, &device_type); @@ -528,7 +534,7 @@ bool _device_found_cb(mdg_device_h device, void *user_data) if (is_exist == FALSE) { found_device_list = g_list_append(found_device_list, device); - msgp("\r[ID] %s [IP] %s [Type] %s [Name] %s", device_id, addr, + msgp("\r[ID] %s [Type] %s [Name] %s", device_id, __device_type_to_string(device_type), model_name); } @@ -564,6 +570,11 @@ static int run_devices_find(MManager *mm, struct menu_data *menu) return RET_SUCCESS; } +void __receive_file_cb(int result, char *device_id, const char *file_path, void *user_data) +{ + msgb("The %s is stored by %s", file_path, device_id); +} + int run_device_show_local_device(MManager *mm, struct menu_data *menu) { int ret = 0; @@ -580,9 +591,6 @@ int run_device_show_local_device(MManager *mm, struct menu_data *menu) if (ret == 0) { char *device_id = NULL; - char *addr = NULL; - int port; - int secure_port; char *model_name; char *device_name; char *platform_ver; @@ -592,9 +600,6 @@ int run_device_show_local_device(MManager *mm, struct menu_data *menu) mdg_device_type_e type; mdg_device_info_get_device_id(device, &device_id); - mdg_device_info_get_addr(device, &addr); - mdg_device_info_get_port(device, &port); - mdg_device_info_get_secure_port(device, &secure_port); mdg_device_info_get_model_name(device, &model_name); mdg_device_info_get_device_name(device, &device_name); mdg_device_info_get_platform_ver(device, &platform_ver); @@ -604,9 +609,6 @@ int run_device_show_local_device(MManager *mm, struct menu_data *menu) mdg_device_info_get_type(device, &type); msgb("\n[ID] %s", device_id); - msgb("[ADDR] %s", addr); - msgb("[PORT] %d", port); - msgb("[S.PORT] %d", secure_port); msgb("[Model Name] %s", model_name); msgb("[Device Name] %s", device_name); msgb("[Platform Ver.] %s", platform_ver); @@ -617,10 +619,6 @@ int run_device_show_local_device(MManager *mm, struct menu_data *menu) if (device_id) free(device_id); - if (addr) - free(addr); - if (model_name) - free(model_name); if (device_name) free(device_name); if (platform_ver) @@ -634,6 +632,9 @@ int run_device_show_local_device(MManager *mm, struct menu_data *menu) device = NULL; } + + mdg_set_receive_file_cb(handle, __receive_file_cb, NULL); + return RET_SUCCESS; } @@ -655,44 +656,36 @@ static int run_group_show(MManager *mm, struct menu_data *menu) } char *device_id; - char *host_addr; char *name; mdg_group_type_e type; mdg_group_info_get_device_id(group, &device_id); - mdg_group_info_get_host_addr(group, &host_addr); mdg_group_info_get_name(group, &name); mdg_group_info_get_type(group, &type); msgp("[%d] type: %s, name: %s", i+1, mdg_group_type_to_string(type), name); - msgp(" host_addr: %s, device_id: %s\n", host_addr, device_id); + msgp(" device_id: %s\n", device_id); mdg_group_h cloned_group; char *cloned_device_id; - char *cloned_host_addr; char *cloned_name; mdg_group_type_e cloned_type; mdg_group_info_clone(&cloned_group, group); mdg_group_info_get_device_id(cloned_group, &cloned_device_id); - mdg_group_info_get_host_addr(cloned_group, &cloned_host_addr); mdg_group_info_get_name(cloned_group, &cloned_name); mdg_group_info_get_type(cloned_group, &cloned_type); msgp("*Cloned* [%d] type: %s, name: %s", i+1, mdg_group_type_to_string(cloned_type), cloned_name); - msgp(" host_addr: %s, device_id: %s\n", cloned_host_addr, cloned_device_id); + msgp(" device_id: %s\n", cloned_device_id); if (device_id) free(device_id); - if (host_addr) - free(host_addr); if (name) free(name); if (cloned_device_id) free(cloned_device_id); - if (cloned_host_addr) - free(cloned_host_addr); if (cloned_name) free(cloned_name); @@ -801,8 +794,7 @@ static int __send_data(int devidx, int chaidx) } mdg_device_info_get_device_id(device, &deviceid); - mdg_device_info_get_addr(device, &address); - msgp("Sent to [ID] %s [ADDR] %s [CHANNEL ID] %s", deviceid, address, channel->channel_id); + msgp("Sent to [ID] %s [CHANNEL ID] %s", deviceid, channel->channel_id); if (deviceid) { free(deviceid); deviceid = NULL; @@ -855,11 +847,11 @@ void __send_file_progress_cb(const char *file_path, long send_size, } void __send_file_finish_cb(int result, mdg_device_h device, void *user_data) { - char *addr; + char *device_id; - mdg_device_info_get_addr(device, &addr); + mdg_device_info_get_device_id(device, &device_id); - msgp("Send file to %s Finished [%s]", addr, mdg_error_to_string(result)); + msgp("Send file to %s Finished [%s]", device_id, mdg_error_to_string(result)); } static int __send_file(int devidx) @@ -878,8 +870,7 @@ static int __send_file(int devidx) } mdg_device_info_get_device_id(device, &deviceid); - mdg_device_info_get_addr(device, &address); - msgp("Sent to [ID] %s [ADDR] %s", deviceid, address); + msgp("Sent to [ID] %s", deviceid); if (deviceid) { free(deviceid); deviceid = NULL; @@ -926,21 +917,16 @@ void _invited_device_finish_cb(int result, void *user_data) bool _invited_device_found_cb(mdg_device_h device, void *user_data) { - char *addr = NULL; char *device_id = NULL; mdg_device_type_e device_type; mdg_device_info_get_device_id(device, &device_id); - mdg_device_info_get_addr(device, &addr); mdg_device_info_get_type(device, &device_type); - msgp("\r[ID] %s [IP] %s [Type] %s", device_id, addr, - __device_type_to_string(device_type)); + msgp("\r[ID] %s [Type] %s", device_id, __device_type_to_string(device_type)); if (device_id) free(device_id); - if (addr) - free(addr); found_invited_device_list = g_list_append(found_invited_device_list, device);