Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4573 → Rev 4574

/branches/network/uspace/srv/net/net/net_standalone.c
82,9 → 82,6
ERROR_PROPAGATE( add_module( NULL, & net_globals.modules, IP_NAME, IP_FILENAME, SERVICE_IP, task_id, ip_connect_module ));
if( ! spawn( "/srv/udp" )) return EINVAL;
if( ! spawn( "/srv/tcp" )) return EINVAL;
// if( ! spawn( "/srv/socket" )) return EINVAL;
// not always necesssary
// if( ! spawn( "/srv/arp" )) return EINVAL;
// if( ! spawn( "/srv/rarp" )) return EINVAL;
// if( ! spawn( "/srv/icmp" )) return EINVAL;
return EOK;
/branches/network/uspace/srv/net/net/net_bundle.c
60,17 → 60,14
 
int module_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count ){
if(( IPC_GET_METHOD( * call ) == IPC_M_CONNECT_TO_ME )
|| IS_NET_IL_MESSAGE( call )){
|| IS_NET_IL_MESSAGE( call )
|| IS_NET_TL_MESSAGE( call )
|| IS_NET_SOCKET_MESSAGE( call )){
switch( IPC_GET_TARGET( call )){
case SERVICE_IP:
return ip_message( callid, call, answer, answer_count );
case SERVICE_ARP:
return arp_message( callid, call, answer, answer_count );
default:
return EINVAL;
}
}else if( IS_NET_TL_MESSAGE( call )){
switch( IPC_GET_TARGET( call )){
case SERVICE_UDP:
return udp_message( callid, call, answer, answer_count );
case SERVICE_TCP:
90,9 → 87,7
return udp_message( callid, call, answer, answer_count );
}else if( IS_NET_TCP_MESSAGE( call )){
return tcp_message( callid, call, answer, answer_count );
/* }else if( IS_NET_SOCKET_MESSAGE( call )){
return socket_message( callid, call, answer, answer_count );
*/ }else{
}else{
if( IS_NET_PACKET_MESSAGE( call )){
return packet_server_message( callid, call, answer, answer_count );
}else{
130,10 → 125,6
ERROR_PROPAGATE( udp_initialize( client_connection ));
ERROR_PROPAGATE( REGISTER_ME( SERVICE_TCP, & phonehash ));
ERROR_PROPAGATE( tcp_initialize( client_connection ));
// ERROR_PROPAGATE( REGISTER_ME( SERVICE_SOCKET, & phonehash ));
// ERROR_PROPAGATE( socket_initialize( client_connection ));
// ERROR_PROPAGATE( REGISTER_ME( SERVICE_ETHERNET, & phonehash ));
// ERROR_PROPAGATE( ethernet_initialize( client_connection ));
return EOK;
}