Skip to content

Commit 2b15776

Browse files
david-cermakdavid-cermak
committed
fix(mdns): Minor cleanup
1 parent 2005f3f commit 2b15776

14 files changed

+380
-402
lines changed

‎components/mdns/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ endif()
1212

1313
set(MDNS_MEMORY "mdns_mem_caps.c")
1414

15-
set(MDNS_CORE "mdns.c" "mdns_receive.c" "mdns_utils.c" "mdns_debug.c" "mdns_browser.c" "mdns_send.c" "mdns_netif.c"
15+
set(MDNS_CORE "mdns_responder.c" "mdns_receive.c" "mdns_utils.c" "mdns_debug.c" "mdns_browser.c" "mdns_send.c" "mdns_netif.c"
1616
"mdns_querier.c" "mdns_pcb.c" "mdns_service.c")
1717
#set(MDNS_CORE "mdns.c" )
1818

‎components/mdns/mdns_browser.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "mdns_debug.h"
1212
#include "mdns_utils.h"
1313
#include "mdns_querier.h"
14+
#include "mdns_responder.h"
1415
#include "mdns_netif.h"
1516
#include "esp_log.h"
1617

‎components/mdns/mdns_netif.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
#include "esp_event.h"
1111
#include "mdns.h"
1212
#include "mdns_private.h"
13-
#include "mdns_networking.h"
1413
#include "mdns_mem_caps.h"
1514
#include "mdns_utils.h"
1615
#include "mdns_debug.h"
1716
#include "mdns_browser.h"
1817
#include "mdns_netif.h"
19-
#include "mdns_send.h"
2018
#include "mdns_pcb.h"
19+
#include "mdns_responder.h"
2120

2221
static const char *TAG = "mdns_netif";
2322

‎components/mdns/mdns_networking_lwip.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
#include "lwip/udp.h"
1717
#include "lwip/mld6.h"
1818
#include "lwip/priv/tcpip_priv.h"
19-
#include "esp_system.h"
20-
#include "esp_event.h"
2119
#include "mdns_networking.h"
2220
#include "esp_netif_net_stack.h"
2321
#include "mdns_mem_caps.h"
2422
#include "mdns_utils.h"
23+
#include "mdns_netif.h"
2524

2625
/*
2726
* MDNS Server Networking
@@ -57,7 +56,7 @@ static esp_err_t _mdns_send_rx_action(mdns_rx_packet_t *packet)
5756

5857
action->type = ACTION_RX_HANDLE;
5958
action->data.rx_handle.packet = packet;
60-
if (!mdns_action_queue(action)) {
59+
if (!mdns_priv_queue_action(action)) {
6160
mdns_mem_free(action);
6261
return ESP_ERR_NO_MEM;
6362
}

‎components/mdns/mdns_pcb.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "mdns_mem_caps.h"
1414
#include "esp_log.h"
1515
#include "esp_random.h"
16+
#include "mdns_responder.h"
1617

1718
static const char *TAG = "mdns_responder";
1819

@@ -36,7 +37,7 @@ void mdns_priv_pcb_announce(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol,
3637
size_t i;
3738
if (mdns_is_netif_ready(tcpip_if, ip_protocol)) {
3839
if (PCB_STATE_IS_PROBING(_pcb)) {
39-
mdns_responder_init_pcb_probe(tcpip_if, ip_protocol, services, len, include_ip);
40+
mdns_priv_init_pcb_probe(tcpip_if, ip_protocol, services, len, include_ip);
4041
} else if (PCB_STATE_IS_ANNOUNCING(_pcb)) {
4142
mdns_tx_packet_t *p = _mdns_get_next_pcb_packet(tcpip_if, ip_protocol);
4243
if (p) {
@@ -121,7 +122,7 @@ static void _mdns_restart_pcb(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol
121122
}
122123
if (srv_count == 0) {
123124
// proble only IP
124-
mdns_responder_init_pcb_probe(tcpip_if, ip_protocol, NULL, 0, true);
125+
mdns_priv_init_pcb_probe(tcpip_if, ip_protocol, NULL, 0, true);
125126
return;
126127
}
127128
mdns_srv_item_t *services[srv_count];
@@ -131,7 +132,7 @@ static void _mdns_restart_pcb(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol
131132
services[i++] = a;
132133
a = a->next;
133134
}
134-
mdns_responder_init_pcb_probe(tcpip_if, ip_protocol, services, srv_count, true);
135+
mdns_priv_init_pcb_probe(tcpip_if, ip_protocol, services, srv_count, true);
135136
}
136137

137138
/**
@@ -376,7 +377,7 @@ static void _mdns_init_pcb_probe_new_service(mdns_if_t tcpip_if, mdns_ip_protoco
376377
pcb->state = PCB_PROBE_1;
377378
}
378379

379-
void mdns_responder_init_pcb_probe(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol, mdns_srv_item_t **services, size_t len, bool probe_ip)
380+
void mdns_priv_init_pcb_probe(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol, mdns_srv_item_t **services, size_t len, bool probe_ip)
380381
{
381382
mdns_pcb_t *pcb = &s_pcbs[tcpip_if][ip_protocol];
382383

@@ -416,7 +417,7 @@ void mdns_responder_init_pcb_probe(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_pro
416417
/**
417418
* @brief Send by for particular services
418419
*/
419-
void mdns_responder_send_bye_service(mdns_srv_item_t **services, size_t len, bool include_ip)
420+
void mdns_priv_pcb_send_bye_service(mdns_srv_item_t **services, size_t len, bool include_ip)
420421
{
421422
uint8_t i, j;
422423
if (mdns_utils_str_null_or_empty(mdns_priv_get_global_hostname())) {
@@ -432,7 +433,7 @@ void mdns_responder_send_bye_service(mdns_srv_item_t **services, size_t len, boo
432433
}
433434
}
434435

435-
void mdns_responder_probe_all_pcbs(mdns_srv_item_t **services, size_t len, bool probe_ip, bool clear_old_probe)
436+
void mdns_priv_probe_all_pcbs(mdns_srv_item_t **services, size_t len, bool probe_ip, bool clear_old_probe)
436437
{
437438
uint8_t i, j;
438439
for (i = 0; i < MDNS_MAX_INTERFACES; i++) {
@@ -445,7 +446,7 @@ void mdns_responder_probe_all_pcbs(mdns_srv_item_t **services, size_t len, bool
445446
_pcb->probe_services_len = 0;
446447
_pcb->probe_running = false;
447448
}
448-
mdns_responder_init_pcb_probe((mdns_if_t) i, (mdns_ip_protocol_t) j, services, len, probe_ip);
449+
mdns_priv_init_pcb_probe((mdns_if_t) i, (mdns_ip_protocol_t) j, services, len, probe_ip);
449450
}
450451
}
451452
}

‎components/mdns/mdns_querier.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "esp_log.h"
1313
#include "mdns_pcb.h"
1414
#include "mdns_netif.h"
15+
#include "mdns_responder.h"
1516

1617
static const char *TAG = "mdns_querier";
1718

‎components/mdns/mdns_receive.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "mdns_browser.h"
1818
#include "mdns_querier.h"
1919
#include "mdns_pcb.h"
20+
#include "mdns_responder.h"
2021

2122
static const char *TAG = "mdns_packet";
2223

@@ -1003,7 +1004,7 @@ void mdns_parse_packet(mdns_rx_packet_t *packet)
10031004
mdns_mem_free((char *)service->service->instance);
10041005
service->service->instance = new_instance;
10051006
}
1006-
mdns_responder_probe_all_pcbs(&service, 1, false, false);
1007+
mdns_priv_probe_all_pcbs(&service, 1, false, false);
10071008
} else if (!mdns_utils_str_null_or_empty(mdns_priv_get_instance())) {
10081009
char *new_instance = _mdns_mangle_name((char *) mdns_priv_get_instance());
10091010
if (new_instance) {
@@ -1020,7 +1021,7 @@ void mdns_parse_packet(mdns_rx_packet_t *packet)
10201021
}
10211022
} else if (service) {
10221023
mdns_send_bye_pcb(packet->tcpip_if, packet->ip_protocol, &service, 1, false);
1023-
mdns_responder_init_pcb_probe(packet->tcpip_if, packet->ip_protocol, &service, 1, false);
1024+
mdns_priv_init_pcb_probe(packet->tcpip_if, packet->ip_protocol, &service, 1, false);
10241025
}
10251026
}
10261027
} else if (ttl > 60 && !col && !parsed_packet->authoritative && !parsed_packet->probe && !parsed_packet->questions) {
@@ -1093,7 +1094,7 @@ void mdns_parse_packet(mdns_rx_packet_t *packet)
10931094
}
10941095
if (col && !mdns_priv_pcb_is_probing(packet) && service) {
10951096
do_not_reply = true;
1096-
mdns_responder_init_pcb_probe(packet->tcpip_if, packet->ip_protocol, &service, 1, true);
1097+
mdns_priv_init_pcb_probe(packet->tcpip_if, packet->ip_protocol, &service, 1, true);
10971098
} else if (ttl > (MDNS_ANSWER_TXT_TTL / 2) && !col && !parsed_packet->authoritative && !parsed_packet->probe && !parsed_packet->questions && !mdns_priv_pcb_is_probing(
10981099
packet)) {
10991100
_mdns_remove_scheduled_answer(packet->tcpip_if, packet->ip_protocol, type, service);
@@ -1150,7 +1151,7 @@ void mdns_parse_packet(mdns_rx_packet_t *packet)
11501151
mdns_priv_restart_all_pcbs();
11511152
}
11521153
} else {
1153-
mdns_responder_init_pcb_probe(packet->tcpip_if, packet->ip_protocol, NULL, 0, true);
1154+
mdns_priv_init_pcb_probe(packet->tcpip_if, packet->ip_protocol, NULL, 0, true);
11541155
}
11551156
} else if (ttl > 60 && !col && !parsed_packet->authoritative && !parsed_packet->probe && !parsed_packet->questions && !mdns_priv_pcb_is_probing(
11561157
packet)) {
@@ -1209,7 +1210,7 @@ void mdns_parse_packet(mdns_rx_packet_t *packet)
12091210
mdns_priv_restart_all_pcbs();
12101211
}
12111212
} else {
1212-
mdns_responder_init_pcb_probe(packet->tcpip_if, packet->ip_protocol, NULL, 0, true);
1213+
mdns_priv_init_pcb_probe(packet->tcpip_if, packet->ip_protocol, NULL, 0, true);
12131214
}
12141215
} else if (ttl > 60 && !col && !parsed_packet->authoritative && !parsed_packet->probe && !parsed_packet->questions && !mdns_priv_pcb_is_probing(
12151216
packet)) {

0 commit comments

Comments
 (0)