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

Timestamp:

2021-10-24T08:28:43Z (3 years ago)

Author:

GitHub <noreply@…>

Children:

6855743

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

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

uspace/lib/inet/src/addr.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2013 Martin Decky
  * All rights reserved.
@@ -28 +28 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -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 = {
-        0x33, 0x33, 0xff, 0, 0, 0
-};
+static eth_addr_t inet_eth_addr_solicited_node =
+    ETH_ADDR_INITIALIZER(0x33, 0x33, 0xff, 0, 0, 0);
 
 static const inet_addr_t inet_addr_any_addr = {
@@ -72 +68 @@
 };
 
-void addr48(const addr48_t src, addr48_t dst)
-{
-        memcpy(dst, src, 6);
-}
-
 void addr128(const addr128_t src, addr128_t dst)
 {
         memcpy(dst, src, 16);
-}
-
-/** 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) == 0;
 }
 
@@ -106 +88 @@
  *
  */
-void addr48_solicited_node(const addr128_t ip, addr48_t mac)
-{
-        memcpy(mac, inet_addr48_solicited_node, 3);
-        memcpy(mac + 3, ip + 13, 3);
+void eth_addr_solicited_node(const addr128_t ip, eth_addr_t *mac)
+{
+        uint8_t b[6];
+        mac->a = inet_eth_addr_solicited_node.a;
+
+        eth_addr_encode(&inet_eth_addr_solicited_node, b);
+        memcpy(&b[3], ip + 13, 3);
+        eth_addr_decode(b, mac);
 }