WebSVN – HelenOS – Diff – /branches/network/uspace/srv/net/netif/lo.c

  */
 #include <async.h>
 #include <errno.h>
 #include <stdio.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
-//#include <sys/mman.h>
 #include "../err.h"
 #include "../measured_strings.h"
 #include "../messages.h"
 #include "../modules.h"
+#include "../packet.h"
 #include "netif.h"
 #define DEFAULT_MTU 1500
 #define NAME    "lo - loopback interface"
 netif_globals_t netif_globals;
-void    change_state( netif_device_ref device, netif_state_t state );
-int change_state_message( netif_device_id_t device_id, netif_state_t state );
+int change_state_message( device_id_t device_id, device_state_t state );
-int netif_create( netif_device_id_t device_id, netif_device_ref * device );
+int create( device_id_t device_id, device_ref * device );
-int netif_call( ipc_callid_t callid );
-int netif_initialize( void );
+int initialize( void );
 void    netif_print_name( void );
-int netif_probe_auto_message( ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t * result1, ipcarg_t * result2, ipcarg_t * result3 );
+int probe_auto_message( void );
-int netif_probe_message( ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t * result1, ipcarg_t * result2, ipcarg_t * result3 );
+int probe_message( device_id_t device_id, int irq, int io );
-int netif_send_message( ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t * result1, ipcarg_t * result2, ipcarg_t * result3 );
-int netif_start_message( ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t * result1, ipcarg_t * result2, ipcarg_t * result3 );
-int netif_stop_message( ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t * result1, ipcarg_t * result2, ipcarg_t * result3 );
-void change_state( netif_device_ref device, netif_state_t state ){
+int send_message( device_id_t device_id, packet_t packet );
-    device->state = state;
+int start_message( device_id_t device_id );
-    ll_message( device, NET_LL_DEVICE_STATE_CHANGED, device->state, NULL, NULL, NULL, NULL );
+int stop_message( device_id_t device_id );
-}
-int change_state_message( netif_device_id_t device_id, netif_state_t state ){
+int change_state_message( device_id_t device_id, device_state_t state ){
     ERROR_DECLARE;
-    netif_device_ref    device;
+    device_ref  device;
-    ERROR_PROPAGATE( netif_device_find( device_id, & device ));
+    ERROR_PROPAGATE( find_device( device_id, & device ));
+    if( device->state != state ){
-    change_state( device, state );
+        device->state = state;
+        nil_message( device, NET_NIL_DEVICE_STATE, device->state, NULL, NULL, NULL, NULL );
+    }
     return EOK;
+}
-int netif_create( netif_device_id_t device_id, netif_device_ref * device ){
+int create( device_id_t device_id, device_ref * device ){
     ERROR_DECLARE;
-    if( netif_device_map_count( & netif_globals.netif_device_map ) > 0 ){
+    if( device_map_count( & netif_globals.device_map ) > 0 ){
         return EXDEV;
     }else{
-        * device = ( netif_device_ref ) malloc( sizeof( netif_device_t ));
+        * device = ( device_ref ) malloc( sizeof( device_t ));
         if( !( * device )) return ENOMEM;
         ( ** device ).device_id = device_id;
-        ( ** device ).ll_registered = -1;
+        ( ** device ).nil_phone = -1;
         ( ** device ).specific = NULL;
-        netif_device_stats_null( &(( ** device ).stats ));
+        null_device_stats( &(( ** device ).stats ));
         ( ** device ).state = NETIF_STOPPED;
         ( ** device ).flags = NULL;
         ( ** device ).mtu = DEFAULT_MTU;
-        if( ERROR_OCCURED( netif_device_map_add( & netif_globals.netif_device_map, ( ** device ).device_id, * device ))){
+        if( ERROR_OCCURED( device_map_add( & netif_globals.device_map, ( ** device ).device_id, * device ))){
             free( * device );
             * device = NULL;
             return ERROR_CODE;
+        }
+    }
     return EOK;
+}
-int netif_call( ipc_callid_t callid ){
-    return EOK;
-}
-int netif_initialize( void ){
+int initialize( void ){
     ipcarg_t    phonehash;
     return REGISTER_ME( SERVICE_LO, & phonehash );
+}
 void netif_print_name( void ){
     printf( NAME );
+}
-int netif_probe_auto_message( ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t * result1, ipcarg_t * result2, ipcarg_t * result3 ){
+int probe_auto_message( void ){
 /*  ERROR_DECLARE;
-    netif_device_ref    device;
+    device_ref  device;
-    ERROR_PROPAGATE( netif_create( arg1, & device ));
+    ERROR_PROPAGATE( create( arg1, & device ));
-    ipc_call_sync_3_3( netif_globals.networking_phone, NET_NETWORKING_DEVICE, device->device_id, NULL, NULL, NULL, NULL, NULL );
+    ipc_call_sync_3_3( netif_globals.networking_phone, NET_NET_DEVICE, device->device_id, NULL, NULL, NULL, NULL, NULL );
 */  return ENOTSUP;
+}
-int netif_probe_message( ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t * result1, ipcarg_t * result2, ipcarg_t * result3 ){
+int probe_message( device_id_t device_id, int irq, int io ){
     ERROR_DECLARE;
-    netif_device_ref    device;
+    device_ref      device;
     aid_t           message;
     ipc_call_t      answer;
     measured_string_t   configuration[ 1 ] = {{ "MTU", 3 }};
     int         count = 1;
     measured_string_ref settings;
     char *          data;
     // create a new device
-    ERROR_PROPAGATE( netif_create( arg1, & device ));
+    ERROR_PROPAGATE( create( device_id, & device ));
     // get configuration
-    message = async_send_2( netif_globals.networking_phone, NET_NETWORKING_GET_DEVICE_CONFIGURATION, device->device_id, count, & answer );
+    message = async_send_2( netif_globals.networking_phone, NET_NET_GET_DEVICE_CONF, device->device_id, count, & answer );
     // send names and get settings
     if( ERROR_OCCURED( measured_strings_send( netif_globals.networking_phone, configuration, count ))
     || ERROR_OCCURED( measured_strings_return( netif_globals.networking_phone, & settings, & data, count ))){
         async_wait_for( message, NULL );
         return ERROR_CODE;
         device->mtu = strtoul( settings[ 0 ].value, NULL, 0 );
     }else{
         device->mtu = DEFAULT_MTU;
+    }
     // print the settings
-    printf("\n -MTU=%d", device->mtu );
+    printf("\n -MTU =\t%d", device->mtu );
     free( settings );
     free( data );
     // end request
     async_wait_for( message, NULL );
     return EOK;
+}
-int netif_send_message( ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t * result1, ipcarg_t * result2, ipcarg_t * result3 ){
+int send_message( device_id_t device_id, packet_t packet ){
     ERROR_DECLARE;
-    netif_device_ref    device;
+    device_ref  device;
+    size_t      length;
+    aid_t       message;
+    ipc_call_t  answer;
+    ipcarg_t    result;
+    packet_t    received;
-    ERROR_PROPAGATE( netif_device_find( arg1, & device ));
+    ERROR_PROPAGATE( find_device( device_id, & device ));
-    if( device->state == NETIF_ACTIVE ){
+    if( device->state != NETIF_ACTIVE ) return EPERM;
-        ++ device->stats.tx_packets;
+    ++ device->stats.tx_packets;
-        ++ device->stats.rx_packets;
+    ++ device->stats.rx_packets;
-        // TODO packet size
+    length = packet_get_data_length( packet );
-        //device->stats->tx_bytes += ;
+    device->stats.tx_bytes += length;
-        //device->stats->rx_bytes += ;
+    device->stats.rx_bytes += length;
-        ll_message( device, NET_LL_RECEIVED, arg2, NULL, NULL, NULL, NULL );
+    received = packet_copy( packet );
+    packet_destroy( packet );
+    if( ! received ){
+        ++ device->stats.rx_dropped;
         return EOK;
-    }else{
-        return EPERM;
+    }
+    message = async_send_1( device->nil_phone, NET_NIL_RECEIVED, ( device_id ), & answer );
+    if( ERROR_OCCURED( packet_send( received, device->nil_phone ))){
+        ++ device->stats.rx_dropped;
+    }
+    async_wait_for( message, & result );
+    if( result != EOK ) ++ device->stats.rx_dropped;
+    return EOK;
+}
-int netif_start_message( ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t * result1, ipcarg_t * result2, ipcarg_t * result3 ){
+int start_message( device_id_t device_id ){
-    return change_state_message( arg1, NETIF_ACTIVE );
+    return change_state_message( device_id, NETIF_ACTIVE );
+}
-int netif_stop_message( ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3, ipcarg_t * result1, ipcarg_t * result2, ipcarg_t * result3 ){
+int stop_message( device_id_t device_id ){
-    return change_state_message( arg1, NETIF_STOPPED );
+    return change_state_message( device_id, NETIF_STOPPED );
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/network/uspace/srv/net/netif/lo.c – Rev 3685 → 3846