Changes in uspace/lib/inet/src/iplink_srv.c [ec7902d:cdd6fc9] in mainline

File:

• uspace/lib/inet/src/iplink_srv.c (modified) (16 diffs)

uspace/lib/inet/src/iplink_srv.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -36 +36 @@
 
 #include <errno.h>
+#include <inet/eth_addr.h>
 #include <ipc/iplink.h>
 #include <stdlib.h>
@@ -51 +52 @@
 static void iplink_get_mac48_srv(iplink_srv_t *srv, ipc_call_t *icall)
 {
-        addr48_t mac;
+        eth_addr_t mac;
         errno_t rc = srv->ops->get_mac48(srv, &mac);
         if (rc != EOK) {
@@ -66 +67 @@
         }
 
-        if (size != sizeof(addr48_t)) {
+        if (size != sizeof(eth_addr_t)) {
                 async_answer_0(&call, EINVAL);
                 async_answer_0(icall, EINVAL);
@@ -73 +74 @@
 
         rc = async_data_read_finalize(&call, &mac, size);
-        if (rc != EOK)
-                async_answer_0(&call, rc);
+        if (rc != EOK) {
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
 
         async_answer_0(icall, rc);
@@ -83 +87 @@
         errno_t rc;
         size_t size;
-        addr48_t mac;
+        eth_addr_t mac;
 
         ipc_call_t call;
@@ -93 +97 @@
         rc = srv->ops->set_mac48(srv, &mac);
         if (rc != EOK) {
-                async_answer_0(icall, rc);
-                return;
-        }
-
-        rc = async_data_read_finalize(&call, &mac, sizeof(addr48_t));
-        if (rc != EOK)
-                async_answer_0(&call, rc);
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        rc = async_data_read_finalize(&call, &mac, sizeof(eth_addr_t));
+        if (rc != EOK) {
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
 
         async_answer_0(icall, rc);
@@ -108 +116 @@
         ipc_call_t call;
         size_t size;
+
         if (!async_data_write_receive(&call, &size)) {
                 async_answer_0(&call, EREFUSED);
@@ -125 +134 @@
                 async_answer_0(&call, rc);
                 async_answer_0(icall, rc);
+                return;
         }
 
@@ -135 +145 @@
         ipc_call_t call;
         size_t size;
+
         if (!async_data_write_receive(&call, &size)) {
                 async_answer_0(&call, EREFUSED);
@@ -152 +163 @@
                 async_answer_0(&call, rc);
                 async_answer_0(icall, rc);
+                return;
         }
 
@@ -180 +192 @@
 {
         iplink_sdu6_t sdu;
-
-        ipc_call_t call;
-        size_t size;
+        ipc_call_t call;
+        size_t size;
+
         if (!async_data_write_receive(&call, &size)) {
                 async_answer_0(&call, EREFUSED);
@@ -189 +201 @@
         }
 
-        if (size != sizeof(addr48_t)) {
+        if (size != sizeof(eth_addr_t)) {
                 async_answer_0(&call, EINVAL);
                 async_answer_0(icall, EINVAL);
@@ -322 +334 @@
 }
 
-errno_t iplink_ev_change_addr(iplink_srv_t *srv, addr48_t *addr)
+errno_t iplink_ev_change_addr(iplink_srv_t *srv, eth_addr_t *addr)
 {
         if (srv->client_sess == NULL)
@@ -332 +344 @@
         aid_t req = async_send_0(exch, IPLINK_EV_CHANGE_ADDR, &answer);
 
-        errno_t rc = async_data_write_start(exch, addr, sizeof(addr48_t));
+        errno_t rc = async_data_write_start(exch, addr, sizeof(eth_addr_t));
         async_exchange_end(exch);