WebSVN – HelenOS – Diff – //branches/network/uspace/srv/net/il/arp/arp.c

  *  @see arp.h
  */
 #include <async.h>
 #include <malloc.h>
+#include <mem.h>
 #include <rwlock.h>
 #include <stdio.h>
-#include <string.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
 #include "../../err.h"
     arp_device_ref  device;
     aid_t           message;
     ipc_call_t      answer;
     ipcarg_t        result;
     arp_proto_ref   proto;
+    int             index;
     rwlock_write_lock( & arp_globals.lock );
     // an existing device?
     device = arp_cache_find( & arp_globals.cache, device_id );
     if( device ){
         }else{
             if( ERROR_OCCURRED( arp_proto_create( & proto, protocol, address ))){
                 rwlock_write_unlock( & arp_globals.lock );
                 return ERROR_CODE;
+            }
-            if( ERROR_OCCURRED( arp_protos_add( & device->protos, proto->service, proto ))){
+            index = arp_protos_add( & device->protos, proto->service, proto );
+            if( index < 0 ){
                 rwlock_write_unlock( & arp_globals.lock );
                 free( proto );
-                return ERROR_CODE;
+                return result;
+            }
+        }
         printf( "\nCache of the existing device %d cleaned", device->device_id );
     }else{
+        index = protocol_map( service, protocol );
+        if( ! index ) return ENOENT;
         // create a new device
         device = ( arp_device_ref ) malloc( sizeof( arp_device_t ));
         if( ! device ){
             rwlock_write_unlock( & arp_globals.lock );
             return ENOMEM;
+        }
+        device->hardware = index;
         device->device_id = device_id;
         if( ERROR_OCCURRED( arp_protos_initialize( & device->protos ))
         || ERROR_OCCURRED( arp_proto_create( & proto, protocol, address ))){
             rwlock_write_unlock( & arp_globals.lock );
             free( device );
             return ERROR_CODE;
+        }
-        if( ERROR_OCCURRED( arp_protos_add( & device->protos, proto->service, proto ))){
+        index = arp_protos_add( & device->protos, proto->service, proto );
+        if( index < 0 ){
             rwlock_write_unlock( & arp_globals.lock );
             arp_protos_destroy( & device->protos );
             free( device );
-            return ERROR_CODE;
+            return index;
+        }
         device->service = service;
         // bind the new one
         device->phone = bind_service( device->service, device->device_id, SERVICE_ARP, 0, arp_receiver );
+        if( device->phone < 0 ){
+            rwlock_write_unlock( & arp_globals.lock );
+            arp_protos_destroy( & device->protos );
+            free( device );
+            return EREFUSED;
+        }
         // get packet dimensions
         if( ERROR_OCCURRED( async_req_1_4( device->phone, NET_NIL_PACKET_SPACE, device_id, & device->addr_len, & device->prefix, & device->content, & device->suffix ))){
             rwlock_write_unlock( & arp_globals.lock );
             arp_protos_destroy( & device->protos );
             free( device );
             free( device->broadcast_data );
             arp_protos_destroy( & device->protos );
             free( device );
             return ERROR_CODE;
+        }
-        printf( "\nNew device registered:\n\tid\t= %d\n\ttype\t= %x\n\tservice\t= %d", device->device_id, device->hardware, device->service );
+        printf( "\nNew device registered:\n\tid\t= %d\n\ttype\t= 0x%x\n\tservice\t= %d", device->device_id, device->hardware, device->service );
+    }
     rwlock_write_unlock( & arp_globals.lock );
     return EOK;
+}
     length = sizeof( arp_header_t );
     memcpy((( uint8_t * ) header ) + length, device->addr->value, device->addr->length );
     length += device->addr->length;
     memcpy((( uint8_t * ) header ) + length, proto->addr->value, proto->addr->length );
     length += proto->addr->length;
-    memset((( uint8_t * ) header ) + length, 0, device->addr->length );
+    bzero((( uint8_t * ) header ) + length, device->addr->length );
     length += device->addr->length;
     memcpy((( uint8_t * ) header ) + length, target->value, target->length );
     packet_set_addr( packet, ( uint8_t * ) device->addr->value, ( uint8_t * ) device->broadcast_addr->value, CONVERT_SIZE( char, uint8_t, device->addr->length ));
     async_msg_3( device->phone, NET_NETIF_SEND, device_id, SERVICE_ARP, packet_get_id( packet ));
     rwlock_read_unlock( & arp_globals.lock );
             packet_set_addr( packet, src_hw, des_hw, header->hardware_length );
             async_msg_3( device->phone, NET_NETIF_SEND, device_id, SERVICE_ARP, packet_get_id( packet ));
             rwlock_read_unlock( & arp_globals.lock );
         }else{
             rwlock_read_unlock( & arp_globals.lock );
-            packet_release( arp_globals.networking_phone, packet_get_id( packet ));
+            pq_release( arp_globals.networking_phone, packet_get_id( packet ));
+        }
+    }
     return EOK;
+}
 void clear_device( arp_device_ref device ){
     int             count;
     arp_proto_ref   proto;
-    count = arp_protos_count( & device->protos );
+    for( count = arp_protos_count( & device->protos ) - 1; count >= 0; -- count ){
-    while( count > 0 ){
         proto = arp_protos_get_index( & device->protos, count );
+        if( proto ){
-        if( proto->addr ) free( proto->addr );
+            if( proto->addr ) free( proto->addr );
-        if( proto->addr_data ) free( proto->addr_data );
+            if( proto->addr_data ) free( proto->addr_data );
-        arp_addr_destroy( & proto->addresses );
+            arp_addr_destroy( & proto->addresses );
-        -- count;
+        }
+    }
     arp_protos_clear( & device->protos );
+}
 int arp_clean_cache_message( void ){
     int             count;
     arp_device_ref  device;
     rwlock_write_lock( & arp_globals.lock );
-    count = arp_cache_count( & arp_globals.cache );
+    for( count = arp_cache_count( & arp_globals.cache ) - 1; count >= 0; -- count ){
-    while( count > 0 ){
         device = arp_cache_get_index( & arp_globals.cache, count );
         if( device ){
             clear_device( device );
             if( device->addr_data ) free( device->addr_data );
             if( device->broadcast_data ) free( device->broadcast_data );

Subversion Repositories HelenOS

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