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
This commit is contained in:
@@ -1,12 +1,14 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network ;
|
SubDir HAIKU_TOP src tests add-ons kernel network ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
UsePrivateHeaders net ;
|
||||||
|
|
||||||
# the network stack tester app
|
# the network stack tester app
|
||||||
|
|
||||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system libroot os ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system libroot os ] ;
|
||||||
|
|
||||||
SimpleTest net_stack_tester :
|
SimpleTest <installed>net_stack_tester :
|
||||||
net_stack_tester.cpp
|
net_stack_tester.cpp
|
||||||
userland_ipc.c
|
userland_ipc.c
|
||||||
userland_modules.cpp
|
userland_modules.cpp
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network core ;
|
SubDir HAIKU_TOP src tests add-ons kernel network core ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
UsePrivateHeaders net ;
|
||||||
|
|
||||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network core ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network core ] ;
|
||||||
@@ -24,4 +26,3 @@ Addon <userland>core : userland obos_network :
|
|||||||
|
|
||||||
LinkAgainst <userland>core : <installed>net_stack_tester ;
|
LinkAgainst <userland>core : <installed>net_stack_tester ;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network interfaces ethernet ;
|
SubDir HAIKU_TOP src tests add-ons kernel network interfaces ethernet ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
UsePrivateHeaders net ;
|
||||||
|
|
||||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network interfaces ethernet ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network interfaces ethernet ] ;
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network interfaces loopback ;
|
SubDir HAIKU_TOP src tests add-ons kernel network interfaces loopback ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
UsePrivateHeaders net ;
|
||||||
|
|
||||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network interfaces loopback ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network interfaces loopback ] ;
|
||||||
|
|||||||
@@ -1,14 +1,16 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network interfaces ppp ;
|
SubDir HAIKU_TOP src tests add-ons kernel network interfaces ppp ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
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 ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network interfaces ppp ] ;
|
||||||
|
|
||||||
|
|
||||||
Addon <userland>ppp : userland obos_network interfaces :
|
Addon <userland>ppp : userland obos_network interfaces :
|
||||||
ppp.cpp
|
ppp.cpp
|
||||||
PPPManager.cpp
|
PPPManager.cpp
|
||||||
;
|
;
|
||||||
|
|
||||||
LinkAgainst <userland>ppp : <userland>libkernelppp.a <installed>net_stack_tester be ;
|
LinkAgainst <userland>ppp : <userland>libkernelppp.a <installed>net_stack_tester be ;
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network ppp ipcp ;
|
SubDir HAIKU_TOP src tests add-ons kernel network ppp ipcp ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
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 ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp ipcp ] ;
|
||||||
|
|
||||||
|
|
||||||
Addon <userland>ipcp : userland obos_network ppp :
|
Addon <userland>ipcp : userland obos_network ppp :
|
||||||
ipcp.cpp
|
ipcp.cpp
|
||||||
Protocol.cpp
|
Protocol.cpp
|
||||||
@@ -17,3 +18,4 @@ LinkAgainst <userland>ipcp :
|
|||||||
be
|
be
|
||||||
libbind.so
|
libbind.so
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network ppp modem ;
|
SubDir HAIKU_TOP src tests add-ons kernel network ppp modem ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
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 ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp modem ] ;
|
||||||
|
|
||||||
|
|
||||||
Addon <userland>modem : userland obos_network ppp :
|
Addon <userland>modem : userland obos_network ppp :
|
||||||
modem.cpp
|
modem.cpp
|
||||||
ModemDevice.cpp
|
ModemDevice.cpp
|
||||||
@@ -13,3 +14,4 @@ Addon <userland>modem : userland obos_network ppp :
|
|||||||
;
|
;
|
||||||
|
|
||||||
LinkAgainst <userland>modem : <userland>libkernelppp.a <installed>net_stack_tester be ;
|
LinkAgainst <userland>modem : <userland>libkernelppp.a <installed>net_stack_tester be ;
|
||||||
|
|
||||||
|
|||||||
@@ -1,14 +1,16 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network ppp pap ;
|
SubDir HAIKU_TOP src tests add-ons kernel network ppp pap ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
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 ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp pap ] ;
|
||||||
|
|
||||||
|
|
||||||
Addon <userland>pap : userland obos_network ppp :
|
Addon <userland>pap : userland obos_network ppp :
|
||||||
pap.cpp
|
pap.cpp
|
||||||
Protocol.cpp
|
Protocol.cpp
|
||||||
;
|
;
|
||||||
|
|
||||||
LinkAgainst <userland>pap : <userland>libkernelppp.a <installed>net_stack_tester be ;
|
LinkAgainst <userland>pap : <userland>libkernelppp.a <installed>net_stack_tester be ;
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network ppp pppoe ;
|
SubDir HAIKU_TOP src tests add-ons kernel network ppp pppoe ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
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 ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp pppoe ] ;
|
||||||
|
|
||||||
|
|
||||||
Addon <userland>pppoe : userland obos_network ppp :
|
Addon <userland>pppoe : userland obos_network ppp :
|
||||||
pppoe.cpp
|
pppoe.cpp
|
||||||
PPPoEDevice.cpp
|
PPPoEDevice.cpp
|
||||||
@@ -13,3 +14,4 @@ Addon <userland>pppoe : userland obos_network ppp :
|
|||||||
;
|
;
|
||||||
|
|
||||||
LinkAgainst <userland>pppoe : <userland>libkernelppp.a <installed>net_stack_tester be ;
|
LinkAgainst <userland>pppoe : <userland>libkernelppp.a <installed>net_stack_tester be ;
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,20 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network ppp shared libkernelppp ;
|
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 ;
|
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 ;
|
||||||
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp ] ;
|
|
||||||
|
|
||||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp ] ;
|
||||||
|
|
||||||
|
|
||||||
StaticLibrary <userland>libkernelppp.a :
|
StaticLibrary <userland>libkernelppp.a :
|
||||||
KPPPConfigurePacket.cpp
|
KPPPConfigurePacket.cpp
|
||||||
KPPPDevice.cpp
|
KPPPDevice.cpp
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network protocols icmp ;
|
SubDir HAIKU_TOP src tests add-ons kernel network protocols icmp ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
UsePrivateHeaders net ;
|
||||||
|
|
||||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols icmp ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols icmp ] ;
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network protocols ipv4 ;
|
SubDir HAIKU_TOP src tests add-ons kernel network protocols ipv4 ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
UsePrivateHeaders net ;
|
||||||
|
|
||||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ipv4 ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ipv4 ] ;
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network protocols raw ;
|
SubDir HAIKU_TOP src tests add-ons kernel network protocols raw ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
UsePrivateHeaders net ;
|
||||||
|
|
||||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols raw ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols raw ] ;
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network protocols route ;
|
SubDir HAIKU_TOP src tests add-ons kernel network protocols route ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
UsePrivateHeaders net ;
|
||||||
|
|
||||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols route ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols route ] ;
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network protocols tcp ;
|
SubDir HAIKU_TOP src tests add-ons kernel network protocols tcp ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
UsePrivateHeaders net ;
|
||||||
|
|
||||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols tcp ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols tcp ] ;
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
SubDir HAIKU_TOP src tests add-ons kernel network protocols udp ;
|
SubDir HAIKU_TOP src tests add-ons kernel network protocols udp ;
|
||||||
|
|
||||||
|
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||||
|
|
||||||
UsePrivateHeaders net ;
|
UsePrivateHeaders net ;
|
||||||
|
|
||||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols udp ] ;
|
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols udp ] ;
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ commands_info g_commands_info[] = {
|
|||||||
C2N(NET_STACK_SELECT),
|
C2N(NET_STACK_SELECT),
|
||||||
C2N(NET_STACK_DESELECT),
|
C2N(NET_STACK_DESELECT),
|
||||||
C2N(NET_STACK_GET_COOKIE),
|
C2N(NET_STACK_GET_COOKIE),
|
||||||
C2N(NET_STACK_STOP),
|
// C2N(NET_STACK_STOP),
|
||||||
C2N(NET_STACK_NOTIFY_SOCKET_EVENT),
|
C2N(NET_STACK_NOTIFY_SOCKET_EVENT),
|
||||||
C2N(NET_STACK_CONTROL_NET_MODULE),
|
C2N(NET_STACK_CONTROL_NET_MODULE),
|
||||||
|
|
||||||
@@ -394,11 +394,11 @@ connection_runner(void *_cookie)
|
|||||||
args->u.sysctl.newlen);
|
args->u.sysctl.newlen);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
case NET_STACK_STOP:
|
case NET_STACK_STOP:
|
||||||
core->stop();
|
core->stop();
|
||||||
break;
|
break;
|
||||||
|
*/
|
||||||
case NET_STACK_CONTROL_NET_MODULE:
|
case NET_STACK_CONTROL_NET_MODULE:
|
||||||
// TODO!
|
// TODO!
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user