Changeset 0773396 in mainline for uspace/srv/net/inetsrv/inetsrv.h


Ignore:
Timestamp:
2013-12-25T13:05:25Z (10 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bc54126c
Parents:
f4a47e52 (diff), 6946f23 (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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/inetsrv/inetsrv.h

    rf4a47e52 r0773396  
    4444#include <ipc/loc.h>
    4545#include <sys/types.h>
     46#include <types/inet.h>
    4647#include <async.h>
    4748
    … …  
    7374} inetping6_client_t;
    7475
    75 /** Address object info */
    76 typedef struct {
    77         /** Network address */
    78         inet_naddr_t naddr;
    79         /** Link service ID */
    80         sysarg_t ilink;
    81         /** Address object name */
    82         char *name;
    83 } inet_addr_info_t;
    84 
    85 /** IP link info */
    86 typedef struct {
    87         /** Link service name */
    88         char *name;
    89         /** Default MTU */
    90         size_t def_mtu;
    91 } inet_link_info_t;
    92 
    93 /** Static route info */
    94 typedef struct {
    95         /** Destination network address */
    96         inet_naddr_t dest;
    97         /** Router address */
    98         inet_addr_t router;
    99         /** Static route name */
    100         char *name;
    101 } inet_sroute_info_t;
    102 
    10376typedef struct {
    10477        /** Source address */
    … …  
    12598        size_t size;
    12699} inet_packet_t;
    127 
    128 typedef struct {
    129         inet_addr_t src;
    130         inet_addr_t dest;
    131         uint8_t tos;
    132         void *data;
    133         size_t size;
    134 } inet_dgram_t;
    135100
    136101typedef struct {
    … …  
    183148} inet_dir_t;
    184149
    185 typedef struct {
    186         uint32_t src;
    187         uint32_t dest;
    188         uint16_t seq_no;
    189         void *data;
    190         size_t size;
    191 } inetping_sdu_t;
    192 
    193 typedef struct {
    194         addr128_t src;
    195         addr128_t dest;
    196         uint16_t seq_no;
    197         void *data;
    198         size_t size;
    199 } inetping6_sdu_t;
    200 
    201150extern int inet_ev_recv(inet_client_t *, inet_dgram_t *);
    202151extern int inet_recv_packet(inet_packet_t *);
Note: See TracChangeset for help on using the changeset viewer.