Changeset 8fb1bf82 in mainline for uspace/lib/net/tl/tl_interface.c

Timestamp:

2010-11-25T13:42:50Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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/lib/net/tl/tl_interface.c (moved) (moved from uspace/srv/net/netstart/netstart.c ) (1 diff)

uspace/lib/net/tl/tl_interface.c

@@ -27 +27 @@
  */
 
-/** @addtogroup net
+/** @addtogroup libnet
  * @{
  */
 
-/** @file
+#include <tl_interface.h>
+#include <generic.h>
+#include <packet_client.h>
+
+#include <ipc/services.h>
+#include <ipc/tl.h>
+
+#include <net/device.h>
+#include <net/packet.h>
+
+/** Notify the remote transport layer modules about the received packet/s.
  *
- * Start the networking subsystem.
- * Perform networking self-test if executed
- * with the -s argument.
+ * @param[in] tl_phone  The transport layer module phone used for remote calls.
+ * @param[in] device_id The device identifier.
+ * @param[in] packet    The received packet or the received packet queue.
+ *                      The packet queue is used to carry a fragmented
+ *                      datagram. The first packet contains the headers,
+ *                      the others contain only data.
+ * @param[in] target    The target transport layer module service to be
+ *                      delivered to.
+ * @param[in] error     The packet error reporting service. Prefixes the
+ *                      received packet.
+ *
+ * @return EOK on success.
  *
  */
-
-#define NAME  "netstart"
-
-#include <async.h>
-#include <stdio.h>
-#include <task.h>
-#include <str_error.h>
-#include <err.h>
-#include <ipc/ipc.h>
-#include <ipc/services.h>
-#include <ipc/net_net.h>
-
-#include <net/modules.h>
-
-#include "self_test.h"
-
-/** Start a module.
- *
- * @param[in] desc The module description
- * @param[in] path The module absolute path.
- *
- * @returns true on succesful spanwning
- * @returns false on failure
- *
- */
-static bool spawn(const char *desc, const char *path)
+int
+tl_received_msg(int tl_phone, device_id_t device_id, packet_t *packet,
+    services_t target, services_t error)
 {
-        printf("%s: Spawning %s (%s)\n", NAME, desc, path);
-        
-        const char *argv[2];
-        
-        argv[0] = path;
-        argv[1] = NULL;
-        
-        int err;
-        if (task_spawn(path, argv, &err) == 0) {
-                fprintf(stderr, "%s: Error spawning %s (%s)\n", NAME, path,
-                    str_error(err));
-                return false;
-        }
-        
-        return true;
-}
-
-int main(int argc, char *argv[])
-{
-        ERROR_DECLARE;
-        
-        /* Run self-tests */
-        if ((argc > 1) && (str_cmp(argv[1], "-s") == 0))
-                ERROR_PROPAGATE(self_test());
-        
-        if (!spawn("networking service", "/srv/net"))
-                return EINVAL;
-        
-        printf("%s: Initializing networking\n", NAME);
-        
-        int net_phone = connect_to_service(SERVICE_NETWORKING);
-        if (ERROR_OCCURRED(ipc_call_sync_0_0(net_phone, NET_NET_STARTUP))) {
-                fprintf(stderr, "%s: Startup error %d\n", NAME, ERROR_CODE);
-                return ERROR_CODE;
-        }
-        
-        return EOK;
+        return generic_received_msg_remote(tl_phone, NET_TL_RECEIVED, device_id,
+            packet_get_id(packet), target, error);
 }