Changeset f05edcb in mainline for uspace/srv/net/inetsrv

Timestamp:

2021-08-08T08:28:24Z (5 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/srv/net/inetsrv

Files:

• addrobj.c (modified) (2 diffs)
• inet_link.c (modified) (7 diffs)
• inet_link.h (modified) (2 diffs)
• inetcfg.c (modified) (2 diffs)
• ndp.c (modified) (6 diffs)
• ndp.h (modified) (1 diff)
• ntrans.c (modified) (4 diffs)
• ntrans.h (modified) (1 diff)
• pdu.c (modified) (4 diffs)

uspace/srv/net/inetsrv/addrobj.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -239 +239 @@
                  * Translate local destination IPv6 address.
                  */
-                rc = ndp_translate(lsrc_v6, ldest_v6, ldest_mac, addr->ilink);
+                rc = ndp_translate(lsrc_v6, ldest_v6, &ldest_mac, addr->ilink);
                 if (rc != EOK)
                         return rc;
 
-                return inet_link_send_dgram6(addr->ilink, ldest_mac, dgram,
+                return inet_link_send_dgram6(addr->ilink, &ldest_mac, dgram,
                     proto, ttl, df);
         default:

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);
 
         /*

uspace/srv/net/inetsrv/inet_link.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -45 +45 @@
 extern errno_t inet_link_send_dgram(inet_link_t *, addr32_t,
     addr32_t, inet_dgram_t *, uint8_t, uint8_t, int);
-extern errno_t inet_link_send_dgram6(inet_link_t *, addr48_t, inet_dgram_t *,
+extern errno_t inet_link_send_dgram6(inet_link_t *, addr48_t *, inet_dgram_t *,
     uint8_t, uint8_t, int);
 extern inet_link_t *inet_link_get_by_id(sysarg_t);

uspace/srv/net/inetsrv/inetcfg.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -177 +177 @@
         linfo->def_mtu = ilink->def_mtu;
         if (ilink->mac_valid) {
-                addr48(ilink->mac, linfo->mac_addr);
+                addr48(&ilink->mac, &linfo->mac_addr);
         } else {
-                memset(linfo->mac_addr, 0, sizeof(linfo->mac_addr));
+                memset(&linfo->mac_addr, 0, sizeof(linfo->mac_addr));
         }
 

uspace/srv/net/inetsrv/ndp.c

@@ -69 +69 @@
         ndp_pdu_encode(packet, &dgram);
 
-        inet_link_send_dgram6(link, packet->target_hw_addr, &dgram,
+        inet_link_send_dgram6(link, &packet->target_hw_addr, &dgram,
             IP_PROTO_ICMPV6, INET6_HOP_LIMIT_MAX, 0);
 
@@ -108 +108 @@
                 if (laddr != NULL) {
                         rc = ntrans_add(packet.sender_proto_addr,
-                            packet.sender_hw_addr);
+                            &packet.sender_hw_addr);
                         if (rc != EOK)
                                 return rc;
@@ -115 +115 @@
 
                         reply.opcode = ICMPV6_NEIGHBOUR_ADVERTISEMENT;
-                        addr48(laddr->ilink->mac, reply.sender_hw_addr);
+                        addr48(&laddr->ilink->mac, &reply.sender_hw_addr);
                         addr128(packet.target_proto_addr, reply.sender_proto_addr);
-                        addr48(packet.sender_hw_addr, reply.target_hw_addr);
+                        addr48(&packet.sender_hw_addr, &reply.target_hw_addr);
                         addr128(packet.sender_proto_addr, reply.target_proto_addr);
 
@@ -128 +128 @@
                 if (laddr != NULL)
                         return ntrans_add(packet.sender_proto_addr,
-                            packet.sender_hw_addr);
+                            &packet.sender_hw_addr);
 
                 break;
@@ -151 +151 @@
  *
  */
-errno_t ndp_translate(addr128_t src_addr, addr128_t ip_addr, addr48_t mac_addr,
+errno_t ndp_translate(addr128_t src_addr, addr128_t ip_addr, addr48_t *mac_addr,
     inet_link_t *ilink)
 {
@@ -167 +167 @@
 
         packet.opcode = ICMPV6_NEIGHBOUR_SOLICITATION;
-        addr48(ilink->mac, packet.sender_hw_addr);
+        addr48(&ilink->mac, &packet.sender_hw_addr);
         addr128(src_addr, packet.sender_proto_addr);
         addr128(ip_addr, packet.solicited_ip);
-        addr48_solicited_node(ip_addr, packet.target_hw_addr);
+        addr48_solicited_node(ip_addr, &packet.target_hw_addr);
         ndp_solicited_node_ip(ip_addr, packet.target_proto_addr);
 

uspace/srv/net/inetsrv/ndp.h

@@ -64 +64 @@
 
 extern errno_t ndp_received(inet_dgram_t *);
-extern errno_t ndp_translate(addr128_t, addr128_t, addr48_t, inet_link_t *);
+extern errno_t ndp_translate(addr128_t, addr128_t, addr48_t *, inet_link_t *);
 
 #endif

uspace/srv/net/inetsrv/ntrans.c

@@ -73 +73 @@
  *
  */
-errno_t ntrans_add(addr128_t ip_addr, addr48_t mac_addr)
+errno_t ntrans_add(addr128_t ip_addr, addr48_t *mac_addr)
 {
         inet_ntrans_t *ntrans;
@@ -83 +83 @@
 
         addr128(ip_addr, ntrans->ip_addr);
-        addr48(mac_addr, ntrans->mac_addr);
+        addr48(mac_addr, &ntrans->mac_addr);
 
         fibril_mutex_lock(&ntrans_list_lock);
@@ -134 +134 @@
  *
  */
-errno_t ntrans_lookup(addr128_t ip_addr, addr48_t mac_addr)
+errno_t ntrans_lookup(addr128_t ip_addr, addr48_t *mac_addr)
 {
         fibril_mutex_lock(&ntrans_list_lock);
@@ -144 +144 @@
 
         fibril_mutex_unlock(&ntrans_list_lock);
-        addr48(ntrans->mac_addr, mac_addr);
+        addr48(&ntrans->mac_addr, mac_addr);
         return EOK;
 }

uspace/srv/net/inetsrv/ntrans.h

@@ -48 +48 @@
 } inet_ntrans_t;
 
-extern errno_t ntrans_add(addr128_t, addr48_t);
+extern errno_t ntrans_add(addr128_t, addr48_t *);
 extern errno_t ntrans_remove(addr128_t);
-extern errno_t ntrans_lookup(addr128_t, addr48_t);
+extern errno_t ntrans_lookup(addr128_t, addr48_t *);
 extern errno_t ntrans_wait_timeout(usec_t);
 

uspace/srv/net/inetsrv/pdu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +40 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <inet/eth_addr.h>
 #include <io/log.h>
 #include <macros.h>
@@ -504 +505 @@
 
         message->length = 1;
-        addr48(ndp->sender_hw_addr, message->mac);
+        mac48_encode(&ndp->sender_hw_addr, message->mac);
 
         icmpv6_phdr_t phdr;
@@ -552 +553 @@
 
         addr128_t_be2host(message->target_address, ndp->target_proto_addr);
-        addr48(message->mac, ndp->sender_hw_addr);
+        mac48_decode(message->mac, &ndp->sender_hw_addr);
 
         return EOK;