From 9d0ef87b7faedd7852be08e0bad247bac492797c Mon Sep 17 00:00:00 2001
From: Arun Muthusamy <arun.muthusamy@inteno.se>
Date: Fri, 8 Jun 2018 09:53:04 +0200
Subject: [PATCH] swap libmobile api return struct type

---
 libmobile_hilink.c | 54 +++++++++++++++++++++++-----------------------
 libmobile_hilink.h | 50 +++++++++++++++++++++---------------------
 2 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/libmobile_hilink.c b/libmobile_hilink.c
index d0bd0cd..b28023e 100644
--- a/libmobile_hilink.c
+++ b/libmobile_hilink.c
@@ -281,7 +281,7 @@ leave:
 }
 
 
-struct write_result *mobile_get_device_info_hilink()
+struct json_object *mobile_get_device_info_hilink()
 {
 	char *api_url = "http://192.168.8.1/api/device/information";
 
@@ -289,7 +289,7 @@ struct write_result *mobile_get_device_info_hilink()
 }
 
 
-struct write_result *mobile_get_monitoring_status_hilink()
+struct json_object *mobile_get_monitoring_status_hilink()
 {
 	char *api_url = "http://192.168.8.1/api/monitoring/status";
 
@@ -297,7 +297,7 @@ struct write_result *mobile_get_monitoring_status_hilink()
 }
 
 
-struct write_result *mobile_get_trafficstatistics_hilink()
+struct json_object *mobile_get_trafficstatistics_hilink()
 {
 	char *api_url = "http://192.168.8.1/api/monitoring/traffic-statistics";
 
@@ -305,7 +305,7 @@ struct write_result *mobile_get_trafficstatistics_hilink()
 }
 
 
-struct write_result *mobile_get_provider_hilink()
+struct json_object *mobile_get_provider_hilink()
 {
 	char *api_url = "http://192.168.8.1/api/net/current-plmn";
 
@@ -313,7 +313,7 @@ struct write_result *mobile_get_provider_hilink()
 }
 
 
-struct write_result *mobile_get_pin_status_hilink()
+struct json_object *mobile_get_pin_status_hilink()
 {
 	char *api_url = "http://192.168.8.1/api/pin/status";
 
@@ -321,7 +321,7 @@ struct write_result *mobile_get_pin_status_hilink()
 }
 
 
-struct write_result *mobile_get_connection_status_hilink()
+struct json_object *mobile_get_connection_status_hilink()
 {
 	char *api_url = "http://192.168.8.1/api/dialup/connection";
 
@@ -329,7 +329,7 @@ struct write_result *mobile_get_connection_status_hilink()
 }
 
 
-struct write_result *mobile_get_apn_profiles_hilink()
+struct json_object *mobile_get_apn_profiles_hilink()
 {
 	char *api_url = "http://192.168.8.1/api/dialup/profiles";
 
@@ -337,7 +337,7 @@ struct write_result *mobile_get_apn_profiles_hilink()
 }
 
 
-struct write_result *mobile_get_notification_hilink()
+struct json_object *mobile_get_notification_hilink()
 {
 	char *api_url = "http://192.168.8.1/api/monitoring/check-notifications";
 
@@ -345,7 +345,7 @@ struct write_result *mobile_get_notification_hilink()
 }
 
 
-struct write_result *mobile_get_sms_count_hilink()
+struct json_object *mobile_get_sms_count_hilink()
 {
 	char *api_url = "http://192.168.8.1/api/sms/sms-count";
 
@@ -366,7 +366,7 @@ struct json_object *mobile_get_language_hilink()
 }
 
        /*     post calls */
-struct write_result *mobile_create_apn_profile_hilink(char *name, char *apn_name, char *username, char *password)
+struct json_object *mobile_create_apn_profile_hilink(char *name, char *apn_name, char *username, char *password)
 {
 	char *api_url = "http://192.168.8.1/api/dialup/profiles";
 	char post_query[1024];
@@ -377,7 +377,7 @@ struct write_result *mobile_create_apn_profile_hilink(char *name, char *apn_name
 }
 
 
-struct write_result *mobile_set_apn_profile_default_hilink(char *name, char *apn_name, char *username, char *password)
+struct json_object *mobile_set_apn_profile_default_hilink(char *name, char *apn_name, char *username, char *password)
 {
 	char *api_url = "http://192.168.8.1/api/dialup/profiles";
 	char post_query[1024];
@@ -388,7 +388,7 @@ struct write_result *mobile_set_apn_profile_default_hilink(char *name, char *apn
 }
 
 
-struct write_result *mobile_delete_apn_profile_hilink(int profile_name_location)
+struct json_object *mobile_delete_apn_profile_hilink(int profile_name_location)
 {
 	char *api_url = "http://192.168.8.1/api/dialup/profiles";
 	char post_query[512];
@@ -399,7 +399,7 @@ struct write_result *mobile_delete_apn_profile_hilink(int profile_name_location)
 }
 
 
-struct write_result *mobile_sms_read_hilink(int sms_location)
+struct json_object *mobile_sms_read_hilink(int sms_location)
 {
 	char *api_url = "http://192.168.8.1/api/sms/set-read";
 	char post_query[256];
@@ -410,7 +410,7 @@ struct write_result *mobile_sms_read_hilink(int sms_location)
 }
 
 
-struct write_result *mobile_sms_delete_hilink(int sms_location)
+struct json_object *mobile_sms_delete_hilink(int sms_location)
 {
 	char *api_url = "http://192.168.8.1/api/sms/delete-sms";
 	char post_query[256];
@@ -421,7 +421,7 @@ struct write_result *mobile_sms_delete_hilink(int sms_location)
 }
 
 
-struct write_result *mobile_reset_traffic_hilink()
+struct json_object *mobile_reset_traffic_hilink()
 {
 	char *api_url = "http://192.168.8.1/api/monitoring/clear-traffic";
 	char *post_query = "<request><ClearTraffic>1</ClearTraffic></request>";
@@ -430,7 +430,7 @@ struct write_result *mobile_reset_traffic_hilink()
 }
 
   /*   mobile_LTE_register has to be called to enbale or disable LTE   */
-struct write_result *mobile_LTE_register_hilink()
+struct json_object *mobile_LTE_register_hilink()
 {
 	char *api_url = "http://192.168.8.1/api/net/register";
 	char *post_query = "<request><Mode>0</Mode><Plmn></Plmn><Rat></Rat></request>";
@@ -439,7 +439,7 @@ struct write_result *mobile_LTE_register_hilink()
 }
 
 
-struct write_result *mobile_LTE_enable_hilink()
+struct json_object *mobile_LTE_enable_hilink()
 {
 	char *api_url = "http://192.168.8.1/api/net/net-mode";
 	char *post_query = "<request><NetworkMode>00</NetworkMode><NetworkBand>3FFFFFFF</NetworkBand><LTEBand>7FFFFFFFFFFFFFFF</LTEBand></request>";
@@ -448,7 +448,7 @@ struct write_result *mobile_LTE_enable_hilink()
 }
 
 
-struct write_result *mobile_LTE_disable_hilink()
+struct json_object *mobile_LTE_disable_hilink()
 {
 	char *api_url = "http://192.168.8.1/api/net/net-mode";
 	char *post_query = "<NetworkMode>0201</NetworkMode><NetworkBand>3FFFFFFF</NetworkBand><LTEBand>7FFFFFFFFFFFFFFF</LTEBand></request>";
@@ -458,7 +458,7 @@ struct write_result *mobile_LTE_disable_hilink()
 
 
 /*   00 - default- 4g,   01 - 2g, 02 - 3g    */
-struct write_result *mobile_set_connection_type_hilink(int connection_type)
+struct json_object *mobile_set_connection_type_hilink(int connection_type)
 {
 	char *api_url = "http://192.168.8.1/api/dialup/connection";
 	char post_query[256];
@@ -469,7 +469,7 @@ struct write_result *mobile_set_connection_type_hilink(int connection_type)
 }
 
 
-struct write_result *data_roaming_hilink(int action)
+struct json_object *data_roaming_hilink(int action)
 {
 	char *api_url = "http://192.168.8.1/api/dialup/connection";
 	char post_query[256];
@@ -480,19 +480,19 @@ struct write_result *data_roaming_hilink(int action)
 }
 
 
-struct write_result *mobile_data_roaming_enable_hilink()
+struct json_object *mobile_data_roaming_enable_hilink()
 {
 	return data_roaming(ENABLE);
 }
 
 
-struct write_result *mobile_data_roaming_disable_hilink()
+struct json_object *mobile_data_roaming_disable_hilink()
 {
 	return data_roaming(DISABLE);
 }
 
 /* 00 -> enter pin, 01 -> activate pin, 02 ->disable pin, 03 -> change pin, 04 -> enter puk */
-struct write_result *pin_action_hilink(char *type, char *current_pin, char *new_pin, char *puk)
+struct json_object *pin_action_hilink(char *type, char *current_pin, char *new_pin, char *puk)
 {
 	char *api_url = "http://192.168.8.1/api/pin/operate";
 	char post_query[256];
@@ -503,25 +503,25 @@ struct write_result *pin_action_hilink(char *type, char *current_pin, char *new_
 }
 
 
-struct write_result *mobile_pin_enable_hilink(char *current_pin)
+struct json_object *mobile_pin_enable_hilink(char *current_pin)
 {
 	return pin_action("01", current_pin, "", "");
 }
 
 
-struct write_result *mobile_pin_disable_hilink(char *current_pin)
+struct json_object *mobile_pin_disable_hilink(char *current_pin)
 {
 	return pin_action("02", current_pin, "", "");
 }
 
 
-struct write_result *mobile_pin_set_hilink(char *current_pin, char *new_pin)
+struct json_object *mobile_pin_set_hilink(char *current_pin, char *new_pin)
 {
 	return pin_action("03", current_pin, new_pin, "");
 }
 
 
-struct write_result *mobile_set_language_hilink(char *language_name)
+struct json_object *mobile_set_language_hilink(char *language_name)
 {
 	char *api_url = "http://192.168.8.1/api/language/current-language";
 	char post_query[128];
diff --git a/libmobile_hilink.h b/libmobile_hilink.h
index d4406a6..343c97c 100644
--- a/libmobile_hilink.h
+++ b/libmobile_hilink.h
@@ -30,75 +30,75 @@ struct write_result {
 
 //DeviceName, SerialNumber, Imei, Imsi, Iccid, Msisdn, HardwareVersion, SoftwareVersion,
 //WebUIVersion, MacAddress1, MacAddress2, ProductFamily, Classify, supportmode, workmode
-struct write_result *mobile_get_device_info_hilink();
+struct json_object *mobile_get_device_info_hilink();
 
 //ConnectionStatus, WifiConnectionStatus, SignalStrength, SignalIcon, CurrentNetworkType, CurrentServiceDomain, RoamingStatus, BatteryStatus
 //BatteryLevel, BatteryPercent, simlockStatus, WanIPAddress, WanIPv6Address, PrimaryDns, SecondaryDns, PrimaryIPv6Dns, SecondaryIPv6Dns,
 //CurrentWifiUser, TotalWifiUser, currenttotalwifiuser, ServiceStatus, SimStatus, WifiStatus, CurrentNetworkTypeEx, maxsignal, wifiindooronly, wififrequence,
 //classify, flymode, cellroam
-struct write_result *mobile_get_monitoring_status_hilink();
+struct json_object *mobile_get_monitoring_status_hilink();
 
 //CurrentConnectTime, currentUpload, CurrentDownload, CurrentDownloadRate, CurrentUploadRate, TotalUpload, TotalDownload, TotalConnectTime, showtraffic
-struct write_result *mobile_get_trafficstatistics_hilink();
+struct json_object *mobile_get_trafficstatistics_hilink();
 
 
 //State, FullName, ShortName, Numeric, Rat
-struct write_result *mobile_get_provider_hilink();
+struct json_object *mobile_get_provider_hilink();
 
 
 ///SimState, PinOptState, SimPinTimes
-struct write_result *mobile_get_pin_status_hilink();
+struct json_object *mobile_get_pin_status_hilink();
 
 //RoamAutoConnectEnable, MaxIdelTime, ConnectMode, MTU, auto_dial_switch, pdp_always_on
-struct write_result *mobile_get_connection_status_hilink();
+struct json_object *mobile_get_connection_status_hilink();
 
 
-struct write_result *mobile_get_apn_profiles_hilink();
+struct json_object *mobile_get_apn_profiles_hilink();
 
 
 //UnreadMessage, SmsStorageFull, OnlineUpdateStatus
-struct write_result *mobile_get_notification_hilink();
+struct json_object *mobile_get_notification_hilink();
 
 
 //LocalUnread, LocalInbox, LocalOutbox, LocalDraft, LocalDeleted, SimUnread, SimInbox, SimOutbox
 //SimDraft, LocalMax, SimMax, SimUsed, NewMsg
-struct write_result *mobile_get_sms_count_hilink();
+struct json_object *mobile_get_sms_count_hilink();
 
 struct json_object *mobile_get_language_hilink();
-struct write_result *mobile_create_apn_profile(char *name, char *apn_name, char *username, char *password);
+struct json_object *mobile_create_apn_profile(char *name, char *apn_name, char *username, char *password);
 
-struct write_result *mobile_set_apn_profile_default_hilink(char *name, char *apn_name, char *username, char *password);
+struct json_object *mobile_set_apn_profile_default_hilink(char *name, char *apn_name, char *username, char *password);
 
-struct write_result *mobile_delete_apn_profile_hilink(int profile_name_location);
+struct json_object *mobile_delete_apn_profile_hilink(int profile_name_location);
 
-struct write_result *mobile_sms_read_hilink(int sms_location);
+struct json_object *mobile_sms_read_hilink(int sms_location);
 
-struct write_result *mobile_sms_delete_hilink(int sms_location);
+struct json_object *mobile_sms_delete_hilink(int sms_location);
 
-struct write_result *mobile_reset_traffic_hilink();
+struct json_object *mobile_reset_traffic_hilink();
 
   /*   mobile_LTE_register has to be called to enbale or disable LTE   */
-struct write_result *mobile_LTE_register_hilink();
+struct json_object *mobile_LTE_register_hilink();
 
-struct write_result *mobile_LTE_enable_hilink();
+struct json_object *mobile_LTE_enable_hilink();
 
-struct write_result *mobile_LTE_disable_hilink();
+struct json_object *mobile_LTE_disable_hilink();
 
 /*   00 - default- 4g,   01 - 2g, 02 - 3g    */
-struct write_result *mobile_set_connection_type_hilink(int connection_type);
+struct json_object *mobile_set_connection_type_hilink(int connection_type);
 
-struct write_result *mobile_data_roaming_enable_hilink();
+struct json_object *mobile_data_roaming_enable_hilink();
 
-struct write_result *mobile_data_roaming_disable_hilink();
+struct json_object *mobile_data_roaming_disable_hilink();
 
 /* 00 -> enter pin, 01 -> activate pin, 02 ->disable pin, 03 -> change pin, 04 -> enter puk */
-struct write_result *mobile_pin_enable_hilink(char *current_pin);
+struct json_object *mobile_pin_enable_hilink(char *current_pin);
 
-struct write_result *mobile_pin_disable_hilink(char *current_pin);
+struct json_object *mobile_pin_disable_hilink(char *current_pin);
 
-struct write_result *mobile_pin_set_hilink(char *current_pin, char *new_pin);
+struct json_object *mobile_pin_set_hilink(char *current_pin, char *new_pin);
 
-struct write_result *mobile_set_language_hilink(char *language_name);
+struct json_object *mobile_set_language_hilink(char *language_name);
 
 
 #endif
-- 
GitLab