use lwip httpd instead of bitty http

.gitmodules

@@ -13,6 +13,3 @@
 [submodule "picowota"]
 	path = picowota
 	url = https://github.com/usedbytes/picowota
-[submodule "BittyHTTP"]
-	path = BittyHTTP
-	url = https://github.com/TheBeef/BittyHTTP

BittyHTTP

@@ -1 +0,0 @@
-Subproject commit 0c531a062fe44ce9ee372361e14906924737ced1

CMakeLists.txt

@@ -24,10 +24,15 @@ execute_process(COMMAND make
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mcufont/fonts
 )
 
-# remove Options.h from BittyHTTP so we can use our own (TODO ugly)
-execute_process(COMMAND rm Options.h
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/BittyHTTP/src
+# build lwip httpd fs
+set(MAKE_FS_DATA_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/pico-sdk/lib/lwip/src/apps/http/makefsdata/makefsdata)
+execute_process(
+    COMMAND perl ${MAKE_FS_DATA_SCRIPT}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    ECHO_OUTPUT_VARIABLE
+    ECHO_ERROR_VARIABLE
 )
+file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/fsdata.c ${CMAKE_CURRENT_BINARY_DIR}/httpd_fsdata.c)
 
 # initialize pico-sdk from submodule
 include(pico-sdk/pico_sdk_init.cmake)
@@ -107,8 +112,6 @@ target_sources(gadget PUBLIC
     src/state_wifi_edit.c
     src/state_string.c
     src/http.c
-    src/http_socket.c
-    src/http_files.c
 
     ${CMAKE_CURRENT_BINARY_DIR}/fatfs/ff.c
     ${CMAKE_CURRENT_BINARY_DIR}/fatfs/ffunicode.c
@@ -123,8 +126,6 @@ target_sources(gadget PUBLIC
     mcufont/decoder/mf_bwfont.c
     mcufont/decoder/mf_scaledfont.c
     mcufont/decoder/mf_wordwrap.c
-
-    BittyHTTP/src/WebServer.c
 )
 
 # external dependency include directories
@@ -136,7 +137,7 @@ target_include_directories(gadget PUBLIC ${CMAKE_CURRENT_LIST_DIR}/st7789/interf
 target_include_directories(gadget PUBLIC ${CMAKE_CURRENT_LIST_DIR}/mcufont/decoder)
 target_include_directories(gadget PUBLIC ${CMAKE_CURRENT_LIST_DIR}/data)
 target_include_directories(gadget PUBLIC ${CMAKE_CURRENT_LIST_DIR}/build)
-target_include_directories(gadget PUBLIC ${CMAKE_CURRENT_LIST_DIR}/BittyHTTP/src)
+target_include_directories(gadget PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 
 # compress source code and stuff we want to include
 add_custom_target(pack bash -c "./pack_data.sh"
@@ -179,6 +180,7 @@ target_link_libraries(gadget
     hardware_flash
     pico_flash
     picowota_reboot
+    pico_lwip_http
 )
 
 pico_set_linker_script(gadget ${CMAKE_CURRENT_SOURCE_DIR}/conf/memmap_custom.ld)
@@ -190,14 +192,11 @@ set(PICOWOTA_WIFI_SSID "WIFI_SSID_HERE")
 set(PICOWOTA_WIFI_PASS "WIFI_PASS_HERE")
 set(PICOWOTA_WIFI_AP 0)
 
-# TODO set DOCVER to hash of static http files?
-
 target_compile_definitions(gadget PUBLIC
     RUNNING_AS_CLIENT=1
     DEFAULT_WIFI_SSID="${PICOWOTA_WIFI_SSID}"
     DEFAULT_WIFI_PASS="${PICOWOTA_WIFI_PASS}"
     CYW43_HOST_NAME="pico-volcano"
-    DOCVER="1.0.0.0"
 )
 
 add_subdirectory(picowota)

README.md

@@ -8,7 +8,7 @@ Supports:
 
 For use with Raspberry Pi Pico W boards with the [Waveshare Pico LCD 1.3](https://www.waveshare.com/wiki/Pico-LCD-1.3) and the [Pimoroni Pico Lipo Shim](https://shop.pimoroni.com/products/pico-lipo-shim).
 
-Adapted from the [tinyusb-cdc-example](https://github.com/hathach/tinyusb/blob/master/examples/device/cdc_msc/src/main.c), [adc example](https://github.com/raspberrypi/pico-examples/tree/master/adc/read_vsys), [standalone client example](https://github.com/raspberrypi/pico-examples/blob/master/pico_w/bt/standalone/client.c) and my [Trackball firmware](https://git.xythobuz.de/thomas/Trackball).
+Adapted from the [tinyusb-cdc-example](https://github.com/hathach/tinyusb/blob/master/examples/device/cdc_msc/src/main.c), [adc example](https://github.com/raspberrypi/pico-examples/tree/master/adc/read_vsys), [standalone client example](https://github.com/raspberrypi/pico-examples/blob/master/pico_w/bt/standalone/client.c), [webserver example](https://github.com/krzmaz/pico-w-webserver-example) and my [Trackball firmware](https://git.xythobuz.de/thomas/Trackball).
 
 `python-test` contains a similar app to the C version in the top level of the repo, but instead written for MicroPython on the Pico W.
 Unfortunately I had many performance and space problems with this, so I decided to rewrite it.

conf/Options.h

@@ -1,47 +0,0 @@
-/*
- * Options.h
- *
- * Copyright (c) 2023 Thomas Buck (thomas@xythobuz.de)
- * Copyright (c) 2019 Paul Hutchinson
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef __OPTIONS_H_
-#define __OPTIONS_H_
-
-#ifndef DOCVER
-#define DOCVER "1.0.0.0"
-#endif
-
-// The max number of connections we can handle at the same time
-// (this will include buffers needed for each connection)
-#define WS_OPT_MAX_CONNECTIONS              2
-
-// The memory block to use to store the cookies, get args, and post args
-#define WS_OPT_ARG_MEMORY_SIZE              100
-
-// How many seconds to wait after a connection stops sending to us before we hang up
-#define WS_SECONDS_UNTIL_CONNECTION_RELEASE 5
-
-// The max number of bytes we can handle a single header line can be (including the GET line).
-// This is normally in the order of 16K - 128K (we default to a lot less)
-#define WS_LINE_BUFFER_SIZE                 256
-
-#endif // __OPTIONS_H_

conf/lwipopts.h

@@ -73,4 +73,12 @@
 #define SLIP_DEBUG                  LWIP_DBG_OFF
 #define DHCP_DEBUG                  LWIP_DBG_OFF
 
+#define LWIP_HTTPD 1
+#define LWIP_HTTPD_SSI 1
+#define LWIP_HTTPD_CGI 1
+// don't include the tag comment - less work for the CPU, but may be harder to debug
+#define LWIP_HTTPD_SSI_INCLUDE_TAG 0
+// use generated fsdata
+#define HTTPD_FSDATA_FILE "httpd_fsdata.c"
+
 #endif /* __LWIPOPTS_H__ */

fs/index.html

@@ -0,0 +1,8 @@
+<html>
+    <head>
+        <title>Volcano Remote</title>
+    </head>
+    <body>
+        <h1>Hello World</h1>
+    </body>
+</html>

include/http.h

@@ -20,7 +20,5 @@
 #define __HTTP_H__
 
 void http_init(void);
-void http_deinit(void);
-void http_run(void);
 
 #endif // __HTTP_H__

src/http.c

@@ -16,28 +16,12 @@
  * See <http://www.gnu.org/licenses/>.
  */
 
-#include "WebServer.h"
+#include "lwip/apps/httpd.h"
 
 #include "config.h"
 #include "log.h"
 #include "http.h"
 
 void http_init(void) {
-    SocketsCon_InitSocketConSystem();
-    WS_Init();
-
-    if (!WS_Start(80)) {
-        debug("failed to start web server");
-    } else {
-        debug("listening on :80");
-    }
-}
-
-void http_deinit(void) {
-    WS_Shutdown();
-    SocketsCon_ShutdownSocketConSystem();
-}
-
-void http_run(void) {
-    WS_Tick();
+    httpd_init();
 }

src/http_files.c

@@ -1,101 +0,0 @@
-/*
- * http_files.c
- *
- * Based on BittyHTTP example.
- *
- * Copyright (c) 2023 Thomas Buck (thomas@xythobuz.de)
- * Copyright (c) 2019 Paul Hutchinson
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <string.h>
-
-#include "WebServer.h"
-
-#include "config.h"
-#include "log.h"
-#include "http.h"
-
-struct FileInfo {
-    const char *Filename; // With Path
-    bool Dynamic;
-    const char **Cookies;
-    const char **Gets;
-    const char **Posts;
-    void (*WriteFile)(struct WebServer *Web);
-};
-
-void File_Root(struct WebServer *Web);
-
-static struct FileInfo m_Files[] =  {
-    // Filename, Dynamic, Cookies, Gets, Posts, Callback
-    {       "/",   false,    NULL, NULL,  NULL, File_Root },
-};
-
-bool FS_GetFileProperties(const char *Filename, struct WSPageProp *PageProp) {
-    PageProp->FileID = 0;
-
-    for (size_t r = 0; r < sizeof(m_Files) / sizeof(struct FileInfo); r++) {
-        if (strcmp(Filename, m_Files[r].Filename) != 0) {
-            continue;
-        }
-
-        PageProp->FileID = (uintptr_t)&m_Files[r];
-        PageProp->DynamicFile = m_Files[r].Dynamic;
-        PageProp->Cookies = m_Files[r].Cookies;
-        PageProp->Gets = m_Files[r].Gets;
-        PageProp->Posts = m_Files[r].Posts;
-
-        debug("serving '%s'", Filename);
-        return true;
-    }
-
-    debug("unknown file '%s'", Filename);
-    return false;
-}
-
-void FS_SendFile(struct WebServer *Web, uintptr_t FileID) {
-    struct FileInfo *File = (struct FileInfo *)FileID;
-    if ((Web == NULL) || (File == NULL)) {
-        debug("invalid param");
-        return;
-    }
-
-    File->WriteFile(Web);
-}
-
-t_ElapsedTime ReadElapsedClock(void) {
-    return to_ms_since_boot(get_absolute_time()) / 1000;
-}
-
-const char RootHTML[]=
-"<!DOCTYPE html>"
-"<html>"
-"<head>"
-    "<title>Volcano Remote</title>"
-"</head>"
-"<body>"
-    "<h1>Hello World</h1>"
-"</body>"
-"</html>";
-
-void File_Root(struct WebServer *Web) {
-    WS_WriteWhole(Web,RootHTML, sizeof(RootHTML) - 1);
-}

src/http_socket.c

@@ -1,395 +0,0 @@
-/*
- * http_socket.c
- *
- * Based on BittyHTTP example socket interface.
- *
- * Copyright (c) 2023 Thomas Buck (thomas@xythobuz.de)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * See <http://www.gnu.org/licenses/>.
- */
-
-#include <string.h>
-
-#include "lwip/tcp.h"
-#include "lwip/dns.h"
-#include "SocketsCon.h"
-
-#include "config.h"
-#include "log.h"
-#include "main.h"
-#include "ring.h"
-#include "http.h"
-
-#define MAX_SOCK 4
-#define SOCK_RECV_BUFF 512
-
-#define HTTP_DNS_TIMEOUT_MS 5000
-#define HTTP_CONNECT_TIMEOUT_MS 5000
-
-struct tcp_sock {
-    bool set;
-    struct tcp_pcb *pcb;
-
-    // TODO listening server socket has unused buffer
-    uint8_t rx_buf[SOCK_RECV_BUFF];
-    struct ring_buffer rx_rb;
-
-    struct tcp_pcb *child_buf[MAX_SOCK];
-    struct ring_buffer child_rb;
-};
-
-static struct tcp_sock sock[MAX_SOCK] = {0};
-
-bool SocketsCon_InitSocketConSystem(void) {
-    return true;
-}
-
-void SocketsCon_ShutdownSocketConSystem(void) { }
-
-static void tcp_server_err(void *arg, err_t err) {
-    debug("tcp error %d", err);
-
-    struct SocketCon *Con = arg;
-    Con->ErrorCode = e_ConnectErrorMAX;
-    Con->State = e_ConnectState_Error;
-}
-
-static err_t tcp_server_recv(void *arg, struct tcp_pcb *tpcb, struct pbuf *p, err_t err) {
-    (void)tpcb;
-    debug("tcp recv %d %d", p->len, err);
-
-    struct SocketCon *Con = arg;
-    size_t idx = Con->SocketFD;
-
-    if (rb_space(&sock[idx].rx_rb) < p->len) {
-        debug("not enough space (%d < %d)", rb_space(&sock[idx].rx_rb), p->len);
-        tcp_abort(sock[idx].pcb);
-        Con->ErrorCode = e_ConnectErrorMAX;
-        Con->State = e_ConnectState_Error;
-        return ERR_ABRT;
-    }
-
-    rb_add(&sock[idx].rx_rb, p->payload, p->len);
-    return ERR_OK;
-}
-
-bool SocketsCon_InitSockCon(struct SocketCon *Con) {
-    if (!Con) {
-        debug("invalid param");
-        return false;
-    }
-
-    ssize_t next = -1;
-    for (size_t i = 0; i < MAX_SOCK; i++) {
-        if (!sock[i].set) {
-            next = i;
-            break;
-        }
-    }
-
-    if (next < 0) {
-        debug("error: too many sockets");
-        return false;
-    }
-
-    debug("new socket at %d", next);
-
-    sock[next].pcb = tcp_new_ip_type(IPADDR_TYPE_ANY);
-    if (sock[next].pcb == NULL) {
-        debug("error allocating new socket");
-        return false;
-    }
-
-    tcp_arg(sock[next].pcb, Con);
-    tcp_err(sock[next].pcb, tcp_server_err);
-    tcp_recv(sock[next].pcb, tcp_server_recv);
-
-    Con->SocketFD = next;
-    sock[next].set = true;
-
-    struct ring_buffer tmp = RB_INIT(sock[next].rx_buf, SOCK_RECV_BUFF, sizeof(uint8_t));
-    sock[next].rx_rb = tmp;
-
-    struct ring_buffer tmp2 = RB_INIT(sock[next].child_buf, MAX_SOCK, sizeof(struct tcp_pcb *));
-    sock[next].child_rb = tmp2;
-
-    Con->ErrorCode = e_ConnectError_AllOk;
-    Con->State = e_ConnectState_Idle;
-    Con->ReadInProgress = false;
-
-    return true;
-}
-
-static err_t tcp_server_connected(void *arg, struct tcp_pcb *tpcb, err_t err) {
-    (void)tpcb;
-    debug("tcp connected");
-
-    struct SocketCon *Con = arg;
-    Con->State = (err == ERR_OK) ? e_ConnectState_Connected : e_ConnectState_Idle;
-    return ERR_OK;
-}
-
-bool SocketsCon_Connect(struct SocketCon *Con,
-                        const char *ServerName, int portNo) {
-    if ((!Con) || (!ServerName)) {
-        debug("invalid param");
-        return false;
-    }
-
-    ip_addr_t ipaddr;
-    err_t err;
-    uint32_t start_time = to_ms_since_boot(get_absolute_time());
-    do {
-        err = dns_gethostbyname(ServerName, &ipaddr, NULL, NULL);
-        main_loop_hw();
-
-        uint32_t now = to_ms_since_boot(get_absolute_time());
-        if ((now - start_time) >= HTTP_DNS_TIMEOUT_MS) {
-            break;
-        }
-    } while (err == ERR_INPROGRESS);
-    if (err != ERR_OK) {
-        debug("error getting IP for '%s'", ServerName);
-        return false;
-    } else {
-        debug("IP %s for '%s'", ip4addr_ntoa(&ipaddr), ServerName);
-    }
-
-    Con->State = e_ConnectState_Connecting;
-
-    size_t idx = Con->SocketFD;
-    err = tcp_connect(sock[idx].pcb,
-                            &ipaddr, portNo,
-                            tcp_server_connected);
-    if (err != ERR_OK) {
-        debug("error connecting (%d)", err);
-        Con->State = e_ConnectState_Idle;
-        return false;
-    }
-
-    start_time = to_ms_since_boot(get_absolute_time());
-    while (Con->State == e_ConnectState_Connecting) {
-        main_loop_hw();
-
-        uint32_t now = to_ms_since_boot(get_absolute_time());
-        if ((now - start_time) >= HTTP_CONNECT_TIMEOUT_MS) {
-            break;
-        }
-    }
-
-    // TODO ?
-    //if (Con->State == e_ConnectState_Error) {
-    //    Con->State = e_ConnectState_Idle;
-    //}
-
-    return (Con->State == e_ConnectState_Connected);
-}
-
-bool SocketsCon_EnableAddressReuse(struct SocketCon *Con, bool Enable) {
-    (void)Con;
-    (void)Enable;
-    return true;
-}
-
-void SocketsCon_Tick(struct SocketCon *Con) { (void)Con; }
-
-bool SocketsCon_Write(struct SocketCon *Con, const void *buf, int num) {
-    if ((!Con) || (!buf) || (num <= 0)) {
-        debug("invalid param");
-        return false;
-    }
-
-    size_t idx = Con->SocketFD;
-    err_t err = tcp_write(sock[idx].pcb,
-                          buf, num, TCP_WRITE_FLAG_COPY);
-    if (err != ERR_OK) {
-        debug("error writing to socket");
-        return false;
-    }
-
-    return true;
-}
-
-int SocketsCon_Read(struct SocketCon *Con, void *buf, int num) {
-    if ((!Con) || (!buf) || (num <= 0)) {
-        debug("invalid param");
-        return false;
-    }
-
-    // TODO irq disable?
-
-    size_t idx = Con->SocketFD;
-    size_t len = rb_get(&sock[idx].rx_rb, buf, num);
-
-    // TODO irq enable?
-
-    return len;
-}
-
-void SocketsCon_Close(struct SocketCon *Con) {
-    if (!Con) {
-        debug("invalid param");
-        return;
-    }
-
-    size_t idx = Con->SocketFD;
-    sock[idx].set = false;
-
-    err_t err = tcp_close(sock[idx].pcb);
-    if (err != ERR_OK) {
-        debug("error closing socket (%d)", err);
-        // TODO retry?
-    }
-}
-
-static err_t tcp_server_accept(void *arg, struct tcp_pcb *newpcb, err_t err) {
-    if (err != ERR_OK) {
-        debug("ignoring failed accept");
-        return ERR_OK;
-    }
-
-    struct SocketCon *Con = arg;
-    size_t idx = Con->SocketFD;
-    if (rb_space(&sock[idx].child_rb) <= 0) {
-        debug("no space for new connection");
-        tcp_abort(newpcb);
-        return ERR_OK; // ERR_ABRT ?
-    }
-
-    debug("new connection (%d)", err);
-
-    rb_push(&sock[idx].child_rb, &newpcb);
-    return ERR_OK;
-}
-
-bool SocketsCon_Listen(struct SocketCon *Con, const char *bindadd, int PortNo) {
-    if (!Con) {
-        debug("invalid param");
-        return false;
-    }
-
-    ip_addr_t ipaddr;
-    err_t err;
-    if (bindadd) {
-        uint32_t start_time = to_ms_since_boot(get_absolute_time());
-        do {
-            err = dns_gethostbyname(bindadd, &ipaddr, NULL, NULL);
-            main_loop_hw();
-
-            uint32_t now = to_ms_since_boot(get_absolute_time());
-            if ((now - start_time) >= HTTP_DNS_TIMEOUT_MS) {
-                break;
-            }
-        } while (err == ERR_INPROGRESS);
-        if (err != ERR_OK) {
-            debug("error getting IP for '%s'", bindadd);
-            return false;
-        } else {
-            debug("IP %s for '%s'", ip4addr_ntoa(&ipaddr), bindadd);
-        }
-    }
-
-    size_t idx = Con->SocketFD;
-    err = tcp_bind(sock[idx].pcb,
-                   bindadd ? &ipaddr : IP_ANY_TYPE,
-                   PortNo);
-    if (err != ERR_OK) {
-        debug("error binding to '%s'", bindadd);
-        return false;
-    }
-
-    struct tcp_pcb *tmp = tcp_listen(sock[idx].pcb);
-    if (tmp == NULL) {
-        debug("error listening on socket");
-        return false;
-    }
-    sock[idx].pcb = tmp;
-
-    tcp_accept(sock[idx].pcb, tcp_server_accept);
-
-    return true;
-}
-
-bool SocketsCon_Accept(struct SocketCon *Con, struct SocketCon *NewCon) {
-    if ((!Con) || (!NewCon)) {
-        debug("invalid param");
-        return false;
-    }
-
-    size_t idx = Con->SocketFD;
-    size_t new_idx = NewCon->SocketFD;
-
-    if (rb_len(&sock[idx].child_rb) <= 0) {
-        return false;
-    }
-
-    debug("accepting new connection");
-
-    struct tcp_pcb *new_pcb;
-    rb_pop(&sock[idx].child_rb, &new_pcb);
-
-    err_t err = tcp_close(sock[new_idx].pcb);
-    if (err != ERR_OK) {
-        debug("error closing prev new socket");
-    }
-
-    sock[new_idx].pcb = new_pcb;
-    return true;
-}
-
-bool SocketsCon_HasError(struct SocketCon *Con) {
-    if (!Con) {
-        debug("invalid param");
-        return true;
-    }
-    return Con->State == e_ConnectState_Error;
-}
-
-bool SocketsCon_IsConnected(struct SocketCon *Con) {
-    if (!Con) {
-        debug("invalid param");
-        return false;
-    }
-    return Con->State == e_ConnectState_Connected;
-}
-
-int SocketsCon_GetLastErrNo(struct SocketCon *Con) {
-    if (!Con) {
-        debug("invalid param");
-        return -1;
-    }
-    return Con->Last_errno;
-}
-
-e_ConnectErrorType SocketsCon_GetErrorCode(struct SocketCon *Con) {
-    if (!Con) {
-        debug("invalid param");
-        return e_ConnectErrorMAX;
-    }
-    return Con->ErrorCode;
-}
-
-bool SocketsCon_GetSocketHandle(struct SocketCon *Con,
-                                t_ConSocketHandle *RetHandle) {
-    if (!Con) {
-        debug("invalid param");
-        return false;
-    }
-
-    if (Con->SocketFD < 0) {
-        return false;
-    }
-
-    *RetHandle = Con->SocketFD;
-    return true;
-}

src/main.c

@@ -64,15 +64,11 @@ void networking_init(void) {
 }
 
 void networking_deinit(void) {
-    debug("http_deinit");
-    http_deinit();
-
     debug("wifi_deinit");
     wifi_deinit();
 }
 
 void networking_run(void) {
-    http_run();
     wifi_run();
 }