adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

net: http_server: Allow service to be created with NULL host

Browse source 
Allow NULL host parameter when creating HTTP service. This means
that the socket is created without specifying binding address.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
This commit is contained in:
Jukka Rissanen 2024-09-04 17:02:47 +03:00 committed by Mahesh Mahadevan
parent 7e20a86e6a
commit 3949873886
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
subsys/net/lib/http/http_server_core.c
View file

@ -108,14 +108,14 @@ int http_server_init(struct http_server_ctx *ctx)
memset(&addr_storage, 0, sizeof(struct sockaddr_storage)); memset(&addr_storage, 0, sizeof(struct sockaddr_storage));
/* Set up the server address struct according to address family */ /* Set up the server address struct according to address family */
if (IS_ENABLED(CONFIG_NET_IPV6) && if (IS_ENABLED(CONFIG_NET_IPV6) && svc->host != NULL &&
zsock_inet_pton(AF_INET6, svc->host, &addr.addr6->sin6_addr) == 1) { zsock_inet_pton(AF_INET6, svc->host, &addr.addr6->sin6_addr) == 1) {
af = AF_INET6; af = AF_INET6;
len = sizeof(*addr.addr6); len = sizeof(*addr.addr6);
addr.addr6->sin6_family = AF_INET6; addr.addr6->sin6_family = AF_INET6;
addr.addr6->sin6_port = htons(*svc->port); addr.addr6->sin6_port = htons(*svc->port);
} else if (IS_ENABLED(CONFIG_NET_IPV4) && } else if (IS_ENABLED(CONFIG_NET_IPV4) && svc->host != NULL &&
zsock_inet_pton(AF_INET, svc->host, &addr.addr4->sin_addr) == 1) { zsock_inet_pton(AF_INET, svc->host, &addr.addr4->sin_addr) == 1) {
af = AF_INET; af = AF_INET;
len = sizeof(*addr.addr4); len = sizeof(*addr.addr4);
@ -209,7 +209,8 @@ int http_server_init(struct http_server_ctx *ctx)
continue; continue;
} }
LOG_DBG("Initialized HTTP Service %s:%u", svc->host, *svc->port); LOG_DBG("Initialized HTTP Service %s:%u",
svc->host ? svc->host : "<any>", *svc->port);
ctx->fds[count].fd = fd; ctx->fds[count].fd = fd;
ctx->fds[count].events = ZSOCK_POLLIN; ctx->fds[count].events = ZSOCK_POLLIN;