* limitations under the License.
*/
#include <stdio.h>
+#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include "iotcon.h"
#include "ic-utils.h"
#include "icl.h"
-#include "icl-repr.h"
+#include "icl-representation.h"
#include "icl-dbus.h"
#include "icl-dbus-type.h"
#include "icl-device.h"
iotcon_device_info_cb cb;
void *user_data;
unsigned int id;
+ int timeout_id;
} icl_device_info_s;
typedef struct {
iotcon_platform_info_cb cb;
void *user_data;
unsigned int id;
+ int timeout_id;
} icl_platform_info_s;
-typedef struct {
- iotcon_tizen_info_cb cb;
- void *user_data;
-} icl_tizen_info_s;
-
API int iotcon_device_info_get_property(iotcon_device_info_h device_info,
iotcon_device_info_e property, char **value)
icl_device_info_s *cb_container = user_data;
iotcon_device_info_cb cb = cb_container->cb;
+ if (cb_container->timeout_id)
+ cb_container->timeout_id = 0;
+
g_variant_get(parameters, "(&s&s&s&s&s)", &uri_path, &info.device_name,
&info.spec_ver, &info.device_id, &info.data_model_ver);
/* From iotivity, we can get uri_path. But, the value is always "/oic/d". */
if (cb)
- cb(&info, cb_container->user_data);
+ cb(&info, IOTCON_ERROR_NONE, cb_container->user_data);
}
+static gboolean _icl_timeout_get_device_info(gpointer p)
+{
+ FN_CALL;
+ icl_device_info_s *cb_container = p;
+ struct icl_device_info info = {0};
+
+ if (NULL == cb_container) {
+ ERR("cb_container is NULL");
+ return G_SOURCE_REMOVE;
+ }
+
+ if (cb_container->timeout_id && cb_container->cb)
+ cb_container->cb(&info, IOTCON_ERROR_TIMEOUT, cb_container->user_data);
+
+ icl_dbus_unsubscribe_signal(cb_container->id);
+ cb_container->id = 0;
-API int iotcon_get_device_info(const char *host_address, iotcon_device_info_cb cb,
+ return G_SOURCE_REMOVE;
+}
+
+API int iotcon_get_device_info(const char *host_address,
+ iotcon_connectivity_type_e connectivity_type,
+ iotcon_device_info_cb cb,
void *user_data)
{
- GError *error = NULL;
+ int ret, timeout;
unsigned int sub_id;
- int ret, signal_number;
- char signal_name[IC_DBUS_SIGNAL_LENGTH] = {0};
+ GError *error = NULL;
icl_device_info_s *cb_container;
+ int64_t signal_number;
+ char signal_name[IC_DBUS_SIGNAL_LENGTH] = {0};
RETV_IF(NULL == icl_dbus_get_object(), IOTCON_ERROR_DBUS);
- RETV_IF(NULL == host_address, IOTCON_ERROR_INVALID_PARAMETER);
RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
- signal_number = icl_dbus_generate_signal_number();
+ timeout = icl_dbus_get_timeout();
- ic_dbus_call_get_device_info_sync(icl_dbus_get_object(), host_address,
- signal_number, &ret, NULL, &error);
+ ic_dbus_call_get_device_info_sync(icl_dbus_get_object(),
+ ic_utils_dbus_encode_str(host_address),
+ connectivity_type,
+ timeout,
+ &signal_number,
+ &ret,
+ NULL,
+ &error);
if (error) {
ERR("ic_dbus_call_get_device_info_sync() Fail(%s)", error->message);
ret = icl_dbus_convert_dbus_error(error->code);
return icl_dbus_convert_daemon_error(ret);
}
- snprintf(signal_name, sizeof(signal_name), "%s_%u", IC_DBUS_SIGNAL_DEVICE,
+ snprintf(signal_name, sizeof(signal_name), "%s_%llx", IC_DBUS_SIGNAL_DEVICE,
signal_number);
cb_container = calloc(1, sizeof(icl_device_info_s));
cb_container->id = sub_id;
+ cb_container->timeout_id = g_timeout_add_seconds(timeout,
+ _icl_timeout_get_device_info, cb_container);
+
return ret;
}
icl_platform_info_s *cb_container = user_data;
iotcon_platform_info_cb cb = cb_container->cb;
+ if (cb_container->timeout_id)
+ cb_container->timeout_id = 0;
+
g_variant_get(parameters, "(&s&s&s&s&s&s&s&s&s&s&s&s)",
&uri_path,
&info.platform_id,
&info.support_url,
&info.system_time);
+ info.manuf_url = ic_utils_dbus_decode_str(info.manuf_url);
+ info.model_number = ic_utils_dbus_decode_str(info.model_number);
+ info.date_of_manuf = ic_utils_dbus_decode_str(info.date_of_manuf);
+ info.platform_ver = ic_utils_dbus_decode_str(info.platform_ver);
+ info.os_ver = ic_utils_dbus_decode_str(info.os_ver);
+ info.hardware_ver = ic_utils_dbus_decode_str(info.hardware_ver);
+ info.firmware_ver = ic_utils_dbus_decode_str(info.firmware_ver);
+ info.support_url = ic_utils_dbus_decode_str(info.support_url);
+ info.system_time = ic_utils_dbus_decode_str(info.system_time);
+
/* From iotivity, we can get uri_path. But, the value is always "/oic/p". */
if (cb)
- cb(&info, cb_container->user_data);
+ cb(&info, IOTCON_ERROR_NONE, cb_container->user_data);
}
+static gboolean _icl_timeout_get_platform_info(gpointer p)
+{
+ FN_CALL;
+ icl_platform_info_s *cb_container = p;
+ struct icl_platform_info info = {0};
+
+ if (NULL == cb_container) {
+ ERR("cb_container is NULL");
+ return G_SOURCE_REMOVE;
+ }
+
+ if (cb_container->timeout_id && cb_container->cb)
+ cb_container->cb(&info, IOTCON_ERROR_TIMEOUT, cb_container->user_data);
+
+ icl_dbus_unsubscribe_signal(cb_container->id);
+ cb_container->id = 0;
-API int iotcon_get_platform_info(const char *host_address, iotcon_platform_info_cb cb,
+ return G_SOURCE_REMOVE;
+}
+
+API int iotcon_get_platform_info(const char *host_address,
+ iotcon_connectivity_type_e connectivity_type,
+ iotcon_platform_info_cb cb,
void *user_data)
{
- GError *error = NULL;
+ int ret, timeout;
unsigned int sub_id;
- int ret, signal_number;
- char signal_name[IC_DBUS_SIGNAL_LENGTH] = {0};
+ GError *error = NULL;
icl_platform_info_s *cb_container;
+ int64_t signal_number;
+ char signal_name[IC_DBUS_SIGNAL_LENGTH] = {0};
RETV_IF(NULL == icl_dbus_get_object(), IOTCON_ERROR_DBUS);
- RETV_IF(NULL == host_address, IOTCON_ERROR_INVALID_PARAMETER);
RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
- signal_number = icl_dbus_generate_signal_number();
+ timeout = icl_dbus_get_timeout();
- ic_dbus_call_get_platform_info_sync(icl_dbus_get_object(), host_address,
- signal_number, &ret, NULL, &error);
+ ic_dbus_call_get_platform_info_sync(icl_dbus_get_object(),
+ ic_utils_dbus_encode_str(host_address),
+ connectivity_type,
+ timeout,
+ &signal_number,
+ &ret,
+ NULL,
+ &error);
if (error) {
ERR("ic_dbus_call_get_platform_info_sync() Fail(%s)", error->message);
ret = icl_dbus_convert_dbus_error(error->code);
return icl_dbus_convert_daemon_error(ret);
}
- snprintf(signal_name, sizeof(signal_name), "%s_%u", IC_DBUS_SIGNAL_PLATFORM,
+ snprintf(signal_name, sizeof(signal_name), "%s_%llx", IC_DBUS_SIGNAL_PLATFORM,
signal_number);
cb_container = calloc(1, sizeof(icl_platform_info_s));
}
cb_container->id = sub_id;
+ cb_container->timeout_id = g_timeout_add_seconds(timeout,
+ _icl_timeout_get_platform_info, cb_container);
return ret;
}
-
-
-static void _icl_tizen_info_cb(GObject *object, GAsyncResult *g_async_res,
- gpointer user_data)
-{
- int res;
- GVariant *result;
- char *device_name;
- char *tizen_device_id;
- GError *error = NULL;
- struct icl_tizen_info info = {0};
- icl_tizen_info_s *cb_container = user_data;
- iotcon_tizen_info_cb cb = cb_container->cb;
-
- ic_dbus_call_get_tizen_info_finish(IC_DBUS(object), &result, g_async_res, &error);
- if (error) {
- ERR("ic_dbus_call_get_tizen_info_finish() Fail(%s)", error->message);
- g_error_free(error);
- cb(&info, IOTCON_ERROR_DBUS, cb_container->user_data);
- /* TODO contain time out error */
- free(cb_container);
- return;
- }
-
- g_variant_get(result, "(&s&si)", &device_name, &tizen_device_id, &res);
-
- if (IOTCON_ERROR_NONE == res && NULL != ic_utils_dbus_decode_str(tizen_device_id)) {
- info.device_name = ic_utils_dbus_decode_str(device_name);
- info.tizen_device_id = tizen_device_id;
- }
-
- if (cb)
- cb(&info, res, cb_container->user_data);
-
- free(cb_container);
-}
-
-
-API int iotcon_get_tizen_info(const char *host_address, iotcon_tizen_info_cb cb,
- void *user_data)
-{
- icl_tizen_info_s *cb_container;
-
- RETV_IF(NULL == icl_dbus_get_object(), IOTCON_ERROR_DBUS);
- RETV_IF(NULL == host_address, IOTCON_ERROR_INVALID_PARAMETER);
- RETV_IF(NULL == cb, IOTCON_ERROR_INVALID_PARAMETER);
-
- cb_container = calloc(1, sizeof(icl_tizen_info_s));
- if (NULL == cb_container) {
- ERR("calloc() Fail(%d)", errno);
- return IOTCON_ERROR_OUT_OF_MEMORY;
- }
-
- cb_container->cb = cb;
- cb_container->user_data = user_data;
-
- ic_dbus_call_get_tizen_info(icl_dbus_get_object(), host_address, NULL,
- _icl_tizen_info_cb, cb_container);
-
- return IOTCON_ERROR_NONE;
-}
-
-
-API int iotcon_tizen_info_get_property(iotcon_tizen_info_h tizen_info,
- iotcon_tizen_info_e property, char **value)
-{
- RETV_IF(NULL == tizen_info, IOTCON_ERROR_INVALID_PARAMETER);
- RETV_IF(NULL == value, IOTCON_ERROR_INVALID_PARAMETER);
-
- switch (property) {
- case IOTCON_TIZEN_INFO_DEVICE_NAME:
- *value = tizen_info->device_name;
- break;
- case IOTCON_TIZEN_INFO_TIZEN_DEVICE_ID:
- *value = tizen_info->tizen_device_id;
- break;
- default:
- ERR("Invalid property(%d)", property);
- return IOTCON_ERROR_INVALID_PARAMETER;
- }
-
- return IOTCON_ERROR_NONE;
-}
projects / platform / core / iot / iotcon.git / blobdiff