From 74d41da4597098b79439ccde54087345f55591f9 Mon Sep 17 00:00:00 2001 From: Jeonghoon Park Date: Thu, 14 Jun 2018 16:56:19 +0900 Subject: [PATCH] apply command API query param changes Change-Id: I30bac3d74dba660e467c66d808dd95c4cdf649c1 --- daemon/include/ttd-url.h | 3 ++- daemon/src/ttd-url.c | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/daemon/include/ttd-url.h b/daemon/include/ttd-url.h index 4955a2e..07f5d01 100644 --- a/daemon/include/ttd-url.h +++ b/daemon/include/ttd-url.h @@ -18,8 +18,9 @@ #define __TT_DAEMON_URL_H__ typedef enum { - TTD_URL_CMD, + TTD_URL_CMD = 0, TTD_URL_REPORT, + TTD_URL_TYPE_NUM } ttd_url_type_e; char *ttd_url_get_by_type(ttd_url_type_e type); diff --git a/daemon/src/ttd-url.c b/daemon/src/ttd-url.c index 3d5dc8a..7059d77 100644 --- a/daemon/src/ttd-url.c +++ b/daemon/src/ttd-url.c @@ -23,11 +23,12 @@ #define CONF_URL_KEY_ADDRESS "server" #define CONF_URL_KEY_CMD "api_cmd" #define CONF_URL_KEY_REPORT "api_report" + #define QUERY_KEY_DEVICE_ID "deviceId=" #define QUERY_KEY_STATE "state=" -#define QUERY_PARAM_STATE "created" +#define QUERY_PARAM_STATE 0 -/* for test */ +/* for test - TO BE Removed */ #define TEST_DEVICE_ID "test-page-device" static char *__ttd_url_get_address(void) @@ -44,7 +45,7 @@ static char *__ttd_url_get_device_id(void) char *device_id = NULL; /* TODO : get device id */ - g_strdup(TEST_DEVICE_ID); + device_id = g_strdup(TEST_DEVICE_ID); return device_id; } @@ -60,13 +61,11 @@ static char *_ttd_url_get_cmd(void) ttd_config_read_string(CONF_URL_GROUP_NAME, CONF_URL_KEY_CMD, &cmd_api); goto_if(!cmd_api, DONE_N_FREE); - cmd_url = g_strdup_printf("%s?&%s%s&%s%s", cmd_api, + cmd_url = g_strdup_printf("%s?&%s%s&%s%d", cmd_api, QUERY_KEY_DEVICE_ID, device_id, QUERY_KEY_STATE, QUERY_PARAM_STATE); - if (cmd_url) - _D("cmd url - %s", cmd_url); - else + if (!cmd_url) _E("failed to create cmd_url"); DONE_N_FREE: @@ -84,8 +83,6 @@ static char *_ttd_url_get_report(void) CONF_URL_KEY_REPORT, &report_url); retv_if(!report_url, NULL); - _D("report url - %s", report_url); - return report_url; } @@ -105,6 +102,10 @@ char *ttd_url_get_by_type(ttd_url_type_e type) case TTD_URL_REPORT: url_postfix = _ttd_url_get_report(); break; + case TTD_URL_TYPE_NUM: + default: + _E("not supported type : %d", type); + break; } if (url_postfix) { -- 2.7.4