From efb7b3d5f881bb21be297ffb37479012a2fc3836 Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Wed, 17 Aug 2016 12:07:38 +0200 Subject: [PATCH] Rename LWIP_MDNS to LWIP_MDNS_RESPONDER --- src/apps/mdns/mdns.c | 4 ++-- src/core/netif.c | 4 ++-- src/include/lwip/apps/mdns.h | 4 ++-- src/include/lwip/apps/mdns_opts.h | 8 ++++---- src/include/lwip/netif.h | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/apps/mdns/mdns.c b/src/apps/mdns/mdns.c index 0f54b395..55fe0193 100644 --- a/src/apps/mdns/mdns.c +++ b/src/apps/mdns/mdns.c @@ -69,7 +69,7 @@ #include #include -#if LWIP_MDNS +#if LWIP_MDNS_RESPONDER #if (LWIP_IPV4 && !LWIP_IGMP) #error "If you want to use MDNS with IPv4, you have to define LWIP_IGMP=1 in your lwipopts.h" @@ -2024,4 +2024,4 @@ mdns_resp_add_service_txtitem(struct mdns_service *service, const char *txt, u8_ return mdns_domain_add_label(&service->txtdata, txt, txt_len); } -#endif /* LWIP_MDNS */ +#endif /* LWIP_MDNS_RESPONDER */ diff --git a/src/core/netif.c b/src/core/netif.c index 2d2abf59..685abaaa 100644 --- a/src/core/netif.c +++ b/src/core/netif.c @@ -247,10 +247,10 @@ netif_add(struct netif *netif, /* netif not under AutoIP control by default */ netif->autoip = NULL; #endif /* LWIP_AUTOIP */ -#if LWIP_MDNS +#if LWIP_MDNS_RESPONDER /* netif not using MDNS by default */ netif->mdns = NULL; -#endif /* LWIP_MDNS */ +#endif /* LWIP_MDNS_RESPONDER */ #if LWIP_IPV6_AUTOCONFIG /* IPv6 address autoconfiguration not enabled by default */ netif->ip6_autoconfig_enabled = 0; diff --git a/src/include/lwip/apps/mdns.h b/src/include/lwip/apps/mdns.h index 3b902fc9..f49cdf9f 100644 --- a/src/include/lwip/apps/mdns.h +++ b/src/include/lwip/apps/mdns.h @@ -40,7 +40,7 @@ #include "lwip/apps/mdns_opts.h" #include "lwip/netif.h" -#if LWIP_MDNS +#if LWIP_MDNS_RESPONDER #define DNSSD_PROTO_UDP 0 #define DNSSD_PROTO_TCP 1 @@ -78,6 +78,6 @@ u16_t mdns_readname(struct pbuf *p, u16_t offset, struct mdns_domain *domain); int mdns_domain_eq(struct mdns_domain *a, struct mdns_domain *b); u16_t mdns_compress_domain(struct pbuf *pbuf, u16_t *offset, struct mdns_domain *domain); -#endif /* LWIP_MDNS */ +#endif /* LWIP_MDNS_RESPONDER */ #endif /* LWIP_HDR_MDNS_H */ diff --git a/src/include/lwip/apps/mdns_opts.h b/src/include/lwip/apps/mdns_opts.h index e34308e6..2112e803 100644 --- a/src/include/lwip/apps/mdns_opts.h +++ b/src/include/lwip/apps/mdns_opts.h @@ -47,12 +47,12 @@ */ /** - * LWIP_MDNS==1: Turn on multicast DNS module. UDP must be available for MDNS + * LWIP_MDNS_RESPONDER==1: Turn on multicast DNS module. UDP must be available for MDNS * transport. IGMP is needed for IPv4 multicast. */ -#ifndef LWIP_MDNS -#define LWIP_MDNS 0 -#endif /* LWIP_MDNS */ +#ifndef LWIP_MDNS_RESPONDER +#define LWIP_MDNS_RESPONDER 0 +#endif /* LWIP_MDNS_RESPONDER */ /** The maximum number of services per netif */ #ifndef MDNS_MAX_SERVICES diff --git a/src/include/lwip/netif.h b/src/include/lwip/netif.h index 156ceafb..5a5d87af 100644 --- a/src/include/lwip/netif.h +++ b/src/include/lwip/netif.h @@ -59,7 +59,7 @@ struct autoip; #if LWIP_IPV6_DHCP6 struct dhcp6; #endif /* LWIP_IPV6_DHCP6 */ -#if LWIP_MDNS +#if LWIP_MDNS_RESPONDER struct mdns_host; #endif @@ -259,10 +259,10 @@ struct netif { /** the AutoIP client state information for this netif */ struct autoip *autoip; #endif -#if LWIP_MDNS +#if LWIP_MDNS_RESPONDER /** Interface-specific info for multicast DNS */ struct mdns_host *mdns; -#endif /* LWIP_MDNS */ +#endif /* LWIP_MDNS_RESPONDER */ #if LWIP_IPV6_AUTOCONFIG /** is this netif enabled for IPv6 autoconfiguration */ u8_t ip6_autoconfig_enabled;