/branches/network/uspace/srv/net/ip/ip.c |
---|
32,6 → 32,7 |
/** @file |
*/ |
#include <async.h> |
#include <errno.h> |
#include <stdio.h> |
39,28 → 40,37 |
#include <ipc/services.h> |
//#include <sys/mman.h> |
#include "../err.h" |
#include "../messages.h" |
#include "../modules.h" |
#include "../netif/netif_device_id_type.h" |
#include "ip.h" |
struct { |
ipc_callid_t tcp_accepted; |
} ip_globals; |
ip_globals_t ip_globals; |
DEVICE_MAP_IMPLEMENT( ip_netifs, ip_netif_t ) |
/** Initializes the module. |
*/ |
int ip_initialize( void ){ |
ip_netifs_initialize( & ip_globals.netifs ); |
return EOK; |
} |
int ip_call( ipc_callid_t callid ){ |
ip_globals.tcp_accepted = callid; |
return EOK; |
} |
int ip_message( ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *result1, ipcarg_t *result2, ipcarg_t *result3 ){ |
int ip_message( ipc_callid_t callid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t * result1, ipcarg_t * result2, ipcarg_t * result3 ){ |
ERROR_DECLARE; |
ip_netif_ref ip_netif; |
// printf( "\nIP message %d", method ); |
switch( method ){ |
// case IPC_M_CONNECT_ME_TO: |
// case IPC_M_CONNECT_TO_ME: |
case IPC_M_PHONE_HUNGUP: |
return EOK; |
case NET_IP_ECHO: |
68,6 → 78,23 |
if( result2 ) * result2 = arg2; |
if( result3 ) * result3 = arg3; |
return EOK; |
case NET_IL_DEVICE: |
ip_netif = ( ip_netif_ref ) malloc( sizeof( ip_netif_t )); |
if( ! ip_netif ) return ENOMEM; |
ip_netif->device_id = arg1; |
ip_netif->phone = connect_to_service( arg2 ); |
if( ERROR_OCCURED( ipc_call_sync_1_0( ip_netif->phone, NET_LL_REGISTER, arg1 ))){ |
free( ip_netif ); |
return ERROR_CODE; |
} |
if( ERROR_OCCURED( ip_netifs_add( & ip_globals.netifs, ip_netif->device_id, ip_netif ))){ |
free( ip_netif ); |
return ERROR_CODE; |
} |
return EOK; |
case NET_IP_TCP_REGISTER: |
ip_globals.tcp_phone = ipc_connect_to_me( callid, 0, 0, 0, 0 ); |
return EOK; |
} |
return ENOTSUP; |
} |
/branches/network/uspace/srv/net/ip/Makefile |
---|
44,8 → 44,11 |
SOURCES = \ |
$(NAME)_module.c \ |
$(NAME).c \ |
../module.c \ |
../modules.c |
DEFS += -D NETWORKING_$(NETWORKING) -D $(NAME)_call=module_call -D $(NAME)_message=module_message -D $(NAME)_start_module=module_start -D $(NAME)_print_name=module_print_name |
OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) |
.PHONY: all clean depend disasm |
75,4 → 78,4 |
$(AS) $(AFLAGS) $< -o $@ |
%.o: %.c |
$(CC) $(DEFS) $(CFLAGS) -D NETWORKING_$(NETWORKING) -c $< -o $@ |
$(CC) $(DEFS) $(CFLAGS) -c $< -o $@ |
/branches/network/uspace/srv/net/ip/ip.h |
---|
39,10 → 39,31 |
#include <ipc/ipc.h> |
int ip_initialize( void ); |
int ip_call( ipc_callid_t callid ); |
int ip_message( ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t *result1, ipcarg_t *result2, ipcarg_t *result3 ); |
#include "../netif/netif_device_id_type.h" |
typedef struct ip_netif ip_netif_t; |
typedef ip_netif_t * ip_netif_ref; |
typedef struct ip_globals ip_globals_t; |
DEVICE_MAP_DECLARE( ip_netifs, ip_netif_t ) |
struct ip_netif{ |
netif_device_id_t device_id; |
int phone; |
// TODO configuration |
}; |
struct ip_globals{ |
int networking_phone; |
int tcp_phone; |
ip_netifs_t netifs; |
}; |
int ip_initialize( void ); |
int ip_call( ipc_callid_t callid ); |
int ip_message( ipc_callid_t callid, ipcarg_t method, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t * result1, ipcarg_t * result2, ipcarg_t * result3 ); |
#endif |
/** @} |
/branches/network/uspace/srv/net/ip/ip_module.c |
---|
32,52 → 32,36 |
/** @file |
*/ |
#include <async.h> |
#include <errno.h> |
#include <stdio.h> |
#include <ipc/ipc.h> |
#include <ipc/services.h> |
//#include <sys/mman.h> |
#include "../modules.h" |
#include "ip.h" |
static void client_connection( ipc_callid_t iid, ipc_call_t * icall ); |
int main( int argc, char * argv[] ); |
#define NAME "IP protocol" |
/** Default thread for new connections. |
*/ |
static void client_connection( ipc_callid_t iid, ipc_call_t * icall ){ |
ipc_callid_t callid; |
ipc_call_t call; |
ipcarg_t arg1, arg2, arg3; |
int res; |
void ip_print_name( void ); |
int ip_start_module( void ( * client_connection )( ipc_callid_t iid, ipc_call_t * icall )); |
/* Accept the connection */ |
ipc_answer_0( iid, EOK ); |
extern ip_globals_t ip_globals; |
while( true ){ |
callid = async_get_call( & call ); |
arg1 = 0; |
arg2 = 0; |
arg3 = 0; |
res = ip_call( callid ); |
if( res == EOK ){ |
res = ip_message( IPC_GET_METHOD( call ), IPC_GET_ARG1( call ), IPC_GET_ARG2( call ), IPC_GET_ARG3( call ), & arg1, & arg2, & arg3 ); |
} |
ipc_answer_2( callid, res, arg1, arg2 ); |
} |
void ip_print_name( void ){ |
printf( NAME ); |
} |
/** Starts the module. |
* Parameters are ignored. |
*/ |
int main( int argc, char * argv[] ){ |
int ip_start_module( void ( * client_connection )( ipc_callid_t iid, ipc_call_t * icall )){ |
services_t need[ 2 ]; |
int * need_phone[ 2 ]; |
printf("ip : HelenOS IP network protocol\n"); |
return start_service( SERVICE_IP, NULL, NULL, client_connection, ip_initialize ); |
need[ 0 ] = SERVICE_NETWORKING; |
need[ 1 ] = NULL; |
need_phone[ 0 ] = & ip_globals.networking_phone; |
need_phone[ 1 ] = NULL; |
return start_service( SERVICE_IP, need, need_phone, client_connection, ip_initialize ); |
} |
/** @} |