Changeset 8a9a41e in mainline for uspace/lib/inet/include/inet/addr.h

Timestamp:

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

Author:

GitHub <noreply@…>

Children:

f628215

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/include/inet/addr.h (modified) (4 diffs)

uspace/lib/inet/include/inet/addr.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef _LIBC_INET_ADDR_H_
-#define _LIBC_INET_ADDR_H_
+#ifndef LIBINET_INET_ADDR_H
+#define LIBINET_INET_ADDR_H
 
 #include <errno.h>
+#include <inet/eth_addr.h>
 #include <stdint.h>
 
 typedef uint32_t addr32_t;
-typedef uint8_t addr48_t[6];
+
 typedef uint8_t addr128_t[16];
 
@@ -78 +79 @@
 
 extern const addr32_t addr32_broadcast_all_hosts;
-extern const addr48_t addr48_broadcast;
 
-extern void addr48(const addr48_t, addr48_t);
 extern void addr128(const addr128_t, addr128_t);
 
-extern int addr48_compare(const addr48_t, const addr48_t);
 extern int addr128_compare(const addr128_t, const addr128_t);
-
-extern void addr48_solicited_node(const addr128_t, addr48_t);
+extern void eth_addr_solicited_node(const addr128_t, eth_addr_t *);
 
 extern void host2addr128_t_be(const addr128_t, addr128_t);