Changes in / [137691a:aa85487] in mainline

Files:

• boot/Makefile.common (modified) (3 diffs)
• uspace/lib/libpci/Makefile.build (added)
• uspace/lib/libpci/Makefile.common (added)
• uspace/srv/bd/part/mbr_part/Makefile.build (added)
• uspace/srv/bd/part/mbr_part/Makefile.common (added)
• uspace/srv/hid/char_mouse/Makefile.build (added)
• uspace/srv/hid/char_mouse/Makefile.common (added)
• uspace/srv/hw/bus/pci/Makefile.build (added)
• uspace/srv/hw/bus/pci/Makefile.common (added)
• uspace/srv/hw/char/i8042/Makefile.build (added)
• uspace/srv/hw/char/i8042/Makefile.common (added)
• uspace/srv/hw/cir/fhc/Makefile.build (added)
• uspace/srv/hw/cir/fhc/Makefile.common (added)
• uspace/srv/hw/cir/obio/Makefile.build (added)
• uspace/srv/hw/cir/obio/Makefile.common (added)
• uspace/srv/net/Makefile (modified) (2 diffs)
• uspace/srv/net/include/socket.h (modified) (1 diff)
• uspace/srv/net/module.c (modified) (1 diff)
• uspace/srv/net/tl/icmp/icmp.c (modified) (6 diffs)
• uspace/srv/net/tl/tcp/tcp.c (modified) (4 diffs)
• uspace/srv/net/tl/udp/udp.c (modified) (6 diffs)

boot/Makefile.common

@@ -91 +91 @@
         $(USPACEDIR)/srv/net/net/net \
         $(USPACEDIR)/srv/net/netif/lo/lo \
-        $(USPACEDIR)/srv/net/netif/dp8390/dp8390 \
         $(USPACEDIR)/srv/net/nil/eth/eth \
         $(USPACEDIR)/srv/net/nil/nildummy/nildummy \
@@ -105 +104 @@
 NET_CFG = \
         $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/general \
-        $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/lo \
-        $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/ne2k
+        $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/lo
+
+ifeq ($(CONFIG_NETIF_DP8390),y)
+        NET_SRVS        +=      $(USPACEDIR)/srv/net/netif/dp8390/dp8390
+
+        NET_CFG +=      $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/ne2k
 endif
 
@@ -130 +133 @@
 endif
 endif
-
+endif

uspace/srv/net/Makefile

@@ -31 +31 @@
 DIRS = \
         netif/lo \
-        netif/dp8390 \
         nil/eth \
         nil/nildummy \
@@ -48 +47 @@
                 tl/udp \
                 tl/tcp \
+
+ifeq ($(CONFIG_NETIF_DP8390),y)
+        DIRS += netif/dp8390
+endif
 
 DIRS_ALL = $(DIRS) $(DIRS_MODULAR)

uspace/srv/net/include/socket.h

@@ -61 +61 @@
  *  @returns EPROTONOSUPPORT if the protocol is not supported.
  *  @returns ENOMEM if there is not enough memory left.
+ *  @returns ELIMIT if there was not a free socket identifier found this time.
  *  @returns Other error codes as defined for the NET_SOCKET message.
  *  @returns Other error codes as defined for the bind_service_timeout() function.

uspace/srv/net/module.c

@@ -110 +110 @@
                 res = module_message( callid, & call, & answer, & answer_count );
 
-                if( IPC_GET_METHOD( call ) == IPC_M_PHONE_HUNGUP ) return;
+                if(( IPC_GET_METHOD( call ) == IPC_M_PHONE_HUNGUP ) || ( res == EHANGUP )){
+                        return;
+                }
 
                 answer_call( callid, res, & answer, answer_count );

uspace/srv/net/tl/icmp/icmp.c

@@ -658 +658 @@
         ipc_callid_t                    data_callid;
         icmp_echo_ref                   echo_data;
+        int                                             res;
 
         /*
@@ -663 +664 @@
          *  - Answer the first NET_ICMP_INIT call.
          */
-        ipc_answer_0( callid, EOK );
+        res = EOK;
+        answer_count = 0;
 
 //      fibril_rwlock_initialize( & lock );
@@ -669 +671 @@
         echo_data = ( icmp_echo_ref ) malloc( sizeof( * echo_data ));
         if( ! echo_data ) return ENOMEM;
+
         // assign a new identifier
         fibril_rwlock_write_lock( & icmp_globals.lock );
-        ERROR_CODE = icmp_bind_free_id( echo_data );
+        res = icmp_bind_free_id( echo_data );
         fibril_rwlock_write_unlock( & icmp_globals.lock );
-        if( ERROR_CODE < 0 ){
+        if( res < 0 ){
                 free( echo_data );
-                return ERROR_CODE;
+                return res;
         }
 
         while( keep_on_going ){
+
+                // answer the call
+                answer_call( callid, res, & answer, answer_count );
+
+                // refresh data
                 refresh_answer( & answer, & answer_count );
 
+                // get the next call
                 callid = async_get_call( & call );
 
+                // process the call
                 switch( IPC_GET_METHOD( call )){
                         case IPC_M_PHONE_HUNGUP:
                                 keep_on_going = false;
-                                ERROR_CODE = EOK;
+                                res = EHANGUP;
                                 break;
                         case NET_ICMP_ECHO:
 //                              fibril_rwlock_write_lock( & lock );
                                 if( ! async_data_write_receive( & data_callid, & length )){
-                                        ERROR_CODE = EINVAL;
+                                        res = EINVAL;
                                 }else{
                                         addr = malloc( length );
                                         if( ! addr ){
-                                                ERROR_CODE = ENOMEM;
+                                                res = ENOMEM;
                                         }else{
                                                 if( ! ERROR_OCCURRED( async_data_write_finalize( data_callid, addr, length ))){
                                                         fibril_rwlock_write_lock( & icmp_globals.lock );
-                                                        ERROR_CODE = icmp_echo( echo_data->identifier, echo_data->sequence_number, ICMP_GET_SIZE( call ), ICMP_GET_TIMEOUT( call ), ICMP_GET_TTL( call ), ICMP_GET_TOS( call ), ICMP_GET_DONT_FRAGMENT( call ), addr, ( socklen_t ) length );
+                                                        res = icmp_echo( echo_data->identifier, echo_data->sequence_number, ICMP_GET_SIZE( call ), ICMP_GET_TIMEOUT( call ), ICMP_GET_TTL( call ), ICMP_GET_TOS( call ), ICMP_GET_DONT_FRAGMENT( call ), addr, ( socklen_t ) length );
                                                         fibril_rwlock_write_unlock( & icmp_globals.lock );
                                                         free( addr );
@@ -707 +717 @@
                                                                 echo_data->sequence_number = 0;
                                                         }
+                                                }else{
+                                                        res = ERROR_CODE;
                                                 }
                                         }
@@ -713 +725 @@
                                 break;
                         default:
-                                ERROR_CODE = icmp_process_message( & call );
+                                res = icmp_process_message( & call );
                 }
-
-                answer_call( callid, ERROR_CODE, & answer, answer_count );
         }
 
@@ -723 +733 @@
         icmp_echo_data_exclude( & icmp_globals.echo_data, echo_data->identifier );
         fibril_rwlock_write_unlock( & icmp_globals.lock );
-        return EOK;
+        return res;
 }
 

uspace/srv/net/tl/tcp/tcp.c

@@ -1070 +1070 @@
          *  - Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0( callid, EOK );
+        res = EOK;
+        answer_count = 0;
 
         socket_cores_initialize( & local_sockets );
@@ -1076 +1077 @@
 
         while( keep_on_going ){
+
+                // answer the call
+                answer_call( callid, res, & answer, answer_count );
+
                 // refresh data
                 refresh_answer( & answer, & answer_count );
 
+                // get the next call
                 callid = async_get_call( & call );
-//              printf( "message %d\n", IPC_GET_METHOD( * call ));
-
+
+                // process the call
                 switch( IPC_GET_METHOD( call )){
                         case IPC_M_PHONE_HUNGUP:
                                 keep_on_going = false;
-                                res = EOK;
+                                res = EHANGUP;
                                 break;
                         case NET_SOCKET:
@@ -1231 +1237 @@
                                 break;
                 }
-
-//              printf( "res = %d\n", res );
-
-                answer_call( callid, res, & answer, answer_count );
         }
 
@@ -1273 +1275 @@
                                         // TODO release as connection lost
                                         //tcp_refresh_socket_data( socket_data );
-                                }
-                                // retransmit
-                                // TODO enable retransmit
-                                //tcp_retransmit_packet( socket, socket_data, timeout->sequence_number );
+                                }else{
+                                        // retransmit
+                                        tcp_retransmit_packet( socket, socket_data, timeout->sequence_number );
+                                }
                                 fibril_rwlock_write_unlock( socket_data->local_lock );
                         }else{

uspace/srv/net/tl/udp/udp.c

@@ -390 +390 @@
         fibril_rwlock_write_unlock( & udp_globals.lock );
         async_msg_5( socket->phone, NET_SOCKET_RECEIVED, ( ipcarg_t ) socket->socket_id, packet_dimension->content, 0, 0, ( ipcarg_t ) fragments );
-/*      fibril_rwlock_write_unlock( & udp_globals.lock );
-        async_msg_5( socket->phone, NET_SOCKET_RECEIVED, ( ipcarg_t ) socket->socket_id, 0, 0, 0, ( ipcarg_t ) fragments );
-*/      return EOK;
+        return EOK;
 }
 
@@ -429 +427 @@
          *  - Answer the first IPC_M_CONNECT_TO_ME call.
          */
-        ipc_answer_0( callid, EOK );
+        res = EOK;
+        answer_count = 0;
 
         // The client connection is only in one fibril and therefore no additional locks are needed.
@@ -437 +436 @@
 
         while( keep_on_going ){
+
+                // answer the call
+                answer_call( callid, res, & answer, answer_count );
+
                 // refresh data
                 refresh_answer( & answer, & answer_count );
 
+                // get the next call
                 callid = async_get_call( & call );
-//              printf( "message %d\n", IPC_GET_METHOD( * call ));
-
+
+                // process the call
                 switch( IPC_GET_METHOD( call )){
                         case IPC_M_PHONE_HUNGUP:
                                 keep_on_going = false;
-                                res = EOK;
+                                res = EHANGUP;
                                 break;
                         case NET_SOCKET:
@@ -514 +518 @@
                                 break;
                 }
-
-//              printf( "res = %d\n", res );
-
-                answer_call( callid, res, & answer, answer_count );
         }
 
@@ -523 +523 @@
         socket_cores_release( udp_globals.net_phone, & local_sockets, & udp_globals.sockets, NULL );
 
-        return EOK;
+        return res;
 }
 
@@ -618 +618 @@
         header->checksum = 0;
         if( udp_globals.checksum_computing ){
-//              if( ERROR_OCCURRED( ip_get_route_req( udp_globals.ip_phone, IPPROTO_UDP, addr, addrlen, & device_id, & ip_header, & headerlen ))){
-//                      return udp_release_and_return( packet, ERROR_CODE );
-//              }
-                if( ERROR_OCCURRED( ip_client_set_pseudo_header_data_length( ip_header, headerlen, total_length + UDP_HEADER_SIZE))){
+                // update the pseudo header
+                if( ERROR_OCCURRED( ip_client_set_pseudo_header_data_length( ip_header, headerlen, total_length + UDP_HEADER_SIZE ))){
                         free( ip_header );
                         return udp_release_and_return( packet, ERROR_CODE );
                 }
+                // finish the checksum computation
                 checksum = compute_checksum( checksum, ip_header, headerlen );
                 checksum = compute_checksum( checksum, ( uint8_t * ) header, sizeof( * header ));