Skip to content
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

fix(mdns): remove the range of MDNS_MAX_SERVICES and fix some issues of str-functions #355

Merged
merged 1 commit into from
Sep 26, 2023
+15 −8
Merged

fix(mdns): remove the range of MDNS_MAX_SERVICES and fix some issues of str-functions #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions components/mdns/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@ menu "mDNS"

config MDNS_MAX_SERVICES
int "Max number of services"
range 1 64
default 10
help
Services take up a certain amount of memory, and allowing fewer
services to be open at the same time conserves memory. Specify
wqx6 marked this conversation as resolved.
Show resolved Hide resolved
the maximum amount of services here. The valid value is from 1
to 64.
the maximum amount of services here.

config MDNS_TASK_PRIORITY
int "mDNS task priority"
Expand Down
19 changes: 14 additions & 5 deletions components/mdns/mdns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5595,9 +5595,14 @@ esp_err_t mdns_hostname_set(const char *hostname)

esp_err_t mdns_hostname_get(char *hostname)
{
if (!_mdns_server || !hostname) {
if (!hostname) {
return ESP_ERR_INVALID_ARG;
}

if (!_mdns_server || !_mdns_server->hostname) {
return ESP_ERR_INVALID_STATE;
}

MDNS_SERVICE_LOCK();
strncpy(hostname, _mdns_server->hostname, strnlen(_mdns_server->hostname, MDNS_NAME_BUF_LEN));
MDNS_SERVICE_UNLOCK();
Expand Down Expand Up @@ -5900,10 +5905,14 @@ static mdns_result_t *_mdns_lookup_service(const char *instance, const char *ser
item->esp_netif = NULL;
item->ttl = _str_null_or_empty(instance) ? MDNS_ANSWER_PTR_TTL : MDNS_ANSWER_SRV_TTL;
item->ip_protocol = MDNS_IP_PROTOCOL_MAX;
item->instance_name = strndup(srv->instance, MDNS_NAME_BUF_LEN - 1);
if (!item->instance_name) {
HOOK_MALLOC_FAILED;
goto handle_error;
if (srv->instance) {
item->instance_name = strndup(srv->instance, MDNS_NAME_BUF_LEN - 1);
if (!item->instance_name) {
HOOK_MALLOC_FAILED;
goto handle_error;
}
} else {
item->instance_name = NULL;
}
item->service_type = strndup(srv->service, MDNS_NAME_BUF_LEN - 1);
if (!item->service_type) {
Expand Down