Skip to content

Commit d847677

Browse files
david-cermakdavid-cermak
committed
fix(mdns): Minor cleanup
1 parent afbec7d commit d847677

File tree

16 files changed

+358
-345
lines changed

16 files changed

+358
-345
lines changed

‎components/mdns/mdns_browser.c‎

Lines changed: 92 additions & 89 deletions
Large diffs are not rendered by default.

‎components/mdns/mdns_netif.c‎

Lines changed: 104 additions & 104 deletions
Large diffs are not rendered by default.

‎components/mdns/mdns_networking_lwip.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static void _udp_pcb_main_deinit(void)
106106
static esp_err_t _udp_join_group(mdns_if_t if_inx, mdns_ip_protocol_t ip_protocol, bool join)
107107
{
108108
struct netif *netif = NULL;
109-
esp_netif_t *tcpip_if = mdns_netif_get_esp_netif(if_inx);
109+
esp_netif_t *tcpip_if = mdns_priv_get_esp_netif(if_inx);
110110

111111
if (!esp_netif_is_netif_up(tcpip_if)) {
112112
// Network interface went down before event propagated, skipping IGMP config
@@ -207,7 +207,7 @@ static void _udp_recv(void *arg, struct udp_pcb *upcb, struct pbuf *pb, const ip
207207
struct netif *netif = NULL;
208208
bool found = false;
209209
for (i = 0; i < MDNS_MAX_INTERFACES; i++) {
210-
netif = esp_netif_get_netif_impl(mdns_netif_get_esp_netif(i));
210+
netif = esp_netif_get_netif_impl(mdns_priv_get_esp_netif(i));
211211
if (s_interfaces[i].proto && netif && netif == ip_current_input_netif()) {
212212
#if LWIP_IPV4
213213
if (packet->src.type == IPADDR_TYPE_V4) {
@@ -231,7 +231,7 @@ static void _udp_recv(void *arg, struct udp_pcb *upcb, struct pbuf *pb, const ip
231231

232232
}
233233

234-
bool mdns_is_netif_ready(mdns_if_t netif, mdns_ip_protocol_t ip_proto)
234+
bool mdns_priv_if_ready(mdns_if_t netif, mdns_ip_protocol_t ip_proto)
235235
{
236236
return s_interfaces[netif].ready &&
237237
s_interfaces[netif].proto & (ip_proto == MDNS_IP_PROTOCOL_V4 ? PROTO_IPV4 : PROTO_IPV6);
@@ -245,7 +245,7 @@ static bool _udp_pcb_is_in_use(void)
245245
int i, p;
246246
for (i = 0; i < MDNS_MAX_INTERFACES; i++) {
247247
for (p = 0; p < MDNS_IP_PROTOCOL_MAX; p++) {
248-
if (mdns_is_netif_ready(i, p)) {
248+
if (mdns_priv_if_ready(i, p)) {
249249
return true;
250250
}
251251
}
@@ -273,7 +273,7 @@ static void _udp_pcb_deinit(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
273273
*/
274274
static esp_err_t _udp_pcb_init(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
275275
{
276-
if (mdns_is_netif_ready(tcpip_if, ip_protocol)) {
276+
if (mdns_priv_if_ready(tcpip_if, ip_protocol)) {
277277
return ESP_ERR_INVALID_STATE;
278278
}
279279

@@ -305,7 +305,7 @@ typedef struct {
305305
/**
306306
* @brief Start PCB from LwIP thread
307307
*/
308-
static err_t _mdns_pcb_init_api(struct tcpip_api_call_data *api_call_msg)
308+
static err_t mdns_priv_if_init_api(struct tcpip_api_call_data *api_call_msg)
309309
{
310310
mdns_api_call_t *msg = (mdns_api_call_t *)api_call_msg;
311311
msg->err = _udp_pcb_init(msg->tcpip_if, msg->ip_protocol) == ESP_OK ? ERR_OK : ERR_IF;
@@ -315,7 +315,7 @@ static err_t _mdns_pcb_init_api(struct tcpip_api_call_data *api_call_msg)
315315
/**
316316
* @brief Stop PCB from LwIP thread
317317
*/
318-
static err_t _mdns_pcb_deinit_api(struct tcpip_api_call_data *api_call_msg)
318+
static err_t mdns_priv_if_deinit_api(struct tcpip_api_call_data *api_call_msg)
319319
{
320320
mdns_api_call_t *msg = (mdns_api_call_t *)api_call_msg;
321321
_udp_pcb_deinit(msg->tcpip_if, msg->ip_protocol);
@@ -328,32 +328,32 @@ static err_t _mdns_pcb_deinit_api(struct tcpip_api_call_data *api_call_msg)
328328
* - _mdns prefixed
329329
* - commented in mdns_networking.h header
330330
*/
331-
esp_err_t _mdns_pcb_init(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
331+
esp_err_t mdns_priv_if_init(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
332332
{
333333
mdns_api_call_t msg = {
334334
.tcpip_if = tcpip_if,
335335
.ip_protocol = ip_protocol
336336
};
337-
tcpip_api_call(_mdns_pcb_init_api, &msg.call);
337+
tcpip_api_call(mdns_priv_if_init_api, &msg.call);
338338
return msg.err;
339339
}
340340

341-
esp_err_t _mdns_pcb_deinit(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
341+
esp_err_t mdns_priv_if_deinit(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
342342
{
343343
mdns_api_call_t msg = {
344344
.tcpip_if = tcpip_if,
345345
.ip_protocol = ip_protocol
346346
};
347-
tcpip_api_call(_mdns_pcb_deinit_api, &msg.call);
347+
tcpip_api_call(mdns_priv_if_deinit_api, &msg.call);
348348
return msg.err;
349349
}
350350

351-
static err_t _mdns_udp_pcb_write_api(struct tcpip_api_call_data *api_call_msg)
351+
static err_t mdns_priv_if_write_api(struct tcpip_api_call_data *api_call_msg)
352352
{
353353
void *nif = NULL;
354354
mdns_api_call_t *msg = (mdns_api_call_t *)api_call_msg;
355-
nif = esp_netif_get_netif_impl(mdns_netif_get_esp_netif(msg->tcpip_if));
356-
if (!nif || !mdns_is_netif_ready(msg->tcpip_if, msg->ip_protocol) || _pcb_main == NULL) {
355+
nif = esp_netif_get_netif_impl(mdns_priv_get_esp_netif(msg->tcpip_if));
356+
if (!nif || !mdns_priv_if_ready(msg->tcpip_if, msg->ip_protocol) || _pcb_main == NULL) {
357357
pbuf_free(msg->pbt);
358358
msg->err = ERR_IF;
359359
return ERR_IF;
@@ -364,7 +364,7 @@ static err_t _mdns_udp_pcb_write_api(struct tcpip_api_call_data *api_call_msg)
364364
return err;
365365
}
366366

367-
size_t _mdns_udp_pcb_write(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol, const esp_ip_addr_t *ip, uint16_t port, uint8_t *data, size_t len)
367+
size_t mdns_priv_if_write(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol, const esp_ip_addr_t *ip, uint16_t port, uint8_t *data, size_t len)
368368
{
369369
struct pbuf *pbt = pbuf_alloc(PBUF_TRANSPORT, len, PBUF_RAM);
370370
if (pbt == NULL) {
@@ -392,25 +392,25 @@ size_t _mdns_udp_pcb_write(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol, c
392392
.ip = &ip_add_copy,
393393
.port = port
394394
};
395-
tcpip_api_call(_mdns_udp_pcb_write_api, &msg.call);
395+
tcpip_api_call(mdns_priv_if_write_api, &msg.call);
396396

397397
if (msg.err) {
398398
return 0;
399399
}
400400
return len;
401401
}
402402

403-
void *_mdns_get_packet_data(mdns_rx_packet_t *packet)
403+
void *mdns_priv_get_packet_data(mdns_rx_packet_t *packet)
404404
{
405405
return packet->pb->payload;
406406
}
407407

408-
size_t _mdns_get_packet_len(mdns_rx_packet_t *packet)
408+
size_t mdns_priv_get_packet_len(mdns_rx_packet_t *packet)
409409
{
410410
return packet->pb->len;
411411
}
412412

413-
void _mdns_packet_free(mdns_rx_packet_t *packet)
413+
void mdns_priv_packet_free(mdns_rx_packet_t *packet)
414414
{
415415
pbuf_free(packet->pb);
416416
mdns_mem_free(packet);

‎components/mdns/mdns_networking_socket.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ struct pbuf {
6060
#define s6_addr32 un.u32_addr
6161
#endif // CONFIG_IDF_TARGET_LINUX
6262

63-
static esp_err_t _mdns_send_rx_action(mdns_rx_packet_t *packet)
63+
static esp_err_t send_rx_action(mdns_rx_packet_t *packet)
6464
{
6565
mdns_action_t *action = NULL;
6666

@@ -93,29 +93,29 @@ static void delete_socket(int sock)
9393
close(sock);
9494
}
9595

96-
bool mdns_is_netif_ready(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
96+
bool mdns_priv_if_ready(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
9797
{
9898
return s_interfaces[tcpip_if].proto & (ip_protocol == MDNS_IP_PROTOCOL_V4 ? PROTO_IPV4 : PROTO_IPV6);
9999
}
100100

101-
void *_mdns_get_packet_data(mdns_rx_packet_t *packet)
101+
void *mdns_priv_get_packet_data(mdns_rx_packet_t *packet)
102102
{
103103
return packet->pb->payload;
104104
}
105105

106-
size_t _mdns_get_packet_len(mdns_rx_packet_t *packet)
106+
size_t mdns_priv_get_packet_len(mdns_rx_packet_t *packet)
107107
{
108108
return packet->pb->len;
109109
}
110110

111-
void _mdns_packet_free(mdns_rx_packet_t *packet)
111+
void mdns_priv_packet_free(mdns_rx_packet_t *packet)
112112
{
113113
mdns_mem_free(packet->pb->payload);
114114
mdns_mem_free(packet->pb);
115115
mdns_mem_free(packet);
116116
}
117117

118-
esp_err_t _mdns_pcb_deinit(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
118+
esp_err_t mdns_priv_if_deinit(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
119119
{
120120
s_interfaces[tcpip_if].proto &= ~(ip_protocol == MDNS_IP_PROTOCOL_V4 ? PROTO_IPV4 : PROTO_IPV6);
121121
if (s_interfaces[tcpip_if].proto == 0) {
@@ -214,7 +214,7 @@ static inline size_t espaddr_to_inet(const esp_ip_addr_t *addr, const uint16_t p
214214
return ss_addr_len;
215215
}
216216

217-
size_t _mdns_udp_pcb_write(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol, const esp_ip_addr_t *ip, uint16_t port, uint8_t *data, size_t len)
217+
size_t mdns_priv_if_write(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol, const esp_ip_addr_t *ip, uint16_t port, uint8_t *data, size_t len)
218218
{
219219
if (!(s_interfaces[tcpip_if].proto & (ip_protocol == MDNS_IP_PROTOCOL_V4 ? PROTO_IPV4 : PROTO_IPV6))) {
220220
return 0;
@@ -232,7 +232,7 @@ size_t _mdns_udp_pcb_write(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol, c
232232
ESP_LOGD(TAG, "[sock=%d]: Sending to IP %s port %d", sock, get_string_address(&in_addr), port);
233233
ssize_t actual_len = sendto(sock, data, len, 0, (struct sockaddr *)&in_addr, ss_size);
234234
if (actual_len < 0) {
235-
ESP_LOGE(TAG, "[sock=%d]: _mdns_udp_pcb_write sendto() has failed\n errno=%d: %s", sock, errno, strerror(errno));
235+
ESP_LOGE(TAG, "[sock=%d]: mdns_priv_if_write sendto() has failed\n errno=%d: %s", sock, errno, strerror(errno));
236236
}
237237
return actual_len;
238238
}
@@ -347,8 +347,8 @@ void sock_recv_task(void *arg)
347347
packet->dest.type = packet->src.type;
348348
packet->ip_protocol =
349349
packet->src.type == ESP_IPADDR_TYPE_V4 ? MDNS_IP_PROTOCOL_V4 : MDNS_IP_PROTOCOL_V6;
350-
if (_mdns_send_rx_action(packet) != ESP_OK) {
351-
ESP_LOGE(TAG, "_mdns_send_rx_action failed!");
350+
if (send_rx_action(packet) != ESP_OK) {
351+
ESP_LOGE(TAG, "send_rx_action failed!");
352352
mdns_mem_free(packet->pb->payload);
353353
mdns_mem_free(packet->pb);
354354
mdns_mem_free(packet);
@@ -360,7 +360,7 @@ void sock_recv_task(void *arg)
360360
vTaskDelete(NULL);
361361
}
362362

363-
static void mdns_networking_init(void)
363+
static void networking_init(void)
364364
{
365365
if (s_run_sock_recv_task == false) {
366366
s_run_sock_recv_task = true;
@@ -374,7 +374,7 @@ static bool create_pcb(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
374374
return true;
375375
}
376376
int sock = s_interfaces[tcpip_if].sock;
377-
esp_netif_t *netif = mdns_netif_get_esp_netif(tcpip_if);
377+
esp_netif_t *netif = mdns_priv_get_esp_netif(tcpip_if);
378378
if (sock < 0) {
379379
sock = create_socket(netif);
380380
}
@@ -391,14 +391,14 @@ static bool create_pcb(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
391391
return true;
392392
}
393393

394-
esp_err_t _mdns_pcb_init(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
394+
esp_err_t mdns_priv_if_init(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
395395
{
396-
ESP_LOGI(TAG, "_mdns_pcb_init(tcpip_if=%lu, ip_protocol=%lu)", (unsigned long)tcpip_if, (unsigned long)ip_protocol);
396+
ESP_LOGI(TAG, "mdns_priv_if_init(tcpip_if=%lu, ip_protocol=%lu)", (unsigned long)tcpip_if, (unsigned long)ip_protocol);
397397
if (!create_pcb(tcpip_if, ip_protocol)) {
398398
return ESP_FAIL;
399399
}
400400

401-
mdns_networking_init();
401+
networking_init();
402402
return ESP_OK;
403403
}
404404

‎components/mdns/mdns_pcb.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void mdns_priv_pcb_announce(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol,
3535
{
3636
mdns_pcb_t *_pcb = &s_pcbs[tcpip_if][ip_protocol];
3737
size_t i;
38-
if (mdns_is_netif_ready(tcpip_if, ip_protocol)) {
38+
if (mdns_priv_if_ready(tcpip_if, ip_protocol)) {
3939
if (PCB_STATE_IS_PROBING(_pcb)) {
4040
mdns_priv_init_pcb_probe(tcpip_if, ip_protocol, services, len, include_ip);
4141
} else if (PCB_STATE_IS_ANNOUNCING(_pcb)) {
@@ -76,7 +76,7 @@ void mdns_priv_pcb_announce(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol,
7676
*/
7777
bool mdns_priv_pcb_check_for_duplicates(mdns_if_t tcpip_if)
7878
{
79-
mdns_if_t ifaces[MDNS_MAX_INTERFACES] = {tcpip_if, mdns_netif_get_other_interface(tcpip_if) };
79+
mdns_if_t ifaces[MDNS_MAX_INTERFACES] = {tcpip_if, mdns_priv_netif_get_other_interface(tcpip_if) };
8080
if (ifaces[1] == MDNS_MAX_INTERFACES) {
8181
return false;
8282
}
@@ -94,7 +94,7 @@ bool mdns_priv_pcb_check_for_duplicates(mdns_if_t tcpip_if)
9494

9595
static esp_err_t mdns_pcb_deinit_local(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_proto)
9696
{
97-
esp_err_t err = _mdns_pcb_deinit(tcpip_if, ip_proto);
97+
esp_err_t err = mdns_priv_if_deinit(tcpip_if, ip_proto);
9898
mdns_pcb_t *_pcb = &s_pcbs[tcpip_if][ip_proto];
9999
if (_pcb == NULL || err != ESP_OK) {
100100
return err;
@@ -140,12 +140,12 @@ static void _mdns_restart_pcb(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol
140140
*/
141141
void mdns_priv_pcb_disable(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
142142
{
143-
mdns_netif_disable(tcpip_if);
143+
mdns_priv_netif_disable(tcpip_if);
144144

145-
if (mdns_is_netif_ready(tcpip_if, ip_protocol)) {
145+
if (mdns_priv_if_ready(tcpip_if, ip_protocol)) {
146146
_mdns_clear_pcb_tx_queue_head(tcpip_if, ip_protocol);
147147
mdns_pcb_deinit_local(tcpip_if, ip_protocol);
148-
mdns_if_t other_if = mdns_netif_get_other_interface(tcpip_if);
148+
mdns_if_t other_if = mdns_priv_netif_get_other_interface(tcpip_if);
149149
if (other_if != MDNS_MAX_INTERFACES && s_pcbs[other_if][ip_protocol].state == PCB_DUP) {
150150
s_pcbs[other_if][ip_protocol].state = PCB_OFF;
151151
mdns_priv_pcb_enable(other_if, ip_protocol);
@@ -159,8 +159,8 @@ void mdns_priv_pcb_disable(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
159159
*/
160160
void mdns_priv_pcb_enable(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
161161
{
162-
if (!mdns_is_netif_ready(tcpip_if, ip_protocol)) {
163-
if (_mdns_pcb_init(tcpip_if, ip_protocol)) {
162+
if (!mdns_priv_if_ready(tcpip_if, ip_protocol)) {
163+
if (mdns_priv_if_init(tcpip_if, ip_protocol)) {
164164
s_pcbs[tcpip_if][ip_protocol].failed_probes = 0;
165165
return;
166166
}
@@ -174,14 +174,14 @@ void mdns_priv_pcb_enable(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
174174
void mdns_priv_pcb_set_duplicate(mdns_if_t tcpip_if)
175175
{
176176
uint8_t i;
177-
mdns_if_t other_if = mdns_netif_get_other_interface(tcpip_if);
177+
mdns_if_t other_if = mdns_priv_netif_get_other_interface(tcpip_if);
178178
if (other_if == MDNS_MAX_INTERFACES) {
179179
return; // no other interface found
180180
}
181181
for (i = 0; i < MDNS_IP_PROTOCOL_MAX; i++) {
182-
if (mdns_is_netif_ready(other_if, i)) {
182+
if (mdns_priv_if_ready(other_if, i)) {
183183
//stop this interface and mark as dup
184-
if (mdns_is_netif_ready(tcpip_if, i)) {
184+
if (mdns_priv_if_ready(tcpip_if, i)) {
185185
_mdns_clear_pcb_tx_queue_head(tcpip_if, i);
186186
mdns_pcb_deinit_local(tcpip_if, i);
187187
}
@@ -299,7 +299,7 @@ void mdns_priv_pcb_deinit(void)
299299

300300
bool mdsn_priv_pcb_is_inited(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
301301
{
302-
return mdns_is_netif_ready(tcpip_if, ip_protocol) && s_pcbs[tcpip_if][ip_protocol].state > PCB_INIT;
302+
return mdns_priv_if_ready(tcpip_if, ip_protocol) && s_pcbs[tcpip_if][ip_protocol].state > PCB_INIT;
303303
}
304304

305305
bool mdns_priv_pcb_is_duplicate(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
@@ -426,7 +426,7 @@ void mdns_priv_pcb_send_bye_service(mdns_srv_item_t **services, size_t len, bool
426426

427427
for (i = 0; i < MDNS_MAX_INTERFACES; i++) {
428428
for (j = 0; j < MDNS_IP_PROTOCOL_MAX; j++) {
429-
if (mdns_is_netif_ready(i, j) && s_pcbs[i][j].state == PCB_RUNNING) {
429+
if (mdns_priv_if_ready(i, j) && s_pcbs[i][j].state == PCB_RUNNING) {
430430
mdns_send_bye_pcb((mdns_if_t) i, (mdns_ip_protocol_t) j, services, len, include_ip);
431431
}
432432
}
@@ -438,7 +438,7 @@ void mdns_priv_probe_all_pcbs(mdns_srv_item_t **services, size_t len, bool probe
438438
uint8_t i, j;
439439
for (i = 0; i < MDNS_MAX_INTERFACES; i++) {
440440
for (j = 0; j < MDNS_IP_PROTOCOL_MAX; j++) {
441-
if (mdns_is_netif_ready(i, j)) {
441+
if (mdns_priv_if_ready(i, j)) {
442442
mdns_pcb_t *_pcb = &s_pcbs[i][j];
443443
if (clear_old_probe) {
444444
mdns_mem_free(_pcb->probe_services);

0 commit comments

Comments
 (0)