mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-25 18:14:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

mdns: minor coding style cleanup

Browse Source
This commit is contained in:
Simon Goldschmidt 2018-06-28 22:04:14 +02:00
parent 4506db4331
commit 8090afa4f9
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/apps/mdns/mdns.c
View File

@ -832,7 +832,7 @@ mdns_write_domain(struct mdns_outpacket *outpkt, struct mdns_domain *domain)
u16_t jump; u16_t jump;
if (!domain->skip_compression) { if (!domain->skip_compression) {
for (i = 0; i < NUM_DOMAIN_OFFSETS; ++i) { for (i = 0; i < NUM_DOMAIN_OFFSETS; i++) {
u16_t offset = outpkt->domain_offsets[i]; u16_t offset = outpkt->domain_offsets[i];
if (offset) { if (offset) {
u16_t len = mdns_compress_domain(outpkt->pbuf, &offset, domain); u16_t len = mdns_compress_domain(outpkt->pbuf, &offset, domain);
@ -852,7 +852,7 @@ mdns_write_domain(struct mdns_outpacket *outpkt, struct mdns_domain *domain)
} }
/* Store offset of this new domain */ /* Store offset of this new domain */
for (i = 0; i < NUM_DOMAIN_OFFSETS; ++i) { for (i = 0; i < NUM_DOMAIN_OFFSETS; i++) {
if (outpkt->domain_offsets[i] == 0) { if (outpkt->domain_offsets[i] == 0) {
outpkt->domain_offsets[i] = outpkt->write_offset; outpkt->domain_offsets[i] = outpkt->write_offset;
break; break;
@ -1323,7 +1323,7 @@ mdns_send_outpacket(struct mdns_outpacket *outpkt, u8_t flags)
#if LWIP_IPV6 #if LWIP_IPV6
if (outpkt->host_replies & REPLY_HOST_AAAA) { if (outpkt->host_replies & REPLY_HOST_AAAA) {
int addrindex; int addrindex;
for (addrindex = 0; addrindex < LWIP_IPV6_NUM_ADDRESSES; ++addrindex) { for (addrindex = 0; addrindex < LWIP_IPV6_NUM_ADDRESSES; addrindex++) {
if (ip6_addr_isvalid(netif_ip6_addr_state(outpkt->netif, addrindex))) { if (ip6_addr_isvalid(netif_ip6_addr_state(outpkt->netif, addrindex))) {
res = mdns_add_aaaa_answer(outpkt, outpkt->cache_flush, outpkt->netif, addrindex); res = mdns_add_aaaa_answer(outpkt, outpkt->cache_flush, outpkt->netif, addrindex);
if (res != ERR_OK) { if (res != ERR_OK) {
@ -1351,7 +1351,7 @@ mdns_send_outpacket(struct mdns_outpacket *outpkt, u8_t flags)
#endif #endif
/* Write answers to service questions */ /* Write answers to service questions */
for (i = 0; i < MDNS_MAX_SERVICES; ++i) { for (i = 0; i < MDNS_MAX_SERVICES; i++) {
service = mdns->services[i]; service = mdns->services[i];
if (!service) { if (!service) {
continue; continue;
@ -1391,14 +1391,14 @@ mdns_send_outpacket(struct mdns_outpacket *outpkt, u8_t flags)
} }
/* if this is a response, the data above is anwers, else this is a probe and the answers above goes into auth section */ /* if this is a response, the data above is anwers, else this is a probe and the answers above goes into auth section */
if ( flags & DNS_FLAG1_RESPONSE ) { if (flags & DNS_FLAG1_RESPONSE) {
outpkt->answers += answers; outpkt->answers += answers;
} else { } else {
outpkt->authoritative += answers; outpkt->authoritative += answers;
} }
/* All answers written, add additional RRs */ /* All answers written, add additional RRs */
for (i = 0; i < MDNS_MAX_SERVICES; ++i) { for (i = 0; i < MDNS_MAX_SERVICES; i++) {
service = mdns->services[i]; service = mdns->services[i];
if (!service) { if (!service) {
continue; continue;
@ -1432,7 +1432,7 @@ mdns_send_outpacket(struct mdns_outpacket *outpkt, u8_t flags)
#if LWIP_IPV6 #if LWIP_IPV6
if (!(outpkt->host_replies & REPLY_HOST_AAAA)) { if (!(outpkt->host_replies & REPLY_HOST_AAAA)) {
int addrindex; int addrindex;
for (addrindex = 0; addrindex < LWIP_IPV6_NUM_ADDRESSES; ++addrindex) { for (addrindex = 0; addrindex < LWIP_IPV6_NUM_ADDRESSES; addrindex++) {
if (ip6_addr_isvalid(netif_ip6_addr_state(outpkt->netif, addrindex))) { if (ip6_addr_isvalid(netif_ip6_addr_state(outpkt->netif, addrindex))) {
res = mdns_add_aaaa_answer(outpkt, outpkt->cache_flush, outpkt->netif, addrindex); res = mdns_add_aaaa_answer(outpkt, outpkt->cache_flush, outpkt->netif, addrindex);
if (res != ERR_OK) { if (res != ERR_OK) {
@ -1499,7 +1499,6 @@ cleanup:
return res; return res;
} }
/** /**
* Send unsolicited answer containing all our known data * Send unsolicited answer containing all our known data
* @param netif The network interface to send on * @param netif The network interface to send on
@ -1521,7 +1520,7 @@ mdns_announce(struct netif *netif, const ip_addr_t *destination)
} }
#endif #endif
#if LWIP_IPV6 #if LWIP_IPV6
for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; ++i) { for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i))) { if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i))) {
announce.host_replies |= REPLY_HOST_AAAA | REPLY_HOST_PTR_V6; announce.host_replies |= REPLY_HOST_AAAA | REPLY_HOST_PTR_V6;
announce.host_reverse_v6_replies |= (1 << i); announce.host_reverse_v6_replies |= (1 << i);
@ -1587,7 +1586,7 @@ mdns_handle_question(struct mdns_packet *pkt)
reply.host_replies |= check_host(pkt->netif, &q.info, &reply.host_reverse_v6_replies); reply.host_replies |= check_host(pkt->netif, &q.info, &reply.host_reverse_v6_replies);
replies |= reply.host_replies; replies |= reply.host_replies;
for (i = 0; i < MDNS_MAX_SERVICES; ++i) { for (i = 0; i < MDNS_MAX_SERVICES; i++) {
service = mdns->services[i]; service = mdns->services[i];
if (!service) { if (!service) {
continue; continue;
@ -1678,7 +1677,7 @@ mdns_handle_question(struct mdns_packet *pkt)
} }
} }
for (i = 0; i < MDNS_MAX_SERVICES; ++i) { for (i = 0; i < MDNS_MAX_SERVICES; i++) {
service = mdns->services[i]; service = mdns->services[i];
if (!service) { if (!service) {
continue; continue;
@ -1802,7 +1801,7 @@ mdns_handle_response(struct mdns_packet *pkt)
/*"Apparently conflicting Multicast DNS responses received *before* the first probe packet is sent MUST /*"Apparently conflicting Multicast DNS responses received *before* the first probe packet is sent MUST
be silently ignored" so drop answer if we haven't started probing yet*/ be silently ignored" so drop answer if we haven't started probing yet*/
if (mdns->probing_state == MDNS_PROBING_ONGOING && mdns->probes_sent > 0) { if ((mdns->probing_state == MDNS_PROBING_ONGOING) && (mdns->probes_sent > 0)) {
struct mdns_domain domain; struct mdns_domain domain;
u8_t i; u8_t i;
u8_t conflict = 0; u8_t conflict = 0;
@ -1813,13 +1812,13 @@ mdns_handle_response(struct mdns_packet *pkt)
conflict = 1; conflict = 1;
} }
for (i = 0; i < MDNS_MAX_SERVICES; ++i) { for (i = 0; i < MDNS_MAX_SERVICES; i++) {
struct mdns_service* service = mdns->services[i]; struct mdns_service* service = mdns->services[i];
if (!service) { if (!service) {
continue; continue;
} }
res = mdns_build_service_domain(&domain, service, 1); res = mdns_build_service_domain(&domain, service, 1);
if (res == ERR_OK && mdns_domain_eq(&ans.info.domain, &domain)) { if ((res == ERR_OK) && mdns_domain_eq(&ans.info.domain, &domain)) {
LWIP_DEBUGF(MDNS_DEBUG, ("MDNS: Probe response matches service domain!")); LWIP_DEBUGF(MDNS_DEBUG, ("MDNS: Probe response matches service domain!"));
conflict = 1; conflict = 1;
} }
@ -1955,7 +1954,7 @@ mdns_send_probe(struct netif* netif, const ip_addr_t *destination)
goto cleanup; goto cleanup;
} }
pkt.questions++; pkt.questions++;
for (i = 0; i < MDNS_MAX_SERVICES; ++i) { for (i = 0; i < MDNS_MAX_SERVICES; i++) {
struct mdns_service* service = mdns->services[i]; struct mdns_service* service = mdns->services[i];
if (!service) { if (!service) {
continue; continue;
@ -1975,7 +1974,7 @@ mdns_send_probe(struct netif* netif, const ip_addr_t *destination)
} }
#endif #endif
#if LWIP_IPV6 #if LWIP_IPV6
for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; ++i) { for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i))) { if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i))) {
pkt.host_replies |= REPLY_HOST_AAAA; pkt.host_replies |= REPLY_HOST_AAAA;
} }
@ -2315,8 +2314,7 @@ mdns_resp_announce(struct netif *netif)
return; return;
} }
if (mdns->probing_state == MDNS_PROBING_COMPLETE) if (mdns->probing_state == MDNS_PROBING_COMPLETE) {
{
/* Announce on IPv6 and IPv4 */ /* Announce on IPv6 and IPv4 */
#if LWIP_IPV6 #if LWIP_IPV6
mdns_announce(netif, IP6_ADDR_ANY); mdns_announce(netif, IP6_ADDR_ANY);