From 271ea0477816455779478f8fbead210e2ed648d7 Mon Sep 17 00:00:00 2001
From: btsimonh <simon@yellaumbrella.tv>
Date: Wed, 16 Feb 2022 18:51:59 +0000
Subject: [PATCH] add more in /api/info

---
 src/httpserver/rest_interface.c | 15 +++++++++++++--
 src/printnetinfo/printnetinfo.c | 11 +++++++++++
 src/printnetinfo/printnetinfo.h |  2 ++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/httpserver/rest_interface.c b/src/httpserver/rest_interface.c
index 94771ac92..b57a812fb 100644
--- a/src/httpserver/rest_interface.c
+++ b/src/httpserver/rest_interface.c
@@ -62,14 +62,17 @@ const char *apppage1 =
 "        <script>"
 "            var root = '";
 #if WINDOWS
+const char *obktype = "windows";
 const char * apppage2 = "';"
 "            var obktype = 'windows';"
 "            var device = 'http://";
 #elif PLATFORM_XR809
+const char *obktype = "XR809";
 const char * apppage2 = "';"
 "            var obktype = 'XR809';"
 "            var device = 'http://";
 #else
+const char *obktype = "beken";
 const char * apppage2 = "';"
 "            var obktype = 'beken';"
 "            var device = 'http://";
@@ -495,9 +498,17 @@ static int http_rest_post_logconfig(http_request_t *request){
 
 
 static int http_rest_get_info(http_request_t *request){
+    char macstr[3*6+1];
     http_setup(request, httpMimeTypeJson);
-    hprintf128(request, "{\"uptimes\":%d,", Time_getUpTimeSeconds());
-    hprintf128(request, "\"build\":\"%s\"}", g_build_str);
+    hprintf128(request, "{\"uptime_s\":%d,", Time_getUpTimeSeconds());
+    hprintf128(request, "\"build\":\"%s\",", g_build_str);
+    hprintf128(request, "\"sys\":\"%s\",", obktype);
+    hprintf128(request, "\"ip\":\"%s\",", getMyIp());
+    hprintf128(request, "\"mac\":\"%s\",", getMACStr(macstr));
+    hprintf128(request, "\"mqtthost\":\"%s:%d\",", CFG_GetMQTTHost(), CFG_GetMQTTPort());
+    hprintf128(request, "\"mqtttopic\":\"%s\"}", CFG_GetShortDeviceName());
+
+
     poststr(request, NULL);
     return 0;
 }
diff --git a/src/printnetinfo/printnetinfo.c b/src/printnetinfo/printnetinfo.c
index 476cdfe00..15ea298c1 100644
--- a/src/printnetinfo/printnetinfo.c
+++ b/src/printnetinfo/printnetinfo.c
@@ -20,7 +20,18 @@ char *getMyIp(){
     return g_IP;
 }
 
+////////////////////
+// NOTE: this gets the STA mac
+void getMAC(unsigned char *mac){
+    net_get_if_macaddr(mac, net_get_sta_handle());
+}
 
+char *getMACStr(char *macstr){
+    unsigned char mac[6];
+    getMAC(mac);
+    sprintf(macstr, MACSTR, MAC2STR(mac));
+    return macstr;
+}
 
 void print_network_info(){
     IPStatusTypedef ipStatus;
diff --git a/src/printnetinfo/printnetinfo.h b/src/printnetinfo/printnetinfo.h
index 99883063c..26990818d 100644
--- a/src/printnetinfo/printnetinfo.h
+++ b/src/printnetinfo/printnetinfo.h
@@ -1,2 +1,4 @@
 char *getMyIp();
+void getMAC(unsigned char *mac);
+char *getMACStr(char *macstr);
 void print_network_info();
\ No newline at end of file