From b0623e48efa646b8d1a4c6f51e09d696d9803276 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 2 Jun 2006 17:08:19 +0000 Subject: [PATCH] - created a new pseudotarget 'install-userland-networking' that installs all userland-networking files into a convenient place for easier testing: + net_server_driver and net_stack_driver are installed to /boot/home/config/add-ons/kernel/drivers/bin and ../dev/net + net_stack_tester, ifconfig, arp and route are installed to $(HAIKU_TEST_DIR)/kits/net/userland + libsocket, libnet, libbind and libnetapi are installed to $(HAIKU_TEST_DIR)/kits/net/userland/lib + userland add-ons are installed to $(HAIKU_TEST_DIR)/kits/net/userland/add-ons/obos_network git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17701 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/network/compat/libbind/Jamfile | 5 ++ src/kits/network/compat/libnet/Jamfile | 5 ++ src/kits/network/compat/libnetapi/Jamfile | 5 ++ src/kits/network/compat/libsocket/Jamfile | 5 ++ src/kits/network/compat/libsocket/socket.c | 9 +-- src/tests/add-ons/kernel/network/Jamfile | 76 +++++++++---------- src/tests/add-ons/kernel/network/core/Jamfile | 8 +- .../add-ons/kernel/network/interfaces/Jamfile | 2 - .../network/interfaces/ethernet/Jamfile | 8 +- .../network/interfaces/loopback/Jamfile | 8 +- .../kernel/network/interfaces/ppp/Jamfile | 11 ++- .../add-ons/kernel/network/ppp/ipcp/Jamfile | 8 +- .../add-ons/kernel/network/ppp/modem/Jamfile | 12 ++- .../add-ons/kernel/network/ppp/pap/Jamfile | 12 ++- .../add-ons/kernel/network/ppp/pppoe/Jamfile | 12 ++- .../kernel/network/protocols/icmp/Jamfile | 9 ++- .../kernel/network/protocols/ipv4/Jamfile | 9 ++- .../kernel/network/protocols/raw/Jamfile | 9 ++- .../kernel/network/protocols/route/Jamfile | 9 ++- .../kernel/network/protocols/tcp/Jamfile | 9 ++- .../kernel/network/protocols/udp/Jamfile | 9 ++- 21 files changed, 180 insertions(+), 60 deletions(-) diff --git a/src/kits/network/compat/libbind/Jamfile b/src/kits/network/compat/libbind/Jamfile index 216ec43bd1..3182e90b44 100644 --- a/src/kits/network/compat/libbind/Jamfile +++ b/src/kits/network/compat/libbind/Jamfile @@ -205,6 +205,11 @@ HaikuInstallRelSymLink install-networking : libbind.so : installed-networking-test ; +HaikuInstallRelSymLink install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland lib ] + : libbind.so + : installed-userland-networking ; + Package haiku-networkingkit-cvs : libbind.so : # boot home config lib ; diff --git a/src/kits/network/compat/libnet/Jamfile b/src/kits/network/compat/libnet/Jamfile index b1fd90dde2..7d6ef1c251 100644 --- a/src/kits/network/compat/libnet/Jamfile +++ b/src/kits/network/compat/libnet/Jamfile @@ -108,6 +108,11 @@ HaikuInstallRelSymLink install-networking : libnet.so : installed-networking-test ; +HaikuInstallRelSymLink install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland lib ] + : libnet.so + : installed-userland-networking ; + Package haiku-networkingkit-cvs : libnet.so : # boot home config lib ; diff --git a/src/kits/network/compat/libnetapi/Jamfile b/src/kits/network/compat/libnetapi/Jamfile index 77158a10df..3d2e587cd1 100644 --- a/src/kits/network/compat/libnetapi/Jamfile +++ b/src/kits/network/compat/libnetapi/Jamfile @@ -38,6 +38,11 @@ HaikuInstallRelSymLink install-networking : libnetapi.so : installed-networking-test ; +HaikuInstallRelSymLink install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland lib ] + : libnetapi.so + : installed-userland-networking ; + Package haiku-networkingkit-cvs : libnetapi.so : # boot home config lib ; diff --git a/src/kits/network/compat/libsocket/Jamfile b/src/kits/network/compat/libsocket/Jamfile index 904e478eaa..adbce15db4 100644 --- a/src/kits/network/compat/libsocket/Jamfile +++ b/src/kits/network/compat/libsocket/Jamfile @@ -27,6 +27,11 @@ HaikuInstallRelSymLink install-networking : libsocket.so : installed-networking-test ; +HaikuInstallRelSymLink install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland lib ] + : libsocket.so + : installed-userland-networking ; + Package haiku-networkingkit-cvs : libsocket.so : # boot home config lib ; diff --git a/src/kits/network/compat/libsocket/socket.c b/src/kits/network/compat/libsocket/socket.c index 321e27f2b5..2785c58b31 100644 --- a/src/kits/network/compat/libsocket/socket.c +++ b/src/kits/network/compat/libsocket/socket.c @@ -363,9 +363,8 @@ static char * stack_driver_path(void) { // user-defined stack driver path? path = getenv("NET_STACK_DRIVER_PATH"); - if (path) - return path; - - // use the default stack driver path - return NET_STACK_DRIVER_PATH; + if (!path) + path = NET_STACK_DRIVER_PATH; + printf("net-stack-driver-path = %s\n", path); + return path; } diff --git a/src/tests/add-ons/kernel/network/Jamfile b/src/tests/add-ons/kernel/network/Jamfile index 77066b728f..15e19b0615 100644 --- a/src/tests/add-ons/kernel/network/Jamfile +++ b/src/tests/add-ons/kernel/network/Jamfile @@ -7,55 +7,53 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ; 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 : be ; -{ - # symlink the userland add-ons dir to the dir where the net_stack_tester - # lives -# TODO: We don't have a "distro" tree (including the add-on dir) anymore. - local dir = [ on net_stack_tester return $(LOCATE) ] ; -# MakeLocate userland : $(HAIKU_ADDON_DIR) ; -# MakeLocate add-ons : $(dir) ; -# RelSymLink add-ons : userland : false ; - - # alias for the net_stack_tester the modules link against - LOCATE on net_stack_tester = $(dir) ; -# Depends net_stack_tester -# : net_stack_tester add-ons ; -} +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland ] + : net_stack_tester + : installed-userland-networking +; -# for convenience: this target builds all userland modules -NotFile userland_network_modules ; -Depends userland_network_modules : - # the stack main module - core +SEARCH_SOURCE = [ FDirName $(HAIKU_TOP) src bin arp ] ; +SimpleTest arp : + arp.c + : libbind.so + libsocket.so + $(SELECT_UNAME_ETC_LIB) +; - # interfaces modules - loopback - ethernet - ppp +SEARCH_SOURCE = [ FDirName $(HAIKU_TOP) src bin ifconfig ] ; +SimpleTest ifconfig : + ifconfig.c + : libbind.so + libsocket.so +; - # ppp modules - ipcp - modem - pap - pppoe +SEARCH_SOURCE = [ FDirName $(HAIKU_TOP) src bin route ] ; +SimpleTest route : + keywords.c + route.c + show.c + : libbind.so + libnet.so + libsocket.so + $(SELECT_UNAME_ETC_LIB) +; - # protocols modules - raw - route - ipv4 - icmp - udp - tcp +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland ] + : arp + ifconfig + route + : installed-userland-networking-bin ; SubInclude HAIKU_TOP src tests add-ons kernel network core ; diff --git a/src/tests/add-ons/kernel/network/core/Jamfile b/src/tests/add-ons/kernel/network/core/Jamfile index 94b3141c4e..5c96fc36c9 100644 --- a/src/tests/add-ons/kernel/network/core/Jamfile +++ b/src/tests/add-ons/kernel/network/core/Jamfile @@ -26,5 +26,11 @@ Addon core : userland obos_network : socket.c ; -LinkAgainst core : net_stack_tester ; +LinkAgainst core : net_stack_tester ; +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network ] + : core + : installed-userland-networking +; diff --git a/src/tests/add-ons/kernel/network/interfaces/Jamfile b/src/tests/add-ons/kernel/network/interfaces/Jamfile index fec2a315ed..f058423dad 100644 --- a/src/tests/add-ons/kernel/network/interfaces/Jamfile +++ b/src/tests/add-ons/kernel/network/interfaces/Jamfile @@ -3,5 +3,3 @@ SubDir HAIKU_TOP src tests add-ons kernel network interfaces ; SubInclude HAIKU_TOP src tests add-ons kernel network interfaces ethernet ; SubInclude HAIKU_TOP src tests add-ons kernel network interfaces loopback ; SubInclude HAIKU_TOP src tests add-ons kernel network interfaces ppp ; - - diff --git a/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile b/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile index 1b1af1649f..1941e21446 100644 --- a/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile +++ b/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile @@ -12,5 +12,11 @@ Addon ethernet : userland obos_network interfaces : ethernet.c ; -LinkAgainst ethernet : net_stack_tester ; +LinkAgainst ethernet : net_stack_tester ; +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network interfaces ] + : ethernet + : installed-userland-networking +; diff --git a/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile b/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile index 05aad33a97..32303d63de 100644 --- a/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile +++ b/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile @@ -12,5 +12,11 @@ Addon loopback : userland obos_network interfaces : loopback.c ; -LinkAgainst loopback : net_stack_tester ; +LinkAgainst loopback : net_stack_tester ; +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network interfaces ] + : loopback + : installed-userland-networking +; diff --git a/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile b/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile index 5cc3cb94be..becaab5739 100644 --- a/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile +++ b/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile @@ -14,5 +14,14 @@ Addon ppp : userland obos_network interfaces : PPPManager.cpp ; -LinkAgainst ppp : libkernelppp.a net_stack_tester be ; +LinkAgainst ppp + : libkernelppp.a + net_stack_tester be +; +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network interfaces ] + : ppp + : installed-userland-networking +; diff --git a/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile b/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile index 728dccc2f7..d58740b3e9 100644 --- a/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile @@ -16,8 +16,14 @@ Addon ipcp : userland obos_network ppp : LinkAgainst ipcp : libkernelppp.a - net_stack_tester + net_stack_tester be libbind.so ; +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network ppp ] + : ipcp + : installed-userland-networking +; diff --git a/src/tests/add-ons/kernel/network/ppp/modem/Jamfile b/src/tests/add-ons/kernel/network/ppp/modem/Jamfile index 3d5ad721d7..a30a8f428e 100644 --- a/src/tests/add-ons/kernel/network/ppp/modem/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/modem/Jamfile @@ -15,5 +15,15 @@ Addon modem : userland obos_network ppp : ACFCHandler.cpp ; -LinkAgainst modem : libkernelppp.a net_stack_tester be ; +LinkAgainst modem + : libkernelppp.a + net_stack_tester + be +; +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network ppp ] + : modem + : installed-userland-networking +; diff --git a/src/tests/add-ons/kernel/network/ppp/pap/Jamfile b/src/tests/add-ons/kernel/network/ppp/pap/Jamfile index dc1af0fa69..b4632e7a4c 100644 --- a/src/tests/add-ons/kernel/network/ppp/pap/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/pap/Jamfile @@ -14,5 +14,15 @@ Addon pap : userland obos_network ppp : Protocol.cpp ; -LinkAgainst pap : libkernelppp.a net_stack_tester be ; +LinkAgainst pap + : libkernelppp.a + net_stack_tester + be +; +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network ppp ] + : pap + : installed-userland-networking +; diff --git a/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile b/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile index e92a5a7177..61a715078b 100644 --- a/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile +++ b/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile @@ -15,5 +15,15 @@ Addon pppoe : userland obos_network ppp : DiscoveryPacket.cpp ; -LinkAgainst pppoe : libkernelppp.a net_stack_tester be ; +LinkAgainst pppoe + : libkernelppp.a + net_stack_tester + be +; +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network ppp ] + : pppoe + : installed-userland-networking +; diff --git a/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile b/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile index ca4af877cd..6179c170d8 100644 --- a/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile @@ -12,4 +12,11 @@ Addon icmp : userland obos_network protocols : icmp.c ; -LinkAgainst icmp : net_stack_tester ; +LinkAgainst icmp : net_stack_tester ; + +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ] + : icmp + : installed-userland-networking +; diff --git a/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile b/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile index 3a52189738..a4f03387a5 100644 --- a/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile @@ -12,4 +12,11 @@ Addon ipv4 : userland obos_network protocols : ipv4.c ; -LinkAgainst ipv4 : net_stack_tester ; +LinkAgainst ipv4 : net_stack_tester ; + +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ] + : ipv4 + : installed-userland-networking +; diff --git a/src/tests/add-ons/kernel/network/protocols/raw/Jamfile b/src/tests/add-ons/kernel/network/protocols/raw/Jamfile index 6057a99923..9005d85ca0 100644 --- a/src/tests/add-ons/kernel/network/protocols/raw/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/raw/Jamfile @@ -12,4 +12,11 @@ Addon raw : userland obos_network protocols : raw.c ; -LinkAgainst raw : net_stack_tester ; +LinkAgainst raw : net_stack_tester ; + +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ] + : raw + : installed-userland-networking +; diff --git a/src/tests/add-ons/kernel/network/protocols/route/Jamfile b/src/tests/add-ons/kernel/network/protocols/route/Jamfile index 125db50046..86b65353c2 100644 --- a/src/tests/add-ons/kernel/network/protocols/route/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/route/Jamfile @@ -12,4 +12,11 @@ Addon route : userland obos_network protocols : route.c ; -LinkAgainst route : net_stack_tester ; +LinkAgainst route : net_stack_tester ; + +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ] + : route + : installed-userland-networking +; diff --git a/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile b/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile index f788581e6b..e61bab02bb 100644 --- a/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile @@ -17,4 +17,11 @@ Addon tcp : userland obos_network protocols : arc4random.c ; -LinkAgainst tcp : net_stack_tester ; +LinkAgainst tcp : net_stack_tester ; + +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ] + : tcp + : installed-userland-networking +; diff --git a/src/tests/add-ons/kernel/network/protocols/udp/Jamfile b/src/tests/add-ons/kernel/network/protocols/udp/Jamfile index 21b0632c3a..6b23a73279 100644 --- a/src/tests/add-ons/kernel/network/protocols/udp/Jamfile +++ b/src/tests/add-ons/kernel/network/protocols/udp/Jamfile @@ -12,4 +12,11 @@ Addon udp : userland obos_network protocols : udp.c ; -LinkAgainst udp : net_stack_tester ; +LinkAgainst udp : net_stack_tester ; + +# Installation -- in the test directory for the time being +HaikuInstall install-userland-networking + : [ FDirName $(HAIKU_TEST_DIR) kits net userland add-ons obos_network protocols ] + : udp + : installed-userland-networking +;