Skip to content

Commit bc2b13a

Browse files
d-a-vd-a-v
authored
LEAmDNSv2: change a macro name to be independant from LEAmDNS1 (#7640)
1 parent 36b444d commit bc2b13a

6 files changed

+59
-59
lines changed

‎libraries/ESP8266mDNS/src/LEAmDNS2Host.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#ifdef MDNS_IPV4_SUPPORT
3434
#include <lwip/igmp.h>
3535
#endif
36-
#ifdef MDNS_IPV6_SUPPORT
36+
#ifdef MDNS2_IPV6_SUPPORT
3737
#include <lwip/mld6.h>
3838
#endif
3939

@@ -172,7 +172,7 @@ const char* clsLEAMDNSHost::clsConsts::pcUDP = "udp";
172172
#ifdef MDNS_IPV4_SUPPORT
173173
const char* clsLEAMDNSHost::clsConsts::pcReverseIPv4Domain = "in-addr";
174174
#endif
175-
#ifdef MDNS_IPV6_SUPPORT
175+
#ifdef MDNS2_IPV6_SUPPORT
176176
const char* clsLEAMDNSHost::clsConsts::pcReverseIPv6Domain = "ip6";
177177
#endif
178178
const char* clsLEAMDNSHost::clsConsts::pcReverseTopDomain = "arpa";
@@ -904,7 +904,7 @@ bool clsLEAMDNSHost::_joinMulticastGroups(void)
904904
}
905905
#endif
906906

907-
#ifdef MDNS_IPV6_SUPPORT
907+
#ifdef MDNS2_IPV6_SUPPORT
908908
ip_addr_t multicast_addr_V6 = DNS_MQUERY_IPV6_GROUP_INIT;
909909
bResult = ((bResult) &&
910910
(ERR_OK == mld6_joingroup_netif(pNetIf, ip_2_ip6(&multicast_addr_V6))));
@@ -937,7 +937,7 @@ bool clsLEAMDNSHost::_leaveMulticastGroups()
937937
DEBUG_EX_ERR(DEBUG_OUTPUT.printf_P(PSTR("\n")););
938938
}
939939
#endif
940-
#ifdef MDNS_IPV6_SUPPORT
940+
#ifdef MDNS2_IPV6_SUPPORT
941941
ip_addr_t multicast_addr_V6 = DNS_MQUERY_IPV6_GROUP_INIT;
942942
if (ERR_OK != mld6_leavegroup_netif(pNetIf, ip_2_ip6(&multicast_addr_V6)/*&(multicast_addr_V6.u_addr.ip6)*/))
943943
{

‎libraries/ESP8266mDNS/src/LEAmDNS2Host.h

+14-14
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110

111111
#define MDNS_IPV4_SUPPORT
112112
#if LWIP_IPV6
113-
#define MDNS_IPV6_SUPPORT // If we've got IPv6 support, then we need IPv6 support :-)
113+
#define MDNS2_IPV6_SUPPORT // If we've got IPv6 support, then we need IPv6 support :-)
114114
#endif
115115

116116
namespace esp8266
@@ -136,7 +136,7 @@ class clsLEAMDNSHost
136136
#ifdef MDNS_IPV4_SUPPORT
137137
static constexpr uint16_t u16IPv4Size = 4; // IPv4 address size in bytes
138138
#endif
139-
#ifdef MDNS_IPV6_SUPPORT
139+
#ifdef MDNS2_IPV6_SUPPORT
140140
static constexpr uint16_t u16IPv6Size = 16; // IPv6 address size in bytes
141141
#endif
142142
static constexpr size_t stServiceTxtMaxLength = 1300; // Maximum length for all service txts for one service
@@ -168,7 +168,7 @@ class clsLEAMDNSHost
168168
#ifdef MDNS_IPV4_SUPPORT
169169
static const char* pcReverseIPv4Domain; // "in-addr";
170170
#endif
171-
#ifdef MDNS_IPV6_SUPPORT
171+
#ifdef MDNS2_IPV6_SUPPORT
172172
static const char* pcReverseIPv6Domain; // "ip6";
173173
#endif
174174
static const char* pcReverseTopDomain; // "arpa";
@@ -246,7 +246,7 @@ class clsLEAMDNSHost
246246
#ifdef MDNS_IPV4_SUPPORT
247247
V4 = 0x01,
248248
#endif
249-
#ifdef MDNS_IPV6_SUPPORT
249+
#ifdef MDNS2_IPV6_SUPPORT
250250
V6 = 0x02,
251251
#endif
252252
};
@@ -784,7 +784,7 @@ class clsLEAMDNSHost
784784
bool clear(void);
785785
};
786786

787-
#ifdef MDNS_IPV6_SUPPORT
787+
#ifdef MDNS2_IPV6_SUPPORT
788788
/**
789789
clsRRAnswerAAAA
790790
*/
@@ -935,7 +935,7 @@ class clsLEAMDNSHost
935935
#ifdef MDNS_IPV4_SUPPORT
936936
IPv4Address = 0x10, // IPv4 address
937937
#endif
938-
#ifdef MDNS_IPV6_SUPPORT
938+
#ifdef MDNS2_IPV6_SUPPORT
939939
IPv6Address = 0x20, // IPv6 address
940940
#endif
941941
};
@@ -1004,7 +1004,7 @@ class clsLEAMDNSHost
10041004
#ifdef MDNS_IPV4_SUPPORT
10051005
clsIPAddressWithTTL::list m_IPv4Addresses; // 3. level answer (A, using host domain), eg. 123.456.789.012
10061006
#endif
1007-
#ifdef MDNS_IPV6_SUPPORT
1007+
#ifdef MDNS2_IPV6_SUPPORT
10081008
clsIPAddressWithTTL::list m_IPv6Addresses; // 3. level answer (AAAA, using host domain), eg. 1234::09
10091009
#endif
10101010
typeQueryAnswerType m_QueryAnswerFlags; // enuQueryAnswerType
@@ -1029,7 +1029,7 @@ class clsLEAMDNSHost
10291029
const clsIPAddressWithTTL* IPv4AddressAtIndex(uint32_t p_u32Index) const;
10301030
clsIPAddressWithTTL* IPv4AddressAtIndex(uint32_t p_u32Index);
10311031
#endif
1032-
#ifdef MDNS_IPV6_SUPPORT
1032+
#ifdef MDNS2_IPV6_SUPPORT
10331033
bool releaseIPv6Addresses(void);
10341034
bool addIPv6Address(clsIPAddressWithTTL* p_pIPAddress);
10351035
bool removeIPv6Address(clsIPAddressWithTTL* p_pIPAddress);
@@ -1081,7 +1081,7 @@ class clsLEAMDNSHost
10811081
bool IPv4AddressAvailable(void) const;
10821082
clsIPAddressVector IPv4Addresses(void) const;
10831083
#endif
1084-
#ifdef MDNS_IPV6_SUPPORT
1084+
#ifdef MDNS2_IPV6_SUPPORT
10851085
bool IPv6AddressAvailable(void) const;
10861086
clsIPAddressVector IPv6Addresses(void) const;
10871087
#endif
@@ -1362,7 +1362,7 @@ class clsLEAMDNSHost
13621362
#ifdef MDNS_IPV4_SUPPORT
13631363
bool _processAAnswer(const clsRRAnswerA* p_pAAnswer);
13641364
#endif
1365-
#ifdef MDNS_IPV6_SUPPORT
1365+
#ifdef MDNS2_IPV6_SUPPORT
13661366
bool _processAAAAAnswer(const clsRRAnswerAAAA* p_pAAAAAnswer);
13671367
#endif
13681368

@@ -1426,7 +1426,7 @@ class clsLEAMDNSHost
14261426
uint16_t p_u16RDLength);
14271427
bool _readRRAnswerTXT(clsRRAnswerTXT& p_rRRAnswerTXT,
14281428
uint16_t p_u16RDLength);
1429-
#ifdef MDNS_IPV6_SUPPORT
1429+
#ifdef MDNS2_IPV6_SUPPORT
14301430
bool _readRRAnswerAAAA(clsRRAnswerAAAA& p_rRRAnswerAAAA,
14311431
uint16_t p_u16RDLength);
14321432
#endif
@@ -1455,7 +1455,7 @@ class clsLEAMDNSHost
14551455
bool _buildDomainForReverseIPv4(IPAddress p_IPv4Address,
14561456
clsRRDomain& p_rReverseIPv4Domain) const;
14571457
#endif
1458-
#ifdef MDNS_IPV6_SUPPORT
1458+
#ifdef MDNS2_IPV6_SUPPORT
14591459
bool _buildDomainForReverseIPv6(IPAddress p_IPv4Address,
14601460
clsRRDomain& p_rReverseIPv6Domain) const;
14611461
#endif
@@ -1520,7 +1520,7 @@ class clsLEAMDNSHost
15201520
clsSendParameter& p_rSendParameter);
15211521
bool _writeMDNSAnswer_TXT(clsService& p_rService,
15221522
clsSendParameter& p_rSendParameter);
1523-
#ifdef MDNS_IPV6_SUPPORT
1523+
#ifdef MDNS2_IPV6_SUPPORT
15241524
bool _writeMDNSAnswer_AAAA(IPAddress p_IPAddress,
15251525
clsSendParameter& p_rSendParameter);
15261526
bool _writeMDNSAnswer_PTR_IPv6(IPAddress p_IPAddress,
@@ -1537,7 +1537,7 @@ class clsLEAMDNSHost
15371537
bool _writeMDNSAnswer_NSEC_PTR_IPv4(IPAddress p_IPAddress,
15381538
clsSendParameter& p_rSendParameter);
15391539
#endif
1540-
#ifdef MDNS_IPV6_SUPPORT
1540+
#ifdef MDNS2_IPV6_SUPPORT
15411541
bool _writeMDNSAnswer_NSEC_PTR_IPv6(IPAddress p_IPAddress,
15421542
clsSendParameter& p_rSendParameter);
15431543
#endif

‎libraries/ESP8266mDNS/src/LEAmDNS2Host_Control.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ bool clsLEAMDNSHost::_parseQuery(netif* pNetIf,
218218
(true)
219219
#endif
220220
&&
221-
#ifdef MDNS_IPV6_SUPPORT
221+
#ifdef MDNS2_IPV6_SUPPORT
222222
(m_pUDPContext->getRemoteAddress().isV6()) &&
223223
(ip6_addr_islinklocal(ip_2_ip6((const ip_addr_t*)m_pUDPContext->getRemoteAddress())))
224224
#else
@@ -304,7 +304,7 @@ bool clsLEAMDNSHost::_parseQuery(netif* pNetIf,
304304
sendParameter.m_u32HostReplyMask &= ~static_cast<uint32_t>(enuContentFlag::PTR_IPv4);
305305
}
306306
#endif
307-
#ifdef MDNS_IPV6_SUPPORT
307+
#ifdef MDNS2_IPV6_SUPPORT
308308
if (u32HostMatchMask & static_cast<uint32_t>(enuContentFlag::PTR_IPv6))
309309
{
310310
// IPv6 PTR was asked for, but is already known -> skipping
@@ -330,7 +330,7 @@ bool clsLEAMDNSHost::_parseQuery(netif* pNetIf,
330330
else if (u32HostMatchMask & static_cast<uint32_t>(enuContentFlag::AAAA))
331331
{
332332
// IPv6 address was asked for
333-
#ifdef MDNS_IPV6_SUPPORT
333+
#ifdef MDNS2_IPV6_SUPPORT
334334
if ((enuAnswerType::AAAA == pKnownRRAnswer->answerType()) &&
335335
(((stcRRAnswerAAAA*)pKnownRRAnswer)->m_IPAddress == _getResponderIPAddress(pNetIf, enuIPProtocolType::V6)))
336336
{
@@ -381,7 +381,7 @@ bool clsLEAMDNSHost::_parseQuery(netif* pNetIf,
381381
}
382382
}
383383
#endif
384-
#ifdef MDNS_IPV6_SUPPORT
384+
#ifdef MDNS2_IPV6_SUPPORT
385385
if (enuAnswerType::AAAA == pKnownRRAnswer->answerType())
386386
{
387387
IPAddress localIPAddress(_getResponderIPAddress(pNetIf, enuIPProtocolType::V6));
@@ -775,7 +775,7 @@ bool clsLEAMDNSHost::_processAnswers(netif* pNetIf, const clsLEAMDNSHost::clsRRA
775775
bResult = _processAAnswer((clsRRAnswerA*)pRRAnswer);
776776
}
777777
#endif
778-
#ifdef MDNS_IPV6_SUPPORT
778+
#ifdef MDNS2_IPV6_SUPPORT
779779
// AAAA -> IPv6Address
780780
else if (enuAnswerType::AAAA == pRRAnswer->answerType())
781781
{
@@ -802,7 +802,7 @@ bool clsLEAMDNSHost::_processAnswers(netif* pNetIf, const clsLEAMDNSHost::clsRRA
802802
bPossibleEcho = true;
803803
}
804804
#endif
805-
#ifdef MDNS_IPV6_SUPPORT
805+
#ifdef MDNS2_IPV6_SUPPORT
806806
if ((enuAnswerType::AAAA == pRRAnswer->answerType()) &&
807807
(((clsRRAnswerAAAA*)pRRAnswer)->m_IPAddress == _getResponderIPAddress(pNetIf, enuIPProtocolType::V6)))
808808
{
@@ -1159,7 +1159,7 @@ bool clsLEAMDNSHost::_processAAnswer(const clsLEAMDNSHost::clsRRAnswerA* p_pAAns
11591159
}
11601160
#endif
11611161

1162-
#ifdef MDNS_IPV6_SUPPORT
1162+
#ifdef MDNS2_IPV6_SUPPORT
11631163
/*
11641164
clsLEAmDNS2_Host::_processAAAAAnswer (level 3)
11651165
*/
@@ -1298,7 +1298,7 @@ bool clsLEAMDNSHost::_updateProbeStatus()
12981298
true
12991299
#endif
13001300
) || (
1301-
#ifdef MDNS_IPV6_SUPPORT
1301+
#ifdef MDNS2_IPV6_SUPPORT
13021302
_getResponderIPAddress(pNetIf, enuIPProtocolType::V6).isSet() // OR has IPv6 address
13031303
#else
13041304
true
@@ -1511,7 +1511,7 @@ bool clsLEAMDNSHost::_sendHostProbe()
15111511
#ifdef MDNS_IPV4_SUPPORT
15121512
sendParameter.m_u32HostReplyMask |= static_cast<uint32_t>(enuContentFlag::A); // Add A answer
15131513
#endif
1514-
#ifdef MDNS_IPV6_SUPPORT
1514+
#ifdef MDNS2_IPV6_SUPPORT
15151515
sendParameter.m_u32HostReplyMask |= static_cast<uint32_t>(enuContentFlag::AAAA); // Add AAAA answer
15161516
#endif
15171517
}
@@ -1705,7 +1705,7 @@ bool clsLEAMDNSHost::_announce(bool p_bAnnounce,
17051705
sendParameter.m_u32HostReplyMask |= static_cast<uint32_t>(enuContentFlag::A); // A answer
17061706
sendParameter.m_u32HostReplyMask |= static_cast<uint32_t>(enuContentFlag::PTR_IPv4); // PTR_IPv4 answer
17071707
#endif
1708-
#ifdef MDNS_IPV6_SUPPORT
1708+
#ifdef MDNS2_IPV6_SUPPORT
17091709
sendParameter.m_u32HostReplyMask |= static_cast<uint32_t>(enuContentFlag::AAAA); // AAAA answer
17101710
sendParameter.m_u32HostReplyMask |= static_cast<uint32_t>(enuContentFlag::PTR_IPv6); // PTR_IPv6 answer
17111711
#endif
@@ -1892,7 +1892,7 @@ bool clsLEAMDNSHost::_checkQueryCache()
18921892
pQAnswer->releaseIPv4Addresses();
18931893
queryAnswerContentFlags |= static_cast<clsQuery::clsAnswer::typeQueryAnswerType>(clsQuery::clsAnswer::enuQueryAnswerType::IPv4Address);
18941894
#endif
1895-
#ifdef MDNS_IPV6_SUPPORT
1895+
#ifdef MDNS2_IPV6_SUPPORT
18961896
pQAnswer->releaseIPv6Addresses();
18971897
queryAnswerContentFlags |= static_cast<clsQuery::clsAnswer::typeQueryAnswerType>(clsQuery::clsAnswer::enuQueryAnswerType::IPv6Address);
18981898
#endif
@@ -1991,7 +1991,7 @@ bool clsLEAMDNSHost::_checkQueryCache()
19911991
pQAnswer->removeIPv4Address(pIPv4Address);
19921992
}
19931993
#endif
1994-
#ifdef MDNS_IPV6_SUPPORT
1994+
#ifdef MDNS2_IPV6_SUPPORT
19951995
// IPv6Address (from AAAA)
19961996
clsQuery::clsAnswer::clsIPAddressWithTTL::list expiredIPv6Addresses;
19971997
bool bAAAAUpdateQuerySent = false;
@@ -2095,7 +2095,7 @@ uint32_t clsLEAMDNSHost::_replyMaskForHost(netif* pNetIf,
20952095
u32ReplyMask |= static_cast<uint32_t>(enuContentFlag::PTR_IPv4);
20962096
}
20972097
#endif
2098-
#ifdef MDNS_IPV6_SUPPORT
2098+
#ifdef MDNS2_IPV6_SUPPORT
20992099
clsRRDomain reverseIPv6Domain;
21002100
if ((_getResponderIPAddress(pNetIf, enuIPProtocolType::V6).isSet()) &&
21012101
(_buildDomainForReverseIPv6(_getResponderIPAddress(pNetIf, enuIPProtocolType::V6), reverseIPv6Domain)) &&
@@ -2121,7 +2121,7 @@ uint32_t clsLEAMDNSHost::_replyMaskForHost(netif* pNetIf,
21212121
u32ReplyMask |= static_cast<uint32_t>(enuContentFlag::A);
21222122
}
21232123
#endif
2124-
#ifdef MDNS_IPV6_SUPPORT
2124+
#ifdef MDNS2_IPV6_SUPPORT
21252125
if ((DNS_RRTYPE_AAAA == p_RRHeader.m_Attributes.m_u16Type) ||
21262126
(DNS_RRTYPE_ANY == p_RRHeader.m_Attributes.m_u16Type))
21272127
{

‎libraries/ESP8266mDNS/src/LEAmDNS2Host_Debug.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ bool clsLEAMDNSHost::_printRRAnswer(const clsLEAMDNSHost::clsRRAnswer& p_RRAnswe
141141
}
142142
break;
143143
}
144-
#ifdef MDNS_IPV6_SUPPORT
144+
#ifdef MDNS2_IPV6_SUPPORT
145145
case DNS_RRTYPE_AAAA:
146146
DEBUG_OUTPUT.printf_P(PSTR("AAAA IP:%s"), ((clsRRAnswerAAAA*&)p_RRAnswer)->m_IPAddress.toString().c_str());
147147
break;
@@ -175,7 +175,7 @@ const char* clsLEAMDNSHost::_RRType2Name(uint16_t p_u16RRType) const
175175
#endif
176176
case DNS_RRTYPE_PTR: strcpy_P(acRRName, PSTR("PTR")); break;
177177
case DNS_RRTYPE_TXT: strcpy_P(acRRName, PSTR("TXT")); break;
178-
#ifdef MDNS_IPV6_SUPPORT
178+
#ifdef MDNS2_IPV6_SUPPORT
179179
case DNS_RRTYPE_AAAA: strcpy_P(acRRName, PSTR("AAAA")); break;
180180
#endif
181181
case DNS_RRTYPE_SRV: strcpy_P(acRRName, PSTR("SRV")); break;
@@ -288,7 +288,7 @@ const char* clsLEAMDNSHost::_NSECBitmap2String(const clsNSECBitmap* p_pNSECBitma
288288
{
289289
strcat_P(acFlagsString, PSTR("PTR ")); // 4
290290
}
291-
#ifdef MDNS_IPV6_SUPPORT
291+
#ifdef MDNS2_IPV6_SUPPORT
292292
if (p_pNSECBitmap->getBit(DNS_RRTYPE_AAAA))
293293
{
294294
strcat_P(acFlagsString, PSTR("AAAA ")); // 5

‎libraries/ESP8266mDNS/src/LEAmDNS2Host_Structs.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1898,7 +1898,7 @@ bool clsLEAMDNSHost::clsRRAnswerTXT::clear(void)
18981898
18991899
*/
19001900

1901-
#ifdef MDNS_IPV6_SUPPORT
1901+
#ifdef MDNS2_IPV6_SUPPORT
19021902
/*
19031903
clsLEAMDNSHost::clsRRAnswerAAAA::clsRRAnswerAAAA constructor
19041904
@@ -2398,7 +2398,7 @@ bool clsLEAMDNSHost::clsQuery::clsAnswer::clear(void)
23982398
(true)
23992399
#endif
24002400
&&
2401-
#ifdef MDNS_IPV6_SUPPORT
2401+
#ifdef MDNS2_IPV6_SUPPORT
24022402
(releaseIPv6Addresses())
24032403
#else
24042404
(true)
@@ -2528,7 +2528,7 @@ const clsLEAMDNSHost::clsQuery::clsAnswer::clsIPAddressWithTTL* clsLEAMDNSHost::
25282528
}
25292529
#endif
25302530

2531-
#ifdef MDNS_IPV6_SUPPORT
2531+
#ifdef MDNS2_IPV6_SUPPORT
25322532
/*
25332533
clsLEAMDNSHost::clsQuery::clsAnswer::releaseIPv6Addresses
25342534
@@ -2793,7 +2793,7 @@ clsLEAMDNSHost::clsQuery::clsAnswerAccessor::clsIPAddressVector clsLEAMDNSHost::
27932793
}
27942794
#endif
27952795

2796-
#ifdef MDNS_IPV6_SUPPORT
2796+
#ifdef MDNS2_IPV6_SUPPORT
27972797
/*
27982798
clsLEAMDNSHost::clsQuery::clsAnswerAccessor::IPv6AddressAvailable
27992799
@@ -2913,7 +2913,7 @@ size_t clsLEAMDNSHost::clsQuery::clsAnswerAccessor::printTo(Print& p_Print) cons
29132913
}
29142914
}
29152915
#endif
2916-
#ifdef MDNS_IPV6_SUPPORT
2916+
#ifdef MDNS2_IPV6_SUPPORT
29172917
if (IPv6AddressAvailable())
29182918
{
29192919
stLen += p_Print.print(cpcI);

0 commit comments

Comments
 (0)