Skip to content

fix(mdns): Incorrect name collision #225

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
merged 2 commits into from
Mar 20, 2023
Merged

fix(mdns): Incorrect name collision #225

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e69a9eb
fix(mdns): Resolve conflicts only on self hosted items
david-cermak Feb 17, 2023
a06fb77
fix(mdns): Removed unused internal lock from mdns_server struct
david-cermak Feb 17, 2023
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
Prev Previous commit
fix(mdns): Removed unused internal lock from mdns_server struct
  • Loading branch information
@david-cermak
david-cermak committed Mar 20, 2023
commit a06fb7714b28ead0ee64a3eb342b665481d7c3e3
11 changes: 1 addition & 10 deletions components/mdns/mdns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5384,16 +5384,10 @@ esp_err_t mdns_init(void)
s_esp_netifs[i].netif = NULL;
}

_mdns_server->lock = xSemaphoreCreateMutex();
if (!_mdns_server->lock) {
err = ESP_ERR_NO_MEM;
goto free_server;
}

_mdns_server->action_queue = xQueueCreate(MDNS_ACTION_QUEUE_LEN, sizeof(mdns_action_t *));
if (!_mdns_server->action_queue) {
err = ESP_ERR_NO_MEM;
goto free_lock;
goto free_server;
}

_mdns_server->action_sema = xSemaphoreCreateBinary();
Expand Down Expand Up @@ -5460,8 +5454,6 @@ esp_err_t mdns_init(void)
vSemaphoreDelete(_mdns_server->action_sema);
free_queue:
vQueueDelete(_mdns_server->action_queue);
free_lock:
vSemaphoreDelete(_mdns_server->lock);
free_server:
free(_mdns_server);
_mdns_server = NULL;
Expand Down Expand Up @@ -5509,7 +5501,6 @@ void mdns_free(void)
free(h);
}
vSemaphoreDelete(_mdns_server->action_sema);
vSemaphoreDelete(_mdns_server->lock);
free(_mdns_server);
_mdns_server = NULL;
}
Expand Down
1 change: 0 additions & 1 deletion components/mdns/private_include/mdns_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,6 @@ typedef struct mdns_server_s {
const char *hostname;
const char *instance;
mdns_srv_item_t *services;
SemaphoreHandle_t lock;
QueueHandle_t action_queue;
SemaphoreHandle_t action_sema;
mdns_tx_packet_t *tx_queue_head;
Expand Down