Changeset b4edc96 in mainline for uspace/lib/inet/src/addr.c

Timestamp:

2021-08-08T09:20:20Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3e6bca8

Parents:

d5ed54b

Message:

Rename and move addr48_t to eth_addr_t

File:

• uspace/lib/inet/src/addr.c (modified) (4 diffs)

uspace/lib/inet/src/addr.c

@@ -37 +37 @@
 #include <errno.h>
 #include <inet/addr.h>
+#include <inet/eth_addr.h>
 #include <stdio.h>
 #include <stddef.h>
@@ -54 +55 @@
 const addr32_t addr32_broadcast_all_hosts = 0xffffffff;
 
-const addr48_t addr48_broadcast = {
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-};
-
-static const addr48_t inet_addr48_solicited_node = {
+static const eth_addr_t inet_eth_addr_solicited_node = {
         0x33, 0x33, 0xff, 0, 0, 0
 };
@@ -77 +74 @@
 }
 
-/** 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, b->b, 6) == 0;
-}
-
 /** Compare addr128.
  *
@@ -101 +89 @@
  *
  */
-void addr48_solicited_node(const addr128_t ip, addr48_t *mac)
-{
-        memcpy(&mac->b[0], &inet_addr48_solicited_node.b[0], 3);
+void eth_addr_solicited_node(const addr128_t ip, eth_addr_t *mac)
+{
+        memcpy(&mac->b[0], &inet_eth_addr_solicited_node.b[0], 3);
         memcpy(&mac->b[3], ip + 13, 3);
 }