From 4de590357e213f2b4c38b6ee1474f0b8503aab37 Mon Sep 17 00:00:00 2001 From: Jakob Olsson <jakobols@kth.se> Date: Tue, 15 May 2018 14:54:13 +0200 Subject: [PATCH] small change to output format --- libmobile.c | 62 +++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/libmobile.c b/libmobile.c index 589b3fc..217593c 100644 --- a/libmobile.c +++ b/libmobile.c @@ -179,6 +179,34 @@ static char *lexer(char **input, char *delimiter) { return substr; } +/** + * Function: get_query_wrapper + * Wraps the input comma-separated values to the appropriate address format for a GET request. + * + * Parameters: + * vars - Char pointer pointing to comma-separated values to retreive. + * + * Returns: + * The entire query on success. + * NULL on failure. + */ +static char *get_query_wrapper(char *vars) +{ + if (strlen(vars) == 0) + { + printf("No GET input provided!\n"); + return NULL; + } + + char query[1024] = {0}; + + strncpy(query, "http://192.168.0.1/goform/goform_get_cmd_process?isTest=false&cmd=", 1023); + strncat(query + strlen(query), vars, 1023); + strncat(query + strlen(query), "&multi_data=1", 1023); + + return strdup(query); +} + struct json_object *parse_apn_profiles(char *apn_profiles) { if (strlen(apn_profiles) <= 0) { @@ -210,8 +238,10 @@ struct json_object *parse_apn_profiles(char *apn_profiles) i++; free(field_val); } - char name[1024]; - sprintf(name, "%d", apn_counter); + char name[1024] = {0}; + + strncpy(name, "apn_config_", 1023); + sprintf(name + strlen(name), "%d", apn_counter); json_object_object_add(parsed_profiles, name, json_object_get(apn_profile)); json_object_put(apn_profile); apn_counter++; @@ -224,7 +254,6 @@ free_objects: fail: return NULL; finished: - //best guess, free: apn_profiles_json json_object_put(apn_profiles_json); return parsed_profiles; } @@ -439,33 +468,6 @@ fail: return NULL; } -/** - * Function: get_query_wrapper - * Wraps the input comma-separated values to the appropriate address format for a GET request. - * - * Parameters: - * vars - Char pointer pointing to comma-separated values to retreive. - * - * Returns: - * The entire query on success. - * NULL on failure. - */ -char *get_query_wrapper(char *vars) -{ - if (strlen(vars) == 0) { - printf("No GET input provided!\n"); - return NULL; - } - - char query[1024] = {0}; - - strncpy(query, "http://192.168.0.1/goform/goform_get_cmd_process?isTest=false&cmd=", 1023); - strncat(query + strlen(query), vars, 1023); - strncat(query + strlen(query), "&multi_data=1", 1023); - - return strdup(query); -} - char *mobile_get_request(char *vars) { CURL *curl; -- GitLab