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

 #include "../../include/byteorder.h"
 #include "../../include/crc.h"
 #include "../../include/ethernet_lsap.h"
 #include "../../include/ethernet_protocols.h"
 #include "../../include/protocol_map.h"
-#include "../../netif/device.h"
+#include "../../include/device.h"
+#include "../../include/netif_messages.h"
 #include "../../structures/measured_strings.h"
 #include "../../structures/packet/packet.h"
 #include "../../structures/packet/packet_client.h"
 #define ETH_PREFIX      ( sizeof( eth_header_t ) + sizeof( eth_header_lsap_t ) + sizeof( eth_header_snap_t ))
 #define ETH_SUFFIX      sizeof( eth_fcs_t )
 #define ETH_MAX_CONTENT 1500
 #define ETH_MIN_CONTENT 46
+#define ETH_MAX_TAGGED_CONTENT  ( ETH_MAX_CONTENT - sizeof( eth_header_lsap_t ) - sizeof( eth_header_snap_t ))
+#define ETH_MIN_TAGGED_CONTENT  ( ETH_MIN_CONTENT - sizeof( eth_header_lsap_t ) - sizeof( eth_header_snap_t ))
 /** Returns the device identifier message parameter.
  */
 #define IPC_GET_DEVICE( call )      ( device_id_t ) IPC_GET_ARG1( * call )
  */
 #define IPC_GET_PROTO( call )       ( services_t ) IPC_GET_ARG2( * call )
 /** Returns the device driver service message parameter.
  */
-#define IPC_GET_SERVICE( call )     ( services_t ) IPC_GET_ARG2( * call )
+#define IPC_GET_SERVICE( call )     ( services_t ) IPC_GET_ARG3( * call )
-#define IPC_GET_MTU( call )         ( size_t ) IPC_GET_ARG3( * call )
+#define IPC_GET_MTU( call )         ( size_t ) IPC_GET_ARG2( * call )
 #define IPC_GET_PHONE( call )       ( int ) IPC_GET_ARG5( * call )
 #define IPC_SET_ADDR( answer )      (( size_t * ) & IPC_GET_ARG1( * answer ))
 #define IPC_SET_PREFIX( answer )    (( size_t * ) & IPC_GET_ARG2( * answer ))
 int eth_receive_message( device_id_t device_id, packet_t packet );
 int eth_packet_space_message( device_id_t device_id, size_t * addr_len, size_t * prefix, size_t * content, size_t * suffix );
 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_process_packet( int dummy, packet_t packet );
 int eth_prepare_packet( int dummy, packet_t packet, uint8_t * src_addr, int ethertype );
 int eth_initialize( void ){
+}
 int eth_device_message( device_id_t device_id, services_t service, size_t mtu ){
     ERROR_DECLARE;
-    aid_t           message;
-    ipc_call_t      answer;
     eth_device_ref  device;
-    ipcarg_t        result;
     int             index;
     rwlock_write_lock( & eth_globals.devices_lock );
     // an existing device?
     device = eth_devices_find( & eth_globals.devices, device_id );
         // create a new device
         device = ( eth_device_ref ) malloc( sizeof( eth_device_t ));
         if( ! device ) return ENOMEM;
         device->device_id = device_id;
         device->service = service;
-        device->mtu = ( mtu > 0 ) ? mtu : ETH_MAX_CONTENT;
+        device->mtu = (( mtu > 0 ) && ( mtu <= ETH_MAX_TAGGED_CONTENT )) ? mtu : ETH_MAX_TAGGED_CONTENT;
         // 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 );
         if( device->phone < 0 ){
             rwlock_write_unlock( & eth_globals.devices_lock );
             free( device );
             return device->phone;
+        }
         // 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 ))){
+        if( ERROR_OCCURRED( netif_get_addr( device->phone, device->device_id, & device->addr, & device->addr_data ))){
             rwlock_write_unlock( & eth_globals.devices_lock );
             free( device );
-            async_wait_for( message, NULL );
-            return ERROR_CODE;
-        }
-        async_wait_for( message, & result );
-        if( ERROR_OCCURRED( result )){
-            rwlock_write_unlock( & eth_globals.devices_lock );
-            free( device->addr );
-            free( device->addr_data );
-            free( device );
             return ERROR_CODE;
+        }
         // add to the cache
         index = eth_devices_add( & eth_globals.devices, device->device_id, device );
         if( index < 0 ){
             return NULL;
         }else if(( header->lsap.dsap == ETH_LSAP_SNAP ) && ( header->lsap.ssap == ETH_LSAP_SNAP )){
             // IEEE 802.3 + 802.2 + LSAP + SNAP
             // organization code not supported
             type = ntohs( header->snap.ethertype );
-            prefix = sizeof( eth_header_t ) + sizeof( eth_header_lsap_t) + sizeof( eth_header_snap_t);
+            prefix = sizeof( eth_header_t ) + sizeof( eth_header_lsap_t ) + sizeof( eth_header_snap_t );
         }else{
             // IEEE 802.3 + 802.2 LSAP
             type = lsap_map( header->lsap.dsap );
             prefix = sizeof( eth_header_t ) + sizeof( eth_header_lsap_t);
+        }
     device = eth_devices_find( & eth_globals.devices, device_id );
     if( ! device ){
         rwlock_read_unlock( & eth_globals.devices_lock );
         return ENOENT;
+    }
-    * content = ( ETH_MAX_CONTENT > device->mtu ) ? device->mtu : ETH_MAX_CONTENT;
+    * content = device->mtu;
     rwlock_read_unlock( & eth_globals.devices_lock );
     * addr_len = ETH_ADDR;
     * prefix = ETH_PREFIX;
     * suffix = ETH_MIN_CONTENT + ETH_SUFFIX;
     return EOK;
     int                 length;
     int                 i;
     void *              padding;
     eth_preamble_ref    preamble;
+    length = packet_get_data_length( packet );
+    if( length > ETH_MAX_TAGGED_CONTENT ) return EINVAL;
+    if( length < ETH_MIN_TAGGED_CONTENT ){
+        padding = packet_suffix( packet, ETH_MIN_TAGGED_CONTENT - length );
+        if( ! padding ) return ENOMEM;
+        bzero( padding, ETH_MIN_TAGGED_CONTENT - length );
+    }
     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;
-    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 );
-    length = packet_get_data_length( packet );
-    if( length > ETH_MAX_CONTENT ) return EINVAL;
-    if( length < ETH_MIN_CONTENT ){
-        padding = packet_suffix( packet, ETH_MIN_CONTENT - length );
-        if( ! padding ) return ENOMEM;
-        bzero( padding, ETH_MIN_CONTENT - length );
-    }
-    header->header.ethertype = htons( length );
+    header->header.ethertype = htons( length + sizeof( eth_header_lsap_t ) + sizeof( eth_header_snap_t ));
     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;
+    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 );
     if( dummy ){
         fcs = PACKET_SUFFIX( packet, eth_fcs_t );
         if( ! fcs ) return ENOMEM;
         * fcs = htonl( ~ compute_crc32( ~ 0, & header->header.dest, ((( void * ) fcs ) - (( void * ) & header->header.dest )) * 8 ));
+    }
         }else{
             next = pq_next( next );
+        }
     }while( next );
     // send packet queue
-    async_msg_2( device->phone, NET_NETIF_SEND, device_id, packet_get_id( packet ));
+    netif_send_msg( device->phone, device_id, packet );
     rwlock_read_unlock( & eth_globals.devices_lock );
     return EOK;
+}
 int eth_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count ){
     ERROR_DECLARE;
     measured_string_ref address;
     packet_t            packet;
+//  printf( "\nmessage %d - %d", IPC_GET_METHOD( * call ), NET_NIL_FIRST );
     * answer_count = 0;
     switch( IPC_GET_METHOD( * call )){
         case IPC_M_PHONE_HUNGUP:
             return EOK;
         case NET_NIL_DEVICE:
             ERROR_PROPAGATE( eth_addr_message( IPC_GET_DEVICE( call ), ETH_LOCAL_ADDR, & address ));
             return measured_strings_reply( address, 1 );
         case NET_NIL_BROADCAST_ADDR:
             ERROR_PROPAGATE( eth_addr_message( IPC_GET_DEVICE( call ), ETH_BROADCAST_ADDR, & address ));
             return measured_strings_reply( address, 1 );
-            return ERROR_CODE;
         case IPC_M_CONNECT_TO_ME:
             return eth_register_message( IPC_GET_PROTO( call ), IPC_GET_PHONE( call ));
+    }
     return ENOTSUP;
+}

Subversion Repositories HelenOS

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