Changeset fdbc3ff in mainline for uspace/lib/net/include


Ignore:
Timestamp:
2010-11-19T23:50:06Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
46d4d9f
Parents:
b4c9c61 (diff), a9c6b966 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

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

Legend:

Unmodified
Added
Removed

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

    rb4c9c61 rfdbc3ff  
    4848typedef struct module_struct module_t;
    4949
    50 /** Type definition of the module structure pointer.
    51  * @see module_struct
    52  */
    53 typedef module_t *module_ref;
    54 
    5550/** Module map.
    5651 * Sorted by module names.
    … …  
    7772};
    7873
    79 extern int add_module(module_ref *, modules_ref, const char *, const char *,
     74extern int add_module(module_t **, modules_t *, const char *, const char *,
    8075    services_t, task_id_t, connect_module_t *);
    81 extern module_ref get_running_module(modules_ref, char *);
     76extern module_t *get_running_module(modules_t *, char *);
    8277extern task_id_t spawn(const char *);
    8378

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

    rb4c9c61 rfdbc3ff  
    4848
    4949extern int arp_device_req(int, device_id_t, services_t, services_t,
    50     measured_string_ref);
    51 extern int arp_translate_req(int, device_id_t, services_t, measured_string_ref,
    52     measured_string_ref *, char **);
     50    measured_string_t *);
     51extern int arp_translate_req(int, device_id_t, services_t, measured_string_t *,
     52    measured_string_t **, char **);
    5353extern int arp_clear_device_req(int, device_id_t);
    5454extern int arp_clear_address_req(int, device_id_t, services_t,
    55     measured_string_ref);
     55    measured_string_t *);
    5656extern int arp_clean_cache_req(int);
    5757extern int arp_connect_module(services_t);

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

    rb4c9c61 rfdbc3ff  
    4949    services_t);
    5050extern int generic_device_req_remote(int, int, device_id_t, int, services_t);
    51 extern int generic_get_addr_req(int, int, device_id_t, measured_string_ref *,
     51extern int generic_get_addr_req(int, int, device_id_t, measured_string_t **,
    5252    char **);
    5353extern int generic_packet_size_req_remote(int, int, device_id_t,
    54     packet_dimension_ref);
     54    packet_dimension_t *);
    5555extern int generic_received_msg_remote(int, int, device_id_t, packet_id_t,
    5656    services_t, services_t);
    … …  
    5858    services_t, services_t);
    5959extern int generic_translate_req(int, int, device_id_t, services_t,
    60     measured_string_ref, size_t, measured_string_ref *, char **);
     60    measured_string_t *, size_t, measured_string_t **, char **);
    6161
    6262#endif

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

    rb4c9c61 rfdbc3ff  
    5252typedef struct icmp_echo icmp_echo_t;
    5353
    54 /** Type definition of the echo specific data pointer.
    55  * @see icmp_echo
    56  */
    57 typedef icmp_echo_t *icmp_echo_ref;
    58 
    5954/** Echo specific data. */
    6055struct icmp_echo {
    … …  
    6964 */
    7065typedef struct icmp_header icmp_header_t;
    71 
    72 /** Type definition of the internet control message header pointer.
    73  * @see icmp_header
    74  */
    75 typedef icmp_header_t *icmp_header_ref;
    7666
    7767/** Internet control message header. */

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

    rb4c9c61 rfdbc3ff  
    4444 * @param[out]          answer_count The last parameter for the actual answer in
    4545 *                      the answer parameter.
    46  * @returns             EOK on success.
    47  * @returns             Other error codes as defined for the arp_message()
     46 * @return              EOK on success.
     47 * @return              Other error codes as defined for the arp_message()
    4848 *                      function.
    4949 */
    … …  
    5959 * @param[in] client_connection The client connection processing function. The
    6060 *                      module skeleton propagates its own one.
    61  * @returns             EOK on successful module termination.
    62  * @returns             Other error codes as defined for the arp_initialize()
     61 * @return              EOK on successful module termination.
     62 * @return              Other error codes as defined for the arp_initialize()
    6363 *                      function.
    64  * @returns             Other error codes as defined for the REGISTER_ME() macro
     64 * @return              Other error codes as defined for the REGISTER_ME() macro
    6565 *                      function.
    6666 */

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

    rb4c9c61 rfdbc3ff  
    127127typedef struct ip_header ip_header_t;
    128128
    129 /** Type definition of the internet header pointer.
    130  * @see ip_header
    131  */
    132 typedef ip_header_t *ip_header_ref;
    133 
    134129/** Type definition of the internet option header.
    135130 * @see ip_header
    … …  
    137132typedef struct ip_option ip_option_t;
    138133
    139 /** Type definition of the internet option header pointer.
    140  * @see ip_header
    141  */
    142 typedef ip_option_t *ip_option_ref;
    143 
    144134/** Type definition of the internet version 4 pseudo header.
    145135 * @see ipv4_pseudo_header
    146136 */
    147137typedef struct ipv4_pseudo_header ipv4_pseudo_header_t;
    148 
    149 /** Type definition of the internet version 4 pseudo header pointer.
    150  * @see ipv4_pseudo_header
    151  */
    152 typedef ipv4_pseudo_header_t *ipv4_pseudo_header_ref;
    153138
    154139/** Internet header.

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

    rb4c9c61 rfdbc3ff  
    6868 * @param[in] error     The packet error reporting service. Prefixes the
    6969 *                      received packet.
    70  * @returns             EOK on success.
     70 * @return              EOK on success.
    7171 */
    7272typedef int (*tl_received_msg_t)(device_id_t device_id, packet_t packet,

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

    rb4c9c61 rfdbc3ff  
    4444
    4545extern 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_ref);
     46extern int ip_packet_size_req_remote(int, device_id_t, packet_dimension_t *);
    4747extern int ip_received_error_msg_remote(int, device_id_t, packet_t, services_t,
    4848    services_t);

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

    rb4c9c61 rfdbc3ff  
    4444/*@{*/
    4545
    46 extern int net_get_device_conf_req(int, device_id_t, measured_string_ref *,
     46extern int net_get_device_conf_req(int, device_id_t, measured_string_t **,
    4747    size_t, char **);
    48 extern int net_get_conf_req(int, measured_string_ref *, size_t, char **);
    49 extern void net_free_settings(measured_string_ref, char *);
     48extern int net_get_conf_req(int, measured_string_t **, size_t, char **);
     49extern void net_free_settings(measured_string_t *, char *);
    5050extern int net_connect_module(void);
    5151

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

    rb4c9c61 rfdbc3ff  
    158158 */
    159159extern int netif_get_addr_message(device_id_t device_id,
    160     measured_string_ref address);
     160    measured_string_t *address);
    161161
    162162/** Process the netif driver specific message.
    … …  
    193193 */
    194194extern int netif_get_device_stats(device_id_t device_id,
    195     device_stats_ref stats);
    196 
    197 extern int netif_get_addr_req_local(int, device_id_t, measured_string_ref *,
     195    device_stats_t *stats);
     196
     197extern int netif_get_addr_req_local(int, device_id_t, measured_string_t **,
    198198    char **);
    199199extern int netif_probe_req_local(int, device_id_t, int, int);
    … …  
    201201extern int netif_start_req_local(int, device_id_t);
    202202extern int netif_stop_req_local(int, device_id_t);
    203 extern int netif_stats_req_local(int, device_id_t, device_stats_ref);
     203extern int netif_stats_req_local(int, device_id_t, device_stats_t *);
    204204extern int netif_bind_service_local(services_t, device_id_t, services_t,
    205205    async_client_conn_t);
    206206
    207207extern int find_device(device_id_t, netif_device_t **);
    208 extern void null_device_stats(device_stats_ref);
     208extern void null_device_stats(device_stats_t *);
    209209extern void netif_pq_release(packet_id_t);
    210210extern packet_t netif_packet_get_1(size_t);

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

    rb4c9c61 rfdbc3ff  
    4141#include <net/packet.h>
    4242
    43 extern int netif_get_addr_req_remote(int, device_id_t, measured_string_ref *,
     43extern int netif_get_addr_req_remote(int, device_id_t, measured_string_t **,
    4444    char **);
    4545extern int netif_probe_req_remote(int, device_id_t, int, int);
    … …  
    4747extern int netif_start_req_remote(int, device_id_t);
    4848extern int netif_stop_req_remote(int, device_id_t);
    49 extern int netif_stats_req_remote(int, device_id_t, device_stats_ref);
     49extern int netif_stats_req_remote(int, device_id_t, device_stats_t *);
    5050extern int netif_bind_service_remote(services_t, device_id_t, services_t,
    5151    async_client_conn_t);

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

    rb4c9c61 rfdbc3ff  
    6161 * @param[in] type      The type to be allocated at the beginning of the packet
    6262 *                      content.
    63  * @returns             The typed pointer to the allocated memory.
    64  * @returns             NULL if the packet is not valid.
    65  * @returns             NULL if there is not enough memory left.
     63 * @return              The typed pointer to the allocated memory.
     64 * @return              NULL if the packet is not valid.
     65 * @return              NULL if there is not enough memory left.
    6666 */
    6767#define PACKET_PREFIX(packet, type) \
    … …  
    7676 * @param[in] type      The type to be allocated at the end of the packet
    7777 *                      content.
    78  * @returns             The typed pointer to the allocated memory.
    79  * @returns             NULL if the packet is not valid.
    80  * @returns             NULL if there is not enough memory left.
     78 * @return              The typed pointer to the allocated memory.
     79 * @return              NULL if the packet is not valid.
     80 * @return              NULL if there is not enough memory left.
    8181 */
    8282#define PACKET_SUFFIX(packet, type) \
    … …  
    9292 * @param[in] suffix    The type of the suffix to be removed from the end of
    9393 *                      the packet content.
    94  * @returns             EOK on success.
    95  * @returns             EINVAL if the packet is not valid.
    96  * @returns             ENOMEM if there is not enough memory left.
     94 * @return              EOK on success.
     95 * @return              EINVAL if the packet is not valid.
     96 * @return              ENOMEM if there is not enough memory left.
    9797 */
    9898#define PACKET_TRIM(packet, prefix, suffix) \

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

    rb4c9c61 rfdbc3ff  
    3737#include <sys/types.h>
    3838
    39 extern int packet_translate_remote(int, packet_ref, packet_id_t);
     39extern int packet_translate_remote(int, packet_t *, packet_id_t);
    4040extern packet_t packet_get_4_remote(int, size_t, size_t, size_t, size_t);
    4141extern packet_t packet_get_1_remote(int, size_t);

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

    rb4c9c61 rfdbc3ff  
    6666typedef struct socket_core socket_core_t;
    6767
    68 /** Type definition of the socket core pointer.
    69  * @see socket_core
    70  */
    71 typedef socket_core_t *socket_core_ref;
    72 
    7368/** Type definition of the socket port.
    7469 * @see socket_port
    7570 */
    7671typedef struct socket_port socket_port_t;
    77 
    78 /** Type definition of the socket port pointer.
    79  * @see socket_port
    80  */
    81 typedef socket_port_t *socket_port_ref;
    8272
    8373/** Socket core. */
    … …  
    111101 * the other use the remote addresses.
    112102 */
    113 GENERIC_CHAR_MAP_DECLARE(socket_port_map, socket_core_ref);
     103GENERIC_CHAR_MAP_DECLARE(socket_port_map, socket_core_t *);
    114104
    115105/** Ports map.
    … …  
    118108INT_MAP_DECLARE(socket_ports, socket_port_t);
    119109
    120 extern void socket_cores_release(int, socket_cores_ref, socket_ports_ref,
    121     void (*)(socket_core_ref));
    122 extern int socket_bind(socket_cores_ref, socket_ports_ref, int, void *, size_t,
     110extern void socket_cores_release(int, socket_cores_t *, socket_ports_t *,
     111    void (*)(socket_core_t *));
     112extern int socket_bind(socket_cores_t *, socket_ports_t *, int, void *, size_t,
    123113    int, int, int);
    124 extern int socket_bind_free_port(socket_ports_ref, socket_core_ref, int, int,
     114extern int socket_bind_free_port(socket_ports_t *, socket_core_t *, int, int,
    125115    int);
    126 extern int socket_create(socket_cores_ref, int, void *, int *);
    127 extern int socket_destroy(int, int, socket_cores_ref, socket_ports_ref,
    128     void (*)(socket_core_ref));
     116extern int socket_create(socket_cores_t *, int, void *, int *);
     117extern int socket_destroy(int, int, socket_cores_t *, socket_ports_t *,
     118    void (*)(socket_core_t *));
    129119extern int socket_reply_packets(packet_t, size_t *);
    130 extern socket_core_ref socket_port_find(socket_ports_ref, int, const char *,
     120extern socket_core_t *socket_port_find(socket_ports_t *, int, const char *,
    131121    size_t);
    132 extern void socket_port_release(socket_ports_ref, socket_core_ref);
    133 extern int socket_port_add(socket_ports_ref, int, socket_core_ref,
     122extern void socket_port_release(socket_ports_t *, socket_core_t *);
     123extern int socket_port_add(socket_ports_t *, int, socket_core_t *,
    134124    const char *, size_t);
    135125

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

    rb4c9c61 rfdbc3ff  
    5151DEVICE_MAP_DECLARE(packet_dimensions, packet_dimension_t);
    5252
    53 extern int tl_get_ip_packet_dimension(int, packet_dimensions_ref,
    54     device_id_t, packet_dimension_ref *);
     53extern int tl_get_ip_packet_dimension(int, packet_dimensions_t *,
     54    device_id_t, packet_dimension_t **);
    5555extern int tl_get_address_port(const struct sockaddr *, int, uint16_t *);
    56 extern int tl_update_ip_packet_dimension(packet_dimensions_ref, device_id_t,
     56extern int tl_update_ip_packet_dimension(packet_dimensions_t *, device_id_t,
    5757    size_t);
    5858extern int tl_set_address_port(struct sockaddr *, int, uint16_t);
    5959extern int tl_prepare_icmp_packet(int, int, packet_t, services_t);
    60 extern int tl_socket_read_packet_data(int, packet_ref, size_t,
    61     const packet_dimension_ref, const struct sockaddr *, socklen_t);
     60extern int tl_socket_read_packet_data(int, packet_t *, size_t,
     61    const packet_dimension_t *, const struct sockaddr *, socklen_t);
    6262
    6363#endif

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

    rb4c9c61 rfdbc3ff  
    4545 * @param[in] client_connection The client connection processing function. The
    4646 *                      module skeleton propagates its own one.
    47  * @returns             EOK on successful module termination.
    48  * @returns             Other error codes as defined for the module initialize
     47 * @return              EOK on successful module termination.
     48 * @return              Other error codes as defined for the module initialize
    4949 *                      function.
    50  * @returns             Other error codes as defined for the REGISTER_ME() macro
     50 * @return              Other error codes as defined for the REGISTER_ME() macro
    5151 *                      function.
    5252 */
    … …  
    6262 * @param[out] answer_count The last parameter for the actual answer in the
    6363 *                      answer parameter.
    64  * @returns             EOK on success.
    65  * @returns             Other error codes as defined for the module's message
     64 * @return              EOK on success.
     65 * @return              Other error codes as defined for the module's message
    6666 *                      standalone function.
    6767 */
Note: See TracChangeset for help on using the changeset viewer.