Changeset 45aa22c in mainline for uspace/srv

Timestamp:

2012-03-07T23:05:42Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a88a6eac

Parents:

0e25780

Message:

Creating static addresses with inetcfg.

Location:

uspace/srv/inet

Files:

• inet.c (modified) (1 diff)
• inet_link.c (modified) (2 diffs)
• inet_link.h (modified) (2 diffs)
• inetcfg.c (modified) (3 diffs)

uspace/srv/inet/inet.c

@@ -276 +276 @@
         sysarg_t port;
 
-        log_msg(LVL_DEBUG, "inet_client_conn(%d, %d, %d)",
-        (int)IPC_GET_ARG1(*icall), (int)IPC_GET_ARG2(*icall),
-        (int)IPC_GET_ARG3(*icall));
-
         port = IPC_GET_ARG1(*icall);
 

uspace/srv/inet/inet_link.c

@@ -159 +159 @@
                 return ENOMEM;
 
+        ilink->svc_id = sid;
+
         rc = loc_service_get_name(sid, &ilink->svc_name);
         if (rc != EOK) {
@@ -260 +262 @@
 }
 
+inet_link_t *inet_link_get_by_id(sysarg_t link_id)
+{
+        fibril_mutex_lock(&inet_discovery_lock);
+
+        list_foreach(inet_link_list, elem) {
+                inet_link_t *ilink = list_get_instance(elem, inet_link_t,
+                    link_list);
+
+                if (ilink->svc_id == link_id) {
+                        fibril_mutex_unlock(&inet_discovery_lock);
+                        return ilink;
+                }
+        }
+
+        fibril_mutex_unlock(&inet_discovery_lock);
+        return NULL;
+}
 
 /** @}

uspace/srv/inet/inet_link.h

@@ -38 +38 @@
 #define INET_LINK_H_
 
+#include <sys/types.h>
 #include "inet.h"
 
@@ -43 +44 @@
 extern int inet_link_send_dgram(inet_link_t *, inet_addr_t *,
     inet_addr_t *, inet_dgram_t *, uint8_t, uint8_t, int);
+extern inet_link_t *inet_link_get_by_id(sysarg_t);
 
 #endif

uspace/srv/inet/inetcfg.c

@@ -35 +35 @@
  */
 
-#include <adt/list.h>
 #include <async.h>
 #include <errno.h>
 #include <macros.h>
-#include <fibril_synch.h>
 #include <io/log.h>
 #include <ipc/inet.h>
-#include <ipc/services.h>
 #include <loc.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
+#include "addrobj.h"
 #include "inet.h"
+#include "inet_link.h"
 #include "inetcfg.h"
 
-static int inetcfg_addr_create_static(inet_naddr_t *naddr, sysarg_t *addr_id)
-{
-        return ENOTSUP;
+static int inetcfg_addr_create_static(inet_naddr_t *naddr, sysarg_t link_id,
+    sysarg_t *addr_id)
+{
+        inet_link_t *ilink;
+        inet_addrobj_t *addr;
+        iplink_addr_t iaddr;
+        int rc;
+
+        ilink = inet_link_get_by_id(link_id);
+        if (ilink == NULL) {
+                log_msg(LVL_DEBUG, "Link %lu not found.",
+                    (unsigned long) link_id);
+                return ENOENT;
+        }
+
+        addr = inet_addrobj_new();
+        addr->naddr = *naddr;
+        addr->ilink = ilink;
+        inet_addrobj_add(addr);
+
+        iaddr.ipv4 = addr->naddr.ipv4;
+        rc = iplink_addr_add(ilink->iplink, &iaddr);
+        if (rc != EOK) {
+                log_msg(LVL_ERROR, "Failed setting IP address on internet link.");
+                inet_addrobj_remove(addr);
+                inet_addrobj_delete(addr);
+                return rc;
+        }
+
+        return EOK;
 }
 
@@ -85 +110 @@
 {
         inet_naddr_t naddr;
+        sysarg_t link_id;
         sysarg_t addr_id;
         int rc;
@@ -92 +118 @@
         naddr.ipv4 = IPC_GET_ARG1(*call);
         naddr.bits = IPC_GET_ARG2(*call);
+        link_id    = IPC_GET_ARG3(*call);
 
         addr_id = 0;
-        rc = inetcfg_addr_create_static(&naddr, &addr_id);
+        rc = inetcfg_addr_create_static(&naddr, link_id, &addr_id);
         async_answer_1(callid, rc, addr_id);
 }