Changeset 7719958 in mainline for uspace/lib/c

Timestamp:

2012-04-23T22:51:36Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6a3808e

Parents:

3293a94 (diff), 32fef47 (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

Location:

uspace/lib/c

Files:

• Makefile (modified) (4 diffs)
• generic/adt/measured_strings.c (deleted)
• generic/async.c (modified) (22 diffs)
• generic/device/nic.c (modified) (2 diffs)
• generic/devman.c (modified) (8 diffs)
• generic/fibril_synch.c (modified) (4 diffs)
• generic/inet.c (added)
• generic/inetcfg.c (added)
• generic/inetping.c (added)
• generic/io/printf_core.c (modified) (2 diffs)
• generic/ipc.c (modified) (1 diff)
• generic/iplink.c (added)
• generic/iplink_srv.c (added)
• generic/loader.c (modified) (5 diffs)
• generic/loc.c (modified) (9 diffs)
• generic/net/icmp_api.c (deleted)
• generic/net/modules.c (modified) (2 diffs)
• generic/net/packet.c (deleted)
• generic/private/async.h (modified) (1 diff)
• include/async.h (modified) (2 diffs)
• include/inet/inet.h (moved) (moved from uspace/lib/net/include/net_hardware.h ) (3 diffs)
• include/inet/inetcfg.h (added)
• include/inet/inetping.h (moved) (moved from uspace/lib/c/generic/net/icmp_common.c ) (2 diffs)
• include/inet/iplink.h (moved) (moved from uspace/lib/net/include/il_remote.h ) (2 diffs)
• include/inet/iplink_srv.h (moved) (moved from uspace/lib/c/include/adt/measured_strings.h ) (2 diffs)
• include/ipc/icmp.h (deleted)
• include/ipc/il.h (deleted)
• include/ipc/inet.h (moved) (moved from uspace/srv/net/net/packet_server.h ) (2 diffs)
• include/ipc/ip.h (deleted)
• include/ipc/ipc.h (modified) (1 diff)
• include/ipc/iplink.h (moved) (moved from uspace/lib/c/include/ipc/tl.h ) (2 diffs)
• include/ipc/net.h (deleted)
• include/ipc/net_net.h (deleted)
• include/ipc/netif.h (deleted)
• include/ipc/nil.h (deleted)
• include/ipc/packet.h (deleted)
• include/ipc/services.h (modified) (1 diff)
• include/ipc/socket.h (modified) (1 diff)
• include/net/icmp_codes.h (deleted)
• include/net/in.h (modified) (1 diff)
• include/net/modules.h (modified) (1 diff)
• include/net/packet.h (deleted)
• include/net/packet_header.h (deleted)

uspace/lib/c/Makefile

@@ -88 +88 @@
         generic/task.c \
         generic/futex.c \
+        generic/inet.c \
+        generic/inetcfg.c \
+        generic/inetping.c \
         generic/io/asprintf.c \
         generic/io/io.c \
@@ -98 +101 @@
         generic/io/printf_core.c \
         generic/io/console.c \
+        generic/iplink.c \
+        generic/iplink_srv.c \
         generic/malloc.c \
         generic/sysinfo.c \
@@ -109 +114 @@
         generic/adt/hash_set.c \
         generic/adt/dynamic_fifo.c \
-        generic/adt/measured_strings.c \
         generic/adt/char_map.c \
         generic/adt/prodcons.c \
@@ -119 +123 @@
         generic/vfs/canonify.c \
         generic/net/inet.c \
-        generic/net/icmp_common.c \
-        generic/net/icmp_api.c \
         generic/net/modules.c \
-        generic/net/packet.c \
         generic/net/socket_client.c \
         generic/net/socket_parse.c \

uspace/lib/c/generic/async.c

@@ -189 +189 @@
         /** If reply was received. */
         bool done;
+
+        /** If the message / reply should be discarded on arrival. */
+        bool forget;
+
+        /** If already destroyed. */
+        bool destroyed;
         
         /** Pointer to where the answer data is stored. */
@@ -240 +246 @@
 /** Identifier of the incoming connection handled by the current fibril. */
 static fibril_local connection_t *fibril_connection;
+
+static void to_event_initialize(to_event_t *to)
+{
+        struct timeval tv = { 0, 0 };
+
+        to->inlist = false;
+        to->occurred = false;
+        link_initialize(&to->link);
+        to->expires = tv;
+}
+
+static void wu_event_initialize(wu_event_t *wu)
+{
+        wu->inlist = false;
+        link_initialize(&wu->link);
+}
+
+void awaiter_initialize(awaiter_t *aw)
+{
+        aw->fid = 0;
+        aw->active = false;
+        to_event_initialize(&aw->to_event);
+        wu_event_initialize(&aw->wu_event);
+}
+
+static amsg_t *amsg_create(void)
+{
+        amsg_t *msg;
+
+        msg = malloc(sizeof(amsg_t));
+        if (msg) {
+                msg->done = false;
+                msg->forget = false;
+                msg->destroyed = false;
+                msg->dataptr = NULL;
+                msg->retval = (sysarg_t) EINVAL;
+                awaiter_initialize(&msg->wdata);
+        }
+
+        return msg;
+}
+
+static void amsg_destroy(amsg_t *msg)
+{
+        assert(!msg->destroyed);
+        msg->destroyed = true;
+        free(msg);
+}
 
 static void *default_client_data_constructor(void)
@@ -892 +946 @@
         
         switch (IPC_GET_IMETHOD(*call)) {
-        case IPC_M_CONNECT_ME:
+        case IPC_M_CLONE_ESTABLISH:
         case IPC_M_CONNECT_ME_TO:
                 /* Open new connection with fibril, etc. */
@@ -963 +1017 @@
                 
                 suseconds_t timeout;
+                unsigned int flags = SYNCH_FLAGS_NONE;
                 if (!list_empty(&timeout_list)) {
                         awaiter_t *waiter = list_get_instance(
@@ -973 +1028 @@
                                 futex_up(&async_futex);
                                 handle_expired_timeouts();
-                                continue;
-                        } else
+                                /*
+                                 * Notice that even if the event(s) already
+                                 * expired (and thus the other fibril was
+                                 * supposed to be running already),
+                                 * we check for incoming IPC.
+                                 *
+                                 * Otherwise, a fibril that continuously
+                                 * creates (almost) expired events could
+                                 * prevent IPC retrieval from the kernel.
+                                 */
+                                timeout = 0;
+                                flags = SYNCH_FLAGS_NON_BLOCKING;
+
+                        } else {
                                 timeout = tv_sub(&waiter->to_event.expires, &tv);
-                } else
+                                futex_up(&async_futex);
+                        }
+                } else {
+                        futex_up(&async_futex);
                         timeout = SYNCH_NO_TIMEOUT;
-                
-                futex_up(&async_futex);
+                }
                 
                 atomic_inc(&threads_in_ipc_wait);
                 
                 ipc_call_t call;
-                ipc_callid_t callid = ipc_wait_cycle(&call, timeout,
-                    SYNCH_FLAGS_NONE);
+                ipc_callid_t callid = ipc_wait_cycle(&call, timeout, flags);
                 
                 atomic_dec(&threads_in_ipc_wait);
@@ -1100 +1168 @@
         
         msg->done = true;
-        if (!msg->wdata.active) {
+
+        if (msg->forget) {
+                assert(msg->wdata.active);
+                amsg_destroy(msg);
+        } else if (!msg->wdata.active) {
                 msg->wdata.active = true;
                 fibril_add_ready(msg->wdata.fid);
         }
-        
+
         futex_up(&async_futex);
 }
@@ -1131 +1203 @@
                 return 0;
         
-        amsg_t *msg = malloc(sizeof(amsg_t));
+        amsg_t *msg = amsg_create();
         if (msg == NULL)
                 return 0;
         
-        msg->done = false;
         msg->dataptr = dataptr;
-        
-        msg->wdata.to_event.inlist = false;
-        
-        /*
-         * We may sleep in the next method,
-         * but it will use its own means
-         */
         msg->wdata.active = true;
         
@@ -1177 +1241 @@
                 return 0;
         
-        amsg_t *msg = malloc(sizeof(amsg_t));
-        
+        amsg_t *msg = amsg_create();
         if (msg == NULL)
                 return 0;
         
-        msg->done = false;
         msg->dataptr = dataptr;
-        
-        msg->wdata.to_event.inlist = false;
-        
-        /*
-         * We may sleep in the next method,
-         * but it will use its own means
-         */
         msg->wdata.active = true;
         
@@ -1213 +1268 @@
         
         futex_down(&async_futex);
+
+        assert(!msg->forget);
+        assert(!msg->destroyed);
+
         if (msg->done) {
                 futex_up(&async_futex);
@@ -1231 +1290 @@
                 *retval = msg->retval;
         
-        free(msg);
+        amsg_destroy(msg);
 }
 
 /** Wait for a message sent by the async framework, timeout variant.
+ *
+ * If the wait times out, the caller may choose to either wait again by calling
+ * async_wait_for() or async_wait_timeout(), or forget the message via
+ * async_forget().
  *
  * @param amsgid  Hash of the message to wait for.
@@ -1249 +1312 @@
         
         amsg_t *msg = (amsg_t *) amsgid;
-        
-        /* TODO: Let it go through the event read at least once */
-        if (timeout < 0)
-                return ETIMEOUT;
-        
+
         futex_down(&async_futex);
+
+        assert(!msg->forget);
+        assert(!msg->destroyed);
+
         if (msg->done) {
                 futex_up(&async_futex);
@@ -1260 +1323 @@
         }
         
+        /*
+         * Negative timeout is converted to zero timeout to avoid
+         * using tv_add with negative augmenter.
+         */
+        if (timeout < 0)
+                timeout = 0;
+
         gettimeofday(&msg->wdata.to_event.expires, NULL);
         tv_add(&msg->wdata.to_event.expires, timeout);
         
+        /*
+         * Current fibril is inserted as waiting regardless of the
+         * "size" of the timeout.
+         *
+         * Checking for msg->done and immediately bailing out when
+         * timeout == 0 would mean that the manager fibril would never
+         * run (consider single threaded program).
+         * Thus the IPC answer would be never retrieved from the kernel.
+         *
+         * Notice that the actual delay would be very small because we
+         * - switch to manager fibril
+         * - the manager sees expired timeout
+         * - and thus adds us back to ready queue
+         * - manager switches back to some ready fibril
+         *   (prior it, it checks for incoming IPC).
+         *
+         */
         msg->wdata.fid = fibril_get_id();
         msg->wdata.active = false;
@@ -1279 +1366 @@
                 *retval = msg->retval;
         
-        free(msg);
+        amsg_destroy(msg);
         
         return 0;
 }
+ 
+/** Discard the message / reply on arrival.
+ *
+ * The message will be marked to be discarded once the reply arrives in
+ * reply_received(). It is not allowed to call async_wait_for() or
+ * async_wait_timeout() on this message after a call to this function.
+ *
+ * @param amsgid  Hash of the message to forget.
+ */
+void async_forget(aid_t amsgid)
+{
+        amsg_t *msg = (amsg_t *) amsgid;
+
+        assert(msg);
+        assert(!msg->forget);
+        assert(!msg->destroyed);
+
+        futex_down(&async_futex);
+        if (msg->done)
+                amsg_destroy(msg);
+        else 
+                msg->forget = true;
+        futex_up(&async_futex);
+}
 
 /** Wait for specified time.
@@ -1293 +1404 @@
 void async_usleep(suseconds_t timeout)
 {
-        amsg_t *msg = malloc(sizeof(amsg_t));
-        
+        amsg_t *msg = amsg_create();
         if (!msg)
                 return;
         
         msg->wdata.fid = fibril_get_id();
-        msg->wdata.active = false;
         
         gettimeofday(&msg->wdata.to_event.expires, NULL);
@@ -1313 +1422 @@
         /* Futex is up automatically after fibril_switch() */
         
-        free(msg);
+        amsg_destroy(msg);
 }
 
@@ -1559 +1668 @@
 }
 
-/** Wrapper for making IPC_M_CONNECT_ME calls using the async framework.
- *
- * Ask through for a cloned connection to some service.
+/** Wrapper for making IPC_M_CLONE_ESTABLISH calls using the async framework.
+ *
+ * Ask for a cloned connection to some service.
  *
  * @param mgmt Exchange management style.
@@ -1569 +1678 @@
  *
  */
-async_sess_t *async_connect_me(exch_mgmt_t mgmt, async_exch_t *exch)
+async_sess_t *async_clone_establish(exch_mgmt_t mgmt, async_exch_t *exch)
 {
         if (exch == NULL) {
@@ -1584 +1693 @@
         ipc_call_t result;
         
-        amsg_t *msg = malloc(sizeof(amsg_t));
-        if (msg == NULL) {
+        amsg_t *msg = amsg_create();
+        if (!msg) {
                 free(sess);
                 errno = ENOMEM;
@@ -1591 +1700 @@
         }
         
-        msg->done = false;
         msg->dataptr = &result;
-        
-        msg->wdata.to_event.inlist = false;
-        
-        /*
-         * We may sleep in the next method,
-         * but it will use its own means
-         */
         msg->wdata.active = true;
         
-        ipc_call_async_0(exch->phone, IPC_M_CONNECT_ME, msg,
+        ipc_call_async_0(exch->phone, IPC_M_CLONE_ESTABLISH, msg,
             reply_received, true);
         
@@ -1643 +1744 @@
         ipc_call_t result;
         
-        amsg_t *msg = malloc(sizeof(amsg_t));
-        if (msg == NULL)
+        amsg_t *msg = amsg_create();
+        if (!msg)
                 return ENOENT;
         
-        msg->done = false;
         msg->dataptr = &result;
-        
-        msg->wdata.to_event.inlist = false;
-        
-        /*
-         * We may sleep in the next method,
-         * but it will use its own means
-         */
         msg->wdata.active = true;
         
@@ -2251 +2344 @@
             IPC_FF_ROUTE_FROM_ME);
         if (retval != EOK) {
-                async_wait_for(msg, NULL);
+                async_forget(msg);
                 ipc_answer_0(callid, retval);
                 return retval;
@@ -2445 +2538 @@
             IPC_FF_ROUTE_FROM_ME);
         if (retval != EOK) {
-                async_wait_for(msg, NULL);
+                async_forget(msg);
                 ipc_answer_0(callid, retval);
                 return retval;

uspace/lib/c/generic/device/nic.c

@@ -65 +65 @@
         
         if (retval != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return retval;
         }
@@ -94 +94 @@
         rc = async_connect_to_me(exch, 0, 0, 0, cfun, carg);
         if (rc != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return rc;
         }

uspace/lib/c/generic/devman.c

@@ -188 +188 @@
         
         if (retval != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return retval;
         }
@@ -226 +226 @@
         if (retval != EOK) {
                 devman_exchange_end(exch);
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return retval;
         }
@@ -242 +242 @@
                 if (retval != EOK) {
                         devman_exchange_end(exch);
-                        async_wait_for(req2, NULL);
-                        async_wait_for(req, NULL);
+                        async_forget(req2);
+                        async_forget(req);
                         return retval;
                 }
@@ -250 +250 @@
                 if (retval != EOK) {
                         devman_exchange_end(exch);
-                        async_wait_for(req, NULL);
+                        async_forget(req);
                         return retval;
                 }
@@ -283 +283 @@
         
         if (retval != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return retval;
         }
@@ -386 +386 @@
         
         if (retval != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return retval;
         }
@@ -423 +423 @@
         
         if (dretval != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return dretval;
         }
@@ -488 +488 @@
         
         if (rc != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return rc;
         }

uspace/lib/c/generic/fibril_synch.c

@@ -112 +112 @@
                 awaiter_t wdata;
 
+                awaiter_initialize(&wdata);
                 wdata.fid = fibril_get_id();
-                wdata.active = false;
                 wdata.wu_event.inlist = true;
-                link_initialize(&wdata.wu_event.link);
                 list_append(&wdata.wu_event.link, &fm->waiters);
                 check_for_deadlock(&fm->oi);
@@ -205 +204 @@
                 awaiter_t wdata;
 
+                awaiter_initialize(&wdata);
                 wdata.fid = (fid_t) f;
-                wdata.active = false;
                 wdata.wu_event.inlist = true;
-                link_initialize(&wdata.wu_event.link);
                 f->flags &= ~FIBRIL_WRITER;
                 list_append(&wdata.wu_event.link, &frw->waiters);
@@ -233 +231 @@
                 awaiter_t wdata;
 
+                awaiter_initialize(&wdata);
                 wdata.fid = (fid_t) f;
-                wdata.active = false;
                 wdata.wu_event.inlist = true;
-                link_initialize(&wdata.wu_event.link);
                 f->flags |= FIBRIL_WRITER;
                 list_append(&wdata.wu_event.link, &frw->waiters);
@@ -375 +372 @@
                 return ETIMEOUT;
 
+        awaiter_initialize(&wdata);
         wdata.fid = fibril_get_id();
-        wdata.active = false;
-        
         wdata.to_event.inlist = timeout > 0;
-        wdata.to_event.occurred = false;
-        link_initialize(&wdata.to_event.link);
-
         wdata.wu_event.inlist = true;
-        link_initialize(&wdata.wu_event.link);
 
         futex_down(&async_futex);

uspace/lib/c/generic/io/printf_core.c

@@ -283 +283 @@
         /* Print leading spaces. */
         size_t strw = str_length(str);
-        if (precision == 0)
+        if ((precision == 0) || (precision > strw))
                 precision = strw;
         
@@ -331 +331 @@
         /* Print leading spaces. */
         size_t strw = wstr_length(str);
-        if (precision == 0)
+        if ((precision == 0) || (precision > strw))
                 precision = strw;
         

uspace/lib/c/generic/ipc.c

@@ -647 +647 @@
  *
  */
-int ipc_connect_me(int phoneid)
+int ipc_clone_establish(int phoneid)
 {
         sysarg_t newphid;
-        int res = ipc_call_sync_0_5(phoneid, IPC_M_CONNECT_ME, NULL, NULL,
-            NULL, NULL, &newphid);
+        int res = ipc_call_sync_0_5(phoneid, IPC_M_CLONE_ESTABLISH, NULL,
+            NULL, NULL, NULL, &newphid);
         if (res)
                 return res;

uspace/lib/c/generic/loader.c

@@ -101 +101 @@
         
         if (rc != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return (int) rc;
         }
@@ -139 +139 @@
         
         if (rc != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return (int) rc;
         }
@@ -177 +177 @@
         
         if (rc != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return (int) rc;
         }
@@ -236 +236 @@
         
         if (rc != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return (int) rc;
         }
@@ -281 +281 @@
 
         if (rc != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return (int) rc;
         }

uspace/lib/c/generic/loc.c

@@ -246 +246 @@
         
         if (retval != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return retval;
         }
@@ -285 +285 @@
         
         if (retval != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return retval;
         }
@@ -352 +352 @@
         
         if (retval != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return retval;
         }
@@ -401 +401 @@
         
         if (dretval != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return dretval;
         }
@@ -471 +471 @@
         
         if (retval != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return retval;
         }
@@ -520 +520 @@
         
         if (retval != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return retval;
         }
@@ -683 +683 @@
                 
                 if (rc != EOK) {
-                        async_wait_for(req, NULL);
+                        async_forget(req);
                         free(devs);
                         return 0;
@@ -732 +732 @@
                 
                 if (rc != EOK) {
-                        async_wait_for(req, NULL);
+                        async_forget(req);
                         free(devs);
                         return 0;
@@ -760 +760 @@
         
         if (rc != EOK) {
-                async_wait_for(req, NULL);
+                async_forget(req);
                 return rc;
         }

uspace/lib/c/generic/net/modules.c

@@ -93 +93 @@
 }
 
+/** Connect to the needed module.
+ *
+ * @param[in] need Needed module service.
+ *
+ * @return Session to the needed service.
+ * @return NULL if the connection timeouted.
+ *
+ */
+static async_sess_t *connect_to_service(services_t need)
+{
+        return service_connect_blocking(EXCHANGE_SERIALIZE, need, 0, 0);
+}
+
 /** Create bidirectional connection with the needed module service and register
  * the message receiver.
@@ -129 +142 @@
 }
 
-/** Connect to the needed module.
- *
- * @param[in] need Needed module service.
- *
- * @return Session to the needed service.
- * @return NULL if the connection timeouted.
- *
- */
-async_sess_t *connect_to_service(services_t need)
-{
-        return service_connect_blocking(EXCHANGE_SERIALIZE, need, 0, 0);
-}
-
-/** Reply the data to the other party.
- *
- * @param[in] data        The data buffer to be sent.
- * @param[in] data_length The buffer length.
- *
- * @return EOK on success.
- * @return EINVAL if the client does not expect the data.
- * @return EOVERFLOW if the client does not expect all the data.
- *         Only partial data are transfered.
- * @return Other error codes as defined for the
- *         async_data_read_finalize() function.
- *
- */
-int data_reply(void *data, size_t data_length)
-{
-        size_t length;
-        ipc_callid_t callid;
-        
-        /* Fetch the request */
-        if (!async_data_read_receive(&callid, &length))
-                return EINVAL;
-        
-        /* Check the requested data size */
-        if (length < data_length) {
-                async_data_read_finalize(callid, data, length);
-                return EOVERFLOW;
-        }
-        
-        /* Send the data */
-        return async_data_read_finalize(callid, data, data_length);
-}
-
 /** Refresh answer structure and argument count.
  *

uspace/lib/c/generic/private/async.h

@@ -81 +81 @@
 } awaiter_t;
 
+extern void awaiter_initialize(awaiter_t *);
+
 extern void __async_init(void);
 extern void async_insert_timeout(awaiter_t *);

uspace/lib/c/include/async.h

@@ -139 +139 @@
 extern void async_wait_for(aid_t, sysarg_t *);
 extern int async_wait_timeout(aid_t, sysarg_t *, suseconds_t);
+extern void async_forget(aid_t);
 
 extern fid_t async_new_connection(task_id_t, sysarg_t, ipc_callid_t,
@@ -320 +321 @@
     sysarg_t *, sysarg_t *);
 
-extern async_sess_t *async_connect_me(exch_mgmt_t, async_exch_t *);
+extern async_sess_t *async_clone_establish(exch_mgmt_t, async_exch_t *);
 extern async_sess_t *async_connect_me_to(exch_mgmt_t, async_exch_t *, sysarg_t,
     sysarg_t, sysarg_t);

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
+/** @addtogroup libc
  * @{
  */
-
 /** @file
- * Hardware types according to the on-line IANA - Address Resolution Protocol
- * (ARP) Parameters
- * http://www.iana.org/assignments/arp-parameters/arp-parameters.xml,
- * cited January 14 2009.
  */
 
-#ifndef LIBNET_NET_HARDWARE_H_
-#define LIBNET_NET_HARDWARE_H_
+#ifndef LIBC_INET_INET_H_
+#define LIBC_INET_INET_H_
 
 #include <sys/types.h>
 
-/** Network interface layer type type definition. */
-typedef uint8_t hw_type_t;
+#define INET_TTL_MAX 255
 
-/** @name Network interface layer types definitions */
-/*@{*/
+typedef struct {
+        uint32_t ipv4;
+} inet_addr_t;
 
-/** Ethernet (10Mb) hardware type. */
-#define HW_ETHER                1
+typedef struct {
+        inet_addr_t src;
+        inet_addr_t dest;
+        uint8_t tos;
+        void *data;
+        size_t size;
+} inet_dgram_t;
 
-/*@}*/
+typedef struct {
+        int (*recv)(inet_dgram_t *);
+} inet_ev_ops_t;
+
+typedef enum {
+        INET_DF = 1
+} inet_df_t;
+
+extern int inet_init(uint8_t, inet_ev_ops_t *);
+extern int inet_send(inet_dgram_t *, uint8_t, inet_df_t);
+extern int inet_get_srcaddr(inet_addr_t *, uint8_t, inet_addr_t *);
 
 #endif
@@ -58 +68 @@
 /** @}
  */
-

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +28 @@
 
 /** @addtogroup libc
- *  @{
+ * @{
+ */
+/** @file
  */
 
-/** @file
- * ICMP common interface implementation.
- * @see icmp_common.h
- */
+#ifndef LIBC_INET_INETPING_H_
+#define LIBC_INET_INETPING_H_
 
-#include <net/modules.h>
-#include <net/icmp_common.h>
-#include <ipc/services.h>
-#include <ipc/icmp.h>
-#include <sys/time.h>
-#include <async.h>
+#include <inet/inet.h>
+#include <sys/types.h>
 
-/** Connect to the ICMP module.
- *
- * @return ICMP module session.
- *
- */
-async_sess_t *icmp_connect_module(void)
-{
-        return connect_to_service(SERVICE_ICMP);
-}
+typedef struct {
+        inet_addr_t src;
+        inet_addr_t dest;
+        uint16_t seq_no;
+        void *data;
+        size_t size;
+} inetping_sdu_t;
+
+typedef struct inetping_ev_ops {
+        int (*recv)(inetping_sdu_t *);
+} inetping_ev_ops_t;
+
+extern int inetping_init(inetping_ev_ops_t *);
+extern int inetping_send(inetping_sdu_t *);
+extern int inetping_get_srcaddr(inet_addr_t *, inet_addr_t *);
+
+
+#endif
 
 /** @}

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
+/** @addtogroup libc
  * @{
  */
-
 /** @file
- * Internetwork layer module interface for the underlying network interface
- * layer. This interface is always called by the remote modules.
  */
 
-#ifndef LIBNET_IL_REMOTE_H_
-#define LIBNET_IL_REMOTE_H_
+#ifndef LIBC_INET_IPLINK_H_
+#define LIBC_INET_IPLINK_H_
 
-#include <ipc/services.h>
+#include <async.h>
 #include <sys/types.h>
-#include <net/device.h>
-#include <net/packet.h>
-#include <async.h>
 
-/** @name Internetwork layer module interface
- * This interface is used by other modules.
- */
-/*@{*/
+struct iplink_ev_ops;
 
-extern int il_device_state_msg(async_sess_t *, nic_device_id_t,
-    nic_device_state_t, services_t);
-extern int il_received_msg(async_sess_t *, nic_device_id_t, packet_t *,
-    services_t);
-extern int il_mtu_changed_msg(async_sess_t *, nic_device_id_t, size_t,
-    services_t);
-extern int il_addr_changed_msg(async_sess_t *, nic_device_id_t, size_t,
-    const uint8_t *);
+typedef struct {
+        async_sess_t *sess;
+        struct iplink_ev_ops *ev_ops;
+} iplink_t;
 
-/*@}*/
+typedef struct {
+        uint32_t ipv4;
+} iplink_addr_t;
+
+/** IP link Service Data Unit */
+typedef struct {
+        /** Local source address */
+        iplink_addr_t lsrc;
+        /** Local destination address */
+        iplink_addr_t ldest;
+        /** Serialized IP packet */
+        void *data;
+        /** Size of @c data in bytes */
+        size_t size;
+} iplink_sdu_t;
+
+typedef struct iplink_ev_ops {
+        int (*recv)(iplink_t *, iplink_sdu_t *);
+} iplink_ev_ops_t;
+
+extern int iplink_open(async_sess_t *, iplink_ev_ops_t *, iplink_t **);
+extern void iplink_close(iplink_t *);
+extern int iplink_send(iplink_t *, iplink_sdu_t *);
+extern int iplink_addr_add(iplink_t *, iplink_addr_t *);
+extern int iplink_addr_remove(iplink_t *, iplink_addr_t *);
+extern int iplink_get_mtu(iplink_t *, size_t *);
 
 #endif

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +28 @@
 
 /** @addtogroup libc
- *  @{
+ * @{
+ */
+/** @file
  */
 
-/** @file
- * Character string with measured length.
- * The structure has been designed for serialization of character strings
- * between modules.
- */
+#ifndef LIBC_INET_IPLINK_SRV_H_
+#define LIBC_INET_IPLINK_SRV_H_
 
-#ifndef LIBC_MEASURED_STRINGS_H_
-#define LIBC_MEASURED_STRINGS_H_
+#include <async.h>
+#include <fibril_synch.h>
+#include <bool.h>
+#include <sys/types.h>
 
-#include <sys/types.h>
-#include <async.h>
+struct iplink_ops;
 
-/** Type definition of the character string with measured length.
- * @see measured_string
- */
-typedef struct measured_string measured_string_t;
+typedef struct {
+        fibril_mutex_t lock;
+        bool connected;
+        struct iplink_ops *ops;
+        void *arg;
+        async_sess_t *client_sess;
+} iplink_srv_t;
 
-/** Character string with measured length.
- *
- * This structure has been designed for serialization of character strings
- * between modules.
- */
-struct measured_string {
-        /** Character string data. */
-        uint8_t *value;
-        /** Character string length. */
-        size_t length;
-};
+typedef struct {
+        uint32_t ipv4;
+} iplink_srv_addr_t;
 
-extern measured_string_t *measured_string_create_bulk(const uint8_t *, size_t);
-extern measured_string_t *measured_string_copy(measured_string_t *);
+/** IP link Service Data Unit */
+typedef struct {
+        /** Local source address */
+        iplink_srv_addr_t lsrc;
+        /** Local destination address */
+        iplink_srv_addr_t ldest;
+        /** Serialized IP packet */
+        void *data;
+        /** Size of @c data in bytes */
+        size_t size;
+} iplink_srv_sdu_t;
 
-extern int measured_strings_receive(measured_string_t **, uint8_t **, size_t);
-extern int measured_strings_reply(const measured_string_t *, size_t);
+typedef struct iplink_ops {
+        int (*open)(iplink_srv_t *);
+        int (*close)(iplink_srv_t *);
+        int (*send)(iplink_srv_t *, iplink_srv_sdu_t *);
+        int (*get_mtu)(iplink_srv_t *, size_t *);
+        int (*addr_add)(iplink_srv_t *, iplink_srv_addr_t *);
+        int (*addr_remove)(iplink_srv_t *, iplink_srv_addr_t *);
+} iplink_ops_t;
 
-extern int measured_strings_return(async_exch_t *, measured_string_t **,
-    uint8_t **, size_t);
-extern int measured_strings_send(async_exch_t *, const measured_string_t *,
-    size_t);
+extern void iplink_srv_init(iplink_srv_t *);
+
+extern int iplink_conn(ipc_callid_t, ipc_call_t *, void *);
+extern int iplink_ev_recv(iplink_srv_t *, iplink_srv_sdu_t *);
 
 #endif

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
- * Copyright (c) 2011 Radim Vansa
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup libpacket
+/** @addtogroup libcipc
  * @{
  */
-
 /** @file
- * Packet server.
- * The hosting module has to be compiled with both the packet.c and the
- * packet_server.c source files. To function correctly, initialization of the
- * packet map by the pm_init() function has to happen at the first place. Then
- * the packet messages have to be processed by the packet_server_message()
- * function. The packet map should be released by the pm_destroy() function
- * during the module termination.
- * @see IS_NET_PACKET_MESSAGE()
  */
 
-#ifndef NET_PACKET_SERVER_H_
-#define NET_PACKET_SERVER_H_
+#ifndef LIBC_IPC_INET_H_
+#define LIBC_IPC_INET_H_
 
 #include <ipc/common.h>
 
-extern int packet_server_init(void);
-extern int packet_server_message(ipc_callid_t, ipc_call_t *, ipc_call_t *,
-    size_t *);
+/** Inet ports */
+typedef enum {
+        /** Default port */
+        INET_PORT_DEFAULT = 1,
+        /** Configuration port */
+        INET_PORT_CFG,
+        /** Ping service port */
+        INET_PORT_PING
+} inet_port_t;
+
+/** Requests on Inet default port */
+typedef enum {
+        INET_CALLBACK_CREATE = IPC_FIRST_USER_METHOD,
+        INET_GET_SRCADDR,
+        INET_SEND,
+        INET_SET_PROTO
+} 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_ADDR_GET_ID,
+        INETCFG_GET_ADDR_LIST,
+        INETCFG_GET_LINK_LIST,
+        INETCFG_GET_SROUTE_LIST,
+        INETCFG_LINK_GET,
+        INETCFG_SROUTE_CREATE,
+        INETCFG_SROUTE_DELETE,
+        INETCFG_SROUTE_GET,
+        INETCFG_SROUTE_GET_ID
+} inetcfg_request_t;
+
+/** Events on Inet ping port */
+typedef enum {
+        INETPING_EV_RECV = IPC_FIRST_USER_METHOD
+} inetping_event_t;
+
+/** Requests on Inet ping port */
+typedef enum {
+        INETPING_SEND = IPC_FIRST_USER_METHOD,
+        INETPING_GET_SRCADDR
+} inetping_request_t;
 
 #endif
 
-/** @}
+/**
+ * @}
  */

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

@@ -254 +254 @@
     sysarg_t, sysarg_t, void *, ipc_async_callback_t, bool);
 
+extern int ipc_clone_establish(int);
 extern int ipc_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t, task_id_t *,
     sysarg_t *);
-extern int ipc_connect_me(int);
 extern int ipc_connect_me_to(int, sysarg_t, sysarg_t, sysarg_t);
 extern int ipc_connect_me_to_blocking(int, sysarg_t, sysarg_t, sysarg_t);

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libcipc
  * @{
  */
-
 /** @file
- * Transport layer modules messages.
- * @see tl_interface.h
  */
 
-#ifndef LIBC_TL_MESSAGES_H_
-#define LIBC_TL_MESSAGES_H_
+#ifndef LIBC_IPC_IPLINK_H_
+#define LIBC_IPC_IPLINK_H_
 
-#include <ipc/net.h>
+#include <ipc/common.h>
 
-/** Transport layer modules messages. */
 typedef enum {
-        /** Packet received message.
-         * @see tl_received_msg()
-         */
-        NET_TL_RECEIVED = NET_TL_FIRST
-} tl_messages;
+        IPLINK_GET_MTU = IPC_FIRST_USER_METHOD,
+        IPLINK_SEND,
+        IPLINK_ADDR_ADD,
+        IPLINK_ADDR_REMOVE
+} iplink_request_t;
+
+typedef enum {
+        IPLINK_EV_RECV = IPC_FIRST_USER_METHOD
+} iplink_event_t;
 
 #endif
 
-/** @}
+/**
+ * @}
  */

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

@@ -48 +48 @@
         SERVICE_IRC        = FOURCC('i', 'r', 'c', ' '),
         SERVICE_CLIPBOARD  = FOURCC('c', 'l', 'i', 'p'),
-        SERVICE_NETWORKING = FOURCC('n', 'e', 't', ' '),
-        SERVICE_ETHERNET   = FOURCC('e', 't', 'h', ' '),
-        SERVICE_NILDUMMY   = FOURCC('n', 'i', 'l', 'd'),
-        SERVICE_IP         = FOURCC('i', 'p', 'v', '4'),
-        SERVICE_ARP        = FOURCC('a', 'r', 'p', ' '),
-        SERVICE_ICMP       = FOURCC('i', 'c', 'm', 'p'),
         SERVICE_UDP        = FOURCC('u', 'd', 'p', ' '),
         SERVICE_TCP        = FOURCC('t', 'c', 'p', ' ')
 } services_t;
+
+#define SERVICE_NAME_INET     "net/inet"
+#define SERVICE_NAME_INETCFG  "net/inetcfg"
+#define SERVICE_NAME_INETPING "net/inetping"
 
 #endif

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

@@ -38 +38 @@
 #define LIBC_SOCKET_MESSAGES_H_
 
-#include <ipc/net.h>
-
 /** Socket client messages. */
 typedef enum {
         /** Creates a new socket. @see socket() */
-        NET_SOCKET = NET_SOCKET_FIRST,
+        NET_SOCKET = IPC_FIRST_USER_METHOD,
         /** Binds the socket. @see bind() */
         NET_SOCKET_BIND,

uspace/lib/c/include/net/in.h

@@ -45 +45 @@
 #define INET_ADDRSTRLEN  (4 * 3 + 3 + 1)
 
+#define INADDR_ANY 0
+
 /** Type definition of the INET address.
  * @see in_addr

uspace/lib/c/include/net/modules.h

@@ -46 +46 @@
 #include <sys/time.h>
 
-/** Connect to module function type definition.
- *
- * @return Session to the service.
- *
- */
-typedef async_sess_t *connect_module_t(services_t);
-
 extern void answer_call(ipc_callid_t, int, ipc_call_t *, size_t);
 extern async_sess_t *bind_service(services_t, sysarg_t, sysarg_t, sysarg_t,
     async_client_conn_t);
-extern async_sess_t *connect_to_service(services_t);
-extern int data_reply(void *, size_t);
 extern void refresh_answer(ipc_call_t *, size_t *);