Changeset f05edcb in mainline for uspace/srv/net/inetsrv/inet_link.c

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

File:

• uspace/srv/net/inetsrv/inet_link.c (modified) (7 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -56 +56 @@
 
 static errno_t inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
-static errno_t inet_iplink_change_addr(iplink_t *, addr48_t);
+static errno_t inet_iplink_change_addr(iplink_t *, addr48_t *);
 static inet_link_t *inet_link_get_by_id_locked(sysarg_t);
 
@@ -70 +70 @@
     { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xfe, 0, 0, 0 };
 
-static void inet_link_local_node_ip(addr48_t mac_addr,
+static void inet_link_local_node_ip(addr48_t *mac_addr,
     addr128_t ip_addr)
 {
         memcpy(ip_addr, link_local_node_ip, 16);
 
-        ip_addr[8] = mac_addr[0] ^ 0x02;
-        ip_addr[9] = mac_addr[1];
-        ip_addr[10] = mac_addr[2];
-        ip_addr[13] = mac_addr[3];
-        ip_addr[14] = mac_addr[4];
-        ip_addr[15] = mac_addr[5];
+        ip_addr[8] = mac_addr->b[0] ^ 0x02;
+        ip_addr[9] = mac_addr->b[1];
+        ip_addr[10] = mac_addr->b[2];
+        ip_addr[13] = mac_addr->b[3];
+        ip_addr[14] = mac_addr->b[4];
+        ip_addr[15] = mac_addr->b[5];
 }
 
@@ -121 +121 @@
 }
 
-static errno_t inet_iplink_change_addr(iplink_t *iplink, addr48_t mac)
+static errno_t inet_iplink_change_addr(iplink_t *iplink, addr48_t *mac)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_change_addr(): "
             "new addr=%02x:%02x:%02x:%02x:%02x:%02x",
-            mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+            mac->b[0], mac->b[1], mac->b[2], mac->b[3], mac->b[4], mac->b[5]);
 
         list_foreach(inet_links, link_list, inet_link_t, ilink) {
@@ -261 +261 @@
 
                 addr128_t link_local;
-                inet_link_local_node_ip(ilink->mac, link_local);
+                inet_link_local_node_ip(&ilink->mac, link_local);
 
                 inet_naddr_set6(link_local, 64, &addr6->naddr);
@@ -387 +387 @@
  *
  */
-errno_t inet_link_send_dgram6(inet_link_t *ilink, addr48_t ldest,
+errno_t inet_link_send_dgram6(inet_link_t *ilink, addr48_t *ldest,
     inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
 {
@@ -401 +401 @@
 
         iplink_sdu6_t sdu6;
-        addr48(ldest, sdu6.dest);
+        addr48(ldest, &sdu6.dest);
 
         /*