/branches/network/uspace/srv/net/app/echo/Makefile |
---|
File deleted |
Property changes: |
Deleted: svn:eol-style |
-native |
\ No newline at end of property |
/branches/network/uspace/srv/net/app/echo/echo.c |
---|
File deleted |
Property changes: |
Deleted: svn:eol-style |
-native |
\ No newline at end of property |
/branches/network/uspace/srv/net/tl/udp/udp.c |
---|
255,8 → 255,7 |
res = udp_recvfrom_message( & local_sockets, SOCKET_GET_SOCKET_ID( call ), SOCKET_GET_FLAGS( call )); |
if( res > 0 ){ |
* SOCKET_SET_READ_DATA_LENGTH( answer ) = res; |
* SOCKET_SET_ADDRESS_LENGTH( answer ) = sizeof( struct sockaddr_in ); |
* answer_count = 2; |
* answer_count = 1; |
res = EOK; |
} |
break; |
389,7 → 388,7 |
header = ( udp_header_ref ) data; |
// set the source address |
address.sin_family = PF_INET; |
address.sin_port = ntohs( header->source ); |
address.sin_port = ntohs( header->dest ); |
length = packet_get_addr( packet, & addr, NULL ); |
if( length != sizeof( address.sin_addr.s_addr )){ |
pq_release( udp_globals.net_phone, packet_id ); |
/branches/network/uspace/srv/net/include/socket.h |
---|
41,7 → 41,6 |
#include <sys/types.h> |
#include "byteorder.h" |
#include "in.h" |
#include "inet.h" |
/branches/network/uspace/srv/net/socket/socket_core.c |
---|
143,11 → 143,11 |
if( ! socket ) return ENOTSOCK; |
socket_ports_exclude( global_sockets, socket->port ); |
// destroy all accepted sockets |
while(( accepted_id = dyn_fifo_pop( & socket->accepted )) >= 0 ){ |
while(( accepted_id = dyn_fifo_pop( & socket->accepted ))){ |
socket_destroy( packet_phone, accepted_id, local_sockets, global_sockets ); |
} |
// release all received packets |
while(( packet_id = dyn_fifo_pop( & socket->received )) >= 0 ){ |
while(( packet_id = dyn_fifo_pop( & socket->received ))){ |
pq_release( packet_phone, packet_id ); |
} |
dyn_fifo_destroy( & socket->received ); |
/branches/network/uspace/srv/net/socket/socket_messages.h |
---|
69,8 → 69,6 |
#define SOCKET_GET_OPT_LEVEL( call ) ( int ) IPC_GET_ARG2( * call ) |
#define SOCKET_SET_DATA_FRAGMENTS( call ) ( int * ) & IPC_GET_ARG2( * call ) |
#define SOCKET_GET_DATA_FRAGMENTS( call ) ( int ) IPC_GET_ARG2( * call ) |
#define SOCKET_SET_ADDRESS_LENGTH( call ) ( size_t * ) & IPC_GET_ARG2( * call ) |
#define SOCKET_GET_ADDRESS_LENGTH( call ) ( size_t ) IPC_GET_ARG2( * call ) |
#define SOCKET_SET_DATA_FRAGMENT_SIZE( call ) ( int * ) & IPC_GET_ARG3( * call ) |
#define SOCKET_GET_DATA_FRAGMENT_SIZE( call ) ( int ) IPC_GET_ARG3( * call ) |
/branches/network/uspace/srv/net/socket/socket_client.c |
---|
454,7 → 454,6 |
if( ! data ) return EBADMEM; |
if( ! datalength ) return NO_DATA; |
if( fromaddr && (( ! addrlen ) || ( * addrlen < sizeof( struct sockaddr_in )))) return EINVAL; |
// find the socket |
socket = sockets_find( socket_get_sockets(), socket_id ); |
if( ! socket ) return ENOTSOCK; |
474,6 → 473,9 |
// request packet data |
message_id = async_send_4( socket->phone, message, socket->socket_id, 0, socket->service, flags, & answer ); |
// read the address if desired |
if( fromaddr ){ |
* addrlen = sizeof( struct sockaddr_in ); |
} |
if(( ! fromaddr ) || ( ipc_data_read_start( socket->phone, fromaddr, * addrlen ) == EOK )){ |
if( fragments == 1 ){ |
// read all if only one fragment |
501,8 → 503,6 |
dyn_fifo_pop( & socket->received ); |
// return read data length |
result = SOCKET_GET_READ_DATA_LENGTH( & answer ); |
// set address length |
if( fromaddr && addrlen ) * addrlen = SOCKET_GET_ADDRESS_LENGTH( & answer ); |
} |
fibril_mutex_unlock( & socket->receive_lock ); |
return result; |
/branches/network/uspace/srv/net/socket/Makefile |
---|
37,7 → 37,6 |
LIB = lib$(NAME).a |
SOURCES = \ |
$(NAME)_client.c \ |
$(NET_BASE)modules.c \ |
$(NET_BASE)inet.c \ |
$(STRUCTURES)dynamic_fifo.c |
/branches/network/uspace/srv/net/net/start/netstart.c |
---|
80,7 → 80,7 |
ERROR_PROPAGATE( self_test()); |
// start net service |
if( ! spawn( "/srv/net" )){ |
fprintf( stderr, "Could not spawn net\n" ); |
printf( "Could not spawn net\n" ); |
return EINVAL; |
} |
// start net |
/branches/network/uspace/srv/net/Makefile |
---|
34,8 → 34,7 |
nil/eth \ |
net \ |
net/start \ |
socket \ |
app/echo |
socket |
DIRS_MODULAR = il/ip \ |
il/arp \ |
/branches/network/contrib/conf/qemu.sh |
---|
1,4 → 1,4 |
#!/bin/sh |
#qemu 0.10.2 only (NOT qemu 0.9.1!) |
qemu $@ -vga std -no-kqemu -M isapc -net nic,model=ne2k_isa -net user -boot d -cdrom image.iso -redir udp:8080::8080 -redir udp:8081::8081 |
qemu $@ -vga std -no-kqemu -M isapc -net nic,model=ne2k_isa -net user -boot d -cdrom image.iso -redir tcp:8080:10.0.2.15:8080 |
/branches/network/boot/arch/ia32/Makefile.inc |
---|
48,7 → 48,6 |
$(USPACEDIR)/srv/net/netif/lo/lo \ |
$(USPACEDIR)/srv/net/netif/dp8390/dp8390 \ |
$(USPACEDIR)/srv/net/nil/eth/eth \ |
$(USPACEDIR)/srv/net/app/echo/echo \ |
$(USPACEDIR)/srv/pci/pci \ |
$(USPACEDIR)/srv/fb/fb \ |
$(USPACEDIR)/srv/kbd/kbd \ |