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

Timestamp:

2021-08-08T09:20:20Z (3 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/srv/net/inetsrv/inet_link.c (modified) (6 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -35 +35 @@
  */
 
-#include <stdbool.h>
 #include <errno.h>
-#include <str_error.h>
 #include <fibril_synch.h>
+#include <inet/eth_addr.h>
 #include <inet/iplink.h>
 #include <io/log.h>
 #include <loc.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <str.h>
+#include <str_error.h>
 #include "addrobj.h"
 #include "inetsrv.h"
@@ -56 +57 @@
 
 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 *, eth_addr_t *);
 static inet_link_t *inet_link_get_by_id_locked(sysarg_t);
 
@@ -70 +71 @@
     { 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(eth_addr_t *mac_addr,
     addr128_t ip_addr)
 {
@@ -121 +122 @@
 }
 
-static errno_t inet_iplink_change_addr(iplink_t *iplink, addr48_t *mac)
+static errno_t inet_iplink_change_addr(iplink_t *iplink, eth_addr_t *mac)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_change_addr(): "
@@ -129 +130 @@
         list_foreach(inet_links, link_list, inet_link_t, ilink) {
                 if (ilink->sess == iplink->sess)
-                        memcpy(&ilink->mac, mac, sizeof(addr48_t));
+                        ilink->mac = *mac;
         }
 
@@ -387 +388 @@
  *
  */
-errno_t inet_link_send_dgram6(inet_link_t *ilink, addr48_t *ldest,
+errno_t inet_link_send_dgram6(inet_link_t *ilink, eth_addr_t *ldest,
     inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
 {