- (bluefox) Corrected the error if MAC address cannot be determined

ioBroker · Sep 21, 2024 · 39c3782 · 39c3782
1 parent 91c8e80
commit 39c3782
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -33,6 +33,9 @@ Detect IP addresses from:
 -->
 
 ## Changelog
+### **WORK IN PROGRESS**
+-   (bluefox) Corrected the error if MAC address cannot be determined
+
 ### 1.0.6 (2024-09-21)
 -   (ChrisDietrich) Corrected the link in readme.md
 -   (bluefox) Corrected the Big-Endian PCAP format

diff --git a/admin/custom/customComponents.js b/admin/custom/customComponents.js
diff --git a/admin/custom/static/js/main.087c865d.js → admin/custom/static/js/main.4b2b1a84.js b/admin/custom/static/js/main.087c865d.js → admin/custom/static/js/main.4b2b1a84.js
diff --git a/...omInstancesSelector_jsx.6dc46b6a.chunk.js → ...omInstancesSelector_jsx.41b1dc76.chunk.js b/...omInstancesSelector_jsx.6dc46b6a.chunk.js → ...omInstancesSelector_jsx.41b1dc76.chunk.js
diff --git a/build/lib/recording.js b/build/lib/recording.js
diff --git a/src-admin/src/ConfigCustomInstancesSelector.jsx b/src-admin/src/ConfigCustomInstancesSelector.jsx
@@ -703,15 +703,26 @@ class ConfigCustomInstancesSelector extends ConfigGeneric {
                                             const _devices = [
                                                 ...(ConfigGeneric.getValue(this.props.data, 'devices') || []),
                                             ];
-                                            const pos = _devices.findIndex(item => item.ip === row.ip);
+                                            const pos = _devices.findIndex(item => item.uuid === row.uuid);
                                             if (pos === -1) {
-                                                _devices.push({
-                                                    ip: row.ip,
-                                                    mac: row.mac,
-                                                    desc: row.desc,
-                                                    enabled: true,
-                                                    uuid: row.uuid,
-                                                });
+                                                // check if maybe the device with this IP already exists
+                                                const posIp = _devices.findIndex(item => item.ip === row.ip);
+                                                if (posIp !== -1) {
+                                                    // Modify ips list
+                                                    const ips = JSON.parse(JSON.stringify(this.state.ips));
+                                                    const ipsItem = ips.find(item => item.uuid === row.uuid);
+                                                    ipsItem.uuid = _devices[posIp].uuid;
+                                                    _devices[posIp].enabled = true;
+                                                    this.setState({ ips }, () => this.onChange('devices', _devices));
+                                                } else {
+                                                    _devices.push({
+                                                        ip: row.ip,
+                                                        mac: row.mac,
+                                                        desc: row.desc,
+                                                        enabled: true,
+                                                        uuid: row.uuid,
+                                                    });
+                                                }
                                             } else {
                                                 _devices.splice(pos, 1);
                                             }

diff --git a/src/lib/recording.ts b/src/lib/recording.ts
@@ -177,7 +177,7 @@ export async function stopAllRecordingsOnFritzBox(ip: string, sid: string): Prom
 }
 
 export function getRecordURL(ip: string, sid: string, iface: string, MACs: string[]): string {
-    const filter = MACs.length ? `ether host ${MACs.join(' || ')}` : '';
+    const filter = MACs.filter(m => m?.trim()).length ? `ether host ${MACs.filter(m => m?.trim()).join(' || ')}` : '';
 
     return `http://${ip.trim()}/cgi-bin/capture_notimeout?ifaceorminor=${encodeURIComponent(iface.trim())}&snaplen=${MAX_PACKET_LENGTH}${filter ? `&filter=${encodeURIComponent(filter)}` : ''}&capture=Start&sid=${sid}`;
 }