jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-22 02:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Berry make mdns compatible with non-IPv6 builds (#19444)

Browse Source
This commit is contained in:
s-hadinger 2023-09-03 16:18:38 +02:00 committed by GitHub
parent 262c8b421b
commit 8a514a0758
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
### Fixed
- PCF8574 mode 1 with base relays exception 3/28 regression from v12.4.0.4 (#19408)
- Berry make mdns compatible with non-IPv6 builds
### Removed

9
lib/libesp32/berry_tasmota/src/be_mdns_module.cpp
View File

@ -213,7 +213,6 @@ static int32_t m_dns_add_hostname(struct bvm *vm) {
const char* hostname = be_tostring(vm, 1);
const char* ip_text = nullptr;
ip_addr_t a;
for (uint16_t i = 2; i <= top; i++) {
const char* ip_text = be_tostring(vm, i);
if (ip_text == nullptr || ip_text[0] == 0) { continue; } // ignore empty string
@ -226,6 +225,7 @@ static int32_t m_dns_add_hostname(struct bvm *vm) {
new_head->next = head;
head = new_head;
#ifdef USE_IPV6
//
ip_addr_t *ip_addr = (ip_addr_t*) ip;
head->addr.type = ip_addr->type;
@ -234,6 +234,9 @@ static int32_t m_dns_add_hostname(struct bvm *vm) {
} else {
head->addr.u_addr.ip4.addr = ip_addr->u_addr.ip4.addr;
}
#else
head->addr.u_addr.ip4.addr = (uint32_t) ip;
#endif
} while (0);
if (err == ESP_OK && head != nullptr) {
@ -308,6 +311,7 @@ static int32_t m_dns_find_service(struct bvm *vm) {
be_newobject(vm, "list");
//
for (a = r->addr; a != NULL; a = a->next) {
#ifdef USE_IPV6
ip_addr_t ip_addr;
if (a->addr.type == IPADDR_TYPE_V6) {
ip_addr_copy_from_ip6(ip_addr, a->addr.u_addr.ip6);
@ -316,6 +320,9 @@ static int32_t m_dns_find_service(struct bvm *vm) {
} else {
continue;
}
#else
uint32_t ip_addr = a->addr.u_addr.ip4.addr;
#endif
be_pushstring(vm, IPAddress(ip_addr).toString().c_str());
be_data_push(vm, -2);
be_pop(vm, 1);