Michel2/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2026-07-28 04:15:53 +00:00
Code Issues Releases Activity

Matter don't advertize IPv6 global address, only link-local (#24563)

Browse Source
This commit is contained in:
s-hadinger
2026-03-17 20:53:26 +01:00
committed by GitHub
parent 17b1a64bee
commit 0aaae08e4e
3 changed files with 155 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
### Changed
- ESP8266 platform update from 2026.02.00 to 2026.03.00 (#24547)
- ESP32 Platform from 2025.02.30 to 2026.03.30, Framework (Arduino Core) from v3.1.9 to v3.1.10 and IDF from v5.3.4.251226 to v5.3.4.260127 (#24547)
- Matter don't advertize IPv6 global address, only link-local
### Fixed
- Athom esp32 2-3-4 gang change led behaviour after firmware update (#24509)
lib/libesp32/berry_matter/src/embedded/Matter_z_Commissioning.be
+4 -4
View File
@@ -261,8 +261,8 @@ class Matter_Commissioning
var eth = tasmota.eth()
self.hostname_eth = string.replace(eth.find("mac"), ':', '')
if !self.device.ipv4only || !eth.contains('ip6local')
# log(format("MTR: calling mdns.add_hostname(%s, %s, %s)", self.hostname_eth, eth.find('ip6local',''), eth.find('ip','')), 4)
mdns.add_hostname(self.hostname_eth, eth.find('ip6local',''), eth.find('ip',''), eth.find('ip6',''))
log(f"MTR: calling mdns.add_hostname({self.hostname_eth}, {eth.find('ip6local','')}, {eth.find('ip','')})", 3)
mdns.add_hostname(self.hostname_eth, eth.find('ip6local',''), eth.find('ip',''))
else
log(format("MTR: calling mdns.add_hostname(%s, %s)", self.hostname_eth, eth.find('ip','')), 3)
mdns.add_hostname(self.hostname_eth, eth.find('ip',''))
@@ -271,8 +271,8 @@ class Matter_Commissioning
var wifi = tasmota.wifi()
self.hostname_wifi = string.replace(wifi.find("mac"), ':', '')
if !self.device.ipv4only || !wifi.contains('ip6local')
# log(format("MTR: calling mdns.add_hostname(%s, %s, %s)", self.hostname_wifi, wifi.find('ip6local',''), wifi.find('ip','')), 4)
mdns.add_hostname(self.hostname_wifi, wifi.find('ip6local',''), wifi.find('ip',''), wifi.find('ip6',''))
log(f"MTR: calling mdns.add_hostname({self.hostname_wifi}, {wifi.find('ip6local','')}, {wifi.find('ip','')})", 3)
mdns.add_hostname(self.hostname_wifi, wifi.find('ip6local',''), wifi.find('ip',''))
else
log(format("MTR: calling mdns.add_hostname(%s, %s)", self.hostname_wifi, wifi.find('ip','')), 3)
mdns.add_hostname(self.hostname_wifi, wifi.find('ip',''))
lib/libesp32/berry_matter/src/solidify/solidified_Matter_z_Commissioning.h
+150 -128
View File
@@ -79,9 +79,9 @@ static const bvalue be_ktab_class_Matter_Commissioning[128] = {
/* K71 */ be_nested_str_weak(ipv4only),
/* K72 */ be_nested_str_weak(contains),
/* K73 */ be_nested_str_weak(ip6local),
/* K74 */ be_nested_str_weak(add_hostname),
/* K74 */ be_nested_str_weak(MTR_X3A_X20calling_X20mdns_X2Eadd_hostname_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29),
/* K75 */ be_nested_str_weak(ip),
/* K76 */ be_nested_str_weak(ip6),
/* K76 */ be_nested_str_weak(add_hostname),
/* K77 */ be_nested_str_weak(MTR_X3A_X20calling_X20mdns_X2Eadd_hostname_X28_X25s_X2C_X20_X25s_X29),
/* K78 */ be_nested_str_weak(MTR_X3A_X20start_X20mDNS_X20on_X20_X25s_X20host_X20_X27_X25s_X2Elocal_X27),
/* K79 */ be_nested_str_weak(mdns_announce_op_discovery_all_fabrics),
@@ -748,13 +748,13 @@ be_local_closure(class_Matter_Commissioning__mdns_announce_hostname, /* name *
&be_ktab_class_Matter_Commissioning, /* shared constants */
be_str_weak(_mdns_announce_hostname),
&be_const_str_solidified,
( &(const binstruction[146]) { /* code */
( &(const binstruction[168]) { /* code */
0xA40A0000, // 0000 IMPORT R2 K0
0xA40E8200, // 0001 IMPORT R3 K65
0x8C100542, // 0002 GETMET R4 R2 K66
0x7C100200, // 0003 CALL R4 1
0xA8020079, // 0004 EXBLK 0 #007F
0x78060034, // 0005 JMPF R1 #003B
0xA802008F, // 0004 EXBLK 0 #0095
0x7806003F, // 0005 JMPF R1 #0046
0xB8120E00, // 0006 GETNGBL R4 K7
0x8C100908, // 0007 GETMET R4 R4 K8
0x7C100200, // 0008 CALL R4 1
@@ -772,129 +772,151 @@ be_local_closure(class_Matter_Commissioning__mdns_announce_hostname, /* name *
0x8C140948, // 0014 GETMET R5 R4 K72
0x581C0049, // 0015 LDCONST R7 K73
0x7C140400, // 0016 CALL R5 2
0x7416000F, // 0017 JMPT R5 #0028
0x8C14054A, // 0018 GETMET R5 R2 K74
0x881C0111, // 0019 GETMBR R7 R0 K17
0x8C200909, // 001A GETMET R8 R4 K9
0x58280049, // 001B LDCONST R10 K73
0x582C0046, // 001C LDCONST R11 K70
0x7C200600, // 001D CALL R8 3
0x8C240909, // 001E GETMET R9 R4 K9
0x582C004B, // 001F LDCONST R11 K75
0x58300046, // 0020 LDCONST R12 K70
0x7C240600, // 0021 CALL R9 3
0x8C280909, // 0022 GETMET R10 R4 K9
0x5830004C, // 0023 LDCONST R12 K76
0x58340046, // 0024 LDCONST R13 K70
0x7C280600, // 0025 CALL R10 3
0x7C140A00, // 0026 CALL R5 5
0x70020011, // 0027 JMP #003A
0xB8161600, // 0028 GETNGBL R5 K11
0x60180018, // 0029 GETGBL R6 G24
0x581C004D, // 002A LDCONST R7 K77
0x88200111, // 002B GETMBR R8 R0 K17
0x8C240909, // 002C GETMET R9 R4 K9
0x582C004B, // 002D LDCONST R11 K75
0x58300046, // 002E LDCONST R12 K70
0x7C240600, // 002F CALL R9 3
0x7C180600, // 0030 CALL R6 3
0x581C000D, // 0031 LDCONST R7 K13
0x7C140400, // 0032 CALL R5 2
0x8C14054A, // 0033 GETMET R5 R2 K74
0x881C0111, // 0034 GETMBR R7 R0 K17
0x8C200909, // 0035 GETMET R8 R4 K9
0x5828004B, // 0036 LDCONST R10 K75
0x582C0046, // 0037 LDCONST R11 K70
0x7C200600, // 0038 CALL R8 3
0x7C140600, // 0039 CALL R5 3
0x70020033, // 003A JMP #006F
0xB8120E00, // 003B GETNGBL R4 K7
0x8C100912, // 003C GETMET R4 R4 K18
0x7C100200, // 003D CALL R4 1
0x8C140743, // 003E GETMET R5 R3 K67
0x8C1C0909, // 003F GETMET R7 R4 K9
0x58240044, // 0040 LDCONST R9 K68
0x7C1C0400, // 0041 CALL R7 2
0x58200045, // 0042 LDCONST R8 K69
0x58240046, // 0043 LDCONST R9 K70
0x7C140800, // 0044 CALL R5 4
0x90022605, // 0045 SETMBR R0 K19 R5
0x88140120, // 0046 GETMBR R5 R0 K32
0x88140B47, // 0047 GETMBR R5 R5 K71
0x78160003, // 0048 JMPF R5 #004D
0x8C140948, // 0049 GETMET R5 R4 K72
0x581C0049, // 004A LDCONST R7 K73
0x7C140400, // 004B CALL R5 2
0x7416000F, // 004C JMPT R5 #005D
0x8C14054A, // 004D GETMET R5 R2 K74
0x881C0113, // 004E GETMBR R7 R0 K19
0x8C200909, // 004F GETMET R8 R4 K9
0x58280049, // 0050 LDCONST R10 K73
0x582C0046, // 0051 LDCONST R11 K70
0x7C200600, // 0052 CALL R8 3
0x8C240909, // 0053 GETMET R9 R4 K9
0x582C004B, // 0054 LDCONST R11 K75
0x58300046, // 0055 LDCONST R12 K70
0x7C240600, // 0056 CALL R9 3
0x8C280909, // 0057 GETMET R10 R4 K9
0x5830004C, // 0058 LDCONST R12 K76
0x58340046, // 0059 LDCONST R13 K70
0x7C280600, // 005A CALL R10 3
0x7C140A00, // 005B CALL R5 5
0x70020011, // 005C JMP #006F
0xB8161600, // 005D GETNGBL R5 K11
0x60180018, // 005E GETGBL R6 G24
0x581C004D, // 005F LDCONST R7 K77
0x88200113, // 0060 GETMBR R8 R0 K19
0x8C240909, // 0061 GETMET R9 R4 K9
0x582C004B, // 0062 LDCONST R11 K75
0x58300046, // 0063 LDCONST R12 K70
0x7C240600, // 0064 CALL R9 3
0x7C180600, // 0065 CALL R6 3
0x581C000D, // 0066 LDCONST R7 K13
0x7C140400, // 0067 CALL R5 2
0x8C14054A, // 0068 GETMET R5 R2 K74
0x881C0113, // 0069 GETMBR R7 R0 K19
0x8C200909, // 006A GETMET R8 R4 K9
0x5828004B, // 006B LDCONST R10 K75
0x582C0046, // 006C LDCONST R11 K70
0x7C200600, // 006D CALL R8 3
0x7C140600, // 006E CALL R5 3
0xB8121600, // 006F GETNGBL R4 K11
0x60140018, // 0070 GETGBL R5 G24
0x5818004E, // 0071 LDCONST R6 K78
0x78060001, // 0072 JMPF R1 #0075
0x581C0008, // 0073 LDCONST R7 K8
0x70020000, // 0074 JMP #0076
0x581C0012, // 0075 LDCONST R7 K18
0x78060001, // 0076 JMPF R1 #0079
0x88200111, // 0077 GETMBR R8 R0 K17
0x70020000, // 0078 JMP #007A
0x88200113, // 0079 GETMBR R8 R0 K19
0x7C140600, // 007A CALL R5 3
0x5818000D, // 007B LDCONST R6 K13
0x7C100400, // 007C CALL R4 2
0xA8040001, // 007D EXBLK 1 1
0x7002000F, // 007E JMP #008F
0xAC100002, // 007F CATCH R4 0 2
0x7002000C, // 0080 JMP #008E
0xB81A1600, // 0081 GETNGBL R6 K11
0x601C0008, // 0082 GETGBL R7 G8
0x5C200800, // 0083 MOVE R8 R4
0x7C1C0200, // 0084 CALL R7 1
0x001E2807, // 0085 ADD R7 K20 R7
0x001C0F15, // 0086 ADD R7 R7 K21
0x60200008, // 0087 GETGBL R8 G8
0x5C240A00, // 0088 MOVE R9 R5
0x7C200200, // 0089 CALL R8 1
0x001C0E08, // 008A ADD R7 R7 R8
0x58200016, // 008B LDCONST R8 K22
0x7C180400, // 008C CALL R6 2
0x70020000, // 008D JMP #008F
0xB0080000, // 008E RAISE 2 R0 R0
0x8C10014F, // 008F GETMET R4 R0 K79
0x7C100200, // 0090 CALL R4 1
0x80000000, // 0091 RET 0
0x7416001A, // 0017 JMPT R5 #0033
0xB8161600, // 0018 GETNGBL R5 K11
0x60180018, // 0019 GETGBL R6 G24
0x581C004A, // 001A LDCONST R7 K74
0x88200111, // 001B GETMBR R8 R0 K17
0x8C240909, // 001C GETMET R9 R4 K9
0x582C0049, // 001D LDCONST R11 K73
0x58300046, // 001E LDCONST R12 K70
0x7C240600, // 001F CALL R9 3
0x8C280909, // 0020 GETMET R10 R4 K9
0x5830004B, // 0021 LDCONST R12 K75
0x58340046, // 0022 LDCONST R13 K70
0x7C280600, // 0023 CALL R10 3
0x7C180800, // 0024 CALL R6 4
0x581C000D, // 0025 LDCONST R7 K13
0x7C140400, // 0026 CALL R5 2
0x8C14054C, // 0027 GETMET R5 R2 K76
0x881C0111, // 0028 GETMBR R7 R0 K17
0x8C200909, // 0029 GETMET R8 R4 K9
0x58280049, // 002A LDCONST R10 K73
0x582C0046, // 002B LDCONST R11 K70
0x7C200600, // 002C CALL R8 3
0x8C240909, // 002D GETMET R9 R4 K9
0x582C004B, // 002E LDCONST R11 K75
0x58300046, // 002F LDCONST R12 K70
0x7C240600, // 0030 CALL R9 3
0x7C140800, // 0031 CALL R5 4
0x70020011, // 0032 JMP #0045
0xB8161600, // 0033 GETNGBL R5 K11
0x60180018, // 0034 GETGBL R6 G24
0x581C004D, // 0035 LDCONST R7 K77
0x88200111, // 0036 GETMBR R8 R0 K17
0x8C240909, // 0037 GETMET R9 R4 K9
0x582C004B, // 0038 LDCONST R11 K75
0x58300046, // 0039 LDCONST R12 K70
0x7C240600, // 003A CALL R9 3
0x7C180600, // 003B CALL R6 3
0x581C000D, // 003C LDCONST R7 K13
0x7C140400, // 003D CALL R5 2
0x8C14054C, // 003E GETMET R5 R2 K76
0x881C0111, // 003F GETMBR R7 R0 K17
0x8C200909, // 0040 GETMET R8 R4 K9
0x5828004B, // 0041 LDCONST R10 K75
0x582C0046, // 0042 LDCONST R11 K70
0x7C200600, // 0043 CALL R8 3
0x7C140600, // 0044 CALL R5 3
0x7002003E, // 0045 JMP #0085
0xB8120E00, // 0046 GETNGBL R4 K7
0x8C100912, // 0047 GETMET R4 R4 K18
0x7C100200, // 0048 CALL R4 1
0x8C140743, // 0049 GETMET R5 R3 K67
0x8C1C0909, // 004A GETMET R7 R4 K9
0x58240044, // 004B LDCONST R9 K68
0x7C1C0400, // 004C CALL R7 2
0x58200045, // 004D LDCONST R8 K69
0x58240046, // 004E LDCONST R9 K70
0x7C140800, // 004F CALL R5 4
0x90022605, // 0050 SETMBR R0 K19 R5
0x88140120, // 0051 GETMBR R5 R0 K32
0x88140B47, // 0052 GETMBR R5 R5 K71
0x78160003, // 0053 JMPF R5 #0058
0x8C140948, // 0054 GETMET R5 R4 K72
0x581C0049, // 0055 LDCONST R7 K73
0x7C140400, // 0056 CALL R5 2
0x7416001A, // 0057 JMPT R5 #0073
0xB8161600, // 0058 GETNGBL R5 K11
0x60180018, // 0059 GETGBL R6 G24
0x581C004A, // 005A LDCONST R7 K74
0x88200113, // 005B GETMBR R8 R0 K19
0x8C240909, // 005C GETMET R9 R4 K9
0x582C0049, // 005D LDCONST R11 K73
0x58300046, // 005E LDCONST R12 K70
0x7C240600, // 005F CALL R9 3
0x8C280909, // 0060 GETMET R10 R4 K9
0x5830004B, // 0061 LDCONST R12 K75
0x58340046, // 0062 LDCONST R13 K70
0x7C280600, // 0063 CALL R10 3
0x7C180800, // 0064 CALL R6 4
0x581C000D, // 0065 LDCONST R7 K13
0x7C140400, // 0066 CALL R5 2
0x8C14054C, // 0067 GETMET R5 R2 K76
0x881C0113, // 0068 GETMBR R7 R0 K19
0x8C200909, // 0069 GETMET R8 R4 K9
0x58280049, // 006A LDCONST R10 K73
0x582C0046, // 006B LDCONST R11 K70
0x7C200600, // 006C CALL R8 3
0x8C240909, // 006D GETMET R9 R4 K9
0x582C004B, // 006E LDCONST R11 K75
0x58300046, // 006F LDCONST R12 K70
0x7C240600, // 0070 CALL R9 3
0x7C140800, // 0071 CALL R5 4
0x70020011, // 0072 JMP #0085
0xB8161600, // 0073 GETNGBL R5 K11
0x60180018, // 0074 GETGBL R6 G24
0x581C004D, // 0075 LDCONST R7 K77
0x88200113, // 0076 GETMBR R8 R0 K19
0x8C240909, // 0077 GETMET R9 R4 K9
0x582C004B, // 0078 LDCONST R11 K75
0x58300046, // 0079 LDCONST R12 K70
0x7C240600, // 007A CALL R9 3
0x7C180600, // 007B CALL R6 3
0x581C000D, // 007C LDCONST R7 K13
0x7C140400, // 007D CALL R5 2
0x8C14054C, // 007E GETMET R5 R2 K76
0x881C0113, // 007F GETMBR R7 R0 K19
0x8C200909, // 0080 GETMET R8 R4 K9
0x5828004B, // 0081 LDCONST R10 K75
0x582C0046, // 0082 LDCONST R11 K70
0x7C200600, // 0083 CALL R8 3
0x7C140600, // 0084 CALL R5 3
0xB8121600, // 0085 GETNGBL R4 K11
0x60140018, // 0086 GETGBL R5 G24
0x5818004E, // 0087 LDCONST R6 K78
0x78060001, // 0088 JMPF R1 #008B
0x581C0008, // 0089 LDCONST R7 K8
0x70020000, // 008A JMP #008C
0x581C0012, // 008B LDCONST R7 K18
0x78060001, // 008C JMPF R1 #008F
0x88200111, // 008D GETMBR R8 R0 K17
0x70020000, // 008E JMP #0090
0x88200113, // 008F GETMBR R8 R0 K19
0x7C140600, // 0090 CALL R5 3
0x5818000D, // 0091 LDCONST R6 K13
0x7C100400, // 0092 CALL R4 2
0xA8040001, // 0093 EXBLK 1 1
0x7002000F, // 0094 JMP #00A5
0xAC100002, // 0095 CATCH R4 0 2
0x7002000C, // 0096 JMP #00A4
0xB81A1600, // 0097 GETNGBL R6 K11
0x601C0008, // 0098 GETGBL R7 G8
0x5C200800, // 0099 MOVE R8 R4
0x7C1C0200, // 009A CALL R7 1
0x001E2807, // 009B ADD R7 K20 R7
0x001C0F15, // 009C ADD R7 R7 K21
0x60200008, // 009D GETGBL R8 G8
0x5C240A00, // 009E MOVE R9 R5
0x7C200200, // 009F CALL R8 1
0x001C0E08, // 00A0 ADD R7 R7 R8
0x58200016, // 00A1 LDCONST R8 K22
0x7C180400, // 00A2 CALL R6 2
0x70020000, // 00A3 JMP #00A5
0xB0080000, // 00A4 RAISE 2 R0 R0
0x8C10014F, // 00A5 GETMET R4 R0 K79
0x7C100200, // 00A6 CALL R4 1
0x80000000, // 00A7 RET 0
})
)
);