Changeset 6b82009 in mainline for uspace/lib/net/include


Ignore:
Timestamp:
2011-06-22T20:41:41Z (14 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ef09a7a
Parents:
55091847
Message:

networking stack: convert to the new async framework

Location:
uspace/lib/net/include
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/net/include/adt/module_map.h

    r55091847 r6b82009  
    3939
    4040#include <task.h>
    41 #include <ipc/services.h>
     41#include <async.h>
    4242#include <net/modules.h>
    4343#include <adt/generic_char_map.h>
    … …  
    6060        /** Module service identifier. */
    6161        services_t service;
    62         /** Module phone if running and connected. */
    63         int phone;
     62        /** Module session if running and connected. */
     63        async_sess_t *sess;
    6464        /** Usage counter. */
    6565        int usage;

  • uspace/lib/net/include/arp_interface.h

    r55091847 r6b82009  
    3636#include <adt/measured_strings.h>
    3737#include <task.h>
    38 
    3938#include <ipc/services.h>
    40 
    4139#include <net/device.h>
    4240#include <net/socket.h>
     41#include <async.h>
    4342
    4443/** @name ARP module interface
    … …  
    4746/*@{*/
    4847
    49 extern int arp_device_req(int, device_id_t, services_t, services_t,
     48extern int arp_device_req(async_sess_t *, device_id_t, services_t, services_t,
    5049    measured_string_t *);
    51 extern int arp_translate_req(int, device_id_t, services_t, measured_string_t *,
    52     measured_string_t **, uint8_t **);
    53 extern int arp_clear_device_req(int, device_id_t);
    54 extern int arp_clear_address_req(int, device_id_t, services_t,
     50extern int arp_translate_req(async_sess_t *, device_id_t, services_t,
     51    measured_string_t *, measured_string_t **, uint8_t **);
     52extern int arp_clear_device_req(async_sess_t *, device_id_t);
     53extern int arp_clear_address_req(async_sess_t *, device_id_t, services_t,
    5554    measured_string_t *);
    56 extern int arp_clean_cache_req(int);
    57 extern int arp_connect_module(services_t);
     55extern int arp_clean_cache_req(async_sess_t *);
     56extern async_sess_t *arp_connect_module(services_t);
    5857
    5958/*@}*/

  • uspace/lib/net/include/generic.h

    r55091847 r6b82009  
    3838#define LIBNET_GENERIC_H_
    3939
    40 #include <async.h>
    4140#include <ipc/services.h>
    42 
    4341#include <net/device.h>
    4442#include <adt/measured_strings.h>
    4543#include <net/packet.h>
     44#include <async.h>
    4645
    47 extern int generic_device_state_msg_remote(int, int, device_id_t, int,
    48     services_t);
    49 extern int generic_device_req_remote(int, int, device_id_t, int, services_t);
    50 extern int generic_get_addr_req(int, int, device_id_t, measured_string_t **,
    51     uint8_t **);
    52 extern int generic_packet_size_req_remote(int, int, device_id_t,
     46extern int generic_device_state_msg_remote(async_sess_t *, sysarg_t,
     47    device_id_t, sysarg_t, services_t);
     48extern int generic_device_req_remote(async_sess_t *, sysarg_t, device_id_t,
     49    sysarg_t, services_t);
     50extern int generic_get_addr_req(async_sess_t *, sysarg_t, device_id_t,
     51    measured_string_t **, uint8_t **);
     52extern int generic_packet_size_req_remote(async_sess_t *, sysarg_t, device_id_t,
    5353    packet_dimension_t *);
    54 extern int generic_received_msg_remote(int, int, device_id_t, packet_id_t,
    55     services_t, services_t);
    56 extern int generic_send_msg_remote(int, int, device_id_t, packet_id_t,
    57     services_t, services_t);
    58 extern int generic_translate_req(int, int, device_id_t, services_t,
    59     measured_string_t *, size_t, measured_string_t **, uint8_t **);
     54extern int generic_received_msg_remote(async_sess_t *, sysarg_t, device_id_t,
     55    packet_id_t, services_t, services_t);
     56extern int generic_send_msg_remote(async_sess_t *, sysarg_t, device_id_t,
     57    packet_id_t, services_t, services_t);
     58extern int generic_translate_req(async_sess_t *, sysarg_t, device_id_t,
     59    services_t, measured_string_t *, size_t, measured_string_t **, uint8_t **);
    6060
    6161#endif

  • uspace/lib/net/include/icmp_remote.h

    r55091847 r6b82009  
    3636#include <net/socket_codes.h>
    3737#include <sys/types.h>
    38 
    3938#include <net/device.h>
    4039#include <adt/measured_strings.h>
    … …  
    4443#include <net/icmp_codes.h>
    4544#include <net/icmp_common.h>
     45#include <async.h>
    4646
    4747/** @name ICMP module interface
    … …  
    5050/*@{*/
    5151
    52 extern int icmp_destination_unreachable_msg(int, icmp_code_t, icmp_param_t,
    53     packet_t *);
    54 extern int icmp_source_quench_msg(int, packet_t *);
    55 extern int icmp_time_exceeded_msg(int, icmp_code_t, packet_t *);
    56 extern int icmp_parameter_problem_msg(int, icmp_code_t, icmp_param_t,
     52extern int icmp_destination_unreachable_msg(async_sess_t *, icmp_code_t,
     53    icmp_param_t, packet_t *);
     54extern int icmp_source_quench_msg(async_sess_t *, packet_t *);
     55extern int icmp_time_exceeded_msg(async_sess_t *, icmp_code_t, packet_t *);
     56extern int icmp_parameter_problem_msg(async_sess_t *, icmp_code_t, icmp_param_t,
    5757    packet_t *);
    5858

  • uspace/lib/net/include/il_remote.h

    r55091847 r6b82009  
    4141#include <ipc/services.h>
    4242#include <sys/types.h>
    43 
    4443#include <net/device.h>
    4544#include <net/packet.h>
     45#include <async.h>
    4646
    4747/** @name Internetwork layer module interface
    … …  
    5050/*@{*/
    5151
    52 extern int il_device_state_msg(int, device_id_t, device_state_t, services_t);
    53 extern int il_received_msg(int, device_id_t, packet_t *, services_t);
    54 extern int il_mtu_changed_msg(int, device_id_t, size_t, services_t);
     52extern int il_device_state_msg(async_sess_t *, device_id_t, device_state_t,
     53    services_t);
     54extern int il_received_msg(async_sess_t *, device_id_t, packet_t *, services_t);
     55extern int il_mtu_changed_msg(async_sess_t *, device_id_t, size_t, services_t);
    5556
    5657/*@}*/

  • uspace/lib/net/include/il_skel.h

    r55091847 r6b82009  
    3939 */
    4040
    41 #include <async.h>
    42 #include <fibril_synch.h>
    4341#include <ipc/services.h>
    44 
    4542#include <adt/measured_strings.h>
    4643#include <net/device.h>
    4744#include <net/packet.h>
     45#include <async.h>
    4846
    4947/** Module initialization.
    … …  
    5149 * This has to be implemented in user code.
    5250 *
    53  * @param[in] net_phone Networking module phone.
     51 * @param[in] sess Networking module session.
    5452 *
    5553 * @return EOK on success.
    … …  
    5856 *
    5957 */
    60 extern int il_initialize(int net_phone);
     58extern int il_initialize(async_sess_t *sess);
    6159
    6260/** Process the internetwork layer module message.
    … …  
    7674    ipc_call_t *answer, size_t *answer_count);
    7775
    78 extern int il_module_start(int);
     76extern int il_module_start(sysarg_t);
    7977
    8078#endif

  • uspace/lib/net/include/ip_interface.h

    r55091847 r6b82009  
    3535
    3636#include <net/socket_codes.h>
    37 #include <async.h>
    3837#include <ipc/services.h>
    39 
    4038#include <net/device.h>
    4139#include <net/packet.h>
    42 
    4340#include <net/in.h>
    4441#include <net/ip_codes.h>
    45 
    4642#include <ip_remote.h>
     43#include <async.h>
    4744
    4845#define ip_received_error_msg  ip_received_error_msg_remote
    … …  
    6158/** The transport layer notification function type definition.
    6259 *
    63  * Notifies the transport layer modules about the received packet/s.
     60 * Notify the transport layer modules about the received packet/s.
    6461 *
    65  * @param[in] device_id The device identifier.
    66  * @param[in] packet    The received packet or the received packet queue.
    67  * @param[in] receiver  The receiving module service.
    68  * @param[in] error     The packet error reporting service. Prefixes the
    69  *                      received packet.
    70  * @return              EOK on success.
     62 * @param[in] device_id Device identifier.
     63 * @param[in] packet    Received packet or the received packet queue.
     64 * @param[in] receiver  Receiving module service.
     65 * @param[in] error     Packet error reporting service. Prefixes the
     66 *                      received packet.
     67 *
     68 * @return EOK on success.
     69 *
    7170 */
    7271typedef int (*tl_received_msg_t)(device_id_t device_id, packet_t *packet,
    7372    services_t receiver, services_t error);
    7473
    75 extern int ip_bind_service(services_t, int, services_t, async_client_conn_t);
    76 extern int ip_connect_module(services_t);
     74extern async_sess_t *ip_bind_service(services_t, int, services_t, async_client_conn_t);
     75extern async_sess_t *ip_connect_module(services_t);
    7776
    7877/*@}*/

  • uspace/lib/net/include/ip_remote.h

    r55091847 r6b82009  
    3535
    3636#include <ipc/services.h>
    37 
    3837#include <net/ip_codes.h>
    3938#include <net/inet.h>
    … …  
    4241#include <net/device.h>
    4342#include <net/socket.h>
     43#include <async.h>
    4444
    45 extern int ip_set_gateway_req_remote(int, device_id_t, in_addr_t);
    46 extern int ip_packet_size_req_remote(int, device_id_t, packet_dimension_t *);
    47 extern int ip_received_error_msg_remote(int, device_id_t, packet_t *, services_t,
    48     services_t);
    49 extern int ip_device_req_remote(int, device_id_t, services_t);
    50 extern int ip_add_route_req_remote(int, device_id_t, in_addr_t, in_addr_t,
    51     in_addr_t);
    52 extern int ip_send_msg_remote(int, device_id_t, packet_t *, services_t,
    53     services_t);
    54 extern int ip_get_route_req_remote(int, ip_protocol_t, const struct sockaddr *,
    55     socklen_t, device_id_t *, void **, size_t *);
     45extern int ip_set_gateway_req_remote(async_sess_t *, device_id_t, in_addr_t);
     46extern int ip_packet_size_req_remote(async_sess_t *, device_id_t,
     47    packet_dimension_t *);
     48extern int ip_received_error_msg_remote(async_sess_t *, device_id_t, packet_t *,
     49    services_t, services_t);
     50extern int ip_device_req_remote(async_sess_t *, device_id_t);
     51extern int ip_add_route_req_remote(async_sess_t *, device_id_t, in_addr_t,
     52    in_addr_t, in_addr_t);
     53extern int ip_send_msg_remote(async_sess_t *, device_id_t, packet_t *,
     54    services_t, services_t);
     55extern int ip_get_route_req_remote(async_sess_t *, ip_protocol_t,
     56    const struct sockaddr *, socklen_t, device_id_t *, void **, size_t *);
    5657
    5758#endif

  • uspace/lib/net/include/net_interface.h

    r55091847 r6b82009  
    3838#include <net/device.h>
    3939#include <adt/measured_strings.h>
     40#include <async.h>
    4041
    4142/** @name Networking module interface
    … …  
    4445/*@{*/
    4546
    46 extern int net_get_device_conf_req(int, device_id_t, measured_string_t **,
    47     size_t, uint8_t **);
    48 extern int net_get_conf_req(int, measured_string_t **, size_t, uint8_t **);
     47extern int net_get_device_conf_req(async_sess_t *, device_id_t,
     48    measured_string_t **, size_t, uint8_t **);
     49extern int net_get_conf_req(async_sess_t *, measured_string_t **, size_t,
     50    uint8_t **);
    4951extern void net_free_settings(measured_string_t *, uint8_t *);
    50 extern int net_connect_module(void);
     52extern async_sess_t *net_connect_module(void);
    5153
    5254/*@}*/

  • uspace/lib/net/include/netif_remote.h

    r55091847 r6b82009  
    3434#define LIBNET_NETIF_REMOTE_H_
    3535
    36 #include <async.h>
    3736#include <ipc/services.h>
    3837#include <adt/measured_strings.h>
    39 
    4038#include <net/device.h>
    4139#include <net/packet.h>
     40#include <async.h>
    4241
    43 extern int netif_get_addr_req(int, device_id_t, measured_string_t **,
     42extern int netif_get_addr_req(async_sess_t *, device_id_t, measured_string_t **,
    4443    uint8_t **);
    45 extern int netif_probe_req(int, device_id_t, int, void *);
    46 extern int netif_send_msg(int, device_id_t, packet_t *, services_t);
    47 extern int netif_start_req(int, device_id_t);
    48 extern int netif_stop_req(int, device_id_t);
    49 extern int netif_stats_req(int, device_id_t, device_stats_t *);
    50 extern int netif_bind_service(services_t, device_id_t, services_t,
     44extern int netif_probe_req(async_sess_t *, device_id_t, int, void *);
     45extern int netif_send_msg(async_sess_t *, device_id_t, packet_t *, services_t);
     46extern int netif_start_req(async_sess_t *, device_id_t);
     47extern int netif_stop_req(async_sess_t *, device_id_t);
     48extern int netif_stats_req(async_sess_t *, device_id_t, device_stats_t *);
     49extern async_sess_t *netif_bind_service(services_t, device_id_t, services_t,
    5150    async_client_conn_t);
    5251

  • uspace/lib/net/include/netif_skel.h

    r55091847 r6b82009  
    3939#define NET_NETIF_SKEL_H_
    4040
    41 #include <async.h>
    4241#include <fibril_synch.h>
    4342#include <ipc/services.h>
    44 
    4543#include <adt/measured_strings.h>
    4644#include <net/device.h>
    4745#include <net/packet.h>
     46#include <async.h>
    4847
    4948/** Network interface device specific data. */
    5049typedef struct {
    51         device_id_t device_id;  /**< Device identifier. */
    52         int nil_phone;          /**< Receiving network interface layer phone. */
    53         device_state_t state;   /**< Actual device state. */
    54         void *specific;         /**< Driver specific data. */
     50        device_id_t device_id;   /**< Device identifier. */
     51        device_state_t state;    /**< Actual device state. */
     52        void *specific;          /**< Driver specific data. */
    5553} netif_device_t;
    5654
    … …  
    6563/** Network interface module skeleton global data. */
    6664typedef struct {
    67         int net_phone;                  /**< Networking module phone. */
     65        async_sess_t *sess;             /**< Networking module session. */
     66        async_sess_t *nil_sess;         /**< Network interface layer session. */
    6867        netif_device_map_t device_map;  /**< Device map. */
    6968        fibril_rwlock_t lock;           /**< Safety lock. */
    … …  
    127126 * @return Other error codes as defined for the specific module
    128127 *         message implementation.
    129  
    130128 *
    131129 */
    … …  
    207205extern packet_t *netif_packet_get_1(size_t);
    208206
    209 extern int netif_module_start(void);
     207extern int netif_module_start(sysarg_t);
    210208
    211209#endif

  • uspace/lib/net/include/nil_remote.h

    r55091847 r6b82009  
    3838#include <net/packet.h>
    3939#include <generic.h>
     40#include <async.h>
    4041
    4142#define nil_bind_service(service, device_id, me, receiver) \
    4243        bind_service(service, device_id, me, 0, receiver)
    4344
    44 #define nil_packet_size_req(nil_phone, device_id, packet_dimension) \
    45         generic_packet_size_req_remote(nil_phone, NET_NIL_PACKET_SPACE, \
     45#define nil_packet_size_req(sess, device_id, packet_dimension) \
     46        generic_packet_size_req_remote(sess, NET_NIL_PACKET_SPACE, \
    4647            device_id, packet_dimension)
    4748
    48 #define nil_get_addr_req(nil_phone, device_id, address, data) \
    49         generic_get_addr_req(nil_phone, NET_NIL_ADDR, device_id, address, data)
     49#define nil_get_addr_req(sess, device_id, address, data) \
     50        generic_get_addr_req(sess, NET_NIL_ADDR, device_id, address, data)
    5051
    51 #define nil_get_broadcast_addr_req(nil_phone, device_id, address, data) \
    52         generic_get_addr_req(nil_phone, NET_NIL_BROADCAST_ADDR, device_id, \
     52#define nil_get_broadcast_addr_req(sess, device_id, address, data) \
     53        generic_get_addr_req(sess, NET_NIL_BROADCAST_ADDR, device_id, \
    5354            address, data)
    5455
    55 #define nil_send_msg(nil_phone, device_id, packet, sender) \
    56         generic_send_msg_remote(nil_phone, NET_NIL_SEND, device_id, \
     56#define nil_send_msg(sess, device_id, packet, sender) \
     57        generic_send_msg_remote(sess, NET_NIL_SEND, device_id, \
    5758            packet_get_id(packet), sender, 0)
    5859
    59 #define nil_device_req(nil_phone, device_id, mtu, netif_service) \
    60         generic_device_req_remote(nil_phone, NET_NIL_DEVICE, device_id, mtu, \
    61             netif_service)
     60#define nil_device_req(sess, device_id, mtu) \
     61        generic_device_req_remote(sess, NET_NIL_DEVICE, device_id, mtu, 0)\
    6262
    63 extern int nil_device_state_msg(int, device_id_t, int);
    64 extern int nil_received_msg(int, device_id_t, packet_t *, services_t);
     63extern int nil_device_state_msg(async_sess_t *, device_id_t, sysarg_t);
     64extern int nil_received_msg(async_sess_t *, device_id_t, packet_t *,
     65    services_t);
    6566
    6667#endif

  • uspace/lib/net/include/nil_skel.h

    r55091847 r6b82009  
    3939#define LIBNET_NIL_SKEL_H_
    4040
    41 #include <async.h>
    42 #include <fibril_synch.h>
    4341#include <ipc/services.h>
    44 
    4542#include <adt/measured_strings.h>
    4643#include <net/device.h>
    4744#include <net/packet.h>
     45#include <async.h>
    4846
    4947/** Module initialization.
    … …  
    5149 * This has to be implemented in user code.
    5250 *
    53  * @param[in] net_phone Networking module phone.
     51 * @param[in] sess Networking module session.
    5452 *
    5553 * @return EOK on success.
    … …  
    5856 *
    5957 */
    60 extern int nil_initialize(int net_phone);
     58extern int nil_initialize(async_sess_t *sess);
    6159
    6260/** Notify the network interface layer about the device state change.
    … …  
    6462 * This has to be implemented in user code.
    6563 *
    66  * @param[in] nil_phone Network interface layer phone.
    6764 * @param[in] device_id Device identifier.
    6865 * @param[in] state     New device state.
    … …  
    7370 *
    7471 */
    75 extern int nil_device_state_msg_local(int, device_id_t, int);
     72extern int nil_device_state_msg_local(device_id_t device_id, sysarg_t state);
    7673
    7774/** Pass the packet queue to the network interface layer.
    … …  
    8279 * This has to be implemented in user code.
    8380 *
    84  * @param[in] nil_phone Network interface layer phone.
    8581 * @param[in] device_id Source device identifier.
    8682 * @param[in] packet    Received packet or the received packet queue.
    … …  
    9288 *
    9389 */
    94 extern int nil_received_msg_local(int, device_id_t, packet_t *, services_t);
     90extern int nil_received_msg_local(device_id_t device_id, packet_t *packet,
     91    services_t target);
    9592
    9693/** Message processing function.
    … …  
    9895 * This has to be implemented in user code.
    9996 *
    100  * @param[in]  name   Module name.
    10197 * @param[in]  callid Message identifier.
    10298 * @param[in]  call   Message parameters.
    … …  
    112108 *
    113109 */
    114 extern int nil_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *,
    115     size_t *);
     110extern int nil_module_message(ipc_callid_t callid, ipc_call_t *call,
     111    ipc_call_t *answer, size_t *count);
    116112
    117 extern int nil_module_start(int);
     113extern int nil_module_start(sysarg_t);
    118114
    119115#endif

  • uspace/lib/net/include/packet_client.h

    r55091847 r6b82009  
    4949
    5050#include <net/packet.h>
     51#include <async.h>
    5152
    5253/** @name Packet client interface */
    … …  
    108109extern int packet_get_addr(const packet_t *, uint8_t **, uint8_t **);
    109110extern int packet_set_addr(packet_t *, const uint8_t *, const uint8_t *, size_t);
    110 extern packet_t *packet_get_copy(int, packet_t *);
     111extern packet_t *packet_get_copy(async_sess_t *, packet_t *);
    111112
    112113/*@}*/

  • uspace/lib/net/include/packet_remote.h

    r55091847 r6b82009  
    3636#include <net/packet.h>
    3737#include <sys/types.h>
     38#include <async.h>
    3839
    39 extern int packet_translate_remote(int, packet_t **, packet_id_t);
    40 extern packet_t *packet_get_4_remote(int, size_t, size_t, size_t, size_t);
    41 extern packet_t *packet_get_1_remote(int, size_t);
    42 extern void pq_release_remote(int, packet_id_t);
     40extern int packet_translate_remote(async_sess_t *, packet_t **, packet_id_t);
     41extern packet_t *packet_get_4_remote(async_sess_t *, size_t, size_t, size_t,
     42    size_t);
     43extern packet_t *packet_get_1_remote(async_sess_t *, size_t);
     44extern void pq_release_remote(async_sess_t *, packet_id_t);
    4345
    4446#endif

  • uspace/lib/net/include/socket_core.h

    r55091847 r6b82009  
    2727 */
    2828
    29 /** @addtogroup libnet 
     29/** @addtogroup libnet
    3030 *  @{
    3131 */
    … …  
    4545#include <net/device.h>
    4646#include <net/packet.h>
     47#include <async.h>
    4748
    4849/** Initial size of the received packet queue. */
    49 #define SOCKET_INITIAL_RECEIVED_SIZE    4
     50#define SOCKET_INITIAL_RECEIVED_SIZE  4
    5051
    5152/** Maximum size of the received packet queue. */
    52 #define SOCKET_MAX_RECEIVED_SIZE        0
     53#define SOCKET_MAX_RECEIVED_SIZE  0
    5354
    5455/** Initial size of the sockets for acceptance queue. */
    55 #define SOCKET_INITIAL_ACCEPTED_SIZE    1
     56#define SOCKET_INITIAL_ACCEPTED_SIZE  1
    5657
    5758/** Maximum size of the sockets for acceptance queue. */
    58 #define SOCKET_MAX_ACCEPTEDED_SIZE      0
     59#define SOCKET_MAX_ACCEPTEDED_SIZE  0
    5960
    6061/** Listening sockets' port map key. */
    61 #define SOCKET_MAP_KEY_LISTENING        "L"
     62#define SOCKET_MAP_KEY_LISTENING  "L"
    6263
    6364/** Type definition of the socket core.
    … …  
    7576        /** Socket identifier. */
    7677        int socket_id;
    77         /** Client application phone. */
    78         int phone;
     78        /** Client application session. */
     79        async_sess_t *sess;
    7980        /** Bound port. */
    8081        int port;
    … …  
    108109INT_MAP_DECLARE(socket_ports, socket_port_t);
    109110
    110 extern void socket_cores_release(int, socket_cores_t *, socket_ports_t *,
    111     void (*)(socket_core_t *));
     111extern void socket_cores_release(async_sess_t *, socket_cores_t *,
     112    socket_ports_t *, void (*)(socket_core_t *));
    112113extern int socket_bind(socket_cores_t *, socket_ports_t *, int, void *, size_t,
    113114    int, int, int);
    114115extern int socket_bind_free_port(socket_ports_t *, socket_core_t *, int, int,
    115116    int);
    116 extern int socket_create(socket_cores_t *, int, void *, int *);
    117 extern int socket_destroy(int, int, socket_cores_t *, socket_ports_t *,
    118     void (*)(socket_core_t *));
     117extern int socket_create(socket_cores_t *, async_sess_t *, void *, int *);
     118extern int socket_destroy(async_sess_t *, int, socket_cores_t *,
     119    socket_ports_t *, void (*)(socket_core_t *));
    119120extern int socket_reply_packets(packet_t *, size_t *);
    120121extern socket_core_t *socket_port_find(socket_ports_t *, int, const uint8_t *,

  • uspace/lib/net/include/tl_common.h

    r55091847 r6b82009  
    2727 */
    2828
    29 /** @addtogroup libnet 
     29/** @addtogroup libnet
    3030 * @{
    3131 */
    … …  
    3939
    4040#include <ipc/services.h>
    41 
    4241#include <net/socket_codes.h>
    4342#include <net/packet.h>
    4443#include <net/device.h>
    4544#include <net/inet.h>
     45#include <async.h>
    4646
    4747/** Device packet dimensions.
    … …  
    5151DEVICE_MAP_DECLARE(packet_dimensions, packet_dimension_t);
    5252
    53 extern int tl_get_ip_packet_dimension(int, packet_dimensions_t *,
     53extern int tl_get_ip_packet_dimension(async_sess_t *, packet_dimensions_t *,
    5454    device_id_t, packet_dimension_t **);
    5555extern int tl_get_address_port(const struct sockaddr *, int, uint16_t *);
    … …  
    5757    size_t);
    5858extern int tl_set_address_port(struct sockaddr *, int, uint16_t);
    59 extern int tl_prepare_icmp_packet(int, int, packet_t *, services_t);
    60 extern int tl_socket_read_packet_data(int, packet_t **, size_t,
     59extern int tl_prepare_icmp_packet(async_sess_t *, async_sess_t *, packet_t *,
     60    services_t);
     61extern int tl_socket_read_packet_data(async_sess_t *, packet_t **, size_t,
    6162    const packet_dimension_t *, const struct sockaddr *, socklen_t);
    6263
    … …  
    6566/** @}
    6667 */
    67 

  • uspace/lib/net/include/tl_remote.h

    r55091847 r6b82009  
    3838#define LIBNET_TL_REMOTE_H_
    3939
    40 #include <async.h>
    4140#include <ipc/services.h>
    4241#include <ipc/tl.h>
    43 
    4442#include <generic.h>
    4543#include <net/device.h>
    4644#include <net/packet.h>
    4745#include <packet_client.h>
     46#include <async.h>
    4847
    4948/** @name Transport layer module interface
    … …  
    5251/*@{*/
    5352
    54 extern int tl_received_msg(int, device_id_t, packet_t *, services_t,
     53extern int tl_received_msg(async_sess_t *, device_id_t, packet_t *, services_t,
    5554    services_t);
    5655

  • uspace/lib/net/include/tl_skel.h

    r55091847 r6b82009  
    3939 */
    4040
    41 #include <async.h>
    4241#include <fibril_synch.h>
    4342#include <ipc/services.h>
    44 
    4543#include <adt/measured_strings.h>
    4644#include <net/device.h>
    4745#include <net/packet.h>
     46#include <async.h>
    4847
    4948/** Module initialization.
    … …  
    5150 * This has to be implemented in user code.
    5251 *
    53  * @param[in] net_phone Networking module phone.
     52 * @param[in] sess Networking module session.
    5453 *
    5554 * @return EOK on success.
    … …  
    5857 *
    5958 */
    60 extern int tl_initialize(int net_phone);
     59extern int tl_initialize(async_sess_t *sess);
    6160
    6261/** Per-connection module initialization.
    … …  
    8382    ipc_call_t *, size_t *);
    8483
    85 extern int tl_module_start(int);
     84extern int tl_module_start(sysarg_t);
    8685
    8786#endif
Note: See TracChangeset for help on using the changeset viewer.