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

 #include "../../structures/measured_strings.h"
 #include "../../structures/packet/packet_client.h"
 #include "../netif.h"
+#include "../netif_interface.h"
 #define DEFAULT_MTU 1500
+#define DEFAULT_ADDR        "\0\0\0\0\0\0"
+#define DEFAULT_ADDR_LEN    ( sizeof( DEFAULT_ADDR ) / sizeof( char ))
 #define NAME    "lo - loopback interface"
 netif_globals_t netif_globals;
 static struct lo_globals{
-    measured_string_ref addr;
     int mtu;
 } lo_globals;
 int change_state_message( device_id_t device_id, device_state_t state );
 int create( device_id_t device_id, device_ref * device );
-int initialize( void );
 void    netif_print_name( void );
-int probe_auto_message( void );
-int probe_message( device_id_t device_id, int irq, int io );
-int send_message( device_id_t device_id, packet_t packet );
-int start_message( device_id_t device_id );
-int stop_message( device_id_t device_id );
-measured_string_ref get_addr_message( device_id_t device_id );
+int specific_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count ){
+    return ENOTSUP;
+}
+int get_addr_message( device_id_t device_id, measured_string_ref address ){
+    if( ! address ) return EBADMEM;
+    address->value = DEFAULT_ADDR;
+    address->length = DEFAULT_ADDR_LEN;
+}
+int get_device_stats( device_id_t device_id, device_stats_ref stats ){
+    ERROR_DECLARE;
+    device_ref  device;
+    if( ! stats ) return EBADMEM;
-measured_string_ref get_addr_message( device_id_t device_id ){
+    ERROR_PROPAGATE( find_device( device_id, & device ));
+    memcpy( stats, ( device_stats_ref ) device->specific, sizeof( device_stats_t ));
-    return lo_globals.addr;
+    return EOK;
+}
 int change_state_message( device_id_t device_id, device_state_t state ){
     ERROR_DECLARE;
+    }
     return EOK;
+}
 int create( device_id_t device_id, device_ref * device ){
-    ERROR_DECLARE;
+    int index;
     if( device_map_count( & netif_globals.device_map ) > 0 ){
         return EXDEV;
     }else{
         * device = ( device_ref ) malloc( sizeof( device_t ));
         if( !( * device )) return ENOMEM;
+        ( ** device ).specific = malloc( sizeof( device_stats_t ));
+        if( ! ( ** device ).specific ){
+            free( * device );
+            return ENOMEM;
+        }
+        null_device_stats(( device_stats_ref )( ** device ).specific );
         ( ** device ).device_id = device_id;
         ( ** device ).nil_phone = -1;
-        ( ** device ).specific = NULL;
-        null_device_stats( &(( ** device ).stats ));
         ( ** device ).state = NETIF_STOPPED;
-        if( ERROR_OCCURRED( device_map_add( & netif_globals.device_map, ( ** device ).device_id, * device ))){
+        index = device_map_add( & netif_globals.device_map, ( ** device ).device_id, * device );
+        if( index < 0 ){
             free( * device );
+            free(( ** device ).specific );
             * device = NULL;
-            return ERROR_CODE;
+            return index;
+        }
+    }
     return EOK;
+}
 int initialize( void ){
     ipcarg_t    phonehash;
-    lo_globals.addr = measured_string_create_bulk( "\0\0\0\0\0\0", 0 );
-    if( ! lo_globals.addr ) return ENOMEM;
     return REGISTER_ME( SERVICE_LO, & phonehash );
+}
 void netif_print_name( void ){
     printf( NAME );
     ipc_call_t      answer;
     measured_string_t   configuration[ 1 ] = {{ "MTU", 3 }};
     int         count = 1;
     measured_string_ref settings;
     char *          data;
+    ipcarg_t        result;
     // create a new device
     ERROR_PROPAGATE( create( device_id, & device ));
     // get configuration
     message = async_send_2( netif_globals.networking_phone, NET_NET_GET_DEVICE_CONF, device->device_id, count, & answer );
     if( ERROR_OCCURRED( measured_strings_send( netif_globals.networking_phone, configuration, count ))
     || ERROR_OCCURRED( measured_strings_return( netif_globals.networking_phone, & settings, & data, count ))){
         async_wait_for( message, NULL );
         return ERROR_CODE;
+    }
+    // end request
+    async_wait_for( message, & result );
+    if( ERROR_OCCURRED( result )){
+        if( settings ){
+            free( settings );
+            free( data );
+        }
+        return ERROR_CODE;
+    }
     // MTU is the first one
     if( settings && ( settings[ 0 ].value )){
         lo_globals.mtu = strtoul( settings[ 0 ].value, NULL, 0 );
+        free( settings );
+        free( data );
     }else{
         lo_globals.mtu = DEFAULT_MTU;
+    }
-    free( settings );
-    free( data );
-    // end request
-    async_wait_for( message, NULL );
     // print the settings
     printf("\nNew device registered:\n\tid\t= %d\n\tMTU\t= %d", device->device_id, lo_globals.mtu );
     return EOK;
+}
     ERROR_PROPAGATE( find_device( device_id, & device ));
     if( device->state != NETIF_ACTIVE ) return EPERM;
     next = packet;
     do{
-        ++ device->stats.tx_packets;
+        ++ (( device_stats_ref ) device->specific )->tx_packets;
-        ++ device->stats.rx_packets;
+        ++ (( device_stats_ref ) device->specific )->rx_packets;
         length = packet_get_data_length( next );
-        device->stats.tx_bytes += length;
+        (( device_stats_ref ) device->specific )->tx_bytes += length;
-        device->stats.rx_bytes += length;
+        (( device_stats_ref ) device->specific )->rx_bytes += length;
         next = pq_next( next );
     }while( next );
     nil_message( device, NET_NIL_RECEIVED, packet_get_id( packet ), PACKET_SELF );
     return EOK;
+}

Subversion Repositories HelenOS

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