Changeset 0773396 in mainline for uspace/srv/net/inetsrv/inetcfg.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/srv/net/inetsrv/inetcfg.c (modified) (14 diffs)

uspace/srv/net/inetsrv/inetcfg.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -44 +44 @@
 #include <str.h>
 #include <sys/types.h>
+#include <types/inetcfg.h>
 
 #include "addrobj.h"
@@ -151 +152 @@
 static int inetcfg_get_link_list(sysarg_t **addrs, size_t *count)
 {
-        return ENOTSUP;
+        return inet_link_get_id_list(addrs, count);
 }
 
@@ -157 +158 @@
 {
         return inet_sroute_get_id_list(sroutes, count);
+}
+
+static int inetcfg_link_add(sysarg_t link_id)
+{
+        return inet_link_open(link_id);
 }
 
@@ -170 +176 @@
         linfo->name = str_dup(ilink->svc_name);
         linfo->def_mtu = ilink->def_mtu;
+        if (ilink->mac_valid) {
+                addr48(ilink->mac, linfo->mac_addr);
+        } else {
+                memset(linfo->mac_addr, 0, sizeof(linfo->mac_addr));
+        }
+
         return EOK;
+}
+
+static int inetcfg_link_remove(sysarg_t link_id)
+{
+        return ENOTSUP;
 }
 
@@ -411 +428 @@
 {
         ipc_callid_t rcallid;
+        size_t count;
         size_t max_size;
         size_t act_size;
@@ -417 +435 @@
         int rc;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_get_link_list_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_get_addr_list_srv()");
 
         if (!async_data_read_receive(&rcallid, &max_size)) {
@@ -425 +443 @@
         }
 
-        rc = inetcfg_get_link_list(&id_buf, &act_size);
+        rc = inetcfg_get_link_list(&id_buf, &count);
         if (rc != EOK) {
                 async_answer_0(rcallid, rc);
@@ -432 +450 @@
         }
 
+        act_size = count * sizeof(sysarg_t);
         size = min(act_size, max_size);
 
@@ -474 +493 @@
 }
 
+static void inetcfg_link_add_srv(ipc_callid_t callid, ipc_call_t *call)
+{
+        sysarg_t link_id;
+        int rc;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_link_add_srv()");
+
+        link_id = IPC_GET_ARG1(*call);
+
+        rc = inetcfg_link_add(link_id);
+        async_answer_0(callid, rc);
+}
+
 static void inetcfg_link_get_srv(ipc_callid_t callid, ipc_call_t *call)
 {
-        ipc_callid_t rcallid;
-        size_t max_size;
+        ipc_callid_t name_callid;
+        ipc_callid_t laddr_callid;
+        size_t name_max_size;
+        size_t laddr_max_size;
 
         sysarg_t link_id;
@@ -488 +522 @@
         linfo.name = NULL;
 
-        if (!async_data_read_receive(&rcallid, &max_size)) {
-                async_answer_0(rcallid, EREFUSED);
+        if (!async_data_read_receive(&name_callid, &name_max_size)) {
+                async_answer_0(name_callid, EREFUSED);
+                async_answer_0(callid, EREFUSED);
+                return;
+        }
+
+        if (!async_data_read_receive(&laddr_callid, &laddr_max_size)) {
+                async_answer_0(name_callid, EREFUSED);
                 async_answer_0(callid, EREFUSED);
                 return;
@@ -496 +536 @@
         rc = inetcfg_link_get(link_id, &linfo);
         if (rc != EOK) {
-                async_answer_0(rcallid, rc);
-                async_answer_0(callid, rc);
-                return;
-        }
-
-        sysarg_t retval = async_data_read_finalize(rcallid, linfo.name,
-            min(max_size, str_size(linfo.name)));
+                async_answer_0(laddr_callid, rc);
+                async_answer_0(name_callid, rc);
+                async_answer_0(callid, rc);
+                return;
+        }
+
+        sysarg_t retval = async_data_read_finalize(name_callid, linfo.name,
+            min(name_max_size, str_size(linfo.name)));
+        if (retval != EOK) {
+                free(linfo.name);
+                async_answer_0(laddr_callid, retval);
+                async_answer_0(callid, retval);
+                return;
+        }
+
+        retval = async_data_read_finalize(laddr_callid, &linfo.mac_addr,
+            min(laddr_max_size, sizeof(linfo.mac_addr)));
+
         free(linfo.name);
 
         async_answer_1(callid, retval, linfo.def_mtu);
+}
+
+static void inetcfg_link_remove_srv(ipc_callid_t callid, ipc_call_t *call)
+{
+        sysarg_t link_id;
+        int rc;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_link_remove_srv()");
+
+        link_id = IPC_GET_ARG1(*call);
+
+        rc = inetcfg_link_remove(link_id);
+        async_answer_0(callid, rc);
 }
 
@@ -686 +750 @@
                 sysarg_t method = IPC_GET_IMETHOD(call);
 
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "method %d", (int)method);
                 if (!method) {
                         /* The other side has hung up */
@@ -714 +779 @@
                         inetcfg_get_sroute_list_srv(callid, &call);
                         break;
+                case INETCFG_LINK_ADD:
+                        inetcfg_link_add_srv(callid, &call);
+                        break;
                 case INETCFG_LINK_GET:
                         inetcfg_link_get_srv(callid, &call);
+                        break;
+                case INETCFG_LINK_REMOVE:
+                        inetcfg_link_remove_srv(callid, &call);
                         break;
                 case INETCFG_SROUTE_CREATE: