capi: Store secure port number of devices

Signed-off-by: Saurav Babu <saurav.babu@samsung.com>

diff --git a/capi/src/companion.c b/capi/src/companion.c
index 2775ce0..025d600 100644 (file)
--- a/capi/src/companion.c
+++ b/capi/src/companion.c
@@ -354,8 +354,8 @@ EXPORT_API int companion_send_data(companion_h handle, companion_device_h device
        _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->ip, dev->port,
-               buf, len, &ret, NULL, &error);
+       group_call_send_data_sync(_handle->group_proxy, dev->device_id, dev->ip,
+                                                         dev->sec_port, buf, len, &ret, NULL, &error);
 
        free(buf);
        buf = NULL;
@@ -399,6 +399,7 @@ EXPORT_API int companion_device_get_found_devices(companion_h handle,
                        char *addr = NULL;
                        char *ver = NULL;
                        int port;
+                       int sec_port;
                        companion_device_s *device = NULL;
 
                        while (g_variant_iter_loop(iter_row, "{sv}", &key, &key_value)) {
@@ -410,10 +411,12 @@ EXPORT_API int companion_device_get_found_devices(companion_h handle,
                                        ver = (char *)g_variant_get_string(key_value, NULL);
                                else if (g_strcmp0(key, "Port") == 0)
                                        port = g_variant_get_uint16(key_value);
+                               else if (g_strcmp0(key, "SecurePort") == 0)
+                                       sec_port = g_variant_get_uint16(key_value);
                        }
                        g_variant_iter_free(iter_row);
 
-                       device = create_device_handle(deviceid, addr, ver, port);
+                       device = create_device_handle(deviceid, addr, ver, port, sec_port);
 
                        (*devices)[i++] = (companion_device_h)device;
                }
@@ -458,6 +461,7 @@ EXPORT_API int companion_device_get_found_mowned_devices(
                        char *addr = NULL;
                        char *ver = NULL;
                        int port;
+                       int sec_port;
                        companion_device_s *device = NULL;
 
                        while (g_variant_iter_loop(iter_row, "{sv}", &key, &key_value)) {
@@ -469,10 +473,12 @@ EXPORT_API int companion_device_get_found_mowned_devices(
                                        ver = (char *)g_variant_get_string(key_value, NULL);
                                else if (g_strcmp0(key, "Port") == 0)
                                        port = g_variant_get_uint16(key_value);
+                               else if (g_strcmp0(key, "SecurePort") == 0)
+                                       sec_port = g_variant_get_uint16(key_value);
                        }
                        g_variant_iter_free(iter_row);
 
-                       device = create_device_handle(deviceid, addr, ver, port);
+                       device = create_device_handle(deviceid, addr, ver, port, sec_port);
 
                        (*devices)[i++] = (companion_device_h)device;
                }
@@ -496,6 +502,7 @@ EXPORT_API int companion_device_get_my_device(companion_h handle,
        char *addr = NULL;
        char *ver = NULL;
        int port = -1;
+       int sec_port = -1;
 
        CHECK_FEATURE_SUPPORTED(COMPANION_FEATURE);
 
@@ -514,12 +521,15 @@ EXPORT_API int companion_device_get_my_device(companion_h handle,
                        ver = (char *)g_variant_get_string(key_value, NULL);
                else if (g_strcmp0(key, "Port") == 0)
                        port = g_variant_get_uint16(key_value);
+               else if (g_strcmp0(key, "SecurePort") == 0)
+                       sec_port = g_variant_get_uint16(key_value);
        }
 
        if (deviceid == NULL || addr == NULL || ver == NULL)
                return -1;
 
-       *device = (companion_device_h)create_device_handle(deviceid, addr, ver, port);
+       *device = (companion_device_h)create_device_handle(deviceid, addr, ver,
+                                                                  port, sec_port);
 
        g_variant_iter_free(iter);
 

diff --git a/capi/src/companion_dbus.c b/capi/src/companion_dbus.c
index e911c87..9127a7b 100644 (file)
--- a/capi/src/companion_dbus.c
+++ b/capi/src/companion_dbus.c
@@ -108,6 +108,7 @@ static void __device_found_cb(Group *object, gint count, GVariant *va,
                char *ip = NULL;
                char *device_type = NULL;
                int port = -1;
+               int sec_port = -1;
 
                while (g_variant_iter_loop(iter_row, "{sv}", &key, &key_value)) {
                        if (g_strcmp0(key, "DeviceID") == 0)
@@ -118,10 +119,13 @@ static void __device_found_cb(Group *object, gint count, GVariant *va,
                                device_type = (char *)g_variant_get_string(key_value, NULL);
                        else if (g_strcmp0(key, "Port") == 0)
                                port = g_variant_get_uint16(key_value);
+                       else if (g_strcmp0(key, "SecurePort") == 0)
+                               sec_port = g_variant_get_uint16(key_value);
                }
                g_variant_iter_free(iter_row);
 
-               device = create_device_handle(device_id, ip, device_type, port);
+               device = create_device_handle(device_id, ip, device_type, port,
+                                                                         sec_port);
                if (handle->device_found_cb.found_cb)
                        handle->device_found_cb.found_cb(device, handle->device_found_cb.user_data);
        }
@@ -160,6 +164,7 @@ static void __mowned_device_found_cb(Group *object, gint count, GVariant *va,
                char *ip = NULL;
                char *device_type = NULL;
                int port = -1;
+               int sec_port = -1;
 
                while (g_variant_iter_loop(iter_row, "{sv}", &key, &key_value)) {
                        if (g_strcmp0(key, "DeviceID") == 0)
@@ -170,11 +175,14 @@ static void __mowned_device_found_cb(Group *object, gint count, GVariant *va,
                                device_type = (char *)g_variant_get_string(key_value, NULL);
                        else if (g_strcmp0(key, "Port") == 0)
                                port = g_variant_get_uint16(key_value);
+                       else if (g_strcmp0(key, "SecurePort") == 0)
+                               sec_port = g_variant_get_uint16(key_value);
 
                }
                g_variant_iter_free(iter_row);
 
-               device = create_device_handle(device_id, ip, device_type, port);
+               device = create_device_handle(device_id, ip, device_type, port,
+                                                                         sec_port);
                if (handle->mowned_device_found_cb.found_cb)
                        handle->mowned_device_found_cb.found_cb(device,
                                handle->mowned_device_found_cb.user_data);

diff --git a/capi/src/companion_private.h b/capi/src/companion_private.h
index 26f6463..9cdd606 100644 (file)
--- a/capi/src/companion_private.h
+++ b/capi/src/companion_private.h
@@ -187,6 +187,7 @@ typedef struct _companion_device_s {
        char *ip; /**< Device IP */
        char *device_type; /**< Device Type */
        int port; /**< Port Number */
+       int sec_port; /**< Secure Port Number */
 } companion_device_s;
 
 

diff --git a/capi/src/companion_util.c b/capi/src/companion_util.c
index 84a8e63..01fe0a5 100644 (file)
--- a/capi/src/companion_util.c
+++ b/capi/src/companion_util.c
@@ -78,7 +78,7 @@ CREATE_GROUP_HANDLER_ERROR:
 }
 
 companion_device_s *create_device_handle(char *device_id, char *ip,
-       char *device_type, int port)
+       char *device_type, int port, int sec_port)
 {
        companion_device_s *device = calloc(1, sizeof(companion_device_s));
        if (NULL == device) {
@@ -92,6 +92,7 @@ companion_device_s *create_device_handle(char *device_id, char *ip,
        device->ip = g_strdup(ip);
        device->device_type = g_strdup(device_type);
        device->port = port;
+       device->sec_port = sec_port;
 
        if (!device->device_id || !device->ip || !device->device_type) {
                /* LCOV_EXCL_START */

diff --git a/capi/src/companion_util.h b/capi/src/companion_util.h
index 2acfaea..1cd4174 100644 (file)
--- a/capi/src/companion_util.h
+++ b/capi/src/companion_util.h
@@ -28,7 +28,7 @@ extern "C"
 companion_group_s *create_group_handle(char *uri_path, char *device_id,
        char *group_name, char *host_addr, char *resource_type, companion_group_type_e type);
 companion_device_s *create_device_handle(char *device_id, char *ip,
-       char *device_type, int port);
+       char *device_type, int port, int sec_port);
 
 #ifdef __cplusplus
 }