/branches/network/uspace/srv/net/net/net_standalone.c |
---|
70,9 → 70,6 |
modules_initialize( & net_globals.modules ); |
measured_strings_initialize( & net_globals.configuration ); |
// run self tests |
// ERROR_PROPAGATE( self_test()); |
ERROR_PROPAGATE( add_module( NULL, & net_globals.modules, LO_NAME, LO_FILENAME, SERVICE_LO, 0, connect_to_service )); |
ERROR_PROPAGATE( add_module( NULL, & net_globals.modules, DP8390_NAME, DP8390_FILENAME, SERVICE_DP8390, 0, connect_to_service )); |
ERROR_PROPAGATE( add_module( NULL, & net_globals.modules, ETHERNET_NAME, ETHERNET_FILENAME, SERVICE_ETHERNET, 0, connect_to_service )); |
84,7 → 81,6 |
if( ! spawn( "/srv/icmp" )) return EINVAL; |
if( ! spawn( "/srv/udp" )) return EINVAL; |
if( ! spawn( "/srv/tcp" )) return EINVAL; |
// if( ! spawn( "/srv/rarp" )) return EINVAL; |
return EOK; |
} |
/branches/network/uspace/srv/net/net/net_bundle.c |
---|
49,7 → 49,7 |
#include "../il/arp/arp_module.h" |
#include "../il/ip/ip_module.h" |
#include "../il/icmp/icmp_module.h" |
#include "../tl/icmp/icmp_module.h" |
#include "../tl/udp/udp_module.h" |
#include "../tl/tcp/tcp_module.h" |
82,9 → 82,7 |
return ip_message( callid, call, answer, answer_count ); |
}else if( IS_NET_ARP_MESSAGE( call )){ |
return arp_message( callid, call, answer, answer_count ); |
/* }else if( IS_NET_RARP_MESSAGE( call )){ |
return rarp_message( callid, call, answer, answer_count ); |
*/ }else if( IS_NET_ICMP_MESSAGE( call )){ |
}else if( IS_NET_ICMP_MESSAGE( call )){ |
return icmp_message( callid, call, answer, answer_count ); |
}else if( IS_NET_UDP_MESSAGE( call )){ |
return udp_message( callid, call, answer, answer_count ); |
109,9 → 107,6 |
modules_initialize( & net_globals.modules ); |
measured_strings_initialize( & net_globals.configuration ); |
// run self tests |
// ERROR_PROPAGATE( self_test()); |
ERROR_PROPAGATE( add_module( NULL, & net_globals.modules, LO_NAME, LO_FILENAME, SERVICE_LO, 0, connect_to_service )); |
ERROR_PROPAGATE( add_module( NULL, & net_globals.modules, DP8390_NAME, DP8390_FILENAME, SERVICE_DP8390, 0, connect_to_service )); |
ERROR_PROPAGATE( add_module( NULL, & net_globals.modules, ETHERNET_NAME, ETHERNET_FILENAME, SERVICE_ETHERNET, 0, connect_to_service )); |
122,8 → 117,6 |
ERROR_PROPAGATE( ip_initialize( client_connection )); |
ERROR_PROPAGATE( REGISTER_ME( SERVICE_ARP, & phonehash )); |
ERROR_PROPAGATE( arp_initialize( client_connection )); |
// ERROR_PROPAGATE( REGISTER_ME( SERVICE_RARP, & phonehash )); |
// ERROR_PROPAGATE( rarp_initialize( client_connection )); |
ERROR_PROPAGATE( REGISTER_ME( SERVICE_ICMP, & phonehash )); |
ERROR_PROPAGATE( icmp_initialize( client_connection )); |
ERROR_PROPAGATE( REGISTER_ME( SERVICE_UDP, & phonehash )); |
/branches/network/uspace/srv/net/net/net.c |
---|
48,7 → 48,6 |
#include "../err.h" |
#include "../messages.h" |
#include "../modules.h" |
//#include "../self_test.h" |
#include "../structures/char_map.h" |
#include "../structures/generic_char_map.h" |
/branches/network/uspace/srv/net/net/Makefile |
---|
41,28 → 41,27 |
$(NAME).c \ |
$(NET_BASE)module.c \ |
$(NET_BASE)modules.c \ |
$(NET_BASE)netif/netif_remote.c \ |
$(STRUCTURES)char_map.c \ |
$(STRUCTURES)measured_strings.c \ |
$(STRUCTURES)module_map.c \ |
$(STRUCTURES)packet/packet.c \ |
$(STRUCTURES)packet/packet_client.c \ |
$(STRUCTURES)packet/packet_server.c \ |
$(NET_BASE)netif/netif_remote.c |
# $(NET_BASE)self_test.c |
$(STRUCTURES)packet/packet_server.c |
ifeq ($(NETWORKING), module) |
SOURCES += $(NAME)_bundle.c \ |
$(NET_BASE)crc.c \ |
$(NET_BASE)inet.c \ |
$(NET_BASE)il/arp/arp.c \ |
$(NET_BASE)il/ip/ip.c \ |
$(NET_BASE)il/ip/ip_client.c \ |
$(NET_BASE)il/icmp/icmp.c \ |
$(NET_BASE)il/icmp/icmp_client.c \ |
$(NET_BASE)inet.c \ |
$(NET_BASE)socket/socket_core.c \ |
$(NET_BASE)tl/icmp/icmp.c \ |
$(NET_BASE)tl/icmp/icmp_client.c \ |
$(NET_BASE)tl/tcp/tcp.c \ |
$(NET_BASE)tl/udp/udp.c \ |
$(NET_BASE)socket/socket_core.c \ |
$(STRUCTURES)dynamic_fifo.c |
else |
/branches/network/uspace/srv/net/net/start/Makefile |
---|
39,11 → 39,11 |
OUTPUT = $(NAME) |
SOURCES = \ |
$(NAME).c \ |
$(NET_BASE)crc.c \ |
$(NET_BASE)modules.c \ |
$(NET_BASE)self_test.c \ |
$(STRUCTURES)char_map.c \ |
$(STRUCTURES)dynamic_fifo.c \ |
$(STRUCTURES)measured_strings.c \ |
$(NET_BASE)crc.c |
$(STRUCTURES)measured_strings.c |
include $(NET_BASE)Makefile.module |