Changeset 69a93df7 in mainline

Timestamp:

2012-04-17T06:33:25Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

06a1d077

Parents:

7fda2e0

Message:

Move network-related servers to srv/net.

Files:

• boot/Makefile.common (modified) (2 diffs)
• uspace/Makefile (modified) (1 diff)
• uspace/srv/net/ethip/Makefile (moved) (moved from uspace/srv/ethip/Makefile ) (1 diff)
• uspace/srv/net/ethip/arp.c (moved) (moved from uspace/srv/ethip/arp.c )
• uspace/srv/net/ethip/arp.h (moved) (moved from uspace/srv/ethip/arp.h )
• uspace/srv/net/ethip/atrans.c (moved) (moved from uspace/srv/ethip/atrans.c )
• uspace/srv/net/ethip/atrans.h (moved) (moved from uspace/srv/ethip/atrans.h )
• uspace/srv/net/ethip/ethip.c (moved) (moved from uspace/srv/ethip/ethip.c )
• uspace/srv/net/ethip/ethip.h (moved) (moved from uspace/srv/ethip/ethip.h )
• uspace/srv/net/ethip/ethip_nic.c (moved) (moved from uspace/srv/ethip/ethip_nic.c )
• uspace/srv/net/ethip/ethip_nic.h (moved) (moved from uspace/srv/ethip/ethip_nic.h )
• uspace/srv/net/ethip/pdu.c (moved) (moved from uspace/srv/ethip/pdu.c )
• uspace/srv/net/ethip/pdu.h (moved) (moved from uspace/srv/ethip/pdu.h )
• uspace/srv/net/ethip/std.h (moved) (moved from uspace/srv/ethip/std.h )
• uspace/srv/net/inet/Makefile (moved) (moved from uspace/srv/inet/Makefile ) (1 diff)
• uspace/srv/net/inet/addrobj.c (moved) (moved from uspace/srv/inet/addrobj.c )
• uspace/srv/net/inet/addrobj.h (moved) (moved from uspace/srv/inet/addrobj.h )
• uspace/srv/net/inet/icmp.c (moved) (moved from uspace/srv/inet/icmp.c )
• uspace/srv/net/inet/icmp.h (moved) (moved from uspace/srv/inet/icmp.h )
• uspace/srv/net/inet/icmp_std.h (moved) (moved from uspace/srv/inet/icmp_std.h )
• uspace/srv/net/inet/inet.c (moved) (moved from uspace/srv/inet/inet.c )
• uspace/srv/net/inet/inet.h (moved) (moved from uspace/srv/inet/inet.h )
• uspace/srv/net/inet/inet_link.c (moved) (moved from uspace/srv/inet/inet_link.c )
• uspace/srv/net/inet/inet_link.h (moved) (moved from uspace/srv/inet/inet_link.h )
• uspace/srv/net/inet/inet_std.h (moved) (moved from uspace/srv/inet/inet_std.h )
• uspace/srv/net/inet/inet_util.c (moved) (moved from uspace/srv/inet/inet_util.c )
• uspace/srv/net/inet/inet_util.h (moved) (moved from uspace/srv/inet/inet_util.h )
• uspace/srv/net/inet/inetcfg.c (moved) (moved from uspace/srv/inet/inetcfg.c )
• uspace/srv/net/inet/inetcfg.h (moved) (moved from uspace/srv/inet/inetcfg.h )
• uspace/srv/net/inet/inetping.c (moved) (moved from uspace/srv/inet/inetping.c )
• uspace/srv/net/inet/inetping.h (moved) (moved from uspace/srv/inet/inetping.h )
• uspace/srv/net/inet/pdu.c (moved) (moved from uspace/srv/inet/pdu.c )
• uspace/srv/net/inet/pdu.h (moved) (moved from uspace/srv/inet/pdu.h )
• uspace/srv/net/inet/reass.c (moved) (moved from uspace/srv/inet/reass.c )
• uspace/srv/net/inet/reass.h (moved) (moved from uspace/srv/inet/reass.h )
• uspace/srv/net/inet/sroute.c (moved) (moved from uspace/srv/inet/sroute.c )
• uspace/srv/net/inet/sroute.h (moved) (moved from uspace/srv/inet/sroute.h )
• uspace/srv/net/tcp/Makefile (moved) (moved from uspace/srv/tcp/Makefile ) (1 diff)
• uspace/srv/net/tcp/conn.c (moved) (moved from uspace/srv/tcp/conn.c )
• uspace/srv/net/tcp/conn.h (moved) (moved from uspace/srv/tcp/conn.h )
• uspace/srv/net/tcp/iqueue.c (moved) (moved from uspace/srv/tcp/iqueue.c )
• uspace/srv/net/tcp/iqueue.h (moved) (moved from uspace/srv/tcp/iqueue.h )
• uspace/srv/net/tcp/ncsim.c (moved) (moved from uspace/srv/tcp/ncsim.c )
• uspace/srv/net/tcp/ncsim.h (moved) (moved from uspace/srv/tcp/ncsim.h )
• uspace/srv/net/tcp/pdu.c (moved) (moved from uspace/srv/tcp/pdu.c )
• uspace/srv/net/tcp/pdu.h (moved) (moved from uspace/srv/tcp/pdu.h )
• uspace/srv/net/tcp/rqueue.c (moved) (moved from uspace/srv/tcp/rqueue.c )
• uspace/srv/net/tcp/rqueue.h (moved) (moved from uspace/srv/tcp/rqueue.h )
• uspace/srv/net/tcp/segment.c (moved) (moved from uspace/srv/tcp/segment.c )
• uspace/srv/net/tcp/segment.h (moved) (moved from uspace/srv/tcp/segment.h )
• uspace/srv/net/tcp/seq_no.c (moved) (moved from uspace/srv/tcp/seq_no.c )
• uspace/srv/net/tcp/seq_no.h (moved) (moved from uspace/srv/tcp/seq_no.h )
• uspace/srv/net/tcp/sock.c (moved) (moved from uspace/srv/tcp/sock.c )
• uspace/srv/net/tcp/sock.h (moved) (moved from uspace/srv/tcp/sock.h )
• uspace/srv/net/tcp/std.h (moved) (moved from uspace/srv/tcp/std.h )
• uspace/srv/net/tcp/tcp.c (moved) (moved from uspace/srv/tcp/tcp.c )
• uspace/srv/net/tcp/tcp.h (moved) (moved from uspace/srv/tcp/tcp.h )
• uspace/srv/net/tcp/tcp_type.h (moved) (moved from uspace/srv/tcp/tcp_type.h )
• uspace/srv/net/tcp/test.c (moved) (moved from uspace/srv/tcp/test.c )
• uspace/srv/net/tcp/test.h (moved) (moved from uspace/srv/tcp/test.h )
• uspace/srv/net/tcp/tqueue.c (moved) (moved from uspace/srv/tcp/tqueue.c )
• uspace/srv/net/tcp/tqueue.h (moved) (moved from uspace/srv/tcp/tqueue.h )
• uspace/srv/net/tcp/ucall.c (moved) (moved from uspace/srv/tcp/ucall.c )
• uspace/srv/net/tcp/ucall.h (moved) (moved from uspace/srv/tcp/ucall.h )
• uspace/srv/net/udp/Makefile (moved) (moved from uspace/srv/udp/Makefile ) (1 diff)
• uspace/srv/net/udp/assoc.c (moved) (moved from uspace/srv/udp/assoc.c )
• uspace/srv/net/udp/assoc.h (moved) (moved from uspace/srv/udp/assoc.h )
• uspace/srv/net/udp/msg.c (moved) (moved from uspace/srv/udp/msg.c )
• uspace/srv/net/udp/msg.h (moved) (moved from uspace/srv/udp/msg.h )
• uspace/srv/net/udp/pdu.c (moved) (moved from uspace/srv/udp/pdu.c )
• uspace/srv/net/udp/pdu.h (moved) (moved from uspace/srv/udp/pdu.h )
• uspace/srv/net/udp/sock.c (moved) (moved from uspace/srv/udp/sock.c )
• uspace/srv/net/udp/sock.h (moved) (moved from uspace/srv/udp/sock.h )
• uspace/srv/net/udp/std.h (moved) (moved from uspace/srv/udp/std.h )
• uspace/srv/net/udp/ucall.c (moved) (moved from uspace/srv/udp/ucall.c )
• uspace/srv/net/udp/ucall.h (moved) (moved from uspace/srv/udp/ucall.h )
• uspace/srv/net/udp/udp.c (moved) (moved from uspace/srv/udp/udp.c )
• uspace/srv/net/udp/udp_inet.c (moved) (moved from uspace/srv/udp/udp_inet.c )
• uspace/srv/net/udp/udp_inet.h (moved) (moved from uspace/srv/udp/udp_inet.h )
• uspace/srv/net/udp/udp_type.h (moved) (moved from uspace/srv/udp/udp_type.h )

boot/Makefile.common

@@ -99 +99 @@
         $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
         $(USPACE_PATH)/srv/clip/clip \
-        $(USPACE_PATH)/srv/ethip/ethip \
         $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
         $(USPACE_PATH)/srv/fs/fat/fat \
@@ -107 +106 @@
         $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
         $(USPACE_PATH)/srv/hid/remcons/remcons \
-        $(USPACE_PATH)/srv/inet/inet \
+        $(USPACE_PATH)/srv/net/ethip/ethip \
+        $(USPACE_PATH)/srv/net/inet/inet \
+        $(USPACE_PATH)/srv/net/tcp/tcp \
+        $(USPACE_PATH)/srv/net/udp/udp \
         $(USPACE_PATH)/srv/taskmon/taskmon \
-        $(USPACE_PATH)/srv/tcp/tcp \
-        $(USPACE_PATH)/srv/udp/udp \
         $(USPACE_PATH)/srv/devman/devman
 

uspace/Makefile

@@ -73 +73 @@
         srv/loc \
         srv/devman \
-        srv/ethip \
-        srv/inet \
         srv/loader \
+        srv/net/ethip \
+        srv/net/inet \
+        srv/net/tcp \
+        srv/net/udp \
         srv/ns \
         srv/taskmon \
-        srv/tcp \
-        srv/udp \
         srv/vfs \
         srv/bd/ata_bd \

uspace/srv/net/ethip/Makefile

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../..
+USPACE_PREFIX = ../../..
 BINARY = ethip
 

uspace/srv/net/inet/Makefile

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../..
+USPACE_PREFIX = ../../..
 BINARY = inet
 

uspace/srv/net/tcp/Makefile

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../..
+USPACE_PREFIX = ../../..
 LIBS = $(LIBNET_PREFIX)/libnet.a
 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include

uspace/srv/net/udp/Makefile

@@ -27 +27 @@
 #
 
-USPACE_PREFIX = ../..
+USPACE_PREFIX = ../../..
 LIBS = $(LIBNET_PREFIX)/libnet.a
 EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include