WebSVN – HelenOS – Diff – /branches/network/uspace/srv/net/nil/eth/eth.c

 int eth_addr_message( device_id_t device_id, eth_addr_type_t type, measured_string_ref * address );
 int eth_register_message( services_t service, int phone );
 int eth_send_message( device_id_t device_id, packet_t packet, services_t sender );
 int eth_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count );
 void    eth_receiver( ipc_callid_t iid, ipc_call_t * icall );
-eth_proto_ref   eth_proccess_packet( packet_t packet );
+eth_proto_ref   eth_proccess_packet( int dummy, packet_t packet );
-int eth_prepare_packet( packet_t packet, uint8_t * src_addr, int ethertype );
+int eth_prepare_packet( int dummy, packet_t packet, uint8_t * src_addr, int ethertype );
 int eth_initialize( void ){
     ERROR_DECLARE;
     rwlock_initialize( & eth_globals.devices_lock );
         device = ( eth_device_ref ) malloc( sizeof( eth_device_t ));
         if( ! device ) return ENOMEM;
         device->device_id = device_id;
         device->service = service;
         device->mtu = mtu;
+        // TODO get dummy setting
+        device->dummy = 0;
         // bind the device driver
         device->phone = bind_service( device->service, device->device_id, SERVICE_ETHERNET, 0, eth_receiver );
         // get hardware address
         message = async_send_1( device->phone, NET_NETIF_GET_ADDR, device->device_id, & answer );
         if( ERROR_OCCURRED( measured_strings_return( device->phone, & device->addr, & device->addr_data, 1 ))){
+    }
     rwlock_write_unlock( & eth_globals.devices_lock );
     return EOK;
+}
-eth_proto_ref eth_proccess_packet( packet_t packet ){
+eth_proto_ref eth_proccess_packet( int dummy, packet_t packet ){
     ERROR_DECLARE;
     eth_header_ex_ref   header;
     size_t              length;
     int                 type;
     size_t              prefix;
     size_t              suffix;
     eth_fcs_ref         fcs;
     length = packet_get_data_length( packet );
+    if( dummy ){
+        packet_trim( packet, sizeof( eth_preamble_t ), 0 );
+    }
     if( length <= sizeof( eth_header_t ) + ETH_MIN_CONTENT + ETH_SUFFIX ) return NULL;
     header = ( eth_header_ex_ref ) packet_get_data( packet );
     type = ntohs( header->header.ethertype );
     if( type >= ETH_MIN_PROTO ){
         // DIX Ethernet
         suffix += length - prefix - type;
     }else{
         // invalid length/type, should not occurr
         return NULL;
+    }
-    // TODO compute crc with fcs to erase?
+    if( dummy ){
-    if(( ~ compute_crc32( ~ 0, & header->header.dest, ((( void * ) fcs ) - (( void * ) & header->header.dest )) * 8 )) != ntohl( * fcs )){
+        if(( ~ compute_crc32( ~ 0, & header->header.dest, ((( void * ) fcs ) - (( void * ) & header->header.dest )) * 8 )) != ntohl( * fcs )){
-        return NULL;
+            return NULL;
+        }
+    }
     if( ERROR_OCCURRED( packet_set_addr( packet, header->header.src, header->header.dest, ETH_ADDR ))
     || ERROR_OCCURRED( packet_trim( packet, prefix, suffix ))){
         return NULL;
+    }
+}
 int eth_receive_message( device_id_t device_id, packet_t packet ){
     eth_proto_ref   proto;
     packet_t        next;
+    eth_device_ref  device;
+    int             dummy;
+    rwlock_read_lock( & eth_globals.devices_lock );
+    device = eth_devices_find( & eth_globals.devices, device_id );
+    if( ! device ){
+        rwlock_read_unlock( & eth_globals.devices_lock );
+        return ENOENT;
+    }
+    dummy = device->dummy;
+    rwlock_read_unlock( & eth_globals.devices_lock );
     rwlock_read_lock( & eth_globals.protos_lock );
     do{
         next = pq_detach( packet );
-        proto = eth_proccess_packet( packet );
+        proto = eth_proccess_packet( dummy, packet );
         if( proto ){
             async_msg_2( proto->phone, NET_IL_RECEIVED, device_id, packet_get_id( packet ));
         }else{
             // drop invalid/unknown
             packet_release( eth_globals.networking_phone, packet_get_id( packet ));
+    }
     rwlock_write_unlock( & eth_globals.protos_lock );
     return EOK;
+}
-int eth_prepare_packet( packet_t packet, uint8_t * src_addr, int ethertype ){
+int eth_prepare_packet( int dummy, packet_t packet, uint8_t * src_addr, int ethertype ){
     eth_header_ex_ref   header;
     eth_fcs_ref         fcs;
     uint8_t *           src;
     uint8_t *           dest;
     int                 length;
     int                 i;
     void *              padding;
+    eth_preamble_ref    preamble;
+    if( dummy ){
+        preamble = PACKET_PREFIX( packet, eth_preamble_t );
+        if( ! preamble ) return ENOMEM;
+        for( i = 0; i < 7; ++ i ) preamble->preamble[ i ] = ETH_PREAMBLE;
+        preamble->sfd = ETH_SFD;
+    }
     header = PACKET_PREFIX( packet, eth_header_ex_t );
     if( ! header ) return ENOMEM;
-    for( i = 0; i < 7; ++ i ) header->header.preamble[ i ] = ETH_PREAMBLE;
-    header->header.sfd = ETH_SFD;
     length = packet_get_addr( packet, & src, & dest );
     if( length < 0 ) return length;
     if( length < ETH_ADDR ) return EINVAL;
     memcpy( header->header.src, src_addr, ETH_ADDR );
     memcpy( & header->header.dest, dest, ETH_ADDR );
     header->lsap.dsap = 0xAA;
     header->lsap.ssap = header->lsap.dsap;
     header->lsap.ctrl = 0;
     for( i = 0; i < 3; ++ i ) header->snap.proto[ i ] = 0;
     header->snap.ethertype = ethertype;
+    if( dummy ){
-    fcs = PACKET_SUFFIX( packet, eth_fcs_t );
+        fcs = PACKET_SUFFIX( packet, eth_fcs_t );
-    if( ! fcs ) return ENOMEM;
+        if( ! fcs ) return ENOMEM;
-    * fcs = htonl( ~ compute_crc32( ~ 0, & header->header.dest, ((( void * ) fcs ) - (( void * ) & header->header.dest )) * 8 ));
+        * fcs = htonl( ~ compute_crc32( ~ 0, & header->header.dest, ((( void * ) fcs ) - (( void * ) & header->header.dest )) * 8 ));
+    }
     return EOK;
+}
 int eth_send_message( device_id_t device_id, packet_t packet, services_t sender ){
     ERROR_DECLARE;
         return ENOENT;
+    }
     // proccess packet queue
     next = packet;
     do{
-        if( ERROR_OCCURRED( eth_prepare_packet( next, ( uint8_t * ) device->addr->value, ethertype ))){
+        if( ERROR_OCCURRED( eth_prepare_packet( device->dummy, next, ( uint8_t * ) device->addr->value, ethertype ))){
             // release invalid packet
             tmp = pq_detach( next );
             packet_release( eth_globals.networking_phone, packet_get_id( next ));
             next = tmp;
         }else{

Subversion Repositories HelenOS

(root)/branches/network/uspace/srv/net/nil/eth/eth.c – Rev 4077 → 4153