Changeset f05edcb in mainline for uspace/lib/inet

Timestamp:

2021-08-08T08:28:24Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d5ed54b

Parents:

98a935e

Message:

Make addr48_t a structure

Location:

uspace/lib/inet

Files:

• include/inet/addr.h (modified) (3 diffs)
• include/inet/eth_addr.h (added)
• include/inet/iplink.h (modified) (3 diffs)
• meson.build (modified) (1 diff)
• src/addr.c (modified) (4 diffs)
• src/eth_addr.c (added)
• src/iplink.c (modified) (3 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +40 @@
 
 typedef uint32_t addr32_t;
-typedef uint8_t addr48_t[6];
+
+#define ETH_ADDR_SIZE 6
+
+typedef struct {
+        uint8_t b[ETH_ADDR_SIZE];
+} addr48_t;
+
 typedef uint8_t addr128_t[16];
 
@@ -80 +86 @@
 extern const addr48_t addr48_broadcast;
 
-extern void addr48(const addr48_t, addr48_t);
+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 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 addr48_solicited_node(const addr128_t, addr48_t *);
 
 extern void host2addr128_t_be(const addr128_t, addr128_t);

uspace/lib/inet/include/inet/iplink.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -79 +79 @@
 typedef struct iplink_ev_ops {
         errno_t (*recv)(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
-        errno_t (*change_addr)(iplink_t *, addr48_t);
+        errno_t (*change_addr)(iplink_t *, addr48_t *);
 } iplink_ev_ops_t;
 
@@ -90 +90 @@
 extern errno_t iplink_get_mtu(iplink_t *, size_t *);
 extern errno_t iplink_get_mac48(iplink_t *, addr48_t *);
-extern errno_t iplink_set_mac48(iplink_t *, addr48_t);
+extern errno_t iplink_set_mac48(iplink_t *, addr48_t *);
 extern void *iplink_get_userptr(iplink_t *);
 

uspace/lib/inet/meson.build

@@ -32 +32 @@
         'src/dnsr.c',
         'src/endpoint.c',
+        'src/eth_addr.c',
         'src/host.c',
         'src/hostname.c',

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.
@@ -72 +72 @@
 };
 
-void addr48(const addr48_t src, addr48_t dst)
-{
-        memcpy(dst, src, 6);
+void addr48(const addr48_t *src, addr48_t *dst)
+{
+        memcpy(dst, src, sizeof(addr48_t));
 }
 
@@ -86 +86 @@
  * @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;
+int addr48_compare(const addr48_t *a, const addr48_t *b)
+{
+        return memcmp(a->b, b->b, 6) == 0;
 }
 
@@ -106 +106 @@
  *
  */
-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 addr48_solicited_node(const addr128_t ip, addr48_t *mac)
+{
+        memcpy(&mac->b[0], &inet_addr48_solicited_node.b[0], 3);
+        memcpy(&mac->b[3], ip + 13, 3);
 }
 

uspace/lib/inet/src/iplink.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -175 +175 @@
 }
 
-errno_t iplink_set_mac48(iplink_t *iplink, addr48_t mac)
+errno_t iplink_set_mac48(iplink_t *iplink, addr48_t *mac)
 {
         async_exch_t *exch = async_exchange_begin(iplink->sess);
@@ -274 +274 @@
         }
 
-        rc = iplink->ev_ops->change_addr(iplink, *addr);
+        rc = iplink->ev_ops->change_addr(iplink, addr);
         free(addr);
         async_answer_0(icall, EOK);