Added function to get the device instance number from the address cache using the MAC address.

2007-10-31 23:01:43 +00:00
parent e51d11856d
commit 801342e85b
4 changed files with 114 additions and 53 deletions
@@ -56,24 +56,30 @@ void bacnet_address_copy(BACNET_ADDRESS * dest, BACNET_ADDRESS * src)

 bool bacnet_address_same(BACNET_ADDRESS * dest, BACNET_ADDRESS * src)
 {
-    int i = 0;
-
-    if (!dest || !src)
-        return false;
-    if (dest->mac_len != src->mac_len)
-        return false;
-    for (i = 0; i < dest->mac_len; i++) {
-        if (dest->mac[i] != src->mac[i])
-            return false;
-    }
-    if (dest->net != src->net)
-        return false;
-    if (dest->len != src->len)
-        return false;
-    for (i = 0; i < dest->len; i++) {
-        if (dest->adr[i] != src->adr[i])
-            return false;
-    }
-
-    return true;
+    unsigned i;
+    unsigned max_len;
+    bool match = true;          /* return value */
+
+    if (dest->mac_len != src->mac_len)
+        match = false;
+    max_len = dest->mac_len;
+    if (max_len > MAX_MAC_LEN)
+        max_len = MAX_MAC_LEN;
+    for (i = 0; i < max_len; i++) {
+        if (dest->mac[i] != src->mac[i])
+            match = false;
+    }
+    if (dest->net != src->net)
+        match = false;
+    if (dest->len != src->len)
+        match = false;
+    max_len = dest->len;
+    if (max_len > MAX_MAC_LEN)
+        max_len = MAX_MAC_LEN;
+    for (i = 0; i < max_len; i++) {
+        if (dest->adr[i] != src->adr[i])
+            match = false;
+    }
+
+    return match;
 }