Changeset f05edcb in mainline for uspace/srv/net/dhcp/dhcp.c

Timestamp:

2021-08-08T08:28:24Z (3 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/dhcp/dhcp.c (modified) (3 diffs)

uspace/srv/net/dhcp/dhcp.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -161 +161 @@
         hdr->flags = flag_broadcast;
 
-        addr48(dlink->link_info.mac_addr, hdr->chaddr);
+        memcpy(dlink->link_info.mac_addr.b, hdr->chaddr,
+            sizeof(dlink->link_info.mac_addr.b));
         hdr->opt_magic = host2uint32_t_be(dhcp_opt_magic);
 
@@ -185 +186 @@
         hdr->flags = flag_broadcast;
         hdr->ciaddr = host2uint32_t_be(offer->oaddr.addr);
-        addr48(dlink->link_info.mac_addr, hdr->chaddr);
+        memcpy(hdr->chaddr, dlink->link_info.mac_addr.b, 6);
         hdr->opt_magic = host2uint32_t_be(dhcp_opt_magic);