Allow "address_mac_from_ascii()" to parse hex 1-6 bytes (#284)

This function is used for BIP MAC, but also for DADR. Some real devices use 2-byte DADR. This can now be expressed e.g. as CA:FE
2022-05-26 04:31:32 +02:00
parent a8428a729c
commit 44d9d2c668
1 changed files with 6 additions and 14 deletions
@@ -325,21 +325,13 @@ bool address_mac_from_ascii(BACNET_MAC_ADDRESS *mac, const char *arg)
    } else {
        c = sscanf(arg, "%2x:%2x:%2x:%2x:%2x:%2x", &a[0], &a[1], &a[2], &a[3],
            &a[4], &a[5]);
-        if (c == 6) {
-            mac->adr[0] = a[0];
-            mac->adr[1] = a[1];
-            mac->adr[2] = a[2];
-            mac->adr[3] = a[3];
-            mac->adr[4] = a[4];
-            mac->adr[5] = a[5];
-            mac->len = 6;
-            status = true;
-        } else if (c == 1) {
-            if (a[0] <= 255) {
-                mac->adr[0] = a[0];
-                mac->len = 1;
-                status = true;
+
+        if (c > 0) {
+            for (int i = 0; i < c; i++) {
+                mac->adr[i] = a[i];
            }
+            mac->len = c;
+            status = true;
        }
    }