Changeset 46d4d9f in mainline for uspace/lib/net


Ignore:
Timestamp:
2010-11-20T17:04:59Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
dd5046dd
Parents:
fdbc3ff
Message:

Redefine packet_t to be just a type alias for struct packet.

Location:
uspace/lib/net
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/net/generic/packet_client.c

    rfdbc3ff r46d4d9f  
    5757 * @return              ENOMEM if there is not enough memory left.
    5858 */
    59 int packet_copy_data(packet_t packet, const void *data, size_t length)
     59int packet_copy_data(packet_t *packet, const void *data, size_t length)
    6060{
    6161        if (!packet_is_valid(packet))
    … …  
    8181 * @return              NULL if there is not enough memory left.
    8282 */
    83 void *packet_prefix(packet_t packet, size_t length)
     83void *packet_prefix(packet_t *packet, size_t length)
    8484{
    8585        if ((!packet_is_valid(packet)) ||
    86             (packet->data_start - sizeof(struct packet) -
     86            (packet->data_start - sizeof(packet_t) -
    8787            2 * (packet->dest_addr - packet->src_addr) < length)) {
    8888                return NULL;
    … …  
    102102 * @return              NULL if there is not enough memory left.
    103103 */
    104 void *packet_suffix(packet_t packet, size_t length)
     104void *packet_suffix(packet_t *packet, size_t length)
    105105{
    106106        if ((!packet_is_valid(packet)) ||
    … …  
    124124 * @return              ENOMEM if there is not enough memory left.
    125125 */
    126 int packet_trim(packet_t packet, size_t prefix, size_t suffix)
     126int packet_trim(packet_t *packet, size_t prefix, size_t suffix)
    127127{
    128128        if (!packet_is_valid(packet))
    … …  
    143143 * @return              Zero if the packet is not valid.
    144144 */
    145 packet_id_t packet_get_id(const packet_t packet)
     145packet_id_t packet_get_id(const packet_t *packet)
    146146{
    147147        return packet_is_valid(packet) ? packet->packet_id : 0;
    … …  
    157157 * @return              EINVAL if the packet is not valid.
    158158 */
    159 int packet_get_addr(const packet_t packet, uint8_t **src, uint8_t **dest)
     159int packet_get_addr(const packet_t *packet, uint8_t **src, uint8_t **dest)
    160160{
    161161        if (!packet_is_valid(packet))
    … …  
    177177 * @return              Zero if the packet is not valid.
    178178 */
    179 size_t packet_get_data_length(const packet_t packet)
     179size_t packet_get_data_length(const packet_t *packet)
    180180{
    181181        if (!packet_is_valid(packet))
    … …  
    191191 * @return              NULL if the packet is not valid.
    192192 */
    193 void *packet_get_data(const packet_t packet)
     193void *packet_get_data(const packet_t *packet)
    194194{
    195195        if (!packet_is_valid(packet))
    … …  
    210210 */
    211211int
    212 packet_set_addr(packet_t packet, const uint8_t *src, const uint8_t *dest,
     212packet_set_addr(packet_t *packet, const uint8_t *src, const uint8_t *dest,
    213213    size_t addr_len)
    214214{
    … …  
    257257 * @return              NULL on error.
    258258 */
    259 packet_t packet_get_copy(int phone, packet_t packet)
    260 {
    261         packet_t copy;
     259packet_t *packet_get_copy(int phone, packet_t *packet)
     260{
     261        packet_t *copy;
    262262        uint8_t * src = NULL;
    263263        uint8_t * dest = NULL;

  • uspace/lib/net/generic/packet_remote.c

    rfdbc3ff r46d4d9f  
    6464 */
    6565static int
    66 packet_return(int phone, packet_t *packet, packet_id_t packet_id, size_t size)
     66packet_return(int phone, packet_t **packet, packet_id_t packet_id, size_t size)
    6767{
    6868        ipc_call_t answer;
    … …  
    7272        message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
    7373
    74         *packet = (packet_t) as_get_mappable_page(size);
     74        *packet = (packet_t *) as_get_mappable_page(size);
    7575        rc = async_share_in_start_0_0(phone, *packet, size);
    7676        if (rc != EOK) {
    … …  
    107107 *                      function.
    108108 */
    109 int packet_translate_remote(int phone, packet_t *packet, packet_id_t packet_id)
     109int packet_translate_remote(int phone, packet_t **packet, packet_id_t packet_id)
    110110{
    111111        int rc;
    … …  
    127127        }
    128128        if ((*packet)->next) {
    129                 packet_t next;
     129                packet_t *next;
    130130               
    131131                return packet_translate_remote(phone, &next, (*packet)->next);
    … …  
    148148 * @return              NULL on error.
    149149 */
    150 packet_t packet_get_4_remote(int phone, size_t max_content, size_t addr_len,
     150packet_t *packet_get_4_remote(int phone, size_t max_content, size_t addr_len,
    151151    size_t max_prefix, size_t max_suffix)
    152152{
    … …  
    161161       
    162162       
    163         packet_t packet = pm_find(packet_id);
     163        packet_t *packet = pm_find(packet_id);
    164164        if (!packet) {
    165165                rc = packet_return(phone, &packet, packet_id, size);
    … …  
    180180 * @return              NULL on error.
    181181 */
    182 packet_t packet_get_1_remote(int phone, size_t content)
     182packet_t *packet_get_1_remote(int phone, size_t content)
    183183{
    184184        ipcarg_t packet_id;
    … …  
    191191                return NULL;
    192192       
    193         packet_t packet = pm_find(packet_id);
     193        packet_t *packet = pm_find(packet_id);
    194194        if (!packet) {
    195195                rc = packet_return(phone, &packet, packet_id, size);

  • uspace/lib/net/il/il_interface.c

    rfdbc3ff r46d4d9f  
    7777 *
    7878 */
    79 int il_received_msg(int il_phone, device_id_t device_id, packet_t packet,
     79int il_received_msg(int il_phone, device_id_t device_id, packet_t *packet,
    8080    services_t target)
    8181{

  • uspace/lib/net/il/ip_client.c

    rfdbc3ff r46d4d9f  
    5151 * @return              Zero if there is no IP header.
    5252 */
    53 size_t ip_client_header_length(packet_t packet)
     53size_t ip_client_header_length(packet_t *packet)
    5454{
    5555        ip_header_t *header;
    … …  
    152152 */
    153153int
    154 ip_client_prepare_packet(packet_t packet, ip_protocol_t protocol, ip_ttl_t ttl,
     154ip_client_prepare_packet(packet_t *packet, ip_protocol_t protocol, ip_ttl_t ttl,
    155155    ip_tos_t tos, int dont_fragment, size_t ipopt_length)
    156156{
    … …  
    208208 */
    209209int
    210 ip_client_process_packet(packet_t packet, ip_protocol_t *protocol,
     210ip_client_process_packet(packet_t *packet, ip_protocol_t *protocol,
    211211    ip_ttl_t *ttl, ip_tos_t *tos, int *dont_fragment, size_t *ipopt_length)
    212212{

  • uspace/lib/net/il/ip_remote.c

    rfdbc3ff r46d4d9f  
    204204 */
    205205int ip_received_error_msg_remote(int ip_phone, device_id_t device_id,
    206     packet_t packet, services_t target, services_t error)
     206    packet_t *packet, services_t target, services_t error)
    207207{
    208208        return generic_received_msg_remote(ip_phone, NET_IP_RECEIVED_ERROR,
    … …  
    225225 *                      function.
    226226 */
    227 int ip_send_msg_remote(int ip_phone, device_id_t device_id, packet_t packet,
     227int ip_send_msg_remote(int ip_phone, device_id_t device_id, packet_t *packet,
    228228    services_t sender, services_t error)
    229229{

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

    rfdbc3ff r46d4d9f  
    4141#include <net/packet.h>
    4242
    43 extern int icmp_client_process_packet(packet_t, icmp_type_t *, icmp_code_t *,
     43extern int icmp_client_process_packet(packet_t *, icmp_type_t *, icmp_code_t *,
    4444    icmp_param_t *, icmp_param_t *);
    45 extern size_t icmp_client_header_length(packet_t);
     45extern size_t icmp_client_header_length(packet_t *);
    4646
    4747#endif

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

    rfdbc3ff r46d4d9f  
    5151
    5252extern 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, packet_t);
     53    packet_t *);
     54extern int icmp_source_quench_msg(int, packet_t *);
     55extern int icmp_time_exceeded_msg(int, icmp_code_t, packet_t *);
     56extern int icmp_parameter_problem_msg(int, icmp_code_t, icmp_param_t, packet_t *);
    5757
    5858/*@}*/

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

    rfdbc3ff r46d4d9f  
    5151
    5252extern 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);
     53extern int il_received_msg(int, device_id_t, packet_t *, services_t);
    5454extern int il_mtu_changed_msg(int, device_id_t, size_t, services_t);
    5555

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

    rfdbc3ff r46d4d9f  
    4545#include <ip_interface.h>
    4646
    47 extern int ip_client_prepare_packet(packet_t, ip_protocol_t, ip_ttl_t, ip_tos_t,
    48     int, size_t);
    49 extern int ip_client_process_packet(packet_t, ip_protocol_t *, ip_ttl_t *,
     47extern int ip_client_prepare_packet(packet_t *, ip_protocol_t, ip_ttl_t,
     48    ip_tos_t, int, size_t);
     49extern int ip_client_process_packet(packet_t *, ip_protocol_t *, ip_ttl_t *,
    5050    ip_tos_t *, int *, size_t *);
    51 extern size_t ip_client_header_length(packet_t);
     51extern size_t ip_client_header_length(packet_t *);
    5252extern int ip_client_set_pseudo_header_data_length(void *, size_t, size_t);
    5353extern int ip_client_get_pseudo_header(ip_protocol_t, struct sockaddr *,

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

    rfdbc3ff r46d4d9f  
    7070 * @return              EOK on success.
    7171 */
    72 typedef int (*tl_received_msg_t)(device_id_t device_id, packet_t packet,
     72typedef int (*tl_received_msg_t)(device_id_t device_id, packet_t *packet,
    7373    services_t receiver, services_t error);
    7474

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

    rfdbc3ff r46d4d9f  
    4545extern int ip_set_gateway_req_remote(int, device_id_t, in_addr_t);
    4646extern 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,
     47extern int ip_received_error_msg_remote(int, device_id_t, packet_t *, services_t,
    4848    services_t);
    4949extern int ip_device_req_remote(int, device_id_t, services_t);
    5050extern int ip_add_route_req_remote(int, device_id_t, in_addr_t, in_addr_t,
    5151    in_addr_t);
    52 extern int ip_send_msg_remote(int, device_id_t, packet_t, services_t,
     52extern int ip_send_msg_remote(int, device_id_t, packet_t *, services_t,
    5353    services_t);
    5454extern int ip_get_route_req_remote(int, ip_protocol_t, const struct sockaddr *,

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

    rfdbc3ff r46d4d9f  
    111111 *                      message implementation.
    112112 */
    113 extern int netif_send_message(device_id_t device_id, packet_t packet,
     113extern int netif_send_message(device_id_t device_id, packet_t *packet,
    114114    services_t sender);
    115115
    … …  
    198198    char **);
    199199extern int netif_probe_req_local(int, device_id_t, int, int);
    200 extern int netif_send_msg_local(int, device_id_t, packet_t, services_t);
     200extern int netif_send_msg_local(int, device_id_t, packet_t *, services_t);
    201201extern int netif_start_req_local(int, device_id_t);
    202202extern int netif_stop_req_local(int, device_id_t);
    … …  
    208208extern void null_device_stats(device_stats_t *);
    209209extern void netif_pq_release(packet_id_t);
    210 extern packet_t netif_packet_get_1(size_t);
     210extern packet_t *netif_packet_get_1(size_t);
    211211extern int netif_init_module(async_client_conn_t);
    212212

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

    rfdbc3ff r46d4d9f  
    4444    char **);
    4545extern int netif_probe_req_remote(int, device_id_t, int, int);
    46 extern int netif_send_msg_remote(int, device_id_t, packet_t, services_t);
     46extern int netif_send_msg_remote(int, device_id_t, packet_t *, services_t);
    4747extern int netif_start_req_remote(int, device_id_t);
    4848extern int netif_stop_req_remote(int, device_id_t);

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

    rfdbc3ff r46d4d9f  
    7777 *                      received function.
    7878 */
    79 extern int nil_received_msg_local(int, device_id_t, packet_t, services_t);
     79extern int nil_received_msg_local(int, device_id_t, packet_t *, services_t);
    8080
    8181/** Message processing function.

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

    rfdbc3ff r46d4d9f  
    3939
    4040extern int nil_device_state_msg_remote(int, device_id_t, int);
    41 extern int nil_received_msg_remote(int, device_id_t, packet_t, services_t);
     41extern int nil_received_msg_remote(int, device_id_t, packet_t *, services_t);
    4242
    4343#endif

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

    rfdbc3ff r46d4d9f  
    9999        packet_trim((packet), sizeof(prefix), sizeof(suffix))
    100100
    101 extern void *packet_prefix(packet_t, size_t);
    102 extern void *packet_suffix(packet_t, size_t);
    103 extern int packet_trim(packet_t, size_t, size_t);
    104 extern int packet_copy_data(packet_t, const void *, size_t);
    105 extern packet_id_t packet_get_id(const packet_t);
    106 extern size_t packet_get_data_length(const packet_t);
    107 extern void *packet_get_data(const packet_t);
    108 extern int packet_get_addr(const packet_t, uint8_t **, uint8_t **);
    109 extern int packet_set_addr(packet_t, const uint8_t *, const uint8_t *, size_t);
    110 extern packet_t packet_get_copy(int phone, packet_t packet);
     101extern void *packet_prefix(packet_t *, size_t);
     102extern void *packet_suffix(packet_t *, size_t);
     103extern int packet_trim(packet_t *, size_t, size_t);
     104extern int packet_copy_data(packet_t *, const void *, size_t);
     105extern packet_id_t packet_get_id(const packet_t *);
     106extern size_t packet_get_data_length(const packet_t *);
     107extern void *packet_get_data(const packet_t *);
     108extern int packet_get_addr(const packet_t *, uint8_t **, uint8_t **);
     109extern int packet_set_addr(packet_t *, const uint8_t *, const uint8_t *, size_t);
     110extern packet_t *packet_get_copy(int, packet_t *);
    111111
    112112/*@}*/

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

    rfdbc3ff r46d4d9f  
    3737#include <sys/types.h>
    3838
    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);
     39extern int packet_translate_remote(int, packet_t **, packet_id_t);
     40extern packet_t *packet_get_4_remote(int, size_t, size_t, size_t, size_t);
     41extern packet_t *packet_get_1_remote(int, size_t);
    4242extern void pq_release_remote(int, packet_id_t);
    4343

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

    rfdbc3ff r46d4d9f  
    117117extern int socket_destroy(int, int, socket_cores_t *, socket_ports_t *,
    118118    void (*)(socket_core_t *));
    119 extern int socket_reply_packets(packet_t, size_t *);
     119extern int socket_reply_packets(packet_t *, size_t *);
    120120extern socket_core_t *socket_port_find(socket_ports_t *, int, const char *,
    121121    size_t);

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

    rfdbc3ff r46d4d9f  
    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(int, int, packet_t *, services_t);
     60extern int tl_socket_read_packet_data(int, packet_t **, size_t,
    6161    const packet_dimension_t *, const struct sockaddr *, socklen_t);
    6262

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

    rfdbc3ff r46d4d9f  
    5252/*@{*/
    5353
    54 extern int tl_received_msg(int, device_id_t, packet_t, services_t, services_t);
     54extern int tl_received_msg(int, device_id_t, packet_t *, services_t, services_t);
    5555
    5656/*@}*/

  • uspace/lib/net/netif/netif_local.c

    rfdbc3ff r46d4d9f  
    9292 */
    9393int netif_send_msg_local(int netif_phone, device_id_t device_id,
    94     packet_t packet, services_t sender)
     94    packet_t *packet, services_t sender)
    9595{
    9696        fibril_rwlock_write_lock(&netif_globals.lock);
    … …  
    307307 *
    308308 */
    309 packet_t netif_packet_get_1(size_t content)
     309packet_t *netif_packet_get_1(size_t content)
    310310{
    311311        return packet_get_1_remote(netif_globals.net_phone, content);
    … …  
    361361        size_t length;
    362362        device_stats_t stats;
    363         packet_t packet;
     363        packet_t *packet;
    364364        measured_string_t address;
    365365        int rc;

  • uspace/lib/net/netif/netif_remote.c

    rfdbc3ff r46d4d9f  
    9393 */
    9494int
    95 netif_send_msg_remote(int netif_phone, device_id_t device_id, packet_t packet,
     95netif_send_msg_remote(int netif_phone, device_id_t device_id, packet_t *packet,
    9696    services_t sender)
    9797{

  • uspace/lib/net/nil/nil_remote.c

    rfdbc3ff r46d4d9f  
    7474 */
    7575int nil_received_msg_remote(int nil_phone, device_id_t device_id,
    76     packet_t packet, services_t target)
     76    packet_t *packet, services_t target)
    7777{
    7878        return generic_received_msg_remote(nil_phone, NET_NIL_RECEIVED,

  • uspace/lib/net/tl/icmp_client.c

    rfdbc3ff r46d4d9f  
    6161 */
    6262int
    63 icmp_client_process_packet(packet_t packet, icmp_type_t *type,
     63icmp_client_process_packet(packet_t *packet, icmp_type_t *type,
    6464    icmp_code_t *code, icmp_param_t *pointer, icmp_param_t *mtu)
    6565{
    … …  
    9494 * @return              The ICMP header length in bytes.
    9595 */
    96 size_t icmp_client_header_length(packet_t packet)
     96size_t icmp_client_header_length(packet_t *packet)
    9797{
    9898        if (packet_get_data_length(packet) < sizeof(icmp_header_t))

  • uspace/lib/net/tl/icmp_remote.c

    rfdbc3ff r46d4d9f  
    6363int
    6464icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code,
    65     icmp_param_t mtu, packet_t packet)
     65    icmp_param_t mtu, packet_t *packet)
    6666{
    6767        async_msg_3(icmp_phone, NET_ICMP_DEST_UNREACH, (ipcarg_t) code,
    … …  
    8282 * @return              ENOMEM if there is not enough memory left.
    8383 */
    84 int icmp_source_quench_msg(int icmp_phone, packet_t packet)
     84int icmp_source_quench_msg(int icmp_phone, packet_t *packet)
    8585{
    8686        async_msg_2(icmp_phone, NET_ICMP_SOURCE_QUENCH, 0,
    … …  
    102102 * @return              ENOMEM if there is not enough memory left.
    103103 */
    104 int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t packet)
     104int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t *packet)
    105105{
    106106        async_msg_2(icmp_phone, NET_ICMP_TIME_EXCEEDED, (ipcarg_t) code,
    … …  
    124124 */
    125125int icmp_parameter_problem_msg(int icmp_phone, icmp_code_t code,
    126     icmp_param_t pointer, packet_t packet)
     126    icmp_param_t pointer, packet_t *packet)
    127127{
    128128        async_msg_3(icmp_phone, NET_ICMP_PARAMETERPROB, (ipcarg_t) code,

  • uspace/lib/net/tl/socket_core.c

    rfdbc3ff r46d4d9f  
    522522 *                      function.
    523523 */
    524 int socket_reply_packets(packet_t packet, size_t *length)
    525 {
    526         packet_t next_packet;
     524int socket_reply_packets(packet_t *packet, size_t *length)
     525{
     526        packet_t *next_packet;
    527527        size_t fragments;
    528528        size_t *lengths;

  • uspace/lib/net/tl/tl_common.c

    rfdbc3ff r46d4d9f  
    248248 */
    249249int
    250 tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t packet,
     250tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t *packet,
    251251    services_t error)
    252252{
    253         packet_t next;
     253        packet_t *next;
    254254        uint8_t *src;
    255255        int length;
    … …  
    287287 */
    288288int
    289 tl_socket_read_packet_data(int packet_phone, packet_t *packet, size_t prefix,
     289tl_socket_read_packet_data(int packet_phone, packet_t **packet, size_t prefix,
    290290    const packet_dimension_t *dimension, const struct sockaddr *addr,
    291291    socklen_t addrlen)

  • uspace/lib/net/tl/tl_interface.c

    rfdbc3ff r46d4d9f  
    5858 */
    5959int
    60 tl_received_msg(int tl_phone, device_id_t device_id, packet_t packet,
     60tl_received_msg(int tl_phone, device_id_t device_id, packet_t *packet,
    6161    services_t target, services_t error)
    6262{
Note: See TracChangeset for help on using the changeset viewer.