From d3d8b26997fac34a84981e6d2b649521de2cc45a Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Mon, 22 May 2006 09:25:35 +0000 Subject: [PATCH] First step in building again the userland test stack environment: actually build it! :-) Next step: fix the Jamfile to create the symlink to userland "obos_network" add-ons. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17520 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/add-ons/kernel/network/Jamfile | 4 +++- src/tests/add-ons/kernel/network/core/Jamfile | 3 ++- .../kernel/network/interfaces/ethernet/Jamfile | 2 ++ .../kernel/network/interfaces/loopback/Jamfile | 2 ++ .../add-ons/kernel/network/interfaces/ppp/Jamfile | 6 ++++-- src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile | 6 ++++-- src/tests/add-ons/kernel/network/ppp/modem/Jamfile | 6 ++++-- src/tests/add-ons/kernel/network/ppp/pap/Jamfile | 6 ++++-- src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile | 6 ++++-- .../kernel/network/ppp/shared/libkernelppp/Jamfile | 14 +++++++++++--- .../add-ons/kernel/network/protocols/icmp/Jamfile | 2 ++ .../add-ons/kernel/network/protocols/ipv4/Jamfile | 2 ++ .../add-ons/kernel/network/protocols/raw/Jamfile | 2 ++ .../add-ons/kernel/network/protocols/route/Jamfile | 2 ++ .../add-ons/kernel/network/protocols/tcp/Jamfile | 2 ++ .../add-ons/kernel/network/protocols/udp/Jamfile | 2 ++ src/tests/add-ons/kernel/network/userland_ipc.c | 6 +++--- 17 files changed, 55 insertions(+), 18 deletions(-) diff --git a/src/tests/add-ons/kernel/network/Jamfile b/src/tests/add-ons/kernel/network/Jamfile index b12e1e89a4..893d9b075d 100644 --- a/src/tests/add-ons/kernel/network/Jamfile +++ b/src/tests/add-ons/kernel/network/Jamfile @@ -1,12 +1,14 @@ SubDir HAIKU_TOP src tests add-ons kernel network ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; # the network stack tester app SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system libroot os ] ; -SimpleTest net_stack_tester : +SimpleTest net_stack_tester : net_stack_tester.cpp userland_ipc.c userland_modules.cpp diff --git a/src/tests/add-ons/kernel/network/core/Jamfile b/src/tests/add-ons/kernel/network/core/Jamfile index 4e6d77c5dd..de0c6a685f 100644 --- a/src/tests/add-ons/kernel/network/core/Jamfile +++ b/src/tests/add-ons/kernel/network/core/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src tests add-ons kernel network core ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network core ] ; @@ -24,4 +26,3 @@ Addon core : userland obos_network : LinkAgainst core : net_stack_tester ; - diff --git a/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile b/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile index 40f321cdb2..977acbdb64 100644 --- a/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile +++ b/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src tests add-ons kernel network interfaces ethernet ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network interfaces ethernet ] ; diff --git a/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile b/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile index 9b8cb16379..6d0bc458d1 100644 --- a/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile +++ b/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src tests add-ons kernel network interfaces loopback ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network interfaces loopback ] ; diff --git a/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile b/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile index f07b2a176b..8ed26fdd67 100644 --- a/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile +++ b/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile @@ -1,14 +1,16 @@ SubDir HAIKU_TOP src tests add-ons kernel network interfaces ppp ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; -UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] : true ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network interfaces ppp ] ; - Addon ppp : userland obos_network interfaces : ppp.cpp PPPManager.cpp ; LinkAgainst ppp : libkernelppp.a net_stack_tester be ; + diff --git a/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile b/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile index 251938f985..e28ff5731a 100644 --- a/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile @@ -1,11 +1,12 @@ SubDir HAIKU_TOP src tests add-ons kernel network ppp ipcp ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; -UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] : true ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp ipcp ] ; - Addon ipcp : userland obos_network ppp : ipcp.cpp Protocol.cpp @@ -17,3 +18,4 @@ LinkAgainst ipcp : be libbind.so ; + diff --git a/src/tests/add-ons/kernel/network/ppp/modem/Jamfile b/src/tests/add-ons/kernel/network/ppp/modem/Jamfile index 18890a9787..e49db803a3 100644 --- a/src/tests/add-ons/kernel/network/ppp/modem/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/modem/Jamfile @@ -1,11 +1,12 @@ SubDir HAIKU_TOP src tests add-ons kernel network ppp modem ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; -UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] : true ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp modem ] ; - Addon modem : userland obos_network ppp : modem.cpp ModemDevice.cpp @@ -13,3 +14,4 @@ Addon modem : userland obos_network ppp : ; LinkAgainst modem : libkernelppp.a net_stack_tester be ; + diff --git a/src/tests/add-ons/kernel/network/ppp/pap/Jamfile b/src/tests/add-ons/kernel/network/ppp/pap/Jamfile index 778001eed1..f7c2dfad45 100644 --- a/src/tests/add-ons/kernel/network/ppp/pap/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/pap/Jamfile @@ -1,14 +1,16 @@ SubDir HAIKU_TOP src tests add-ons kernel network ppp pap ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; -UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] : true ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp pap ] ; - Addon pap : userland obos_network ppp : pap.cpp Protocol.cpp ; LinkAgainst pap : libkernelppp.a net_stack_tester be ; + diff --git a/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile b/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile index 6537e660a9..5e46583628 100644 --- a/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile @@ -1,11 +1,12 @@ SubDir HAIKU_TOP src tests add-ons kernel network ppp pppoe ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; -UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] : true ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp pppoe ] ; - Addon pppoe : userland obos_network ppp : pppoe.cpp PPPoEDevice.cpp @@ -13,3 +14,4 @@ Addon pppoe : userland obos_network ppp : ; LinkAgainst pppoe : libkernelppp.a net_stack_tester be ; + diff --git a/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile b/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile index 809fc35a0a..1bfeaa0e03 100644 --- a/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile @@ -1,12 +1,20 @@ SubDir HAIKU_TOP src tests add-ons kernel network ppp shared libkernelppp ; +SetSubDirSupportedPlatformsBeOSCompatible ; + +if $(TARGET_PLATFORM) != haiku { + UseHeaders [ FStandardOSHeaders ] : true ; + # Needed for the atomic_add64() prototype. :-/ + UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; + # We need the public network headers also when not compiling for Haiku. + # Unfortunately we get more than we want, namely all POSIX headers. +} + UsePrivateHeaders net ; -UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; -UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] : true ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp ] ; - StaticLibrary libkernelppp.a : KPPPConfigurePacket.cpp KPPPDevice.cpp diff --git a/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile b/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile index 6a4429b5eb..a9bec9bd74 100644 --- a/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src tests add-ons kernel network protocols icmp ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols icmp ] ; diff --git a/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile b/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile index 9afe3ae36f..e88fa95433 100644 --- a/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src tests add-ons kernel network protocols ipv4 ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ipv4 ] ; diff --git a/src/tests/add-ons/kernel/network/protocols/raw/Jamfile b/src/tests/add-ons/kernel/network/protocols/raw/Jamfile index 9fd23797a2..302f6242e3 100644 --- a/src/tests/add-ons/kernel/network/protocols/raw/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/raw/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src tests add-ons kernel network protocols raw ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols raw ] ; diff --git a/src/tests/add-ons/kernel/network/protocols/route/Jamfile b/src/tests/add-ons/kernel/network/protocols/route/Jamfile index 28f74f8680..d604455ce8 100644 --- a/src/tests/add-ons/kernel/network/protocols/route/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/route/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src tests add-ons kernel network protocols route ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols route ] ; diff --git a/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile b/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile index e9d0bb438e..54a4629331 100644 --- a/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src tests add-ons kernel network protocols tcp ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols tcp ] ; diff --git a/src/tests/add-ons/kernel/network/protocols/udp/Jamfile b/src/tests/add-ons/kernel/network/protocols/udp/Jamfile index eb5808b083..8ad48170c8 100644 --- a/src/tests/add-ons/kernel/network/protocols/udp/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/udp/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src tests add-ons kernel network protocols udp ; +SetSubDirSupportedPlatformsBeOSCompatible ; + UsePrivateHeaders net ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols udp ] ; diff --git a/src/tests/add-ons/kernel/network/userland_ipc.c b/src/tests/add-ons/kernel/network/userland_ipc.c index 14b494629e..d39f80aa7b 100644 --- a/src/tests/add-ons/kernel/network/userland_ipc.c +++ b/src/tests/add-ons/kernel/network/userland_ipc.c @@ -48,7 +48,7 @@ commands_info g_commands_info[] = { C2N(NET_STACK_SELECT), C2N(NET_STACK_DESELECT), C2N(NET_STACK_GET_COOKIE), - C2N(NET_STACK_STOP), +// C2N(NET_STACK_STOP), C2N(NET_STACK_NOTIFY_SOCKET_EVENT), C2N(NET_STACK_CONTROL_NET_MODULE), @@ -394,11 +394,11 @@ connection_runner(void *_cookie) args->u.sysctl.newlen); break; } - +/* case NET_STACK_STOP: core->stop(); break; - +*/ case NET_STACK_CONTROL_NET_MODULE: // TODO! break;