Changeset e2839d7 in mainline

Timestamp:

2013-09-30T20:13:39Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

26de91a

Parents:

159ad6d

Message:

Address compare functions should return non-zero on match - logic is inverted. addr128_t is big endian in host memory, so it should never be byte-swapped.

File:

• uspace/lib/c/generic/inet/addr.c (modified) (2 diffs)

uspace/lib/c/generic/inet/addr.c

@@ -79 +79 @@
 }
 
+/** Compare addr48.
+  *
+  * @return Non-zero if equal, zero if not equal.
+  */
 int addr48_compare(const addr48_t a, const addr48_t b)
 {
-        return memcmp(a, b, 6);
-}
-
+        return memcmp(a, b, 6) == 0;
+}
+
+/** Compare addr128.
+  *
+  * @return Non-zero if equal, zero if not equal.
+  */
 int addr128_compare(const addr128_t a, const addr128_t b)
 {
-        return memcmp(a, b, 16);
+        return memcmp(a, b, 16) == 0;
 }
 
@@ -103 +111 @@
 void host2addr128_t_be(const addr128_t host, addr128_t be)
 {
-#ifdef __BE__
         memcpy(be, host, 16);
-#else
-        be[0] = host[15];
-        be[1] = host[14];
-        be[2] = host[13];
-        be[3] = host[12];
-        be[4] = host[11];
-        be[5] = host[10];
-        be[6] = host[9];
-        be[7] = host[8];
-        be[8] = host[7];
-        be[9] = host[6];
-        be[10] = host[5];
-        be[11] = host[4];
-        be[12] = host[3];
-        be[13] = host[2];
-        be[14] = host[1];
-        be[15] = host[0];
-#endif
 }
 
 void addr128_t_be2host(const addr128_t be, addr128_t host)
 {
-#ifdef __BE__
         memcpy(host, be, 16);
-#else
-        host[0] = be[15];
-        host[1] = be[14];
-        host[2] = be[13];
-        host[3] = be[12];
-        host[4] = be[11];
-        host[5] = be[10];
-        host[6] = be[9];
-        host[7] = be[8];
-        host[8] = be[7];
-        host[9] = be[6];
-        host[10] = be[5];
-        host[11] = be[4];
-        host[12] = be[3];
-        host[13] = be[2];
-        host[14] = be[1];
-        host[15] = be[0];
-#endif
 }