Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/il/arp/arp.h

    rffa2c8ef r4eca056  
    3939
    4040#include <fibril_synch.h>
     41
     42#include <ipc/ipc.h>
    4143#include <ipc/services.h>
     44
    4245#include <net/device.h>
    4346#include <net/packet.h>
    … …  
    6265typedef struct arp_proto arp_proto_t;
    6366
    64 /** Type definition of the ARP address translation record.
    65  * @see arp_trans
    66  */
    67 typedef struct arp_trans arp_trans_t;
    68 
    6967/** ARP address map.
    7068 *
    … …  
    7270 * @see generic_char_map.h
    7371 */
    74 GENERIC_CHAR_MAP_DECLARE(arp_addr, arp_trans_t);
     72GENERIC_CHAR_MAP_DECLARE(arp_addr, measured_string_t);
    7573
    7674/** ARP address cache.
    … …  
    9189struct arp_device {
    9290        /** Actual device hardware address. */
    93         measured_string_t *addr;
     91        measured_string_t * addr;
    9492        /** Actual device hardware address data. */
    95         uint8_t *addr_data;
     93        char *addr_data;
    9694        /** Broadcast device hardware address. */
    97         measured_string_t *broadcast_addr;
     95        measured_string_t * broadcast_addr;
    9896        /** Broadcast device hardware address data. */
    99         uint8_t *broadcast_data;
     97        char *broadcast_data;
    10098        /** Device identifier. */
    10199        device_id_t device_id;
    … …  
    122120        arp_cache_t cache;
    123121       
     122        /**
     123         * The client connection processing function.
     124         * The module skeleton propagates its own one.
     125         */
     126        async_client_conn_t client_connection;
     127       
    124128        /** Networking module phone. */
    125129        int net_phone;
    126130        /** Safety lock. */
    127         fibril_mutex_t lock;
     131        fibril_rwlock_t lock;
    128132};
    129133
    … …  
    133137        measured_string_t *addr;
    134138        /** Actual device protocol address data. */
    135         uint8_t *addr_data;
     139        char *addr_data;
    136140        /** Address map. */
    137141        arp_addr_t addresses;
    … …  
    140144};
    141145
    142 /** ARP address translation record. */
    143 struct arp_trans {
    144         /**
    145          * Hardware address for the translation. NULL denotes an incomplete
    146          * record with possible waiters.
    147          */
    148         measured_string_t *hw_addr;
    149         /** Condition variable used for waiting for completion of the record. */
    150         fibril_condvar_t cv;
    151 };
    152 
    153146#endif
    154147
    155148/** @}
    156149 */
    157 
Note: See TracChangeset for help on using the changeset viewer.