Changeset c0e74b1 in mainline for uspace/lib/socket/generic/socket_core.c

Timestamp:

2010-10-06T22:58:18Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ae972834

Parents:

49d871ea (diff), d9e2e0e (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 from lp:~jakub/helenos/net.

This merge continues with the overhaul of the networking subsystem and procedes
towards the ultimate goal of getting rid of the current lib socket. The current
lib socket mixes code which should either belong to libc, libnet or directly to
the packet server. By moving generic non-networking and client networking code
out of the current lib socket, I am preparing to merge the rest of it to lib net
and the packet server and fix ticket #257 for the modular builds. When this is
done, we can talk of moving some of the networking client code back to a
dedicated client library, but we can just as well keep it in lib C, similar to
how we have file system client code there.

File:

• uspace/lib/socket/generic/socket_core.c (modified) (2 diffs)

uspace/lib/socket/generic/socket_core.c

@@ -35 +35 @@
  */
 
+#include <net/socket_codes.h>
+#include <net/in.h>
+#include <net/inet.h>
+
 #include <stdint.h>
 #include <stdlib.h>
@@ -40 +44 @@
 #include <err.h>
 
-#include <in.h>
-#include <inet.h>
-#include <socket_codes.h>
 #include <adt/dynamic_fifo.h>
 #include <adt/int_map.h>
 #include <packet/packet.h>
 #include <packet/packet_client.h>
-#include <net_modules.h>
+#include <net/modules.h>
 #include <socket_core.h>