Changeset 0e25780 in mainline

Timestamp:

2012-03-07T21:01:10Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45aa22c

Parents:

3d016ac

Message:

Inetcfg skeleton.

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/inetcfg/Makefile (added)
• uspace/app/inetcfg/inetcfg.c (added)
• uspace/lib/c/Makefile (modified) (1 diff)
• uspace/lib/c/generic/inetcfg.c (added)
• uspace/lib/c/include/inet/inetcfg.h (added)
• uspace/lib/c/include/ipc/inet.h (modified) (2 diffs)
• uspace/lib/c/include/ipc/services.h (modified) (1 diff)
• uspace/srv/inet/Makefile (modified) (1 diff)
• uspace/srv/inet/inet.c (modified) (4 diffs)
• uspace/srv/inet/inet.h (modified) (1 diff)
• uspace/srv/inet/inetcfg.c (added)
• uspace/srv/inet/inetcfg.h (added)

boot/Makefile.common

@@ -156 +156 @@
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/ext2info/ext2info \
+        $(USPACE_PATH)/app/inetcfg/inetcfg \
         $(USPACE_PATH)/app/kill/kill \
         $(USPACE_PATH)/app/killall/killall \

uspace/Makefile

@@ -42 +42 @@
         app/getterm \
         app/init \
+        app/inetcfg \
         app/kill \
         app/killall \

uspace/lib/c/Makefile

@@ -88 +88 @@
         generic/futex.c \
         generic/inet.c \
+        generic/inetcfg.c \
         generic/io/asprintf.c \
         generic/io/io.c \

uspace/lib/c/include/ipc/inet.h

@@ -38 +38 @@
 #include <ipc/common.h>
 
+/** Inet ports */
+typedef enum {
+        /** Default port */
+        INET_PORT_DEFAULT = 1,
+        /** Configuration port */
+        INET_PORT_CFG
+} inet_port_t;
+
+/** Requests on Inet default port */
 typedef enum {
         INET_CALLBACK_CREATE = IPC_FIRST_USER_METHOD,
@@ -45 +54 @@
 } inet_request_t;
 
+/** Events on Inet default port */
 typedef enum {
         INET_EV_RECV = IPC_FIRST_USER_METHOD
 } inet_event_t;
+
+/** Requests on Inet configuration port */
+typedef enum {
+        INETCFG_ADDR_CREATE_STATIC = IPC_FIRST_USER_METHOD,
+        INETCFG_ADDR_DELETE,
+        INETCFG_ADDR_GET,
+        INETCFG_GET_ADDR_LIST,
+        INETCFG_GET_LINK_LIST,
+        INETCFG_LINK_GET,
+} inetcfg_request_t;
 
 #endif

uspace/lib/c/include/ipc/services.h

@@ -52 +52 @@
 } services_t;
 
-#define SERVICE_NAME_INET "net/inet"
+#define SERVICE_NAME_INET    "net/inet"
+#define SERVICE_NAME_INETCFG "net/inetcfg"
 
 #endif

uspace/srv/inet/Makefile

@@ -34 +34 @@
         inet.c \
         inet_link.c \
+        inetcfg.c \
         pdu.c
 

uspace/srv/inet/inet.c

@@ -49 +49 @@
 #include "addrobj.h"
 #include "inet.h"
+#include "inetcfg.h"
 #include "inet_link.h"
 
@@ -73 +74 @@
         }
 
-        rc = loc_service_register(SERVICE_NAME_INET, &sid);
+        rc = loc_service_register_with_iface(SERVICE_NAME_INET, &sid,
+            INET_PORT_DEFAULT);
+        if (rc != EOK) {
+                log_msg(LVL_ERROR, "Failed registering service (%d).", rc);
+                return EEXIST;
+        }
+
+        rc = loc_service_register_with_iface(SERVICE_NAME_INETCFG, &sid,
+            INET_PORT_CFG);
         if (rc != EOK) {
                 log_msg(LVL_ERROR, "Failed registering service (%d).", rc);
@@ -220 +229 @@
 }
 
-static void inet_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void inet_default_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         inet_client_t client;
 
-        log_msg(LVL_DEBUG, "inet_client_conn()");
+        log_msg(LVL_DEBUG, "inet_default_conn()");
 
         /* Accept the connection */
@@ -263 +272 @@
 }
 
+static void inet_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        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);
+
+        switch (port) {
+        case INET_PORT_DEFAULT:
+                inet_default_conn(iid, icall, arg);
+                break;
+        case INET_PORT_CFG:
+                inet_cfg_conn(iid, icall, arg);
+                break;
+        default:
+                printf("uknown port number %d\n", port);
+                async_answer_0(iid, ENOTSUP);
+                break;
+        }
+}
+
 static inet_client_t *inet_client_find(uint8_t proto)
 {

uspace/srv/inet/inet.h

@@ -64 +64 @@
 } inet_naddr_t;
 
+/** Address object info */
+typedef struct {
+        /** Network address */
+        inet_naddr_t naddr;
+} inet_addr_info_t;
+
+/** IP link info */
+typedef struct {
+        int dummy;
+} inet_link_info_t;
+
 typedef struct {
         inet_addr_t src;