dok-net
diff --git a/‎libraries/ESP8266mDNS/src/LEAmDNS.h
Copy file name to clipboardExpand all lines: libraries/ESP8266mDNS/src/LEAmDNS.h
+3-1Lines changed: 3 additions & 1 deletion b/‎libraries/ESP8266mDNS/src/LEAmDNS.h
Copy file name to clipboardExpand all lines: libraries/ESP8266mDNS/src/LEAmDNS.h
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎libraries/ESP8266mDNS/src/LEAmDNS_Structs.cpp
Copy file name to clipboardExpand all lines: libraries/ESP8266mDNS/src/LEAmDNS_Structs.cpp
+4-7Lines changed: 4 additions & 7 deletions b/‎libraries/ESP8266mDNS/src/LEAmDNS_Structs.cpp
Copy file name to clipboardExpand all lines: libraries/ESP8266mDNS/src/LEAmDNS_Structs.cpp
+4-7Lines changed: 4 additions & 7 deletions
@@ -1030,6 +1030,8 @@ class MDNSResponder
                 esp8266::polledTimeout::oneShotMs m_TTLTimeout;
                 timeoutLevel_t                    m_timeoutLevel;
 
+                using timeoutBase = decltype(m_TTLTimeout);
+
                 stcTTL(void);
                 bool set(uint32_t p_u32TTL);
 
@@ -1039,7 +1041,7 @@ class MDNSResponder
                 bool prepareDeletion(void);
                 bool finalTimeoutLevel(void) const;
 
-                unsigned long timeout(void) const;
+                timeoutBase::timeType timeout(void) const;
             };
 #ifdef MDNS_IP4_SUPPORT
             /**
 
@@ -1663,22 +1663,19 @@ bool MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::finalTimeoutLevel(vo
 /*
     MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::timeout
 */
-unsigned long MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::timeout(void) const
+MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::timeoutBase::timeType MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::timeout(void) const
 {
-
-    unsigned long   timeout = esp8266::polledTimeout::oneShotMs::neverExpires;
-
     if (TIMEOUTLEVEL_BASE == m_timeoutLevel)            // 80%
     {
-        timeout = (m_u32TTL * 800L);                  // to milliseconds
+        return (m_u32TTL * 800L);                  // to milliseconds
     }
     else if ((TIMEOUTLEVEL_BASE < m_timeoutLevel) &&    // >80% AND
              (TIMEOUTLEVEL_FINAL >= m_timeoutLevel))    // <= 100%
     {
 
-        timeout = (m_u32TTL * 50L);
+        return (m_u32TTL * 50L);
     }   // else: invalid
-    return timeout;
+    return MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::timeoutBase::neverExpires;
 }
Original file line number	Diff line number	Diff line change
`@@ -1663,22 +1663,19 @@ bool MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::finalTimeoutLevel(vo`
`1663`	`1663`	`/*`
`1664`	`1664`	`MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::timeout`
`1665`	`1665`	`*/`
`1666`		`-unsigned long MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::timeout(void) const`
	`1666`	`+MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::timeoutBase::timeType MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::timeout(void) const`
`1667`	`1667`	`{`
`1668`		`-`
`1669`		`- unsigned long timeout = esp8266::polledTimeout::oneShotMs::neverExpires;`
`1670`		`-`
`1671`	`1668`	`if (TIMEOUTLEVEL_BASE == m_timeoutLevel) // 80%`
`1672`	`1669`	`{`
`1673`		`- timeout = (m_u32TTL * 800L); // to milliseconds`
	`1670`	`+ return (m_u32TTL * 800L); // to milliseconds`
`1674`	`1671`	`}`
`1675`	`1672`	`else if ((TIMEOUTLEVEL_BASE < m_timeoutLevel) && // >80% AND`
`1676`	`1673`	`(TIMEOUTLEVEL_FINAL >= m_timeoutLevel)) // <= 100%`
`1677`	`1674`	`{`
`1678`	`1675`
`1679`		`- timeout = (m_u32TTL * 50L);`
	`1676`	`+ return (m_u32TTL * 50L);`
`1680`	`1677`	`} // else: invalid`
`1681`		`- return timeout;`
	`1678`	`+ return MDNSResponder::stcMDNSServiceQuery::stcAnswer::stcTTL::timeoutBase::neverExpires;`
`1682`	`1679`	`}`
`1683`	`1680`
`1684`	`1681`