replace value to macro for HTTP OK

[apps/native/tizen-things-daemon.git] / daemon / src / ttd-url.c

diff --git a/daemon/src/ttd-url.c b/daemon/src/ttd-url.c
index 7059d77..6a8ebe2 100644 (file)
--- a/daemon/src/ttd-url.c
+++ b/daemon/src/ttd-url.c
@@ -23,6 +23,8 @@
 #define CONF_URL_KEY_ADDRESS "server"
 #define CONF_URL_KEY_CMD "api_cmd"
 #define CONF_URL_KEY_REPORT "api_report"
+#define CONF_URL_KEY_DATA "api_data"
+#define CONF_URL_KEY_LOG "api_log"
 
 #define QUERY_KEY_DEVICE_ID "deviceId="
 #define QUERY_KEY_STATE "state="
@@ -49,6 +51,40 @@ static char *__ttd_url_get_device_id(void)
        return device_id;
 }
 
+static char *__ttd_url_get_by_key(const char *key)
+{
+       char *url = NULL;
+       retv_if(!key, NULL);
+
+       ttd_config_read_string(CONF_URL_GROUP_NAME, key, &url);
+       return url;
+}
+
+static char *_ttd_url_get_log(void)
+{
+       char *log_api = NULL;
+       char *device_id = NULL;
+       char *log_url = NULL;
+
+       device_id = __ttd_url_get_device_id();
+       retv_if(!device_id, NULL);
+
+       log_api = __ttd_url_get_by_key(CONF_URL_KEY_LOG);
+       goto_if(!log_api, DONE_N_FREE);
+
+       log_url = g_strdup_printf("%s?&%s%s", log_api,
+               QUERY_KEY_DEVICE_ID, device_id);
+
+       if (!log_url)
+               _E("failed to create log_url");
+
+DONE_N_FREE:
+       g_free(device_id);
+       g_free(log_api);
+
+       return log_url;
+}
+
 static char *_ttd_url_get_cmd(void)
 {
        char *cmd_api = NULL;
@@ -58,7 +94,7 @@ static char *_ttd_url_get_cmd(void)
        device_id = __ttd_url_get_device_id();
        retv_if(!device_id, NULL);
 
-       ttd_config_read_string(CONF_URL_GROUP_NAME, CONF_URL_KEY_CMD, &cmd_api);
+       cmd_api = __ttd_url_get_by_key(CONF_URL_KEY_CMD);
        goto_if(!cmd_api, DONE_N_FREE);
 
        cmd_url = g_strdup_printf("%s?&%s%s&%s%d", cmd_api,
@@ -77,13 +113,12 @@ DONE_N_FREE:
 
 static char *_ttd_url_get_report(void)
 {
-       char *report_url = NULL;
-
-       ttd_config_read_string(CONF_URL_GROUP_NAME,
-               CONF_URL_KEY_REPORT, &report_url);
-       retv_if(!report_url, NULL);
+       return __ttd_url_get_by_key(CONF_URL_KEY_REPORT);
+}
 
-       return report_url;
+static char *_ttd_url_get_data(void)
+{
+       return __ttd_url_get_by_key(CONF_URL_KEY_DATA);
 }
 
 char *ttd_url_get_by_type(ttd_url_type_e type)
@@ -102,6 +137,12 @@ 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_DATA:
+               url_postfix = _ttd_url_get_data();
+               break;
+       case TTD_URL_LOG:
+               url_postfix = _ttd_url_get_log();
+               break;
        case TTD_URL_TYPE_NUM:
        default:
                _E("not supported type : %d", type);