Skip to content

Upstream Fix: Library exits on "socket 0" error #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
starnight merged 2 commits into from
Jan 18, 2026
Merged

Upstream Fix: Library exits on "socket 0" error #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d419fb3
Fix: Do not fail on socket 0.
TangoBravo64 Jan 18, 2026
f1e8833
Improvement: Avoid "exit" in the libraries.
TangoBravo64 Jan 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions FreeRTOS/lib/server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@ HTTPReq http_req[MAX_HTTP_CLIENT];
uint8_t req_buf[MAX_HTTP_CLIENT][MAX_HEADER_SIZE + MAX_BODY_SIZE];
uint8_t res_buf[MAX_HTTP_CLIENT][MAX_HEADER_SIZE + MAX_BODY_SIZE];

void HTTPServerInit(HTTPServer *srv, uint16_t port) {
int HTTPServerInit(HTTPServer *srv, uint16_t port) {
struct sockaddr_in srv_addr;
unsigned int i;

/* Have a server socket. */
srv->sock = socket(AF_INET, SOCK_STREAM, 0);
if(srv->sock <= 0) exit(1);
if(srv->sock < 0)
return -1;
/* Set server address. */
memset(&srv_addr, 0, sizeof(srv_addr));
srv_addr.sin_family = AF_INET;
Expand All @@ -52,7 +53,8 @@ void HTTPServerInit(HTTPServer *srv, uint16_t port) {
setsockopt(srv->sock, SOL_SOCKET, SO_REUSEADDR, &(int){1}, sizeof(int));
/* Bind the server socket with the server address. */
if(bind(srv->sock, (struct sockaddr*) &srv_addr, sizeof(srv_addr)) == -1) {
exit(1);
HTTPServerClose(srv);
return -1;
}
/* Set the server socket non-blocking. */
fcntl(srv->sock, F_SETFL, O_NONBLOCK);
Expand All @@ -75,6 +77,7 @@ void HTTPServerInit(HTTPServer *srv, uint16_t port) {
http_req[i].clisock = -1;
http_req[i].work_state = NOTWORK_SOCKET;
}
return 0;
}

void _HTTPServerAccept(HTTPServer *srv) {
Expand Down Expand Up @@ -385,6 +388,9 @@ void HTTPServerRun(HTTPServer *srv, HTTPREQ_CALLBACK callback) {
struct timeval timeout = {0, 0};
uint16_t i;

if (srv->sock < 0)
return;

/* Copy master socket queue to readable, writeable socket queue. */
readable = srv->_read_sock_pool;
writeable = srv->_write_sock_pool;
Expand Down Expand Up @@ -426,8 +432,11 @@ void HTTPServerRun(HTTPServer *srv, HTTPREQ_CALLBACK callback) {
}

void HTTPServerClose(HTTPServer *srv) {
if (srv->sock < 0)
return;
shutdown(srv->sock, SHUT_RDWR);
close((srv)->sock);
srv->sock = -1;
}

#ifdef MICRO_HTTP_SERVER_EXAMPLE
Expand Down
2 changes: 1 addition & 1 deletion FreeRTOS/lib/server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ typedef struct _HTTPResMessage {

typedef void (*HTTPREQ_CALLBACK)(HTTPReqMessage *, HTTPResMessage *);

void HTTPServerInit(HTTPServer *, uint16_t);
int HTTPServerInit(HTTPServer *, uint16_t);
void HTTPServerRun(HTTPServer *, HTTPREQ_CALLBACK);
#define HTTPServerRunLoop(srv, callback) { \
while(1) { \
Expand Down
19 changes: 12 additions & 7 deletions FreeRTOS/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,19 @@ void MicroHTTPServer_task() {
AddRoute(HTTP_POST, "/fib", Fib);
AddRoute(HTTP_POST, "/led", LED);
USART_Printf(USART2, "Going to start Micro HTTP Server.\r\n");
HTTPServerInit(&srv, MHS_PORT);
USART_Printf(USART2, "Micro HTTP Server started and listening.\r\n");
while(1) {
HTTPServerRun(&srv, Dispatch);
/* Reschedule after each HTTP server run turn. */
vTaskDelay(10);
if (HTTPServerInit(&srv, MHS_PORT) < 0) {
USART_Printf(USART2, "Micro HTTP Server initialzation failed.\r\n");
}
else
{
USART_Printf(USART2, "Micro HTTP Server started and listening.\r\n");
while(1) {
HTTPServerRun(&srv, Dispatch);
/* Reschedule after each HTTP server run turn. */
vTaskDelay(10);
}
HTTPServerClose(&srv);
}
HTTPServerClose(&srv);

vTaskDelete(NULL);
}
Expand Down
15 changes: 12 additions & 3 deletions c-version/lib/server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@ HTTPReq http_req[MAX_HTTP_CLIENT];
uint8_t req_buf[MAX_HTTP_CLIENT][MAX_HEADER_SIZE + MAX_BODY_SIZE];
uint8_t res_buf[MAX_HTTP_CLIENT][MAX_HEADER_SIZE + MAX_BODY_SIZE];

void HTTPServerInit(HTTPServer *srv, uint16_t port) {
int HTTPServerInit(HTTPServer *srv, uint16_t port) {
struct sockaddr_in srv_addr;
unsigned int i;

/* Have a server socket. */
srv->sock = socket(AF_INET, SOCK_STREAM, 0);
if(srv->sock <= 0) exit(1);
if(srv->sock < 0)
return -1;
/* Set server address. */
memset(&srv_addr, 0, sizeof(srv_addr));
srv_addr.sin_family = AF_INET;
Expand All @@ -52,7 +53,8 @@ void HTTPServerInit(HTTPServer *srv, uint16_t port) {
setsockopt(srv->sock, SOL_SOCKET, SO_REUSEADDR, &(int){1}, sizeof(int));
/* Bind the server socket with the server address. */
if(bind(srv->sock, (struct sockaddr*) &srv_addr, sizeof(srv_addr)) == -1) {
exit(1);
HTTPServerClose(srv);
return -1;
}
/* Set the server socket non-blocking. */
fcntl(srv->sock, F_SETFL, O_NONBLOCK);
Expand All @@ -75,6 +77,7 @@ void HTTPServerInit(HTTPServer *srv, uint16_t port) {
http_req[i].clisock = -1;
http_req[i].work_state = NOTWORK_SOCKET;
}
return 0;
}

void _HTTPServerAccept(HTTPServer *srv) {
Expand Down Expand Up @@ -385,6 +388,9 @@ void HTTPServerRun(HTTPServer *srv, HTTPREQ_CALLBACK callback) {
struct timeval timeout = {0, 0};
uint16_t i;

if (srv->sock < 0)
return;

/* Copy master socket queue to readable, writeable socket queue. */
readable = srv->_read_sock_pool;
writeable = srv->_write_sock_pool;
Expand Down Expand Up @@ -426,8 +432,11 @@ void HTTPServerRun(HTTPServer *srv, HTTPREQ_CALLBACK callback) {
}

void HTTPServerClose(HTTPServer *srv) {
if (srv->sock < 0)
return;
shutdown(srv->sock, SHUT_RDWR);
close((srv)->sock);
srv->sock = -1;
}

#ifdef MICRO_HTTP_SERVER_EXAMPLE
Expand Down
2 changes: 1 addition & 1 deletion c-version/lib/server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ typedef struct _HTTPResMessage {

typedef void (*HTTPREQ_CALLBACK)(HTTPReqMessage *, HTTPResMessage *);

void HTTPServerInit(HTTPServer *, uint16_t);
int HTTPServerInit(HTTPServer *, uint16_t);
void HTTPServerRun(HTTPServer *, HTTPREQ_CALLBACK);
#define HTTPServerRunLoop(srv, callback) { \
while(1) { \
Expand Down
3 changes: 2 additions & 1 deletion c-version/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ int main(void) {
AddRoute(HTTP_GET, "/", HelloPage);
AddRoute(HTTP_POST, "/fib", Fib);
/* Initial the HTTP server and make it listening on MHS_PORT. */
HTTPServerInit(&srv, MHS_PORT);
if (HTTPServerInit(&srv, MHS_PORT) < 0)
return -1;
/* Run the HTTP server forever. */
/* Run the dispatch callback if there is a new request */
HTTPServerRunLoop(&srv, Dispatch);
Expand Down