Changes in / [84b7384:e503d3a9] in mainline


Ignore:
Files:
54 added
19 deleted
55 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r84b7384 re503d3a9  
    6161                cp "$$file" "$(DIST_PATH)/cfg/net/" ; \
    6262        done
    63 
     63        for drv in $(RD_DRVS) ; do \
     64                mkdir -p "$(DIST_PATH)/$(DRVS_PATH)/$$drv" ; \
     65                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv/$$drv" "$(DIST_PATH)/$(DRVS_PATH)/$$drv/$$drv" ; \
     66                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv/$$drv.ma" "$(DIST_PATH)/$(DRVS_PATH)/$$drv/$$drv.ma" ; \
     67        done
     68        for file in $(RD_DRV_CFG) ; do \
     69                cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file" "$(DIST_PATH)/$(DRVS_PATH)/$$file" ; \
     70        done
     71       
    6472clean: clean_dist
    6573        $(MAKE) -f $(BUILD) clean PRECHECK=$(PRECHECK)
    … …  
    7482        rm -f $(INITRD).fs $(INITRD).img $(COMPS_H) $(COMPS_C) $(LINK) $(LINK).comp *.co
    7583        rm -f $(USPACE_PATH)/dist/srv/*
     84        rm -rf $(USPACE_PATH)/dist/drv/*
    7685        rm -f $(USPACE_PATH)/dist/app/*
    7786        rm -f $(USPACE_PATH)/dist/cfg/net/*

  • boot/Makefile.common

    r84b7384 re503d3a9  
    4949DIST_PATH = $(USPACE_PATH)/dist
    5050TOOLS_PATH = $(ROOT_PATH)/tools
     51DRVS_PATH = drv
    5152
    5253SANDBOX = pack
    … …  
    106107        $(USPACE_PATH)/srv/net/net/net \
    107108        $(USPACE_PATH)/srv/net/netstart/netstart \
     109        $(USPACE_PATH)/srv/devman/devman \
     110        $(USPACE_PATH)/srv/drivers/root/root
     111       
     112RD_DRVS = \
     113        root
     114
     115RD_DRV_CFG =
    108116
    109117ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
    … …  
    125133        $(USPACE_PATH)/app/taskdump/taskdump \
    126134        $(USPACE_PATH)/app/tester/tester \
     135        $(USPACE_PATH)/app/test_serial/test_serial \
    127136        $(USPACE_PATH)/app/tetris/tetris \
    128137        $(USPACE_PATH)/app/trace/trace \

  • boot/arch/amd64/Makefile.inc

    r84b7384 re503d3a9  
    3737        $(USPACE_PATH)/srv/hid/char_mouse/char_ms
    3838
     39RD_DRVS += \
     40        rootia32 \
     41        pciintel \
     42        isa \
     43        ns8250
     44       
     45RD_DRV_CFG += \
     46        isa/isa.dev
     47
    3948BOOT_OUTPUT = $(ROOT_PATH)/image.iso
    4049PREBUILD = $(INITRD).img

  • kernel/generic/include/ddi/ddi.h

    r84b7384 re503d3a9  
    5454extern unative_t sys_physmem_map(unative_t, unative_t, unative_t, unative_t);
    5555extern unative_t sys_iospace_enable(ddi_ioarg_t *);
     56extern unative_t sys_interrupt_enable(int irq, int enable);
    5657
    5758/*
    … …  
    6061extern int ddi_iospace_enable_arch(task_t *, uintptr_t, size_t);
    6162
     63
    6264#endif
    6365

  • kernel/generic/include/syscall/syscall.h

    r84b7384 re503d3a9  
    8080        SYS_PHYSMEM_MAP,
    8181        SYS_IOSPACE_ENABLE,
     82        SYS_INTERRUPT_ENABLE,
    8283       
    8384        SYS_SYSINFO_GET_TAG,

  • kernel/generic/src/ddi/ddi.c

    r84b7384 re503d3a9  
    258258}
    259259
     260/** Disable or enable specified interrupts.
     261 *
     262 * @param irq the interrupt to be enabled/disabled.
     263 * @param enable if true enable the interrupt, disable otherwise.
     264 *
     265 * @retutn Zero on success, error code otherwise.
     266 */
     267unative_t sys_interrupt_enable(int irq, int enable)
     268{
     269/* FIXME: this needs to be generic code, or better not be in kernel at all. */
     270#if 0
     271        cap_t task_cap = cap_get(TASK);
     272        if (!(task_cap & CAP_IRQ_REG))
     273                return EPERM;
     274               
     275        if (irq < 0 || irq > 16) {
     276                return EINVAL;
     277        }
     278       
     279        uint16_t irq_mask = (uint16_t)(1 << irq);
     280        if (enable) {
     281                trap_virtual_enable_irqs(irq_mask);
     282        } else {
     283                trap_virtual_disable_irqs(irq_mask);
     284        }
     285       
     286#endif
     287        return 0;
     288}
     289
    260290/** @}
    261291 */

  • kernel/generic/src/syscall/syscall.c

    r84b7384 re503d3a9  
    159159        (syshandler_t) sys_physmem_map,
    160160        (syshandler_t) sys_iospace_enable,
     161        (syshandler_t) sys_interrupt_enable,
    161162       
    162163        /* Sysinfo syscalls */

  • tools/pack.py

    r84b7384 re503d3a9  
    113113               
    114114                comp_in = file(component, "rb")
    115                 comp_data = comp_in.read();
     115                comp_data = comp_in.read()
    116116                comp_in.close()
    117117               

  • uspace/Makefile

    r84b7384 re503d3a9  
    4646        app/tasks \
    4747        app/tester \
     48        app/test_serial \
    4849        app/tetris \
    4950        app/trace \
    5051        app/top \
     52        app/netecho \
     53        app/nettest1 \
     54        app/nettest2 \
     55        app/ping \
    5156        srv/clip \
    5257        srv/devmap \
     58        srv/devman \
    5359        srv/loader \
    5460        srv/ns \
    … …  
    8187        srv/net/net \
    8288        srv/net/netstart \
    83         app/netecho \
    84         app/nettest1 \
    85         app/nettest2 \
    86         app/ping
     89        drv/root
    8790
    8891## Networking
    … …  
    107110
    108111ifeq ($(UARCH),amd64)
    109         DIRS += srv/hw/bus/pci
    110112endif
    111113
    112114ifeq ($(UARCH),ia32)
    113         DIRS += srv/hw/bus/pci
     115        DIRS += drv/rootia32
     116        DIRS += drv/pciintel
     117        DIRS += drv/isa
     118        DIRS += drv/ns8250
    114119endif
    115120
    … …  
    134139        lib/softint \
    135140        lib/softfloat \
     141        lib/drv \
    136142        lib/packet \
    137143        lib/net
    138 
    139 ifeq ($(UARCH),amd64)
    140         LIBS += lib/pci
    141 endif
    142 
    143 ifeq ($(UARCH),ia32)
    144         LIBS += lib/pci
    145 endif
    146 
    147144
    148145LIBC_BUILD = $(addsuffix .build,$(LIBC))

  • uspace/Makefile.common

    r84b7384 re503d3a9  
    8686LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
    8787
    88 LIBPCI_PREFIX = $(LIB_PREFIX)/pci
    89 
     88LIBDRV_PREFIX = $(LIB_PREFIX)/drv
    9089LIBPACKET_PREFIX = $(LIB_PREFIX)/packet
    9190LIBNET_PREFIX = $(LIB_PREFIX)/net

  • uspace/app/trace/syscalls.c

    r84b7384 re503d3a9  
    7373    [SYS_PHYSMEM_MAP] = { "physmem_map",                4,      V_ERRNO },
    7474    [SYS_IOSPACE_ENABLE] = { "iospace_enable",          1,      V_ERRNO },
     75    [SYS_INTERRUPT_ENABLE] = { "interrupt_enable",      2,      V_ERRNO },
    7576
    7677    [SYS_SYSINFO_GET_TAG] = { "sysinfo_get_tag",                2,      V_INTEGER },

  • uspace/lib/c/Makefile

    r84b7384 re503d3a9  
    5757        generic/clipboard.c \
    5858        generic/devmap.c \
     59        generic/devman.c \
     60        generic/device/hw_res.c \
     61        generic/device/char.c \
    5962        generic/event.c \
    6063        generic/errno.c \

  • uspace/lib/c/generic/adt/dynamic_fifo.c

    r84b7384 re503d3a9  
    2828
    2929/** @addtogroup libc
    30  *  @{
     30 * @{
    3131 */
    3232
    … …  
    3434 * Dynamic first in first out positive integer queue implementation.
    3535 */
     36
     37#include <adt/dynamic_fifo.h>
    3638
    3739#include <errno.h>
    3840#include <malloc.h>
    3941#include <mem.h>
    40 
    41 #include <adt/dynamic_fifo.h>
    4242
    4343/** Internal magic value for a consistency check. */
    … …  
    106106int dyn_fifo_push(dyn_fifo_ref fifo, int value, int max_size)
    107107{
    108         int * new_items;
     108        int *new_items;
    109109
    110110        if (!dyn_fifo_is_valid(fifo))
    … …  
    149149/** Returns and excludes the first item in the queue.
    150150 *
    151  * @param[in,out] fifoi The dynamic queue.
     151 * @param[in,out] fifo  The dynamic queue.
    152152 * @returns             Value of the first item in the queue.
    153153 * @returns             EINVAL if the queue is not valid.
    … …  
    189189/** Clears and destroys the queue.
    190190 *
    191  *  @param[in,out] fifo         The dynamic queue.
    192  *  @returns                    EOK on success.
    193  *  @returns                    EINVAL if the queue is not valid.
     191 * @param[in,out] fifo  The dynamic queue.
     192 * @returns             EOK on success.
     193 * @returns             EINVAL if the queue is not valid.
    194194 */
    195195int dyn_fifo_destroy(dyn_fifo_ref fifo)

  • uspace/lib/c/generic/ddi.c

    r84b7384 re503d3a9  
    9696}
    9797
     98/** Enable an interrupt.
     99 *
     100 * @param irq the interrupt.
     101 *
     102 * @return Zero on success, negative error code otherwise.
     103 */
     104int interrupt_enable(int irq)
     105{
     106        return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, 1);
     107}
     108
     109/** Disable an interrupt.
     110 *
     111 * @param irq the interrupt.
     112 *
     113 * @return Zero on success, negative error code otherwise.
     114 */
     115int interrupt_disable(int irq)
     116{
     117        return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, 0);
     118}
     119
    98120/** Enable PIO for specified I/O range.
    99121 *

  • uspace/lib/c/include/ddi.h

    r84b7384 re503d3a9  
    4242extern int iospace_enable(task_id_t, void *, unsigned long);
    4343extern int pio_enable(void *, size_t, void **);
     44extern int interrupt_enable(int);
     45extern int interrupt_disable(int);
    4446
    4547#endif

  • uspace/lib/c/include/ipc/services.h

    r84b7384 re503d3a9  
    4545        SERVICE_VFS,
    4646        SERVICE_DEVMAP,
     47        SERVICE_DEVMAN,
    4748        SERVICE_FHC,
    4849        SERVICE_OBIO,

  • uspace/lib/c/include/net/icmp_codes.h

    r84b7384 re503d3a9  
    4242#define LIBC_ICMP_CODES_H_
    4343
     44#include <sys/types.h>
     45
    4446/** ICMP type type definition. */
    4547typedef uint8_t icmp_type_t;

  • uspace/lib/net/Makefile

    r84b7384 re503d3a9  
    3838        generic/packet_client.c \
    3939        generic/packet_remote.c \
    40         generic/socket_core.c \
     40        generic/protocol_map.c \
    4141        adt/module_map.c \
    4242        netif/netif_local.c \
    4343        netif/netif_remote.c \
    4444        nil/nil_remote.c \
     45        il/il_interface.c \
    4546        il/ip_remote.c \
    4647        il/ip_client.c \
    … …  
    4849        tl/icmp_remote.c \
    4950        tl/icmp_client.c \
     51        tl/socket_core.c \
     52        tl/tl_interface.c \
    5053        tl/tl_common.c
    5154

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup ip
     29/** @addtogroup libnet
    3030 * @{
    3131 */
    … …  
    7272}
    7373
     74/** Creates bidirectional connection with the ip module service and registers
     75 * the message receiver.
     76 *
     77 * @param[in] service   The IP module service.
     78 * @param[in] protocol  The transport layer protocol.
     79 * @param[in] me        The requesting module service.
     80 * @param[in] receiver  The message receiver. Used for remote connection.
     81 * @returns             The phone of the needed service.
     82 * @returns             EOK on success.
     83 * @returns             Other error codes as defined for the bind_service()
     84 *                      function.
     85 */
    7486int ip_bind_service(services_t service, int protocol, services_t me,
    7587    async_client_conn_t receiver)
    … …  
    7991}
    8092
     93/** Connects to the IP module.
     94 *
     95 * @param service       The IP module service. Ignored parameter.
     96 * @returns             The IP module phone on success.
     97 */
    8198int ip_connect_module(services_t service)
    8299{
    … …  
    110127}
    111128
    112 /** Return the device identifier and the IP pseudo header based on the destination address.
     129/** Return the device identifier and the IP pseudo header based on the
     130 * destination address.
    113131 *
    114132 * @param[in]  ip_phone    The IP module phone used for (semi)remote calls.
    … …  
    137155            (ipcarg_t) protocol, &answer);
    138156       
    139         if ((async_data_write_start(ip_phone, destination, addrlen) == EOK)
    140             && (async_data_read_start(ip_phone, headerlen, sizeof(*headerlen)) == EOK)
    141             && (*headerlen > 0)) {
     157        if ((async_data_write_start(ip_phone, destination, addrlen) == EOK) &&
     158            (async_data_read_start(ip_phone, headerlen,
     159            sizeof(*headerlen)) == EOK) && (*headerlen > 0)) {
    142160                *header = malloc(*headerlen);
    143161                if (*header) {
    144                         if (async_data_read_start(ip_phone, *header, *headerlen) != EOK)
     162                        if (async_data_read_start(ip_phone, *header,
     163                            *headerlen) != EOK)
    145164                                free(*header);
    146165                }
    … …  
    173192    packet_dimension_ref packet_dimension)
    174193{
    175         return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE, device_id,
    176             packet_dimension);
     194        return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE,
     195            device_id, packet_dimension);
    177196}
    178197

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup eth
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  Link service access point identifiers.
     34 * Link service access point identifiers.
    3535 */
    3636
    37 #ifndef __NET_ETHERNET_LSAP_H__
    38 #define __NET_ETHERNET_LSAP_H__
     37#ifndef LIBNET_ETHERNET_LSAP_H_
     38#define LIBNET_ETHERNET_LSAP_H_
    3939
    4040#include <sys/types.h>
    4141
    42 /** Ethernet LSAP type definition.
    43  */
    44 typedef uint8_t eth_lsap_t;
     42/** Ethernet LSAP type definition. */
     43typedef uint8_t eth_lsap_t;
    4544
    46 /** @name Ethernet LSAP values definitions
    47  */
     45/** @name Ethernet LSAP values definitions */
    4846/*@{*/
    4947
    50 /** Null LSAP LSAP identifier.
    51  */
     48/** Null LSAP LSAP identifier. */
    5249#define ETH_LSAP_NULL   0x00
    53 /** Individual LLC Sublayer Management Function LSAP identifier.
    54  */
    55 #define ETH_LSAP_ISLMF  0x02
    56 /** Group LLC Sublayer Management Function LSAP identifier.
    57  */
    58 #define ETH_LSAP_GSLMI  0x03
    59 /** IBM SNA Path Control (individual) LSAP identifier.
    60  */
    61 #define ETH_LSAP_ISNA   0x04
    62 /** IBM SNA Path Control (group) LSAP identifier.
    63  */
    64 #define ETH_LSAP_GSNA   0x05
    65 /** ARPANET Internet Protocol (IP) LSAP identifier.
    66  */
     50/** ARPANET Internet Protocol (IP) LSAP identifier. */
    6751#define ETH_LSAP_IP     0x06
    68 /** SNA LSAP identifier.
    69  */
    70 #define ETH_LSAP_SNA    0x08
    71 /** SNA LSAP identifier.
    72  */
    73 #define ETH_LSAP_SNA2   0x0C
    74 /** PROWAY (IEC955) Network Management &Initialization LSAP identifier.
    75  */
    76 #define ETH_LSAP_PROWAY_NMI     0x0E
    77 /** Texas Instruments LSAP identifier.
    78  */
    79 #define ETH_LSAP_TI     0x18
    80 /** IEEE 802.1 Bridge Spanning Tree Protocol LSAP identifier.
    81  */
    82 #define ETH_LSAP_BRIDGE 0x42
    83 /** EIA RS-511 Manufacturing Message Service LSAP identifier.
    84  */
    85 #define ETH_LSAP_EIS    0x4E
    86 /** ISO 8208 (X.25 over IEEE 802.2 Type 2 LLC) LSAP identifier.
    87  */
    88 #define ETH_LSAP_ISO8208        0x7E
    89 /** Xerox Network Systems (XNS) LSAP identifier.
    90  */
    91 #define ETH_LSAP_XNS    0x80
    92 /** Nestar LSAP identifier.
    93  */
    94 #define ETH_LSAP_NESTAR 0x86
    95 /** PROWAY (IEC 955) Active Station List Maintenance LSAP identifier.
    96  */
    97 #define ETH_LSAP_PROWAY_ASLM    0x8E
    98 /** ARPANET Address Resolution Protocol (ARP) LSAP identifier.
    99  */
     52/** ARPANET Address Resolution Protocol (ARP) LSAP identifier. */
    10053#define ETH_LSAP_ARP    0x98
    101 /** Banyan VINES LSAP identifier.
    102  */
    103 #define ETH_LSAP_VINES  0xBC
    104 /** SubNetwork Access Protocol (SNAP) LSAP identifier.
    105  */
     54/** SubNetwork Access Protocol (SNAP) LSAP identifier. */
    10655#define ETH_LSAP_SNAP   0xAA
    107 /** Novell NetWare LSAP identifier.
    108  */
    109 #define ETH_LSAP_NETWARE        0xE0
    110 /** IBM NetBIOS LSAP identifier.
    111  */
    112 #define ETH_LSAP_NETBIOS        0xF0
    113 /** IBM LAN Management (individual) LSAP identifier.
    114  */
    115 #define ETH_LSAP_ILAN   0xF4
    116 /** IBM LAN Management (group) LSAP identifier.
    117  */
    118 #define ETH_LSAP_GLAN   0xF5
    119 /** IBM Remote Program Load (RPL) LSAP identifier.
    120  */
    121 #define ETH_LSAP_RPL    0xF8
    122 /** Ungermann-Bass LSAP identifier.
    123  */
    124 #define ETH_LSAP_UB     0xFA
    125 /** ISO Network Layer Protocol LSAP identifier.
    126  */
    127 #define ETH_LSAP_ISONLP 0xFE
    128 /** Global LSAP LSAP identifier.
    129  */
     56/** Global LSAP LSAP identifier. */
    13057#define ETH_LSAP_GLSAP  0xFF
    13158

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup eth
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  Ethernet protocol numbers according to the on-line IANA - Ethernet numbers - <http://www.iana.org/assignments/ethernet-numbers>, cited January 17 2009.
     34 * Ethernet protocol numbers according to the on-line IANA - Ethernet numbers
     35 * http://www.iana.org/assignments/ethernet-numbers
     36 * cited January 17 2009.
    3537 */
    3638
    37 #ifndef __NET_ETHERNET_PROTOCOLS_H__
    38 #define __NET_ETHERNET_PROTOCOLS_H__
     39#ifndef LIBNET_ETHERNET_PROTOCOLS_H_
     40#define LIBNET_ETHERNET_PROTOCOLS_H_
    3941
    4042#include <sys/types.h>
    4143
    42 /** Ethernet protocol type definition.
    43  */
    44 typedef uint16_t        eth_type_t;
     44/** Ethernet protocol type definition. */
     45typedef uint16_t eth_type_t;
    4546
    46 /** @name Ethernet protocols definitions
    47  */
     47/** @name Ethernet protocols definitions */
    4848/*@{*/
    4949
    5050/** Ethernet minimal protocol number.
    51  *  According to the IEEE 802.3 specification.
     51 * According to the IEEE 802.3 specification.
    5252 */
    53 #define ETH_MIN_PROTO   0x0600 /*1536*/
     53#define ETH_MIN_PROTO           0x0600 /* 1536 */
    5454
    55 /** Ethernet loopback packet protocol type.
    56  */
    57 #define ETH_P_LOOP              0x0060
    58 
    59 /** XEROX PUP (see 0A00) ethernet protocol type.
    60  */
    61 #define ETH_P_PUP               0x0200
    62 
    63 /** PUP Addr Trans (see 0A01) ethernet protocol type.
    64  */
    65 #define ETH_P_PUPAT             0x0201
    66 
    67 /** Nixdorf ethernet protocol type.
    68  */
    69 #define ETH_P_Nixdorf           0x0400
    70 
    71 /** XEROX NS IDP ethernet protocol type.
    72  */
    73 #define ETH_P_XEROX_NS_IDP              0x0600
    74 
    75 /** DLOG ethernet protocol type.
    76  */
    77 #define ETH_P_DLOG              0x0660
    78 
    79 /** DLOG ethernet protocol type.
    80  */
    81 #define ETH_P_DLOG2             0x0661
    82 
    83 /** Internet IP (IPv4) ethernet protocol type.
    84  */
     55/** Internet IP (IPv4) ethernet protocol type. */
    8556#define ETH_P_IP                0x0800
    8657
    87 /** X.75 Internet ethernet protocol type.
    88  */
    89 #define ETH_P_X_75              0x0801
    90 
    91 /** NBS Internet ethernet protocol type.
    92  */
    93 #define ETH_P_NBS               0x0802
    94 
    95 /** ECMA Internet ethernet protocol type.
    96  */
    97 #define ETH_P_ECMA              0x0803
    98 
    99 /** Chaosnet ethernet protocol type.
    100  */
    101 #define ETH_P_Chaosnet          0x0804
    102 
    103 /** X.25 Level 3 ethernet protocol type.
    104  */
    105 #define ETH_P_X25               0x0805
    106 
    107 /** ARP ethernet protocol type.
    108  */
     58/** ARP ethernet protocol type. */
    10959#define ETH_P_ARP               0x0806
    110 
    111 /** XNS Compatability ethernet protocol type.
    112  */
    113 #define ETH_P_XNS_Compatability         0x0807
    114 
    115 /** Frame Relay ARP ethernet protocol type.
    116  */
    117 #define ETH_P_Frame_Relay_ARP           0x0808
    118 
    119 /** Symbolics Private ethernet protocol type.
    120  */
    121 #define ETH_P_Symbolics_Private         0x081C
    122 
    123 /** Xyplex ethernet protocol type.
    124  */
    125 #define ETH_P_Xyplex_MIN                0x0888
    126 
    127 /** Xyplex ethernet protocol type.
    128  */
    129 #define ETH_P_Xyplex_MAX                0x088A
    130 
    131 /** Ungermann-Bass net debugr ethernet protocol type.
    132  */
    133 #define ETH_P_Ungermann_Bass_net_debugr         0x0900
    134 
    135 /** Xerox IEEE802.3 PUP ethernet protocol type.
    136  */
    137 #define ETH_P_IEEEPUP           0x0A00
    138 
    139 /** PUP Addr Trans ethernet protocol type.
    140  */
    141 #define ETH_P_IEEEPUPAT         0x0A01
    142 
    143 /** Banyan VINES ethernet protocol type.
    144  */
    145 #define ETH_P_Banyan_VINES              0x0BAD
    146 
    147 /** VINES Loopback ethernet protocol type.
    148  */
    149 #define ETH_P_VINES_Loopback            0x0BAE
    150 
    151 /** VINES Echo ethernet protocol type.
    152  */
    153 #define ETH_P_VINES_Echo                0x0BAF
    154 
    155 /** Berkeley Trailer nego ethernet protocol type.
    156  */
    157 #define ETH_P_Berkeley_Trailer_nego             0x1000
    158 
    159 /** Berkeley Trailer encap/IP ethernet protocol type.
    160  */
    161 #define ETH_P_Berkeley_Trailer_encapIP_MIN              0x1001
    162 
    163 /** Berkeley Trailer encap/IP ethernet protocol type.
    164  */
    165 #define ETH_P_Berkeley_Trailer_encapIP_MAX              0x100F
    166 
    167 /** Valid Systems ethernet protocol type.
    168  */
    169 #define ETH_P_Valid_Systems             0x1600
    170 
    171 /** PCS Basic Block Protocol ethernet protocol type.
    172  */
    173 #define ETH_P_PCS_Basic_Block_Protocol          0x4242
    174 
    175 /** BBN Simnet ethernet protocol type.
    176  */
    177 #define ETH_P_BBN_Simnet                0x5208
    178 
    179 /** DEC Unassigned (Exp.) ethernet protocol type.
    180  */
    181 #define ETH_P_DEC               0x6000
    182 
    183 /** DEC MOP Dump/Load ethernet protocol type.
    184  */
    185 #define ETH_P_DNA_DL            0x6001
    186 
    187 /** DEC MOP Remote Console ethernet protocol type.
    188  */
    189 #define ETH_P_DNA_RC            0x6002
    190 
    191 /** DEC DECNET Phase IV Route ethernet protocol type.
    192  */
    193 #define ETH_P_DNA_RT            0x6003
    194 
    195 /** DEC LAT ethernet protocol type.
    196  */
    197 #define ETH_P_LAT               0x6004
    198 
    199 /** DEC Diagnostic Protocol ethernet protocol type.
    200  */
    201 #define ETH_P_DIAG              0x6005
    202 
    203 /** DEC Customer Protocol ethernet protocol type.
    204  */
    205 #define ETH_P_CUST              0x6006
    206 
    207 /** DEC LAVC, SCA ethernet protocol type.
    208  */
    209 #define ETH_P_SCA               0x6007
    210 
    211 /** DEC Unassigned ethernet protocol type.
    212  */
    213 #define ETH_P_DEC_Unassigned_MIN                0x6008
    214 
    215 /** DEC Unassigned ethernet protocol type.
    216  */
    217 #define ETH_P_DEC_Unassigned_MAX                0x6009
    218 
    219 /** Com Corporation ethernet protocol type.
    220  */
    221 #define ETH_P_Com_Corporation_MIN               0x6010
    222 
    223 /** Com Corporation ethernet protocol type.
    224  */
    225 #define ETH_P_Com_Corporation_MAX               0x6014
    226 
    227 /** Trans Ether Bridging ethernet protocol type.
    228  */
    229 #define ETH_P_Trans_Ether_Bridging              0x6558
    230 
    231 /** Raw Frame Relay ethernet protocol type.
    232  */
    233 #define ETH_P_Raw_Frame_Relay           0x6559
    234 
    235 /** Ungermann-Bass download ethernet protocol type.
    236  */
    237 #define ETH_P_Ungermann_Bass_download           0x7000
    238 
    239 /** Ungermann-Bass dia/loop ethernet protocol type.
    240  */
    241 #define ETH_P_Ungermann_Bass_dialoop            0x7002
    242 
    243 /** LRT ethernet protocol type.
    244  */
    245 #define ETH_P_LRT_MIN           0x7020
    246 
    247 /** LRT ethernet protocol type.
    248  */
    249 #define ETH_P_LRT_MAX           0x7029
    250 
    251 /** Proteon ethernet protocol type.
    252  */
    253 #define ETH_P_Proteon           0x7030
    254 
    255 /** Cabletron ethernet protocol type.
    256  */
    257 #define ETH_P_Cabletron         0x7034
    258 
    259 /** Cronus VLN ethernet protocol type.
    260  */
    261 #define ETH_P_Cronus_VLN                0x8003
    262 
    263 /** Cronus Direct ethernet protocol type.
    264  */
    265 #define ETH_P_Cronus_Direct             0x8004
    266 
    267 /** HP Probe ethernet protocol type.
    268  */
    269 #define ETH_P_HP_Probe          0x8005
    270 
    271 /** Nestar ethernet protocol type.
    272  */
    273 #define ETH_P_Nestar            0x8006
    274 
    275 /** AT&T ethernet protocol type.
    276  */
    277 #define ETH_P_AT_T              0x8008
    278 
    279 /** Excelan ethernet protocol type.
    280  */
    281 #define ETH_P_Excelan           0x8010
    282 
    283 /** SGI diagnostics ethernet protocol type.
    284  */
    285 #define ETH_P_SGI_diagnostics           0x8013
    286 
    287 /** SGI network games ethernet protocol type.
    288  */
    289 #define ETH_P_SGI_network_games         0x8014
    290 
    291 /** SGI reserved ethernet protocol type.
    292  */
    293 #define ETH_P_SGI_reserved              0x8015
    294 
    295 /** SGI bounce server ethernet protocol type.
    296  */
    297 #define ETH_P_SGI_bounce_server         0x8016
    298 
    299 /** Apollo Domain ethernet protocol type.
    300  */
    301 #define ETH_P_Apollo_Domain             0x8019
    302 
    303 /** Tymshare ethernet protocol type.
    304  */
    305 #define ETH_P_Tymshare          0x802E
    306 
    307 /** Tigan, Inc. ethernet protocol type.
    308  */
    309 #define ETH_P_Tigan             0x802F
    310 
    311 /** Reverse ARP ethernet protocol type.
    312  */
    313 #define ETH_P_RARP              0x8035
    314 
    315 /** Aeonic Systems ethernet protocol type.
    316  */
    317 #define ETH_P_Aeonic_Systems            0x8036
    318 
    319 /** DEC LANBridge ethernet protocol type.
    320  */
    321 #define ETH_P_DEC_LANBridge             0x8038
    322 
    323 /** DEC Unassigned ethernet protocol type.
    324  */
    325 #define ETH_P_DEC_Unassigned_MIN1               0x8039
    326 
    327 /** DEC Unassigned ethernet protocol type.
    328  */
    329 #define ETH_P_DEC_Unassigned_MAX2               0x803C
    330 
    331 /** DEC Ethernet Encryption ethernet protocol type.
    332  */
    333 #define ETH_P_DEC_Ethernet_Encryption           0x803D
    334 
    335 /** DEC Unassigned ethernet protocol type.
    336  */
    337 #define ETH_P_DEC_Unassigned            0x803E
    338 
    339 /** DEC LAN Traffic Monitor ethernet protocol type.
    340  */
    341 #define ETH_P_DEC_LAN_Traffic_Monitor           0x803F
    342 
    343 /** DEC Unassigned ethernet protocol type.
    344  */
    345 #define ETH_P_DEC_Unassigned_MIN3               0x8040
    346 
    347 /** DEC Unassigned ethernet protocol type.
    348  */
    349 #define ETH_P_DEC_Unassigned_MAX3               0x8042
    350 
    351 /** Planning Research Corp. ethernet protocol type.
    352  */
    353 #define ETH_P_Planning_Research_Corp            0x8044
    354 
    355 /** AT&T ethernet protocol type.
    356  */
    357 #define ETH_P_AT_T2             0x8046
    358 
    359 /** AT&T ethernet protocol type.
    360  */
    361 #define ETH_P_AT_T3             0x8047
    362 
    363 /** ExperData ethernet protocol type.
    364  */
    365 #define ETH_P_ExperData         0x8049
    366 
    367 /** Stanford V Kernel exp. ethernet protocol type.
    368  */
    369 #define ETH_P_Stanford_V_Kernel_exp             0x805B
    370 
    371 /** Stanford V Kernel prod. ethernet protocol type.
    372  */
    373 #define ETH_P_Stanford_V_Kernel_prod            0x805C
    374 
    375 /** Evans &Sutherland ethernet protocol type.
    376  */
    377 #define ETH_P_Evans_Sutherland          0x805D
    378 
    379 /** Little Machines ethernet protocol type.
    380  */
    381 #define ETH_P_Little_Machines           0x8060
    382 
    383 /** Counterpoint Computers ethernet protocol type.
    384  */
    385 #define ETH_P_Counterpoint_Computers            0x8062
    386 
    387 /** Univ. of Mass. @ Amherst ethernet protocol type.
    388  */
    389 #define ETH_P_Univ_of_Mass              0x8065
    390 
    391 /** Univ. of Mass. @ Amherst ethernet protocol type.
    392  */
    393 #define ETH_P_Univ_of_Mass2             0x8066
    394 
    395 /** Veeco Integrated Auto. ethernet protocol type.
    396  */
    397 #define ETH_P_Veeco_Integrated_Auto             0x8067
    398 
    399 /** General Dynamics ethernet protocol type.
    400  */
    401 #define ETH_P_General_Dynamics          0x8068
    402 
    403 /** AT&T ethernet protocol type.
    404  */
    405 #define ETH_P_AT_T4             0x8069
    406 
    407 /** Autophon ethernet protocol type.
    408  */
    409 #define ETH_P_Autophon          0x806A
    410 
    411 /** ComDesign ethernet protocol type.
    412  */
    413 #define ETH_P_ComDesign         0x806C
    414 
    415 /** Computgraphic Corp. ethernet protocol type.
    416  */
    417 #define ETH_P_Computgraphic_Corp                0x806D
    418 
    419 /** Landmark Graphics Corp. ethernet protocol type.
    420  */
    421 #define ETH_P_Landmark_Graphics_Corp_MIN                0x806E
    422 
    423 /** Landmark Graphics Corp. ethernet protocol type.
    424  */
    425 #define ETH_P_Landmark_Graphics_Corp_MAX                0x8077
    426 
    427 /** Matra ethernet protocol type.
    428  */
    429 #define ETH_P_Matra             0x807A
    430 
    431 /** Dansk Data Elektronik ethernet protocol type.
    432  */
    433 #define ETH_P_Dansk_Data_Elektronik             0x807B
    434 
    435 /** Merit Internodal ethernet protocol type.
    436  */
    437 #define ETH_P_Merit_Internodal          0x807C
    438 
    439 /** Vitalink Communications ethernet protocol type.
    440  */
    441 #define ETH_P_Vitalink_Communications_MIN               0x807D
    442 
    443 /** Vitalink Communications ethernet protocol type.
    444  */
    445 #define ETH_P_Vitalink_Communications_MAX               0x807F
    446 
    447 /** Vitalink TransLAN III ethernet protocol type.
    448  */
    449 #define ETH_P_Vitalink_TransLAN_III             0x8080
    450 
    451 /** Counterpoint Computers ethernet protocol type.
    452  */
    453 #define ETH_P_Counterpoint_Computers_MIN                0x8081
    454 
    455 /** Counterpoint Computers ethernet protocol type.
    456  */
    457 #define ETH_P_Counterpoint_Computers_MAX                0x8083
    458 
    459 /** Appletalk ethernet protocol type.
    460  */
    461 #define ETH_P_ATALK             0x809B
    462 
    463 /** Datability ethernet protocol type.
    464  */
    465 #define ETH_P_Datability_MIN            0x809C
    466 
    467 /** Datability ethernet protocol type.
    468  */
    469 #define ETH_P_Datability_MAX            0x809E
    470 
    471 /** Spider Systems Ltd. ethernet protocol type.
    472  */
    473 #define ETH_P_Spider_Systems_Ltd                0x809F
    474 
    475 /** Nixdorf Computers ethernet protocol type.
    476  */
    477 #define ETH_P_Nixdorf_Computers         0x80A3
    478 
    479 /** Siemens Gammasonics Inc. ethernet protocol type.
    480  */
    481 #define ETH_P_Siemens_Gammasonics_Inc_MIN               0x80A4
    482 
    483 /** Siemens Gammasonics Inc. ethernet protocol type.
    484  */
    485 #define ETH_P_Siemens_Gammasonics_Inc_MAX               0x80B3
    486 
    487 /** DCA Data Exchange Cluster ethernet protocol type.
    488  */
    489 #define ETH_P_DCA_Data_Exchange_Cluster_MIN             0x80C0
    490 
    491 /** DCA Data Exchange Cluster ethernet protocol type.
    492  */
    493 #define ETH_P_DCA_Data_Exchange_Cluster_MAX             0x80C3
    494 
    495 /** Banyan Systems ethernet protocol type.
    496  */
    497 #define ETH_P_Banyan_Systems            0x80C4
    498 
    499 /** Banyan Systems ethernet protocol type.
    500  */
    501 #define ETH_P_Banyan_Systems2           0x80C5
    502 
    503 /** Pacer Software ethernet protocol type.
    504  */
    505 #define ETH_P_Pacer_Software            0x80C6
    506 
    507 /** Applitek Corporation ethernet protocol type.
    508  */
    509 #define ETH_P_Applitek_Corporation              0x80C7
    510 
    511 /** Intergraph Corporation ethernet protocol type.
    512  */
    513 #define ETH_P_Intergraph_Corporation_MIN                0x80C8
    514 
    515 /** Intergraph Corporation ethernet protocol type.
    516  */
    517 #define ETH_P_Intergraph_Corporation_MAX                0x80CC
    518 
    519 /** Harris Corporation ethernet protocol type.
    520  */
    521 #define ETH_P_Harris_Corporation_MIN            0x80CD
    522 
    523 /** Harris Corporation ethernet protocol type.
    524  */
    525 #define ETH_P_Harris_Corporation_MAX            0x80CE
    526 
    527 /** Taylor Instrument ethernet protocol type.
    528  */
    529 #define ETH_P_Taylor_Instrument_MIN             0x80CF
    530 
    531 /** Taylor Instrument ethernet protocol type.
    532  */
    533 #define ETH_P_Taylor_Instrument_MAX             0x80D2
    534 
    535 /** Rosemount Corporation ethernet protocol type.
    536  */
    537 #define ETH_P_Rosemount_Corporation_MIN         0x80D3
    538 
    539 /** Rosemount Corporation ethernet protocol type.
    540  */
    541 #define ETH_P_Rosemount_Corporation_MAX         0x80D4
    542 
    543 /** IBM SNA Service on Ether ethernet protocol type.
    544  */
    545 #define ETH_P_IBM_SNA_Service_on_Ether          0x80D5
    546 
    547 /** Varian Associates ethernet protocol type.
    548  */
    549 #define ETH_P_Varian_Associates         0x80DD
    550 
    551 /** Integrated Solutions TRFS ethernet protocol type.
    552  */
    553 #define ETH_P_Integrated_Solutions_TRFS_MIN             0x80DE
    554 
    555 /** Integrated Solutions TRFS ethernet protocol type.
    556  */
    557 #define ETH_P_Integrated_Solutions_TRFS_MAX             0x80DF
    558 
    559 /** Allen-Bradley ethernet protocol type.
    560  */
    561 #define ETH_P_Allen_Bradley_MIN         0x80E0
    562 
    563 /** Allen-Bradley ethernet protocol type.
    564  */
    565 #define ETH_P_Allen_Bradley_MAX         0x80E3
    566 
    567 /** Datability ethernet protocol type.
    568  */
    569 #define ETH_P_Datability_MIN2           0x80E4
    570 
    571 /** Datability ethernet protocol type.
    572  */
    573 #define ETH_P_Datability_MAX2           0x80F0
    574 
    575 /** Retix ethernet protocol type.
    576  */
    577 #define ETH_P_Retix             0x80F2
    578 
    579 /** AppleTalk AARP (Kinetics) ethernet protocol type.
    580  */
    581 #define ETH_P_AARP              0x80F3
    582 
    583 /** Kinetics ethernet protocol type.
    584  */
    585 #define ETH_P_Kinetics_MIN              0x80F4
    586 
    587 /** Kinetics ethernet protocol type.
    588  */
    589 #define ETH_P_Kinetics_MAX              0x80F5
    590 
    591 /** Apollo Computer ethernet protocol type.
    592  */
    593 #define ETH_P_Apollo_Computer           0x80F7
    594 
    595 /** Wellfleet Communications ethernet protocol type.
    596  */
    597 #define ETH_P_Wellfleet_Communications          0x80FF
    598 
    599 /** IEEE 802.1Q VLAN-tagged frames (initially Wellfleet) ethernet protocol type.
    600  */
    601 #define ETH_P_8021Q             0x8100
    602 
    603 /** Wellfleet Communications ethernet protocol type.
    604  */
    605 #define ETH_P_Wellfleet_Communications_MIN              0x8101
    606 
    607 /** Wellfleet Communications ethernet protocol type.
    608  */
    609 #define ETH_P_Wellfleet_Communications_MAX              0x8103
    610 
    611 /** Symbolics Private ethernet protocol type.
    612  */
    613 #define ETH_P_Symbolics_Private_MIN             0x8107
    614 
    615 /** Symbolics Private ethernet protocol type.
    616  */
    617 #define ETH_P_Symbolics_Private_MAX             0x8109
    618 
    619 /** Hayes Microcomputers ethernet protocol type.
    620  */
    621 #define ETH_P_Hayes_Microcomputers              0x8130
    622 
    623 /** VG Laboratory Systems ethernet protocol type.
    624  */
    625 #define ETH_P_VG_Laboratory_Systems             0x8131
    626 
    627 /** Bridge Communications ethernet protocol type.
    628  */
    629 #define ETH_P_Bridge_Communications_MIN         0x8132
    630 
    631 /** Bridge Communications ethernet protocol type.
    632  */
    633 #define ETH_P_Bridge_Communications_MAX         0x8136
    634 
    635 /** Novell, Inc. ethernet protocol type.
    636  */
    637 #define ETH_P_Novell_Inc_MIN            0x8137
    638 
    639 /** Novell, Inc. ethernet protocol type.
    640  */
    641 #define ETH_P_Novell_Inc_MAX            0x8138
    642 
    643 /** KTI ethernet protocol type.
    644  */
    645 #define ETH_P_KTI_MIN           0x8139
    646 
    647 /** KTI ethernet protocol type.
    648  */
    649 #define ETH_P_KTI_MAX           0x813D
    650 
    651 /** Logicraft ethernet protocol type.
    652  */
    653 #define ETH_P_Logicraft         0x8148
    654 
    655 /** Network Computing Devices ethernet protocol type.
    656  */
    657 #define ETH_P_Network_Computing_Devices         0x8149
    658 
    659 /** Alpha Micro ethernet protocol type.
    660  */
    661 #define ETH_P_Alpha_Micro               0x814A
    662 
    663 /** SNMP ethernet protocol type.
    664  */
    665 #define ETH_P_SNMP              0x814C
    666 
    667 /** BIIN ethernet protocol type.
    668  */
    669 #define ETH_P_BIIN              0x814D
    670 
    671 /** BIIN ethernet protocol type.
    672  */
    673 #define ETH_P_BIIN2             0x814E
    674 
    675 /** Technically Elite Concept ethernet protocol type.
    676  */
    677 #define ETH_P_Technically_Elite_Concept         0x814F
    678 
    679 /** Rational Corp ethernet protocol type.
    680  */
    681 #define ETH_P_Rational_Corp             0x8150
    682 
    683 /** Qualcomm ethernet protocol type.
    684  */
    685 #define ETH_P_Qualcomm_MIN              0x8151
    686 
    687 /** Qualcomm ethernet protocol type.
    688  */
    689 #define ETH_P_Qualcomm_MAX              0x8153
    690 
    691 /** Computer Protocol Pty Ltd ethernet protocol type.
    692  */
    693 #define ETH_P_Computer_Protocol_Pty_Ltd_MIN             0x815C
    694 
    695 /** Computer Protocol Pty Ltd ethernet protocol type.
    696  */
    697 #define ETH_P_Computer_Protocol_Pty_Ltd_MAX             0x815E
    698 
    699 /** Charles River Data System ethernet protocol type.
    700  */
    701 #define ETH_P_Charles_River_Data_System_MIN             0x8164
    702 
    703 /** Charles River Data System ethernet protocol type.
    704  */
    705 #define ETH_P_Charles_River_Data_System_MAX             0x8166
    706 
    707 /** XTP ethernet protocol type.
    708  */
    709 #define ETH_P_XTP               0x817D
    710 
    711 /** SGI/Time Warner prop. ethernet protocol type.
    712  */
    713 #define ETH_P_SGITime_Warner_prop               0x817E
    714 
    715 /** HIPPI-FP encapsulation ethernet protocol type.
    716  */
    717 #define ETH_P_HIPPI_FP_encapsulation            0x8180
    718 
    719 /** STP, HIPPI-ST ethernet protocol type.
    720  */
    721 #define ETH_P_STP_HIPPI_ST              0x8181
    722 
    723 /** Reserved for HIPPI-6400 ethernet protocol type.
    724  */
    725 #define ETH_P_Reserved_for_HIPPI_6400           0x8182
    726 
    727 /** Reserved for HIPPI-6400 ethernet protocol type.
    728  */
    729 #define ETH_P_Reserved_for_HIPPI_64002          0x8183
    730 
    731 /** Silicon Graphics prop. ethernet protocol type.
    732  */
    733 #define ETH_P_Silicon_Graphics_prop_MIN         0x8184
    734 
    735 /** Silicon Graphics prop. ethernet protocol type.
    736  */
    737 #define ETH_P_Silicon_Graphics_prop_MAX         0x818C
    738 
    739 /** Motorola Computer ethernet protocol type.
    740  */
    741 #define ETH_P_Motorola_Computer         0x818D
    742 
    743 /** Qualcomm ethernet protocol type.
    744  */
    745 #define ETH_P_Qualcomm_MIN2             0x819A
    746 
    747 /** Qualcomm ethernet protocol type.
    748  */
    749 #define ETH_P_Qualcomm_MAX2             0x81A3
    750 
    751 /** ARAI Bunkichi ethernet protocol type.
    752  */
    753 #define ETH_P_ARAI_Bunkichi             0x81A4
    754 
    755 /** RAD Network Devices ethernet protocol type.
    756  */
    757 #define ETH_P_RAD_Network_Devices_MIN           0x81A5
    758 
    759 /** RAD Network Devices ethernet protocol type.
    760  */
    761 #define ETH_P_RAD_Network_Devices_MAX           0x81AE
    762 
    763 /** Xyplex ethernet protocol type.
    764  */
    765 #define ETH_P_Xyplex_MIN2               0x81B7
    766 
    767 /** Xyplex ethernet protocol type.
    768  */
    769 #define ETH_P_Xyplex_MAX2               0x81B9
    770 
    771 /** Apricot Computers ethernet protocol type.
    772  */
    773 #define ETH_P_Apricot_Computers_MIN             0x81CC
    774 
    775 /** Apricot Computers ethernet protocol type.
    776  */
    777 #define ETH_P_Apricot_Computers_MAX             0x81D5
    778 
    779 /** Artisoft ethernet protocol type.
    780  */
    781 #define ETH_P_Artisoft_MIN              0x81D6
    782 
    783 /** Artisoft ethernet protocol type.
    784  */
    785 #define ETH_P_Artisoft_MAX              0x81DD
    786 
    787 /** Polygon ethernet protocol type.
    788  */
    789 #define ETH_P_Polygon_MIN               0x81E6
    790 
    791 /** Polygon ethernet protocol type.
    792  */
    793 #define ETH_P_Polygon_MAX               0x81EF
    794 
    795 /** Comsat Labs ethernet protocol type.
    796  */
    797 #define ETH_P_Comsat_Labs_MIN           0x81F0
    798 
    799 /** Comsat Labs ethernet protocol type.
    800  */
    801 #define ETH_P_Comsat_Labs_MAX           0x81F2
    802 
    803 /** SAIC ethernet protocol type.
    804  */
    805 #define ETH_P_SAIC_MIN          0x81F3
    806 
    807 /** SAIC ethernet protocol type.
    808  */
    809 #define ETH_P_SAIC_MAX          0x81F5
    810 
    811 /** VG Analytical ethernet protocol type.
    812  */
    813 #define ETH_P_VG_Analytical_MIN         0x81F6
    814 
    815 /** VG Analytical ethernet protocol type.
    816  */
    817 #define ETH_P_VG_Analytical_MAX         0x81F8
    818 
    819 /** Quantum Software ethernet protocol type.
    820  */
    821 #define ETH_P_Quantum_Software_MIN              0x8203
    822 
    823 /** Quantum Software ethernet protocol type.
    824  */
    825 #define ETH_P_Quantum_Software_MAX              0x8205
    826 
    827 /** Ascom Banking Systems ethernet protocol type.
    828  */
    829 #define ETH_P_Ascom_Banking_Systems_MIN         0x8221
    830 
    831 /** Ascom Banking Systems ethernet protocol type.
    832  */
    833 #define ETH_P_Ascom_Banking_Systems_MAX         0x8222
    834 
    835 /** Advanced Encryption Syste ethernet protocol type.
    836  */
    837 #define ETH_P_Advanced_Encryption_Syste_MIN             0x823E
    838 
    839 /** Advanced Encryption Syste ethernet protocol type.
    840  */
    841 #define ETH_P_Advanced_Encryption_Syste_MAX             0x8240
    842 
    843 /** Athena Programming ethernet protocol type.
    844  */
    845 #define ETH_P_Athena_Programming_MIN            0x827F
    846 
    847 /** Athena Programming ethernet protocol type.
    848  */
    849 #define ETH_P_Athena_Programming_MAX            0x8282
    850 
    851 /** Charles River Data System ethernet protocol type.
    852  */
    853 #define ETH_P_Charles_River_Data_System_MIN2            0x8263
    854 
    855 /** Charles River Data System ethernet protocol type.
    856  */
    857 #define ETH_P_Charles_River_Data_System_MAX2            0x826A
    858 
    859 /** Inst Ind Info Tech ethernet protocol type.
    860  */
    861 #define ETH_P_Inst_Ind_Info_Tech_MIN            0x829A
    862 
    863 /** Inst Ind Info Tech ethernet protocol type.
    864  */
    865 #define ETH_P_Inst_Ind_Info_Tech_MAX            0x829B
    866 
    867 /** Taurus Controls ethernet protocol type.
    868  */
    869 #define ETH_P_Taurus_Controls_MIN               0x829C
    870 
    871 /** Taurus Controls ethernet protocol type.
    872  */
    873 #define ETH_P_Taurus_Controls_MAX               0x82AB
    874 
    875 /** Walker Richer &Quinn ethernet protocol type.
    876  */
    877 #define ETH_P_Walker_Richer_Quinn_MIN           0x82AC
    878 
    879 /** Walker Richer &Quinn ethernet protocol type.
    880  */
    881 #define ETH_P_Walker_Richer_Quinn_MAX           0x8693
    882 
    883 /** Idea Courier ethernet protocol type.
    884  */
    885 #define ETH_P_Idea_Courier_MIN          0x8694
    886 
    887 /** Idea Courier ethernet protocol type.
    888  */
    889 #define ETH_P_Idea_Courier_MAX          0x869D
    890 
    891 /** Computer Network Tech ethernet protocol type.
    892  */
    893 #define ETH_P_Computer_Network_Tech_MIN         0x869E
    894 
    895 /** Computer Network Tech ethernet protocol type.
    896  */
    897 #define ETH_P_Computer_Network_Tech_MAX         0x86A1
    898 
    899 /** Gateway Communications ethernet protocol type.
    900  */
    901 #define ETH_P_Gateway_Communications_MIN                0x86A3
    902 
    903 /** Gateway Communications ethernet protocol type.
    904  */
    905 #define ETH_P_Gateway_Communications_MAX                0x86AC
    906 
    907 /** SECTRA ethernet protocol type.
    908  */
    909 #define ETH_P_SECTRA            0x86DB
    910 
    911 /** Delta Controls ethernet protocol type.
    912  */
    913 #define ETH_P_Delta_Controls            0x86DE
    914 
    915 /** IPv6 ethernet protocol type.
    916  */
    917 #define ETH_P_IPV6              0x86DD
    918 
    919 /** ATOMIC ethernet protocol type.
    920  */
    921 #define ETH_P_ATOMIC            0x86DF
    922 
    923 /** Landis &Gyr Powers ethernet protocol type.
    924  */
    925 #define ETH_P_Landis_Gyr_Powers_MIN             0x86E0
    926 
    927 /** Landis &Gyr Powers ethernet protocol type.
    928  */
    929 #define ETH_P_Landis_Gyr_Powers_MAX             0x86EF
    930 
    931 /** Motorola ethernet protocol type.
    932  */
    933 #define ETH_P_Motorola_MIN              0x8700
    934 
    935 /** Motorola ethernet protocol type.
    936  */
    937 #define ETH_P_Motorola_MAX              0x8710
    938 
    939 /** TCP/IP Compression ethernet protocol type.
    940  */
    941 #define ETH_P_TCPIP_Compression         0x876B
    942 
    943 /** IP Autonomous Systems ethernet protocol type.
    944  */
    945 #define ETH_P_IP_Autonomous_Systems             0x876C
    946 
    947 /** Secure Data ethernet protocol type.
    948  */
    949 #define ETH_P_Secure_Data               0x876D
    950 
    951 /** PPP ethernet protocol type.
    952  */
    953 #define ETH_P_PPP               0x880B
    954 
    955 /** MPLS ethernet protocol type.
    956  */
    957 #define ETH_P_MPLS_UC           0x8847
    958 
    959 /** MPLS with upstream-assigned label ethernet protocol type.
    960  */
    961 #define ETH_P_MPLS_MC           0x8848
    962 
    963 /** Invisible Software ethernet protocol type.
    964  */
    965 #define ETH_P_Invisible_Software_MIN            0x8A96
    966 
    967 /** Invisible Software ethernet protocol type.
    968  */
    969 #define ETH_P_Invisible_Software_MAX            0x8A97
    970 
    971 /** PPPoE Discovery Stage ethernet protocol type.
    972  */
    973 #define ETH_P_PPP_DISC          0x8863
    974 
    975 /** PPPoE Session Stage ethernet protocol type.
    976  */
    977 #define ETH_P_PPP_SES           0x8864
    978 
    979 /** Loopback ethernet protocol type.
    980  */
    981 #define ETH_P_Loopback          0x9000
    982 
    983 /** Com(Bridge) XNS Sys Mgmt ethernet protocol type.
    984  */
    985 #define ETH_P_Com_XNS_Sys_Mgmt          0x9001
    986 
    987 /** Com(Bridge) TCP-IP Sys ethernet protocol type.
    988  */
    989 #define ETH_P_Com_TCP_IP_Sys            0x9002
    990 
    991 /** Com(Bridge) loop detect ethernet protocol type.
    992  */
    993 #define ETH_P_Com_loop_detect           0x9003
    994 
    995 /** BBN VITAL-LanBridge cache ethernet protocol type.
    996  */
    997 #define ETH_P_BBN_VITAL_LanBridge_cache         0xFF00
    998 
    999 /** ISC Bunker Ramo ethernet protocol type.
    1000  */
    1001 #define ETH_P_ISC_Bunker_Ramo_MIN               0xFF00
    1002 
    1003 /** ISC Bunker Ramo ethernet protocol type.
    1004  */
    1005 #define ETH_P_ISC_Bunker_Ramo_MAX               0xFF0F
    100660
    100761/*@}*/

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup icmp
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  ICMP client interface.
     34 * ICMP client interface.
    3535 */
    3636
    37 #ifndef __NET_ICMP_CLIENT_H__
    38 #define __NET_ICMP_CLIENT_H__
     37#ifndef LIBNET_ICMP_CLIENT_H_
     38#define LIBNET_ICMP_CLIENT_H_
    3939
    4040#include <net/icmp_codes.h>
    4141#include <net/packet.h>
    4242
    43 /** Processes the received packet prefixed with an ICMP header.
    44  *  @param[in] packet The received packet.
    45  *  @param[out] type The ICMP header type.
    46  *  @param[out] code The ICMP header code.
    47  *  @param[out] pointer The ICMP header pointer.
    48  *  @param[out] mtu The ICMP header MTU.
    49  *  @returns The ICMP header length.
    50  *  @returns Zero (0) if the packet contains no data.
    51  */
    52 extern int icmp_client_process_packet(packet_t packet, icmp_type_t * type, icmp_code_t * code, icmp_param_t * pointer, icmp_param_t * mtu);
    53 
    54 /** Returns the ICMP header length.
    55  *  @param[in] packet The packet.
    56  *  @returns The ICMP header length in bytes.
    57  */
    58 extern size_t icmp_client_header_length(packet_t packet);
     43extern int icmp_client_process_packet(packet_t, icmp_type_t *, icmp_code_t *,
     44    icmp_param_t *, icmp_param_t *);
     45extern size_t icmp_client_header_length(packet_t);
    5946
    6047#endif

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup icmp
     29/** @addtogroup libnet
    3030 *  @{
    3131 */
    3232
    3333/** @file
    34  *  ICMP header definition.
    35  *  Based on the RFC~792.
     34 * ICMP header definition.
     35 * Based on the RFC 792.
    3636 */
    3737
    38 #ifndef __NET_ICMP_HEADER_H__
    39 #define __NET_ICMP_HEADER_H__
     38#ifndef LIBNET_ICMP_HEADER_H_
     39#define LIBNET_ICMP_HEADER_H_
    4040
    4141#include <sys/types.h>
    … …  
    4444#include <net/icmp_codes.h>
    4545
    46 /** ICMP header size in bytes.
    47  */
    48 #define ICMP_HEADER_SIZE                        sizeof(icmp_header_t)
     46/** ICMP header size in bytes. */
     47#define ICMP_HEADER_SIZE        sizeof(icmp_header_t)
    4948
    5049/** Type definition of the echo specific data.
    51  *  @see icmp_echo
     50 * @see icmp_echo
    5251 */
    53 typedef struct icmp_echo        icmp_echo_t;
     52typedef struct icmp_echo icmp_echo_t;
    5453
    5554/** Type definition of the echo specific data pointer.
    56  *  @see icmp_echo
     55 * @see icmp_echo
    5756 */
    58 typedef icmp_echo_t *           icmp_echo_ref;
     57typedef icmp_echo_t *icmp_echo_ref;
    5958
    60 /** Echo specific data.
    61  */
    62 struct icmp_echo{
    63         /** Message idintifier.
    64          */
     59/** Echo specific data. */
     60struct icmp_echo {
     61        /** Message idintifier. */
    6562        icmp_param_t identifier;
    66         /** Message sequence number.
    67          */
     63        /** Message sequence number. */
    6864        icmp_param_t sequence_number;
    6965} __attribute__ ((packed));
    7066
    7167/** Type definition of the internet control message header.
    72  *  @see icmp_header
     68 * @see icmp_header
    7369 */
    74 typedef struct icmp_header      icmp_header_t;
     70typedef struct icmp_header icmp_header_t;
    7571
    7672/** Type definition of the internet control message header pointer.
    77  *  @see icmp_header
     73 * @see icmp_header
    7874 */
    79 typedef icmp_header_t *         icmp_header_ref;
     75typedef icmp_header_t *icmp_header_ref;
    8076
    81 /** Internet control message header.
    82  */
    83 struct icmp_header{
    84         /** The type of the message.
    85          */
     77/** Internet control message header. */
     78struct icmp_header {
     79        /** The type of the message. */
    8680        uint8_t type;
    87         /** The error code for the datagram reported by the ICMP message.
    88          *  The interpretation is dependent on the message type.
     81       
     82        /**
     83         * The error code for the datagram reported by the ICMP message.
     84         * The interpretation is dependent on the message type.
    8985         */
    9086        uint8_t code;
    91         /** The checksum is the 16-bit ones's complement of the one's complement sum of the ICMP message starting with the ICMP Type.
    92      *  For computing the checksum, the checksum field should be zero.
    93          *  If the checksum does not match the contents, the datagram is discarded.
     87       
     88        /**
     89         * The checksum is the 16-bit ones's complement of the one's complement
     90         * sum of the ICMP message starting with the ICMP Type. For computing
     91         * the checksum, the checksum field should be zero. If the checksum does
     92         * not match the contents, the datagram is discarded.
    9493         */
    9594        uint16_t checksum;
    96         /** Message specific data.
    97          */
    98         union{
    99                 /** Echo specific data.
    100                  */
     95
     96        /** Message specific data. */
     97        union {
     98                /** Echo specific data. */
    10199                icmp_echo_t  echo;
    102                 /** Proposed gateway value.
    103                  */
     100                /** Proposed gateway value. */
    104101                in_addr_t gateway;
    105                 /** Fragmentation needed specific data.
    106                  */
    107                 struct{
    108                         /** Reserved field.
    109                          *  Must be zero.
    110                          */
     102               
     103                /** Fragmentation needed specific data. */
     104                struct {
     105                        /** Reserved field. Must be zero. */
    111106                        icmp_param_t reserved;
    112                         /** Proposed MTU.
    113                          */
     107                        /** Proposed MTU. */
    114108                        icmp_param_t mtu;
    115109                } frag;
    116                 /** Parameter problem specific data.
    117                  */
    118                 struct{
    119                         /** Problem pointer.
    120                          */
     110               
     111                /** Parameter problem specific data. */
     112                struct {
     113                        /** Problem pointer. */
    121114                        icmp_param_t pointer;
    122                         /** Reserved field.
    123                          *  Must be zero.
    124                          */
     115                        /** Reserved field. Must be zero. */
    125116                        icmp_param_t reserved;
    126117                } param;

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup icmp
     29/** @addtogroup libnet
    3030 *  @{
    3131 */
    3232
    33 #ifndef __NET_ICMP_INTERFACE_H__
    34 #define __NET_ICMP_INTERFACE_H__
     33#ifndef LIBNET_ICMP_INTERFACE_H_
     34#define LIBNET_ICMP_INTERFACE_H_
    3535
    3636#include <net/socket_codes.h>
    … …  
    4646
    4747/** @name ICMP module interface
    48  *  This interface is used by other modules.
     48 * This interface is used by other modules.
    4949 */
    5050/*@{*/
    5151
    52 /** Sends the Destination Unreachable error notification packet.
    53  *  Beginning of the packet is sent as the notification packet data.
    54  *  The source and the destination addresses should be set in the original packet.
    55  *  @param[in] icmp_phone The ICMP module phone used for (semi)remote calls.
    56  *  @param[in] code The error specific code.
    57  *  @param[in] mtu The error MTU value.
    58  *  @param[in] packet The original packet.
    59  *  @returns EOK on success.
    60  *  @returns EPERM if the ICMP error notifications are disabled.
    61  *  @returns ENOMEM if there is not enough memory left.
    62  */
    63 extern int icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code, icmp_param_t mtu, packet_t packet);
    64 
    65 /** Sends the Source Quench error notification packet.
    66  *  Beginning of the packet is sent as the notification packet data.
    67  *  The source and the destination addresses should be set in the original packet.
    68  *  @param[in] icmp_phone The ICMP module phone used for (semi)remote calls.
    69  *  @param[in] packet The original packet.
    70  *  @returns EOK on success.
    71  *  @returns EPERM if the ICMP error notifications are disabled.
    72  *  @returns ENOMEM if there is not enough memory left.
    73  */
    74 extern int icmp_source_quench_msg(int icmp_phone, packet_t packet);
    75 
    76 /** Sends the Time Exceeded error notification packet.
    77  *  Beginning of the packet is sent as the notification packet data.
    78  *  The source and the destination addresses should be set in the original packet.
    79  *  @param[in] icmp_phone The ICMP module phone used for (semi)remote calls.
    80  *  @param[in] code The error specific code.
    81  *  @param[in] packet The original packet.
    82  *  @returns EOK on success.
    83  *  @returns EPERM if the ICMP error notifications are disabled.
    84  *  @returns ENOMEM if there is not enough memory left.
    85  */
    86 extern int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t packet);
    87 
    88 /** Sends the Parameter Problem error notification packet.
    89  *  Beginning of the packet is sent as the notification packet data.
    90  *  The source and the destination addresses should be set in the original packet.
    91  *  @param[in] icmp_phone The ICMP module phone used for (semi)remote calls.
    92  *  @param[in] code The error specific code.
    93  *  @param[in] pointer The problematic parameter offset.
    94  *  @param[in] packet The original packet.
    95  *  @returns EOK on success.
    96  *  @returns EPERM if the ICMP error notifications are disabled.
    97  *  @returns ENOMEM if there is not enough memory left.
    98  */
    99 extern int icmp_parameter_problem_msg(int icmp_phone, icmp_code_t code, icmp_param_t pointer, packet_t packet);
     52extern int icmp_destination_unreachable_msg(int, icmp_code_t, icmp_param_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);
    10057
    10158/*@}*/

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup net_il
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    3333/** @file
    34  * Internetwork layer module interface for the underlying network interface layer.
    35  * This interface is always called by the remote modules.
     34 * Internetwork layer module interface for the underlying network interface
     35 * layer. This interface is always called by the remote modules.
    3636 */
    3737
    38 #ifndef __NET_IL_INTERFACE_H__
    39 #define __NET_IL_INTERFACE_H__
    40 
    41 #include <generic.h>
     38#ifndef LIBNET_IL_INTERFACE_H_
     39#define LIBNET_IL_INTERFACE_H_
    4240
    4341#include <ipc/services.h>
    44 #include <ipc/il.h>
     42#include <sys/types.h>
    4543
    4644#include <net/device.h>
    4745#include <net/packet.h>
    48 
    49 #include <packet_client.h>
    5046
    5147/** @name Internetwork layer module interface
    … …  
    5450/*@{*/
    5551
    56 /** Notify the internetwork layer modules about the device state change.
    57  *
    58  * @param[in] il_phone  The internetwork layer module phone used for
    59  *                      (semi)remote calls.
    60  * @param[in] device_id The device identifier.
    61  * @param[in] state     The new device state.
    62  * @param[in] target    The target internetwork module service to be
    63  *                      delivered to.
    64  *
    65  * @return EOK on success.
    66  *
    67  */
    68 static inline int il_device_state_msg(int il_phone, device_id_t device_id,
    69     device_state_t state, services_t target)
    70 {
    71         return generic_device_state_msg_remote(il_phone, NET_IL_DEVICE_STATE,
    72             device_id, state, target);
    73 }
    74 
    75 /** Notify the internetwork layer modules about the received packet/s.
    76  *
    77  * @param[in] il_phone  The internetwork layer module phone used for
    78  *                      (semi)remote calls.
    79  * @param[in] device_id The device identifier.
    80  * @param[in] packet    The received packet or the received packet queue.
    81  * @param[in] target    The target internetwork module service to be
    82  *                      delivered to.
    83  *
    84  * @return EOK on success.
    85  *
    86  */
    87 inline static int il_received_msg(int il_phone, device_id_t device_id,
    88     packet_t packet, services_t target)
    89 {
    90         return generic_received_msg_remote(il_phone, NET_IL_RECEIVED, device_id,
    91             packet_get_id(packet), target, 0);
    92 }
    93 
    94 /** Notify the internetwork layer modules about the mtu change.
    95  *
    96  * @param[in] il_phone  The internetwork layer module phone used for
    97  *                      (semi)remote calls.
    98  * @param[in] device_id The device identifier.
    99  * @param[in] mtu       The new mtu value.
    100  * @param[in] target    The target internetwork module service to be
    101  *                      delivered to.
    102  *
    103  * @return EOK on success.
    104  *
    105  */
    106 inline static int il_mtu_changed_msg(int il_phone, device_id_t device_id,
    107     size_t mtu, services_t target)
    108 {
    109         return generic_device_state_msg_remote(il_phone, NET_IL_MTU_CHANGED,
    110             device_id, (int) mtu, target);
    111 }
     52extern int il_device_state_msg(int, device_id_t, device_state_t, services_t);
     53extern int il_received_msg(int, device_id_t, packet_t, services_t);
     54extern int il_mtu_changed_msg(int, device_id_t, size_t, services_t);
    11255
    11356/*@}*/

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup il_local
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    33 #ifndef __IL_LOCAL_H__
    34 #define __IL_LOCAL_H__
     33#ifndef LIBNET_IL_LOCAL_H_
     34#define LIBNET_IL_LOCAL_H_
    3535
    3636#include <ipc/ipc.h>
    3737#include <async.h>
    3838
     39/** Processes the Internet layer module message.
     40 *
     41 * @param[in]           callid The message identifier.
     42 * @param[in]           call The message parameters.
     43 * @param[out]          answer The message answer parameters.
     44 * @param[out]          answer_count The last parameter for the actual answer in
     45 *                      the answer parameter.
     46 * @returns             EOK on success.
     47 * @returns             Other error codes as defined for the arp_message()
     48 *                      function.
     49 */
    3950extern int il_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
    4051    ipc_call_t *answer, int *answer_count);
     52
     53/** Starts the Internet layer module.
     54 *
     55 * Initializes the client connection servicing function, initializes the module,
     56 * registers the module service and starts the async manager, processing IPC
     57 * messages in an infinite loop.
     58 *
     59 * @param[in] client_connection The client connection processing function. The
     60 *                      module skeleton propagates its own one.
     61 * @returns             EOK on successful module termination.
     62 * @returns             Other error codes as defined for the arp_initialize()
     63 *                      function.
     64 * @returns             Other error codes as defined for the REGISTER_ME() macro
     65 *                      function.
     66 */
    4167extern int il_module_start_standalone(async_client_conn_t client_connection);
    4268

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup ip
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  IP header and options definitions.
    35  *  Based on the RFC~791.
    36  */
    37 
    38 #ifndef __NET_IP_HEADER_H__
    39 #define __NET_IP_HEADER_H__
     34 * IP header and options definitions.
     35 * Based on the RFC 791.
     36 */
     37
     38#ifndef LIBNET_IP_HEADER_H_
     39#define LIBNET_IP_HEADER_H_
    4040
    4141#include <byteorder.h>
    … …  
    4343
    4444/** Returns the fragment offest high bits.
    45  *  @param[in] length The prefixed data total length.
    46  */
    47 #define IP_COMPUTE_FRAGMENT_OFFSET_HIGH(length) ((((length) / 8u) &0x1F00) >> 8)
     45 * @param[in] length The prefixed data total length.
     46 */
     47#define IP_COMPUTE_FRAGMENT_OFFSET_HIGH(length) \
     48        ((((length) / 8U) & 0x1f00) >> 8)
    4849
    4950/** Returns the fragment offest low bits.
    50  *  @param[in] length The prefixed data total length.
    51  */
    52 #define IP_COMPUTE_FRAGMENT_OFFSET_LOW(length) (((length) / 8u) &0xFF)
     51 * @param[in] length The prefixed data total length.
     52 */
     53#define IP_COMPUTE_FRAGMENT_OFFSET_LOW(length) \
     54        (((length) / 8U) & 0xff)
    5355
    5456/** Returns the IP header length.
    55  *  @param[in] length The IP header length in bytes.
    56  */
    57 #define IP_COMPUTE_HEADER_LENGTH(length)                ((uint8_t) ((length) / 4u))
     57 * @param[in] length The IP header length in bytes.
     58 */
     59#define IP_COMPUTE_HEADER_LENGTH(length) \
     60        ((uint8_t) ((length) / 4U))
    5861
    5962/** Returns the fragment offest.
    60  *  @param[in] header The IP packet header.
    61  */
    62 #define IP_FRAGMENT_OFFSET(header) ((((header)->fragment_offset_high << 8) + (header)->fragment_offset_low) * 8u)
     63 * @param[in] header The IP packet header.
     64 */
     65#define IP_FRAGMENT_OFFSET(header) \
     66        ((((header)->fragment_offset_high << 8) + \
     67            (header)->fragment_offset_low) * 8U)
    6368
    6469/** Returns the IP packet header checksum.
    6570 *  @param[in] header The IP packet header.
    6671 */
    67 #define IP_HEADER_CHECKSUM(header)      (htons(ip_checksum((uint8_t *)(header), IP_HEADER_LENGTH(header))))
     72#define IP_HEADER_CHECKSUM(header) \
     73        (htons(ip_checksum((uint8_t *) (header), IP_HEADER_LENGTH(header))))
    6874
    6975/** Returns the actual IP packet data length.
    70  *  @param[in] header The IP packet header.
    71  */
    72 #define IP_HEADER_DATA_LENGTH(header)   (IP_TOTAL_LENGTH(header) - IP_HEADER_LENGTH(header))
     76 * @param[in] header The IP packet header.
     77 */
     78#define IP_HEADER_DATA_LENGTH(header) \
     79        (IP_TOTAL_LENGTH(header) - IP_HEADER_LENGTH(header))
    7380
    7481/** Returns the actual IP header length in bytes.
    75  *  @param[in] header The IP packet header.
    76  */
    77 #define IP_HEADER_LENGTH(header)                ((header)->header_length * 4u)
     82 * @param[in] header The IP packet header.
     83 */
     84#define IP_HEADER_LENGTH(header) \
     85        ((header)->header_length * 4U)
    7886
    7987/** Returns the actual IP packet total length.
    80  *  @param[in] header The IP packet header.
    81  */
    82 #define IP_TOTAL_LENGTH(header)         ntohs((header)->total_length)
    83 
    84 /** @name IP flags definitions
    85  */
     88 * @param[in] header The IP packet header.
     89 */
     90#define IP_TOTAL_LENGTH(header) \
     91        ntohs((header)->total_length)
     92
     93/** @name IP flags definitions */
    8694/*@{*/
    8795
    88 /** Fragment flag field shift.
    89  */
    90 #define IPFLAG_FRAGMENT_SHIFT           1
    91 
    92 /** Fragmented flag field shift.
    93  */
    94 #define IPFLAG_FRAGMENTED_SHIFT         0
     96/** Fragment flag field shift. */
     97#define IPFLAG_FRAGMENT_SHIFT   1
     98
     99/** Fragmented flag field shift. */
     100#define IPFLAG_FRAGMENTED_SHIFT 0
    95101
    96102/** Don't fragment flag value.
    97  *  Permits the packet fragmentation.
    98  */
    99 #define IPFLAG_DONT_FRAGMENT            (0x1 << IPFLAG_FRAGMENT_SHIFT)
     103 * Permits the packet fragmentation.
     104 */
     105#define IPFLAG_DONT_FRAGMENT    (0x1 << IPFLAG_FRAGMENT_SHIFT)
    100106
    101107/** Last fragment flag value.
    102  *  Indicates the last packet fragment.
    103  */
    104 #define IPFLAG_LAST_FRAGMENT            (0x0 << IPFLAG_FRAGMENTED_SHIFT)
     108 * Indicates the last packet fragment.
     109 */
     110#define IPFLAG_LAST_FRAGMENT    (0x0 << IPFLAG_FRAGMENTED_SHIFT)
    105111
    106112/** May fragment flag value.
    107  *  Allows the packet fragmentation.
    108  */
    109 #define IPFLAG_MAY_FRAGMENT                     (0x0 << IPFLAG_FRAGMENT_SHIFT)
     113 * Allows the packet fragmentation.
     114 */
     115#define IPFLAG_MAY_FRAGMENT     (0x0 << IPFLAG_FRAGMENT_SHIFT)
    110116
    111117/** More fragments flag value.
    112  *  Indicates that more packet fragments follow.
    113  */
    114 #define IPFLAG_MORE_FRAGMENTS           (0x1 << IPFLAG_FRAGMENTED_SHIFT)
     118 * Indicates that more packet fragments follow.
     119 */
     120#define IPFLAG_MORE_FRAGMENTS   (0x1 << IPFLAG_FRAGMENTED_SHIFT)
    115121
    116122/*@}*/
    117123
    118124/** Type definition of the internet header.
    119  *  @see ip_header
    120  */
    121 typedef struct ip_header        ip_header_t;
     125 * @see ip_header
     126 */
     127typedef struct ip_header ip_header_t;
    122128
    123129/** Type definition of the internet header pointer.
    124  *  @see ip_header
    125  */
    126 typedef ip_header_t *           ip_header_ref;
     130 * @see ip_header
     131 */
     132typedef ip_header_t *ip_header_ref;
    127133
    128134/** Type definition of the internet option header.
    129  *  @see ip_header
    130  */
    131 typedef struct ip_option        ip_option_t;
     135 * @see ip_header
     136 */
     137typedef struct ip_option ip_option_t;
    132138
    133139/** Type definition of the internet option header pointer.
    134  *  @see ip_header
    135  */
    136 typedef ip_option_t *           ip_option_ref;
     140 * @see ip_header
     141 */
     142typedef ip_option_t *ip_option_ref;
    137143
    138144/** Type definition of the internet version 4 pseudo header.
    139  *  @see ipv4_pseudo_header
    140  */
    141 typedef struct ipv4_pseudo_header       ipv4_pseudo_header_t;
     145 * @see ipv4_pseudo_header
     146 */
     147typedef struct ipv4_pseudo_header ipv4_pseudo_header_t;
    142148
    143149/** Type definition of the internet version 4 pseudo header pointer.
    144  *  @see ipv4_pseudo_header
    145  */
    146 typedef ipv4_pseudo_header_t *          ipv4_pseudo_header_ref;
     150 * @see ipv4_pseudo_header
     151 */
     152typedef ipv4_pseudo_header_t *ipv4_pseudo_header_ref;
    147153
    148154/** Internet header.
    149  *  The variable options should be included after the header itself and indicated by the increased header length value.
    150  */
    151 struct ip_header{
     155 *
     156 * The variable options should be included after the header itself and
     157 * indicated by the increased header length value.
     158 */
     159struct ip_header {
    152160#ifdef ARCH_IS_BIG_ENDIAN
    153         /** The Version field indicates the format of the internet header.
    154          */
    155         uint8_t version:4;
    156         /** Internet Header Length is the length of the internet header in 32~bit words, and thus points to the beginning of the data.
    157          *  Note that the minimum value for a~correct header is~5.
    158          */
    159         uint8_t header_length:4;
     161        uint8_t version : 4;
     162        uint8_t header_length : 4;
    160163#else
    161         /** Internet Header Length is the length of the internet header in 32~bit words, and thus points to the beginning of the data.
    162          *  Note that the minimum value for a~correct header is~5.
    163          */
    164         uint8_t header_length:4;
    165         /** The Version field indicates the format of the internet header.
    166          */
    167         uint8_t version:4;
    168 #endif
    169         /** The Type of Service provides an indication of the abstract parameters of the quality of service desired.
    170          *  These parameters are to be used to guide the selection of the actual service parameters when transmitting a~datagram through a~particular network.
    171          *  Several networks offer service precedence, which somehow treats high precedence traffic as more important than other traffic (generally by accepting only traffic above a~certain precedence at time of high load).
    172          *  The major choice is a~three way tradeoff between low-delay, high-reliability, and high-throughput.
    173          */
     164        uint8_t header_length : 4;
     165        uint8_t version : 4;
     166#endif
     167
    174168        uint8_t tos;
    175         /** Total Length is the length of the datagram, measured in octets, including internet header and data.
    176          *  This field allows the length of a~datagram to be up to 65,535~octets.
    177          */
    178169        uint16_t total_length;
    179         /** An identifying value assigned by the sender to aid in assembling the fragments of a~datagram.
    180          */
    181170        uint16_t identification;
     171
    182172#ifdef ARCH_IS_BIG_ENDIAN
    183         /** Various control flags.
    184          */
    185         uint8_t flags:3;
    186         /** This field indicates where in the datagram this fragment belongs.
    187          *  High bits.
    188          */
    189         uint8_t fragment_offset_high:5;
     173        uint8_t flags : 3;
     174        uint8_t fragment_offset_high : 5;
    190175#else
    191         /** This field indicates where in the datagram this fragment belongs.
    192          *  High bits.
    193          */
    194         uint8_t fragment_offset_high:5;
    195         /** Various control flags.
    196          */
    197         uint8_t flags:3;
    198 #endif
    199         /** This field indicates where in the datagram this fragment belongs.
    200          *  Low bits.
    201          */
     176        uint8_t fragment_offset_high : 5;
     177        uint8_t flags : 3;
     178#endif
     179
    202180        uint8_t fragment_offset_low;
    203         /** This field indicates the maximum time the datagram is allowed to remain in the internet system.
    204          *  If this field contains the value zero, then the datagram must be destroyed.
    205          *  This field is modified in internet header processing.
    206          *  The time is measured in units of seconds, but since every module that processes a~datagram must decrease the TTL by at least one even if it process the datagram in less than a~second, the TTL must be thought of only as an upper bound on the time a~datagram may exist.
    207          *  The intention is to cause undeliverable datagrams to be discarded, and to bound the maximum datagram lifetime.
    208          */
    209181        uint8_t ttl;
    210         /** This field indicates the next level protocol used in the data portion of the internet datagram.
    211          */
    212182        uint8_t protocol;
    213         /** A checksum of the header only.
    214          *  Since some header fields change (e.g., time to live), this is recomputed and verified at each point that the internet header is processed.
    215          *  The checksum algorithm is: The checksum field is the 16~bit one's complement of the one's complement sum of all 16~bit words in the header.
    216          *  For purposes of computing the checksum, the value of the checksum field is zero.
    217          */
    218183        uint16_t header_checksum;
    219         /** The source address.
    220          */
    221184        uint32_t source_address;
    222         /** The destination address.
    223          */
    224185        uint32_t destination_address;
    225186} __attribute__ ((packed));
    226187
    227188/** Internet option header.
    228  *  Only type field is always valid.
    229  *  Other fields' validity depends on the option type.
    230  */
    231 struct ip_option{
    232         /** A single octet of option-type.
    233          */
     189 *
     190 * Only type field is always valid.
     191 * Other fields' validity depends on the option type.
     192 */
     193struct ip_option {
    234194        uint8_t type;
    235         /** An option length octet.
    236          */
    237195        uint8_t length;
    238         /** A~pointer.
    239          */
    240196        uint8_t pointer;
     197
    241198#ifdef ARCH_IS_BIG_ENDIAN
    242         /** The number of IP modules that cannot register timestamps due to lack of space.
    243          */
    244         uint8_t overflow:4;
    245         /** Various internet timestamp control flags.
    246          */
    247         uint8_t flags:4;
     199        uint8_t overflow : 4;
     200        uint8_t flags : 4;
    248201#else
    249         /** Various internet timestamp control flags.
    250          */
    251         uint8_t flags:4;
    252         /** The number of IP modules that cannot register timestamps due to lack of space.
    253          */
    254         uint8_t overflow:4;
     202        uint8_t flags : 4;
     203        uint8_t overflow : 4;
    255204#endif
    256205} __attribute__ ((packed));
    257206
    258 /** Internet version 4 pseudo header.
    259  */
    260 struct ipv4_pseudo_header{
    261         /** The source address.
    262          */
     207/** Internet version 4 pseudo header. */
     208struct ipv4_pseudo_header {
    263209        uint32_t source_address;
    264         /** The destination address.
    265          */
    266210        uint32_t destination_address;
    267         /** Reserved byte.
    268          *  Must be zero.
    269          */
    270211        uint8_t reserved;
    271         /** This field indicates the next level protocol used in the data portion of the internet datagram.
    272          */
    273212        uint8_t protocol;
    274         /** Data length is the length of the datagram, measured in octets.
    275          */
    276213        uint16_t data_length;
    277214} __attribute__ ((packed));

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup ip
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    33 #ifndef __NET_IP_INTERFACE_H__
    34 #define __NET_IP_INTERFACE_H__
     33#ifndef LIBNET_IP_INTERFACE_H_
     34#define LIBNET_IP_INTERFACE_H_
    3535
    3636#include <net/socket_codes.h>
    … …  
    5555
    5656/** @name IP module interface
    57  *  This interface is used by other modules.
     57 * This interface is used by other modules.
    5858 */
    5959/*@{*/
    6060
    6161/** The transport layer notification function type definition.
    62  *  Notifies the transport layer modules about the received packet/s.
    63  *  @param[in] device_id The device identifier.
    64  *  @param[in] packet The received packet or the received packet queue.
    65  *  @param[in] receiver The receiving module service.
    66  *  @param[in] error The packet error reporting service. Prefixes the received packet.
    67  *  @returns EOK on success.
     62 *
     63 * Notifies the transport layer modules about the received packet/s.
     64 *
     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 * @returns             EOK on success.
    6871 */
    69 typedef int     (*tl_received_msg_t)(device_id_t device_id, packet_t packet, services_t receiver, services_t error);
     72typedef int (*tl_received_msg_t)(device_id_t device_id, packet_t packet,
     73    services_t receiver, services_t error);
    7074
    71 /** Creates bidirectional connection with the ip module service and registers the message receiver.
    72  *  @param[in] service The IP module service.
    73  *  @param[in] protocol The transport layer protocol.
    74  *  @param[in] me The requesting module service.
    75  *  @param[in] receiver The message receiver. Used for remote connection.
    76  *  @returns The phone of the needed service.
    77  *  @returns EOK on success.
    78  *  @returns Other error codes as defined for the bind_service() function.
    79  */
    80 extern int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver);
    81 
    82 /** Connects to the IP module.
    83  *  @param service The IP module service. Ignored parameter.
    84  *  @returns The IP module phone on success.
    85  */
    86 extern int ip_connect_module(services_t service);
     75extern int ip_bind_service(services_t, int, services_t, async_client_conn_t);
     76extern int ip_connect_module(services_t);
    8777
    8878/*@}*/

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup ip
     29/** @addtogroup libnet
    3030 * @{
    3131 */
    3232
    33 #ifndef __NET_IP_REMOTE_H__
    34 #define __NET_IP_REMOTE_H__
     33#ifndef LIBNET_IP_REMOTE_H_
     34#define LIBNET_IP_REMOTE_H_
    3535
    3636#include <ipc/services.h>

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup net_nil
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  Hardware types according to the on-line IANA - Address Resolution Protocol (ARP) Parameters - <http://www.iana.org/assignments/arp-parameters/arp-parameters.xml>, cited January 14 2009.
     34 * Hardware types according to the on-line IANA - Address Resolution Protocol
     35 * (ARP) Parameters
     36 * http://www.iana.org/assignments/arp-parameters/arp-parameters.xml,
     37 * cited January 14 2009.
    3538 */
    3639
    37 #ifndef __NET_HW_TYPES_H__
    38 #define __NET_HW_TYPES_H__
     40#ifndef LIBNET_NET_HARDWARE_H_
     41#define LIBNET_NET_HARDWARE_H_
    3942
    4043#include <sys/types.h>
    4144
    42 /** Network interface layer type type definition.
    43  */
    44 typedef uint8_t hw_type_t;
     45/** Network interface layer type type definition. */
     46typedef uint8_t hw_type_t;
    4547
    46 /** @name Network interface layer types definitions
    47  */
     48/** @name Network interface layer types definitions */
    4849/*@{*/
    4950
    50 /** Ethernet (10Mb) hardware type.
    51  */
     51/** Ethernet (10Mb) hardware type. */
    5252#define HW_ETHER                1
    53 
    54 /** Experimental Ethernet (3Mb) hardware type.
    55  */
    56 #define HW_EETHER               2
    57 
    58 /** Amateur Radio AX.25 hardware type.
    59  */
    60 #define HW_AX25         3
    61 
    62 /** Proteon ProNET Token Ring hardware type.
    63  */
    64 #define HW_PRONET               4
    65 
    66 /** Chaos hardware type.
    67  */
    68 #define HW_CHAOS                5
    69 
    70 /** IEEE 802 Networks hardware type.
    71  */
    72 #define HW_IEEE802              6
    73 
    74 /** ARCNET hardware type.
    75  */
    76 #define HW_ARCNET               7
    77 
    78 /** Hyperchannel hardware type.
    79  */
    80 #define HW_Hyperchannel         8
    81 
    82 /** Lanstar hardware type.
    83  */
    84 #define HW_Lanstar              9
    85 
    86 /** Autonet Short Address hardware type.
    87  */
    88 #define HW_ASA          10
    89 
    90 /** LocalTalk hardware type.
    91  */
    92 #define HW_LocalTalk            11
    93 
    94 /** LocalNet (IBM PCNet or SYTEK LocalNET) hardware type.
    95  */
    96 #define HW_LocalNet             12
    97 
    98 /** Ultra link hardware type.
    99  */
    100 #define HW_Ultra_link           13
    101 
    102 /** SMDS hardware type.
    103  */
    104 #define HW_SMDS         14
    105 
    106 /** Frame Relay DLCI hardware type.
    107  */
    108 #define HW_DLCI         15
    109 
    110 /** Asynchronous Transmission Mode (ATM) hardware type.
    111  */
    112 #define HW_ATM          16
    113 
    114 /** HDLC hardware type.
    115  */
    116 #define HW_HDLC         17
    117 
    118 /** Fibre Channel hardware type.
    119  */
    120 #define HW_Fibre_Channel                18
    121 
    122 /** Asynchronous Transmission Mode (ATM) hardware type.
    123  */
    124 #define HW_ATM2         19
    125 
    126 /** Serial Line hardware type.
    127  */
    128 #define HW_Serial_Line          20
    129 
    130 /** Asynchronous Transmission Mode (ATM) hardware type.
    131  */
    132 #define HW_ATM3         21
    133 
    134 /** MIL-STD-188-220 hardware type.
    135  */
    136 #define HW_MIL_STD_188_220              22
    137 
    138 /** Metricom hardware type.
    139  */
    140 #define HW_METRICOM             23
    141 
    142 /** IEEE 1394.1995 hardware type.
    143  */
    144 #define HW_IEEE1394             24
    145 
    146 /** MAPOS hardware type.
    147  */
    148 #define HW_MAPOS                25
    149 
    150 /** Twinaxial hardware type.
    151  */
    152 #define HW_Twinaxial            26
    153 
    154 /** EUI-64 hardware type.
    155  */
    156 #define HW_EUI64                27
    157 
    158 /** HIPARP hardware type.
    159  */
    160 #define HW_HIPARP               28
    161 
    162 /** IP and ARP over ISO 7816-3 hardware type.
    163  */
    164 #define HW_ISO_7816_3           29
    165 
    166 /** ARPSec hardware type.
    167  */
    168 #define HW_ARPSec               30
    169 
    170 /** IPsec tunnel hardware type.
    171  */
    172 #define HW_IPsec_tunnel         31
    173 
    174 /** InfiniBand (TM) hardware type.
    175  */
    176 #define HW_INFINIBAND           32
    177 
    178 /** TIA-102 Project 25 Common Air Interface (CAI) hardware type.
    179  */
    180 #define HW_CAI          33
    181 
    182 /** Wiegand Interface hardware type.
    183  */
    184 #define HW_Wiegand              34
    185 
    186 /** Pure IP hardware type.
    187  */
    188 #define HW_Pure_IP              35
    18953
    19054/*@}*/
    … …  
    19458/** @}
    19559 */
     60

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup netif
     29/** @addtogroup libnet
    3030 * @{
    3131 */
    3232
    33 #ifndef __NET_NETIF_INTERFACE_H__
    34 #define __NET_NETIF_INTERFACE_H__
     33#ifndef LIBNET_NETIF_INTERFACE_H_
     34#define LIBNET_NETIF_INTERFACE_H_
    3535
    3636#include <netif_remote.h>

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup netif
     29/** @addtogroup libnet
    3030 * @{
    3131 */
    … …  
    3636 */
    3737
    38 #ifndef __NET_NETIF_LOCAL_H__
    39 #define __NET_NETIF_LOCAL_H__
     38#ifndef NET_NETIF_LOCAL_H_
     39#define NET_NETIF_LOCAL_H_
    4040
    4141#include <async.h>
    … …  
    4343#include <ipc/ipc.h>
    4444#include <ipc/services.h>
    45 #include <err.h>
    4645
    4746#include <adt/measured_strings.h>
    … …  
    4948#include <net/packet.h>
    5049
    51 /** Network interface device specific data.
    52  *
    53  */
     50/** Network interface device specific data. */
    5451typedef struct {
    5552        device_id_t device_id;  /**< Device identifier. */
    … …  
    6764DEVICE_MAP_DECLARE(netif_device_map, netif_device_t);
    6865
    69 /** Network interface module skeleton global data.
    70  *
    71  */
     66/** Network interface module skeleton global data. */
    7267typedef struct {
    7368        int net_phone;                  /**< Networking module phone. */
    … …  
    8176 *
    8277 * This function has to be implemented in user code.
    83  *
    8478 */
    8579extern int netif_initialize(void);
    … …  
    8983 * This has to be implemented in user code.
    9084 *
    91  * @param[in] device_id The device identifier.
    92  * @param[in] irq       The device interrupt number.
    93  * @param[in] io        The device input/output address.
    94  *
    95  * @return EOK on success.
    96  * @return Other error codes as defined for the find_device() function.
    97  * @return Other error codes as defined for the specific module message
    98  *         implementation.
    99  *
     85 * @param[in] device_id The device identifier.
     86 * @param[in] irq       The device interrupt number.
     87 * @param[in] io        The device input/output address.
     88 *
     89 * @return              EOK on success.
     90 * @return              Other error codes as defined for the find_device()
     91 *                      function.
     92 * @return              Other error codes as defined for the specific module
     93 *                      message implementation.
    10094 */
    10195extern int netif_probe_message(device_id_t device_id, int irq, uintptr_t io);
    … …  
    10599 * This has to be implemented in user code.
    106100 *
    107  * @param[in] device_id The device identifier.
    108  * @param[in] packet    The packet queue.
    109  * @param[in] sender    The sending module service.
    110  *
    111  * @return EOK on success.
    112  * @return EFORWARD if the device is not active (in the NETIF_ACTIVE state).
    113  * @return Other error codes as defined for the find_device() function.
    114  * @return Other error codes as defined for the specific module message
    115  *         implementation.
    116  *
     101 * @param[in] device_id The device identifier.
     102 * @param[in] packet    The packet queue.
     103 * @param[in] sender    The sending module service.
     104 *
     105 * @return              EOK on success.
     106 * @return              EFORWARD if the device is not active (in the
     107 *                      NETIF_ACTIVE state).
     108 * @return              Other error codes as defined for the find_device()
     109 *                      function.
     110 * @return              Other error codes as defined for the specific module
     111 *                      message implementation.
    117112 */
    118113extern int netif_send_message(device_id_t device_id, packet_t packet,
    … …  
    123118 * This has to be implemented in user code.
    124119 *
    125  * @param[in] device The device structure.
    126  *
    127  * @return EOK on success.
    128  * @return Other error codes as defined for the find_device() function.
    129  * @return Other error codes as defined for the specific module message
    130  *         implementation.
    131  *
     120 * @param[in] device    The device structure.
     121 *
     122 * @return              EOK on success.
     123 * @return              Other error codes as defined for the find_device()
     124 *                      function.
     125 * @return              Other error codes as defined for the specific module
     126 *                      message implementation.
    132127 */
    133128extern int netif_start_message(netif_device_t *device);
    … …  
    137132 * This has to be implemented in user code.
    138133 *
    139  * @param[in] device The device structure.
    140  *
    141  * @return EOK on success.
    142  * @return Other error codes as defined for the find_device() function.
    143  * @return Other error codes as defined for the specific module message
    144  *         implementation.
    145  *
     134 * @param[in] device    The device structure.
     135 *
     136 * @return              EOK on success.
     137 * @return              Other error codes as defined for the find_device()
     138 *                      function.
     139 * @return              Other error codes as defined for the specific module
     140 *                      message implementation.
    146141 */
    147142extern int netif_stop_message(netif_device_t *device);
    … …  
    151146 * This has to be implemented in user code.
    152147 *
    153  * @param[in]  device_id The device identifier.
    154  * @param[out] address   The device local hardware address.
    155  *
    156  * @return EOK on success.
    157  * @return EBADMEM if the address parameter is NULL.
    158  * @return ENOENT if there no such device.
    159  * @return Other error codes as defined for the find_device() function.
    160  * @return Other error codes as defined for the specific module message
    161  *         implementation.
    162  *
     148 * @param[in] device_id The device identifier.
     149 * @param[out] address  The device local hardware address.
     150 *
     151 * @return              EOK on success.
     152 * @return              EBADMEM if the address parameter is NULL.
     153 * @return              ENOENT if there no such device.
     154 * @return              Other error codes as defined for the find_device()
     155 *                      function.
     156 * @return              Other error codes as defined for the specific module
     157 *                      message implementation.
    163158 */
    164159extern int netif_get_addr_message(device_id_t device_id,
    … …  
    170165 * skeleton. This has to be implemented in user code.
    171166 *
    172  * @param[in]  callid       The message identifier.
    173  * @param[in]  call         The message parameters.
    174  * @param[out] answer       The message answer parameters.
     167 * @param[in] callid    The message identifier.
     168 * @param[in] call      The message parameters.
     169 * @param[out] answer   The message answer parameters.
    175170 * @param[out] answer_count The last parameter for the actual answer in
    176  *                          the answer parameter.
    177  *
    178  * @return EOK on success.
    179  * @return ENOTSUP if the message is not known.
    180  * @return Other error codes as defined for the specific module message
    181  *         implementation.
    182  *
     171 *                      the answer parameter.
     172 *
     173 * @return              EOK on success.
     174 * @return              ENOTSUP if the message is not known.
     175 * @return              Other error codes as defined for the specific module
     176 *                      message implementation.
    183177 */
    184178extern int netif_specific_message(ipc_callid_t callid, ipc_call_t *call,
    … …  
    189183 * This has to be implemented in user code.
    190184 *
    191  * @param[in]  device_id The device identifier.
    192  * @param[out] stats     The device usage statistics.
    193  *
    194  * @return EOK on success.
    195  * @return Other error codes as defined for the find_device() function.
    196  * @return Other error codes as defined for the specific module message
    197  *         implementation.
    198  *
     185 * @param[in] device_id The device identifier.
     186 * @param[out] stats    The device usage statistics.
     187 *
     188 * @return              EOK on success.
     189 * @return              Other error codes as defined for the find_device()
     190 *                      function.
     191 * @return              Other error codes as defined for the specific module
     192 *                      message implementation.
    199193 */
    200194extern int netif_get_device_stats(device_id_t device_id,

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup netif
     29/** @addtogroup libnet
    3030 * @{
    3131 */
    3232
    33 #ifndef __NET_NETIF_REMOTE_H__
    34 #define __NET_NETIF_REMOTE_H__
     33#ifndef LIBNET_NETIF_REMOTE_H_
     34#define LIBNET_NETIF_REMOTE_H_
    3535
     36#include <async.h>
    3637#include <ipc/services.h>
    3738#include <adt/measured_strings.h>
     39
    3840#include <net/device.h>
     41#include <net/packet.h>
    3942
    4043extern int netif_get_addr_req_remote(int, device_id_t, measured_string_ref *,

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup net_nil
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    33 #ifndef __NET_NIL_INTERFACE_H__
    34 #define __NET_NIL_INTERFACE_H__
     33#ifndef LIBNET_NIL_INTERFACE_H_
     34#define LIBNET_NIL_INTERFACE_H_
    3535
    3636#include <async.h>
    … …  
    4747
    4848#define nil_packet_size_req(nil_phone, device_id, packet_dimension) \
    49         generic_packet_size_req_remote(nil_phone, NET_NIL_PACKET_SPACE, device_id, \
    50             packet_dimension)
     49        generic_packet_size_req_remote(nil_phone, NET_NIL_PACKET_SPACE, \
     50            device_id, packet_dimension)
    5151
    5252#define nil_get_addr_req(nil_phone, device_id, address, data) \

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup net_nil
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    … …  
    3636 */
    3737
    38 #ifndef __NET_NIL_LOCAL_H__
    39 #define __NET_NIL_LOCAL_H__
     38#ifndef LIBNET_NIL_LOCAL_H_
     39#define LIBNET_NIL_LOCAL_H_
    4040
    4141#include <ipc/ipc.h>
    … …  
    4545 * Is called by the module_start() function.
    4646 *
    47  * @param[in] net_phone The networking moduel phone.
    48  *
    49  * @return EOK on success.
    50  * @return Other error codes as defined for each specific module initialize function.
    51  *
     47 * @param[in] net_phone The networking moduel phone.
     48 * @return              EOK on success.
     49 * @return              Other error codes as defined for each specific module
     50 *                      initialize function.
    5251 */
    5352extern int nil_initialize(int);
    5453
     54/** Notify the network interface layer about the device state change.
     55 *
     56 * @param[in] nil_phone The network interface layer phone.
     57 * @param[in] device_id The device identifier.
     58 * @param[in] state     The new device state.
     59 * @return              EOK on success.
     60 * @return              Other error codes as defined for each specific module
     61 *                      device state function.
     62 */
    5563extern int nil_device_state_msg_local(int, device_id_t, int);
     64
     65
     66/** Pass the packet queue to the network interface layer.
     67 *
     68 * Process and redistribute the received packet queue to the registered
     69 * upper layers.
     70 *
     71 * @param[in] nil_phone The network interface layer phone.
     72 * @param[in] device_id The source device identifier.
     73 * @param[in] packet    The received packet or the received packet queue.
     74 * @param target        The target service. Ignored parameter.
     75 * @return              EOK on success.
     76 * @return              Other error codes as defined for each specific module
     77 *                      received function.
     78 */
    5679extern int nil_received_msg_local(int, device_id_t, packet_t, services_t);
    5780
    5881/** Message processing function.
    5982 *
    60  * @param[in]  name         Module name.
    61  * @param[in]  callid       The message identifier.
    62  * @param[in]  call         The message parameters.
    63  * @param[out] answer       The message answer parameters.
    64  * @param[out] answer_count The last parameter for the actual answer
    65  *                          in the answer parameter.
    66  *
    67  * @return EOK on success.
    68  * @return ENOTSUP if the message is not known.
    69  * @return Other error codes as defined for each specific
    70  *         module message function.
     83 * @param[in] name      Module name.
     84 * @param[in] callid    The message identifier.
     85 * @param[in] call      The message parameters.
     86 * @param[out] answer   The message answer parameters.
     87 * @param[out] answer_count The last parameter for the actual answer in the
     88 *                      answer parameter.
     89 * @return              EOK on success.
     90 * @return              ENOTSUP if the message is not known.
     91 * @return              Other error codes as defined for each specific module
     92 *                      message function.
    7193 *
    7294 * @see nil_interface.h
    7395 * @see IS_NET_NIL_MESSAGE()
     96 */
     97extern int nil_message_standalone(const char *, ipc_callid_t, ipc_call_t *,
     98    ipc_call_t *, int *);
     99
     100/** Pass the parameters to the module specific nil_message() function.
    74101 *
     102 * @param[in] name      Module name.
     103 * @param[in] callid    The message identifier.
     104 * @param[in] call      The message parameters.
     105 * @param[out] answer   The message answer parameters.
     106 * @param[out] answer_count The last parameter for the actual answer in the
     107 *                      answer parameter.
     108 * @return              EOK on success.
     109 * @return              ENOTSUP if the message is not known.
     110 * @return              Other error codes as defined for each specific module
     111 *                      message function.
    75112 */
    76 extern int nil_message_standalone(const char *, ipc_callid_t, ipc_call_t *, ipc_call_t *,
    77     int *);
    78 
    79113extern int nil_module_message_standalone(const char *, ipc_callid_t,
    80114    ipc_call_t *, ipc_call_t *, int *);
     115
     116/** Start the standalone nil layer module.
     117 *
     118 * Initialize the client connection serving function, initialize
     119 * the module, register the module service and start the async
     120 * manager, processing IPC messages in an infinite loop.
     121 *
     122 * @param[in] client_connection The client connection processing function.
     123 *                      The module skeleton propagates its own one.
     124 * @return              EOK on success.
     125 * @return              Other error codes as defined for the pm_init() function.
     126 * @return              Other error codes as defined for the nil_initialize()
     127 *                      function.
     128 * @return              Other error codes as defined for the REGISTER_ME() macro
     129 *                      function.
     130 */
    81131extern int nil_module_start_standalone(async_client_conn_t);
    82132

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup net_nil
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  Internetwork layer services - network interface layer service type translation.
     34 * Internetwork layer services - network interface layer service type
     35 * translation.
    3536 */
    3637
    37 #ifndef __NET_PROTOCOL_MAP_H__
    38 #define __NET_PROTOCOL_MAP_H__
    39 
    40 #include <ipc/services.h>
     38#ifndef LIBNET_PROTOCOL_MAP_H_
     39#define LIBNET_PROTOCOL_MAP_H_
    4140
    4241#include <ethernet_lsap.h>
    … …  
    4443#include <net_hardware.h>
    4544
    46 /** Maps the internetwork layer service to the network interface layer type.
    47  *  @param[in] nil Network interface layer service.
    48  *  @param[in] il Internetwork layer service.
    49  *  @returns Network interface layer type of the internetworking layer service.
    50  *  @returns 0 if mapping is not found.
    51  */
    52 static inline eth_type_t protocol_map(services_t nil, services_t il){
    53         switch(nil){
    54                 case SERVICE_ETHERNET:
    55                 case SERVICE_DP8390:
    56                         switch(il){
    57                                 case SERVICE_IP:
    58                                         return ETH_P_IP;
    59                                 case SERVICE_ARP:
    60                                         return ETH_P_ARP;
    61                                 default:
    62                                         return 0;
    63                         }
    64                 default:
    65                         return 0;
    66         }
    67 }
     45#include <ipc/services.h>
    6846
    69 /** Maps the network interface layer type to the internetwork layer service.
    70  *  @param[in] nil Network interface layer service.
    71  *  @param[in] protocol Network interface layer type.
    72  *  @returns Internetwork layer service of the network interface layer type.
    73  *  @returns 0 if mapping is not found.
    74  */
    75 static inline services_t protocol_unmap(services_t nil, int protocol){
    76         switch(nil){
    77                 case SERVICE_ETHERNET:
    78                 case SERVICE_DP8390:
    79                         switch(protocol){
    80                                 case ETH_P_IP:
    81                                         return SERVICE_IP;
    82                                 case ETH_P_ARP:
    83                                         return SERVICE_ARP;
    84                                 default:
    85                                         return 0;
    86                         }
    87                 default:
    88                         return 0;
    89         }
    90 }
    91 
    92 /** Maps the link service access point identifier to the Ethernet protocol identifier.
    93  *  @param[in] lsap Link service access point identifier.
    94  *  @returns Ethernet protocol identifier of the link service access point identifier.
    95  *  @returns ETH_LSAP_NULL if mapping is not found.
    96  */
    97 static inline eth_type_t lsap_map(eth_lsap_t lsap){
    98         switch(lsap){
    99                 case ETH_LSAP_IP:
    100                         return ETH_P_IP;
    101                 case ETH_LSAP_ARP:
    102                         return ETH_P_ARP;
    103                 default:
    104                         return ETH_LSAP_NULL;
    105         }
    106 }
    107 
    108 /** Maps the Ethernet protocol identifier to the link service access point identifier.
    109  *  @param[in] ethertype Ethernet protocol identifier.
    110  *  @returns Link service access point identifier.
    111  *  @returns 0 if mapping is not found.
    112  */
    113 static inline eth_lsap_t lsap_unmap(eth_type_t ethertype){
    114         switch(ethertype){
    115                 case ETH_P_IP:
    116                         return ETH_LSAP_IP;
    117                 case ETH_P_ARP:
    118                         return ETH_LSAP_ARP;
    119                 default:
    120                         return 0;
    121         }
    122 }
    123 
    124 /** Maps the network interface layer services to the hardware types.
    125  *  @param[in] nil The network interface service.
    126  *  @returns The hardware type of the network interface service.
    127  *  @returns 0 if mapping is not found.
    128  */
    129 static inline hw_type_t hardware_map(services_t nil){
    130         switch(nil){
    131                 case SERVICE_ETHERNET:
    132                 case SERVICE_DP8390:
    133                         return HW_ETHER;
    134                 default:
    135                         return 0;
    136         }
    137 }
     47extern eth_type_t protocol_map(services_t, services_t);
     48extern services_t protocol_unmap(services_t, int);
     49extern eth_type_t lsap_map(eth_lsap_t);
     50extern eth_lsap_t lsap_unmap(eth_type_t);
     51extern hw_type_t hardware_map(services_t);
    13852
    13953#endif

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup net_tl
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  Transport layer common functions.
     34 * Transport layer common functions.
    3535 */
    3636
    37 #ifndef __NET_TL_COMMON_H__
    38 #define __NET_TL_COMMON_H__
     37#ifndef LIBNET_TL_COMMON_H_
     38#define LIBNET_TL_COMMON_H_
     39
     40#include <ipc/services.h>
    3941
    4042#include <net/socket_codes.h>
    … …  
    4446
    4547/** Device packet dimensions.
    46  *  Maps devices to the packet dimensions.
    47  *  @see device.h
     48 * Maps devices to the packet dimensions.
     49 * @see device.h
    4850 */
    4951DEVICE_MAP_DECLARE(packet_dimensions, packet_dimension_t);
    … …  
    5153extern int tl_get_ip_packet_dimension(int, packet_dimensions_ref,
    5254    device_id_t, packet_dimension_ref *);
    53 
    54 /** Gets the address port.
    55  *  Supports AF_INET and AF_INET6 address families.
    56  *  @param[in,out] addr The address to be updated.
    57  *  @param[in] addrlen The address length.
    58  *  @param[out] port The set port.
    59  *  @returns EOK on success.
    60  *  @returns EINVAL if the address length does not match the address family.
    61  *  @returns EAFNOSUPPORT if the address family is not supported.
    62  */
    63 extern int tl_get_address_port(const struct sockaddr * addr, int addrlen, uint16_t * port);
    64 
    65 /** Updates IP device packet dimensions cache.
    66  *  @param[in,out] packet_dimensions The packet dimensions cache.
    67  *  @param[in] device_id The device identifier.
    68  *  @param[in] content The new maximum content size.
    69  *  @returns EOK on success.
    70  *  @returns ENOENT if the packet dimension is not cached.
    71  */
    72 extern int tl_update_ip_packet_dimension(packet_dimensions_ref packet_dimensions, device_id_t device_id, size_t content);
    73 
    74 /** Sets the address port.
    75  *  Supports AF_INET and AF_INET6 address families.
    76  *  @param[in,out] addr The address to be updated.
    77  *  @param[in] addrlen The address length.
    78  *  @param[in] port The port to be set.
    79  *  @returns EOK on success.
    80  *  @returns EINVAL if the address length does not match the address family.
    81  *  @returns EAFNOSUPPORT if the address family is not supported.
    82  */
    83 extern int tl_set_address_port(struct sockaddr * addr, int addrlen, uint16_t port);
    84 
    85 /** Prepares the packet for ICMP error notification.
    86  *  Keeps the first packet and releases all the others.
    87  *  Releases all the packets on error.
    88  *  @param[in] packet_phone The packet server module phone.
    89  *  @param[in] icmp_phone The ICMP module phone.
    90  *  @param[in] packet The packet to be send.
    91  *  @param[in] error The packet error reporting service. Prefixes the received packet.
    92  *  @returns EOK on success.
    93  *  @returns ENOENT if no packet may be sent.
    94  */
    95 extern int tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t packet, services_t error);
    96 
    97 /** Receives data from the socket into a packet.
    98  *  @param[in] packet_phone The packet server module phone.
    99  *  @param[out] packet The new created packet.
    100  *  @param[in] prefix Reserved packet data prefix length.
    101  *  @param[in] dimension The packet dimension.
    102  *  @param[in] addr The destination address.
    103  *  @param[in] addrlen The address length.
    104  *  @returns Number of bytes received.
    105  *  @returns EINVAL if the client does not send data.
    106  *  @returns ENOMEM if there is not enough memory left.
    107  *  @returns Other error codes as defined for the async_data_read_finalize() function.
    108  */
    109 extern int tl_socket_read_packet_data(int packet_phone, packet_ref packet, size_t prefix, const packet_dimension_ref dimension, const struct sockaddr * addr, socklen_t addrlen);
     55extern int tl_get_address_port(const struct sockaddr *, int, uint16_t *);
     56extern int tl_update_ip_packet_dimension(packet_dimensions_ref, device_id_t,
     57    size_t);
     58extern int tl_set_address_port(struct sockaddr *, int, uint16_t);
     59extern int tl_prepare_icmp_packet(int, int, packet_t, services_t);
     60extern int tl_socket_read_packet_data(int, packet_ref, size_t,
     61    const packet_dimension_ref, const struct sockaddr *, socklen_t);
    11062
    11163#endif

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup net_tl
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    … …  
    3535 */
    3636
    37 #ifndef __NET_TL_INTERFACE_H__
    38 #define __NET_TL_INTERFACE_H__
     37#ifndef LIBNET_TL_INTERFACE_H_
     38#define LIBNET_TL_INTERFACE_H_
    3939
    4040#include <async.h>
    … …  
    5252/*@{*/
    5353
    54 /** Notify the remote transport layer modules about the received packet/s.
    55  *
    56  * @param[in] tl_phone  The transport layer module phone used for remote calls.
    57  * @param[in] device_id The device identifier.
    58  * @param[in] packet    The received packet or the received packet queue.
    59  *                      The packet queue is used to carry a fragmented
    60  *                      datagram. The first packet contains the headers,
    61  *                      the others contain only data.
    62  * @param[in] target    The target transport layer module service to be
    63  *                      delivered to.
    64  * @param[in] error     The packet error reporting service. Prefixes the
    65  *                      received packet.
    66  *
    67  * @return EOK on success.
    68  *
    69  */
    70 inline static int tl_received_msg(int tl_phone, device_id_t device_id,
    71     packet_t packet, services_t target, services_t error)
    72 {
    73         return generic_received_msg_remote(tl_phone, NET_TL_RECEIVED, device_id,
    74             packet_get_id(packet), target, error);
    75 }
     54extern int tl_received_msg(int, device_id_t, packet_t, services_t, services_t);
    7655
    7756/*@}*/

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup tl_local
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    33 #ifndef __TL_LOCAL_H__
    34 #define __TL_LOCAL_H__
     33#ifndef LIBNET_TL_LOCAL_H_
     34#define LIBNET_TL_LOCAL_H_
    3535
    3636#include <ipc/ipc.h>

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup netif
     29/** @addtogroup libnet
    3030 * @{
    3131 */
    … …  
    5858DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t);
    5959
    60 /** Network interface global data.
    61  */
     60/** Network interface global data. */
    6261netif_globals_t netif_globals;
    6362
    … …  
    6564 *
    6665 * @param[in] netif_phone The network interface phone.
    67  * @param[in] device_id   The device identifier.
    68  * @param[in] irq         The device interrupt number.
    69  * @param[in] io          The device input/output address.
    70  *
    71  * @return EOK on success.
    72  * @return Other errro codes as defined for the netif_probe_message().
    73  *
    74  */
    75 int netif_probe_req_local(int netif_phone, device_id_t device_id, int irq, int io)
     66 * @param[in] device_id The device identifier.
     67 * @param[in] irq       The device interrupt number.
     68 * @param[in] io        The device input/output address.
     69 * @return              EOK on success.
     70 * @return              Other error codes as defined for the
     71 *                      netif_probe_message().
     72 */
     73int
     74netif_probe_req_local(int netif_phone, device_id_t device_id, int irq, int io)
    7675{
    7776        fibril_rwlock_write_lock(&netif_globals.lock);
    … …  
    8584 *
    8685 * @param[in] netif_phone The network interface phone.
    87  * @param[in] device_id   The device identifier.
    88  * @param[in] packet      The packet queue.
    89  * @param[in] sender      The sending module service.
    90  *
    91  * @return EOK on success.
    92  * @return Other error codes as defined for the generic_send_msg() function.
    93  *
     86 * @param[in] device_id The device identifier.
     87 * @param[in] packet    The packet queue.
     88 * @param[in] sender    The sending module service.
     89 * @return              EOK on success.
     90 * @return              Other error codes as defined for the generic_send_msg()
     91 *                      function.
    9492 */
    9593int netif_send_msg_local(int netif_phone, device_id_t device_id,
    … …  
    106104 *
    107105 * @param[in] netif_phone The network interface phone.
    108  * @param[in] device_id   The device identifier.
    109  *
    110  * @return EOK on success.
    111  * @return Other error codes as defined for the find_device() function.
    112  * @return Other error codes as defined for the netif_start_message() function.
    113  *
     106 * @param[in] device_id The device identifier.
     107 * @return              EOK on success.
     108 * @return              Other error codes as defined for the find_device()
     109 *                      function.
     110 * @return              Other error codes as defined for the
     111 *                      netif_start_message() function.
    114112 */
    115113int netif_start_req_local(int netif_phone, device_id_t device_id)
    … …  
    141139 *
    142140 * @param[in] netif_phone The network interface phone.
    143  * @param[in] device_id   The device identifier.
    144  *
    145  * @return EOK on success.
    146  * @return Other error codes as defined for the find_device() function.
    147  * @return Other error codes as defined for the netif_stop_message() function.
    148  *
     141 * @param[in] device_id The device identifier.
     142 * @return              EOK on success.
     143 * @return              Other error codes as defined for the find_device()
     144 *                      function.
     145 * @return              Other error codes as defined for the
     146 *                      netif_stop_message() function.
    149147 */
    150148int netif_stop_req_local(int netif_phone, device_id_t device_id)
    … …  
    175173/** Return the device usage statistics.
    176174 *
    177  * @param[in]  netif_phone The network interface phone.
    178  * @param[in]  device_id   The device identifier.
    179  * @param[out] stats       The device usage statistics.
    180  *
     175 * @param[in] netif_phone The network interface phone.
     176 * @param[in] device_id The device identifier.
     177 * @param[out] stats    The device usage statistics.
    181178 * @return EOK on success.
    182  *
    183179 */
    184180int netif_stats_req_local(int netif_phone, device_id_t device_id,
    … …  
    194190/** Return the device local hardware address.
    195191 *
    196  * @param[in]  netif_phone The network interface phone.
    197  * @param[in]  device_id   The device identifier.
    198  * @param[out] address     The device local hardware address.
    199  * @param[out] data        The address data.
    200  *
    201  * @return EOK on success.
    202  * @return EBADMEM if the address parameter is NULL.
    203  * @return ENOENT if there no such device.
    204  * @return Other error codes as defined for the netif_get_addr_message()
    205  *         function.
    206  *
     192 * @param[in] netif_phone The network interface phone.
     193 * @param[in] device_id The device identifier.
     194 * @param[out] address  The device local hardware address.
     195 * @param[out] data     The address data.
     196 * @return              EOK on success.
     197 * @return              EBADMEM if the address parameter is NULL.
     198 * @return              ENOENT if there no such device.
     199 * @return              Other error codes as defined for the
     200 *                      netif_get_addr_message() function.
    207201 */
    208202int netif_get_addr_req_local(int netif_phone, device_id_t device_id,
    … …  
    211205        ERROR_DECLARE;
    212206       
    213         if ((!address) || (!data))
     207        if (!address || !data)
    214208                return EBADMEM;
    215209       
    … …  
    231225/** Find the device specific data.
    232226 *
    233  * @param[in]  device_id The device identifier.
    234  * @param[out] device    The device specific data.
    235  *
    236  * @return EOK on success.
    237  * @return ENOENT if device is not found.
    238  * @return EPERM if the device is not initialized.
    239  *
     227 * @param[in] device_id The device identifier.
     228 * @param[out] device   The device specific data.
     229 * @return              EOK on success.
     230 * @return              ENOENT if device is not found.
     231 * @return              EPERM if the device is not initialized.
    240232 */
    241233int find_device(device_id_t device_id, netif_device_t **device)
    … …  
    256248/** Clear the usage statistics.
    257249 *
    258  * @param[in] stats The usage statistics.
    259  *
     250 * @param[in] stats     The usage statistics.
    260251 */
    261252void null_device_stats(device_stats_ref stats)
    … …  
    266257/** Initialize the netif module.
    267258 *
    268  *  @param[in] client_connection The client connection functio to be
    269  *                               registered.
    270  *
    271  *  @return EOK on success.
    272  *  @return Other error codes as defined for each specific module
    273  *          message function.
    274  *
     259 * @param[in] client_connection The client connection functio to be registered.
     260 * @return              EOK on success.
     261 * @return              Other error codes as defined for each specific module
     262 *                      message function.
    275263 */
    276264int netif_init_module(async_client_conn_t client_connection)
    … …  
    298286 * Prepared for future optimization.
    299287 *
    300  * @param[in] packet_id The packet identifier.
    301  *
     288 * @param[in] packet_id The packet identifier.
    302289 */
    303290void netif_pq_release(packet_id_t packet_id)
    … …  
    308295/** Allocate new packet to handle the given content size.
    309296 *
    310  * @param[in] content The minimum content size.
    311  *
    312  * @return The allocated packet.
    313  * @return NULL if there is an error.
     297 * @param[in] content   The minimum content size.
     298 * @return              The allocated packet.
     299 * @return              NULL if there is an error.
    314300 *
    315301 */
    … …  
    319305}
    320306
    321 /** Register the device notification receiver, the network interface layer module.
    322  *
    323  * @param[in] name      Module name.
    324  * @param[in] device_id The device identifier.
    325  * @param[in] phone     The network interface layer module phone.
    326  *
    327  * @return EOK on success.
    328  * @return ENOENT if there is no such device.
    329  * @return ELIMIT if there is another module registered.
    330  *
     307/** Register the device notification receiver, the network interface layer
     308 * module.
     309 *
     310 * @param[in] name      Module name.
     311 * @param[in] device_id The device identifier.
     312 * @param[in] phone     The network interface layer module phone.
     313 * @return              EOK on success.
     314 * @return              ENOENT if there is no such device.
     315 * @return              ELIMIT if there is another module registered.
    331316 */
    332317static int register_message(const char *name, device_id_t device_id, int phone)
    … …  
    347332/** Process the netif module messages.
    348333 *
    349  * @param[in]  name         Module name.
    350  * @param[in]  callid       The message identifier.
    351  * @param[in]  call         The message parameters.
    352  * @param[out] answer       The message answer parameters.
    353  * @param[out] answer_count The last parameter for the actual answer
    354  *                          in the answer parameter.
    355  *
    356  * @return EOK on success.
    357  * @return ENOTSUP if the message is not known.
    358  * @return Other error codes as defined for each specific module message function.
     334 * @param[in] name      Module name.
     335 * @param[in] callid    The message identifier.
     336 * @param[in] call      The message parameters.
     337 * @param[out] answer   The message answer parameters.
     338 * @param[out] answer_count The last parameter for the actual answer in the
     339 *                      answer parameter.
     340 * @return              EOK on success.
     341 * @return              ENOTSUP if the message is not known.
     342 * @return              Other error codes as defined for each specific module
     343 *                      message function.
    359344 *
    360345 * @see IS_NET_NETIF_MESSAGE()
    … …  
    373358        *answer_count = 0;
    374359        switch (IPC_GET_METHOD(*call)) {
    375                 case IPC_M_PHONE_HUNGUP:
    376                         return EOK;
    377                 case NET_NETIF_PROBE:
    378                         return netif_probe_req_local(0, IPC_GET_DEVICE(call),
    379                             NETIF_GET_IRQ(call), NETIF_GET_IO(call));
    380                 case IPC_M_CONNECT_TO_ME:
    381                         fibril_rwlock_write_lock(&netif_globals.lock);
    382                         ERROR_CODE = register_message(name, IPC_GET_DEVICE(call),
    383                             IPC_GET_PHONE(call));
    384                         fibril_rwlock_write_unlock(&netif_globals.lock);
    385                         return ERROR_CODE;
    386                 case NET_NETIF_SEND:
    387                         ERROR_PROPAGATE(packet_translate_remote(netif_globals.net_phone,
    388                             &packet, IPC_GET_PACKET(call)));
    389                         return netif_send_msg_local(0, IPC_GET_DEVICE(call), packet,
    390                             IPC_GET_SENDER(call));
    391                 case NET_NETIF_START:
    392                         return netif_start_req_local(0, IPC_GET_DEVICE(call));
    393                 case NET_NETIF_STATS:
    394                         fibril_rwlock_read_lock(&netif_globals.lock);
    395                         if (!ERROR_OCCURRED(async_data_read_receive(&callid, &length))) {
    396                                 if (length < sizeof(device_stats_t))
    397                                         ERROR_CODE = EOVERFLOW;
    398                                 else {
    399                                         if (!ERROR_OCCURRED(netif_get_device_stats(
    400                                             IPC_GET_DEVICE(call), &stats)))
    401                                                 ERROR_CODE = async_data_read_finalize(callid, &stats,
    402                                                     sizeof(device_stats_t));
    403                                 }
    404                         }
     360        case IPC_M_PHONE_HUNGUP:
     361                return EOK;
     362       
     363        case NET_NETIF_PROBE:
     364                return netif_probe_req_local(0, IPC_GET_DEVICE(call),
     365                    NETIF_GET_IRQ(call), NETIF_GET_IO(call));
     366                   
     367        case IPC_M_CONNECT_TO_ME:
     368                fibril_rwlock_write_lock(&netif_globals.lock);
     369                ERROR_CODE = register_message(name, IPC_GET_DEVICE(call),
     370                    IPC_GET_PHONE(call));
     371                fibril_rwlock_write_unlock(&netif_globals.lock);
     372                return ERROR_CODE;
     373               
     374        case NET_NETIF_SEND:
     375                ERROR_PROPAGATE(packet_translate_remote(netif_globals.net_phone,
     376                    &packet, IPC_GET_PACKET(call)));
     377                return netif_send_msg_local(0, IPC_GET_DEVICE(call), packet,
     378                    IPC_GET_SENDER(call));
     379                   
     380        case NET_NETIF_START:
     381                return netif_start_req_local(0, IPC_GET_DEVICE(call));
     382               
     383        case NET_NETIF_STATS:
     384                fibril_rwlock_read_lock(&netif_globals.lock);
     385
     386                if (ERROR_OCCURRED(async_data_read_receive(&callid, &length))) {
    405387                        fibril_rwlock_read_unlock(&netif_globals.lock);
    406388                        return ERROR_CODE;
    407                 case NET_NETIF_STOP:
    408                         return netif_stop_req_local(0, IPC_GET_DEVICE(call));
    409                 case NET_NETIF_GET_ADDR:
    410                         fibril_rwlock_read_lock(&netif_globals.lock);
    411                         if (!ERROR_OCCURRED(netif_get_addr_message(IPC_GET_DEVICE(call),
    412                             &address)))
    413                                 ERROR_CODE = measured_strings_reply(&address, 1);
     389                }
     390                if (length < sizeof(device_stats_t)) {
    414391                        fibril_rwlock_read_unlock(&netif_globals.lock);
    415                         return ERROR_CODE;
     392                        return EOVERFLOW;
     393                }
     394
     395                if (ERROR_NONE(netif_get_device_stats(IPC_GET_DEVICE(call),
     396                    &stats))) {
     397                        ERROR_CODE = async_data_read_finalize(callid, &stats,
     398                            sizeof(device_stats_t));
     399                }
     400
     401                fibril_rwlock_read_unlock(&netif_globals.lock);
     402                return ERROR_CODE;
     403
     404        case NET_NETIF_STOP:
     405                return netif_stop_req_local(0, IPC_GET_DEVICE(call));
     406               
     407        case NET_NETIF_GET_ADDR:
     408                fibril_rwlock_read_lock(&netif_globals.lock);
     409                if (ERROR_NONE(netif_get_addr_message(IPC_GET_DEVICE(call),
     410                    &address)))
     411                        ERROR_CODE = measured_strings_reply(&address, 1);
     412                fibril_rwlock_read_unlock(&netif_globals.lock);
     413                return ERROR_CODE;
    416414        }
    417415       
    … …  
    421419/** Start the network interface module.
    422420 *
    423  * Initialize the client connection serving function, initialize
    424  * the module, registers the module service and start the async
    425  * manager, processing IPC messages in an infinite loop.
    426  *
    427  * @param[in] client_connection The client connection processing
    428  *                              function. The module skeleton propagates
    429  *                              its own one.
    430  *
    431  * @return EOK on success.
    432  * @return Other error codes as defined for each specific module message
    433  *         function.
    434  *
     421 * Initialize the client connection serving function, initialize the module,
     422 * registers the module service and start the async manager, processing IPC
     423 * messages in an infinite loop.
     424 *
     425 * @param[in] client_connection The client connection processing function.
     426 *                      The module skeleton propagates its own one.
     427 * @return              EOK on success.
     428 * @return              Other error codes as defined for each specific module
     429 *                      message function.
    435430 */
    436431int netif_module_start_standalone(async_client_conn_t client_connection)

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup netif
     29/** @addtogroup libnet
    3030 * @{
    3131 */
    … …  
    3535 */
    3636
     37#include <netif_remote.h>
     38#include <packet_client.h>
     39#include <generic.h>
     40
    3741#include <ipc/services.h>
    3842#include <ipc/netif.h>
    … …  
    4145#include <adt/measured_strings.h>
    4246#include <net/packet.h>
    43 #include <packet_client.h>
    4447#include <net/device.h>
    45 #include <netif_remote.h>
    46 #include <generic.h>
    4748
     49/** Return the device local hardware address.
     50 *
     51 * @param[in] netif_phone The network interface phone.
     52 * @param[in] device_id The device identifier.
     53 * @param[out] address  The device local hardware address.
     54 * @param[out] data     The address data.
     55 * @return              EOK on success.
     56 * @return              EBADMEM if the address parameter is NULL.
     57 * @return              ENOENT if there no such device.
     58 * @return              Other error codes as defined for the
     59 *                      netif_get_addr_message() function.
     60 */
    4861int netif_get_addr_req_remote(int netif_phone, device_id_t device_id,
    4962    measured_string_ref *address, char **data)
    … …  
    5366}
    5467
    55 int netif_probe_req_remote(int netif_phone, device_id_t device_id, int irq, int io)
     68/** Probe the existence of the device.
     69 *
     70 * @param[in] netif_phone The network interface phone.
     71 * @param[in] device_id The device identifier.
     72 * @param[in] irq       The device interrupt number.
     73 * @param[in] io        The device input/output address.
     74 * @return              EOK on success.
     75 * @return              Other error codes as defined for the
     76 *                      netif_probe_message().
     77 */
     78int
     79netif_probe_req_remote(int netif_phone, device_id_t device_id, int irq, int io)
    5680{
    5781        return async_req_3_0(netif_phone, NET_NETIF_PROBE, device_id, irq, io);
    5882}
    5983
    60 int netif_send_msg_remote(int netif_phone, device_id_t device_id, packet_t packet,
     84/** Send the packet queue.
     85 *
     86 * @param[in] netif_phone The network interface phone.
     87 * @param[in] device_id The device identifier.
     88 * @param[in] packet    The packet queue.
     89 * @param[in] sender    The sending module service.
     90 * @return              EOK on success.
     91 * @return              Other error codes as defined for the generic_send_msg()
     92 *                      function.
     93 */
     94int
     95netif_send_msg_remote(int netif_phone, device_id_t device_id, packet_t packet,
    6196    services_t sender)
    6297{
    … …  
    65100}
    66101
     102/** Start the device.
     103 *
     104 * @param[in] netif_phone The network interface phone.
     105 * @param[in] device_id The device identifier.
     106 * @return              EOK on success.
     107 * @return              Other error codes as defined for the find_device()
     108 *                      function.
     109 * @return              Other error codes as defined for the
     110 *                      netif_start_message() function.
     111 */
    67112int netif_start_req_remote(int netif_phone, device_id_t device_id)
    68113{
    … …  
    70115}
    71116
     117/** Stop the device.
     118 *
     119 * @param[in] netif_phone The network interface phone.
     120 * @param[in] device_id The device identifier.
     121 * @return              EOK on success.
     122 * @return              Other error codes as defined for the find_device()
     123 *                      function.
     124 * @return              Other error codes as defined for the
     125 *                      netif_stop_message() function.
     126 */
    72127int netif_stop_req_remote(int netif_phone, device_id_t device_id)
    73128{
    … …  
    75130}
    76131
     132/** Return the device usage statistics.
     133 *
     134 * @param[in] netif_phone The network interface phone.
     135 * @param[in] device_id The device identifier.
     136 * @param[out] stats    The device usage statistics.
     137 * @return EOK on success.
     138 */
    77139int netif_stats_req_remote(int netif_phone, device_id_t device_id,
    78140    device_stats_ref stats)
    … …  
    99161 * @param[in] receiver  The message receiver.
    100162 *
    101  * @return The phone of the needed service.
    102  * @return EOK on success.
    103  * @return Other error codes as defined for the bind_service() function.
    104  *
     163 * @return              The phone of the needed service.
     164 * @return              EOK on success.
     165 * @return              Other error codes as defined for the bind_service()
     166 *                      function.
    105167 */
    106 int netif_bind_service_remote(services_t service, device_id_t device_id, services_t me,
    107     async_client_conn_t receiver)
     168int
     169netif_bind_service_remote(services_t service, device_id_t device_id,
     170    services_t me, async_client_conn_t receiver)
    108171{
    109172        return bind_service(service, device_id, me, 0, receiver);

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup net_nil
     29/** @addtogroup libnet
    3030 * @{
    3131 */
    … …  
    4747/** Notify the network interface layer about the device state change.
    4848 *
    49  * @param[in] nil_phone The network interface layer phone.
    50  * @param[in] device_id The device identifier.
    51  * @param[in] state     The new device state.
    52  *
    53  * @return EOK on success.
    54  * @return Other error codes as defined for each specific module device
    55  *         state function.
    56  *
     49 * @param[in] nil_phone The network interface layer phone.
     50 * @param[in] device_id The device identifier.
     51 * @param[in] state     The new device state.
     52 * @return              EOK on success.
     53 * @return              Other error codes as defined for each specific module
     54 *                      device state function.
    5755 */
    5856int nil_device_state_msg_remote(int nil_phone, device_id_t device_id, int state)
    … …  
    6765 * upper layers.
    6866 *
    69  * @param[in] nil_phone The network interface layer phone.
    70  * @param[in] device_id The source device identifier.
    71  * @param[in] packet    The received packet or the received packet queue.
    72  * @param     target    The target service. Ignored parameter.
    73  *
    74  * @return EOK on success.
    75  * @return Other error codes as defined for each specific module
    76  *         received function.
    77  *
     67 * @param[in] nil_phone The network interface layer phone.
     68 * @param[in] device_id The source device identifier.
     69 * @param[in] packet    The received packet or the received packet queue.
     70 * @param target        The target service. Ignored parameter.
     71 * @return              EOK on success.
     72 * @return              Other error codes as defined for each specific module
     73 *                      received function.
    7874 */
    7975int nil_received_msg_remote(int nil_phone, device_id_t device_id,
    8076    packet_t packet, services_t target)
    8177{
    82         return generic_received_msg_remote(nil_phone, NET_NIL_RECEIVED, device_id,
    83             packet_get_id(packet), target, 0);
     78        return generic_received_msg_remote(nil_phone, NET_NIL_RECEIVED,
     79            device_id, packet_get_id(packet), target, 0);
    8480}
    8581

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup icmp
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  ICMP client interface implementation.
    35  *  @see icmp_client.h
     34 * ICMP client interface implementation.
     35 * @see icmp_client.h
    3636 */
    3737
     38#include <icmp_client.h>
     39#include <icmp_header.h>
     40#include <packet_client.h>
     41
    3842#ifdef CONFIG_DEBUG
    39         #include <stdio.h>
     43#include <stdio.h>
    4044#endif
    4145
    … …  
    4448
    4549#include <net/icmp_codes.h>
    46 #include <icmp_client.h>
    4750#include <net/packet.h>
    48 #include <packet_client.h>
    49 #include <icmp_header.h>
    5051
    51 int icmp_client_process_packet(packet_t packet, icmp_type_t * type, icmp_code_t * code, icmp_param_t * pointer, icmp_param_t * mtu){
     52/** Processes the received packet prefixed with an ICMP header.
     53 *
     54 * @param[in] packet    The received packet.
     55 * @param[out] type     The ICMP header type.
     56 * @param[out] code     The ICMP header code.
     57 * @param[out] pointer  The ICMP header pointer.
     58 * @param[out] mtu      The ICMP header MTU.
     59 * @returns             The ICMP header length.
     60 * @returns             Zero if the packet contains no data.
     61 */
     62int
     63icmp_client_process_packet(packet_t packet, icmp_type_t *type,
     64    icmp_code_t *code, icmp_param_t *pointer, icmp_param_t *mtu)
     65{
    5266        icmp_header_ref header;
    5367
    5468        header = (icmp_header_ref) packet_get_data(packet);
    55         if((! header)
    56                 || (packet_get_data_length(packet) < sizeof(icmp_header_t))){
     69        if (!header ||
     70            (packet_get_data_length(packet) < sizeof(icmp_header_t))) {
    5771                return 0;
    5872        }
    59         if(type){
     73
     74        if (type)
    6075                *type = header->type;
    61         }
    62         if(code){
     76        if (code)
    6377                *code = header->code;
    64         }
    65         if(pointer){
     78        if (pointer)
    6679                *pointer = header->un.param.pointer;
    67         }
    68         if(mtu){
     80        if (mtu)
    6981                *mtu = header->un.frag.mtu;
    70         }
     82
    7183        // remove debug dump
    7284#ifdef CONFIG_DEBUG
    73         printf("ICMP error %d (%d) in packet %d\n", header->type, header->code, packet_get_id(packet));
     85        printf("ICMP error %d (%d) in packet %d\n", header->type, header->code,
     86            packet_get_id(packet));
    7487#endif
    7588        return sizeof(icmp_header_t);
    7689}
    7790
    78 size_t icmp_client_header_length(packet_t packet){
    79         if(packet_get_data_length(packet) < sizeof(icmp_header_t)){
     91/** Returns the ICMP header length.
     92 *
     93 * @param[in] packet    The packet.
     94 * @returns             The ICMP header length in bytes.
     95 */
     96size_t icmp_client_header_length(packet_t packet)
     97{
     98        if (packet_get_data_length(packet) < sizeof(icmp_header_t))
    8099                return 0;
    81         }
     100
    82101        return sizeof(icmp_header_t);
    83102}

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup icmp
     29/** @addtogroup libnet
    3030 *  @{
    3131 */
    3232
    3333/** @file
    34  *  ICMP interface implementation for remote modules.
    35  *  @see icmp_interface.h
     34 * ICMP interface implementation for remote modules.
     35 * @see icmp_interface.h
    3636 */
     37
     38#include <icmp_interface.h>
     39#include <net/modules.h>
     40#include <packet_client.h>
    3741
    3842#include <async.h>
    … …  
    4347#include <sys/types.h>
    4448
    45 #include <net/modules.h>
    46 #include <icmp_interface.h>
    47 #include <packet_client.h>
    48 
    49 int icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code, icmp_param_t mtu, packet_t packet){
    50         async_msg_3(icmp_phone, NET_ICMP_DEST_UNREACH, (ipcarg_t) code, (ipcarg_t) packet_get_id(packet), (ipcarg_t) mtu);
     49/** Sends the Destination Unreachable error notification packet.
     50 *
     51 * Beginning of the packet is sent as the notification packet data.
     52 * The source and the destination addresses should be set in the original
     53 * packet.
     54 *
     55 * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls.
     56 * @param[in] code      The error specific code.
     57 * @param[in] mtu       The error MTU value.
     58 * @param[in] packet    The original packet.
     59 * @returns             EOK on success.
     60 * @returns             EPERM if the ICMP error notifications are disabled.
     61 * @returns             ENOMEM if there is not enough memory left.
     62 */
     63int
     64icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code,
     65    icmp_param_t mtu, packet_t packet)
     66{
     67        async_msg_3(icmp_phone, NET_ICMP_DEST_UNREACH, (ipcarg_t) code,
     68            (ipcarg_t) packet_get_id(packet), (ipcarg_t) mtu);
    5169        return EOK;
    5270}
    5371
    54 int icmp_source_quench_msg(int icmp_phone, packet_t packet){
    55         async_msg_2(icmp_phone, NET_ICMP_SOURCE_QUENCH, 0, (ipcarg_t) packet_get_id(packet));
     72/** Sends the Source Quench error notification packet.
     73 *
     74 * Beginning of the packet is sent as the notification packet data.
     75 * The source and the destination addresses should be set in the original
     76 * packet.
     77 *
     78 * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls.
     79 * @param[in] packet    The original packet.
     80 * @returns             EOK on success.
     81 * @returns             EPERM if the ICMP error notifications are disabled.
     82 * @returns             ENOMEM if there is not enough memory left.
     83 */
     84int icmp_source_quench_msg(int icmp_phone, packet_t packet)
     85{
     86        async_msg_2(icmp_phone, NET_ICMP_SOURCE_QUENCH, 0,
     87            (ipcarg_t) packet_get_id(packet));
    5688        return EOK;
    5789}
    5890
    59 int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t packet){
    60         async_msg_2(icmp_phone, NET_ICMP_TIME_EXCEEDED, (ipcarg_t) code, (ipcarg_t) packet_get_id(packet));
     91/** Sends the Time Exceeded error notification packet.
     92 *
     93 * Beginning of the packet is sent as the notification packet data.
     94 * The source and the destination addresses should be set in the original
     95 * packet.
     96 *
     97 * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls.
     98 * @param[in] code      The error specific code.
     99 * @param[in] packet    The original packet.
     100 * @returns             EOK on success.
     101 * @returns             EPERM if the ICMP error notifications are disabled.
     102 * @returns             ENOMEM if there is not enough memory left.
     103 */
     104int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t packet)
     105{
     106        async_msg_2(icmp_phone, NET_ICMP_TIME_EXCEEDED, (ipcarg_t) code,
     107            (ipcarg_t) packet_get_id(packet));
    61108        return EOK;
    62109}
    63110
    64 int icmp_parameter_problem_msg(int icmp_phone, icmp_code_t code, icmp_param_t pointer, packet_t packet){
    65         async_msg_3(icmp_phone, NET_ICMP_PARAMETERPROB, (ipcarg_t) code, (ipcarg_t) packet_get_id(packet), (ipcarg_t) pointer);
     111/** Sends the Parameter Problem error notification packet.
     112 *
     113 * Beginning of the packet is sent as the notification packet data.
     114 * The source and the destination addresses should be set in the original
     115 * packet.
     116 *
     117 * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls.
     118 * @param[in] code      The error specific code.
     119 * @param[in] pointer   The problematic parameter offset.
     120 * @param[in] packet    The original packet.
     121 * @returns             EOK on success.
     122 * @returns             EPERM if the ICMP error notifications are disabled.
     123 * @returns             ENOMEM if there is not enough memory left.
     124 */
     125int icmp_parameter_problem_msg(int icmp_phone, icmp_code_t code,
     126    icmp_param_t pointer, packet_t packet)
     127{
     128        async_msg_3(icmp_phone, NET_ICMP_PARAMETERPROB, (ipcarg_t) code,
     129            (ipcarg_t) packet_get_id(packet), (ipcarg_t) pointer);
    66130        return EOK;
    67131}
    … …  
    69133/** @}
    70134 */
     135

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

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup net_tl
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  Transport layer common functions implementation.
    35  *  @see tl_common.h
    36  */
     34 * Transport layer common functions implementation.
     35 * @see tl_common.h
     36 */
     37
     38#include <tl_common.h>
     39#include <packet_client.h>
     40#include <packet_remote.h>
     41#include <icmp_interface.h>
     42#include <ip_remote.h>
     43#include <ip_interface.h>
     44#include <tl_interface.h>
    3745
    3846#include <net/socket_codes.h>
    … …  
    4048#include <net/in6.h>
    4149#include <net/inet.h>
     50#include <net/device.h>
     51#include <net/packet.h>
     52
    4253#include <async.h>
    4354#include <ipc/services.h>
    … …  
    4556#include <err.h>
    4657
    47 #include <net/packet.h>
    48 #include <packet_client.h>
    49 #include <packet_remote.h>
    50 #include <net/device.h>
    51 #include <icmp_interface.h>
    52 #include <ip_remote.h>
    53 #include <ip_interface.h>
    54 #include <tl_interface.h>
    55 #include <tl_common.h>
    56 
    5758DEVICE_MAP_IMPLEMENT(packet_dimensions, packet_dimension_t);
    5859
     60/** Gets the address port.
     61 *
     62 * Supports AF_INET and AF_INET6 address families.
     63 *
     64 * @param[in,out] addr  The address to be updated.
     65 * @param[in] addrlen   The address length.
     66 * @param[out] port     The set port.
     67 * @returns             EOK on success.
     68 * @returns             EINVAL if the address length does not match the address
     69 *                      family.
     70 * @returns             EAFNOSUPPORT if the address family is not supported.
     71 */
    5972int
    6073tl_get_address_port(const struct sockaddr *addr, int addrlen, uint16_t *port)
    … …  
    7487                *port = ntohs(address_in->sin_port);
    7588                break;
     89       
    7690        case AF_INET6:
    7791                if (addrlen != sizeof(struct sockaddr_in6))
    78                                 return EINVAL;
     92                        return EINVAL;
    7993
    8094                address_in6 = (struct sockaddr_in6 *) addr;
    8195                *port = ntohs(address_in6->sin6_port);
    8296                break;
     97       
    8398        default:
    8499                return EAFNOSUPPORT;
    … …  
    93108 * The reply is cached then.
    94109 *
    95  * @param[in]  ip_phone          The IP moduel phone for (semi)remote calls.
    96  * @param[in]  packet_dimensions The packet dimensions cache.
    97  * @param[in]  device_id         The device identifier.
    98  * @param[out] packet_dimension  The IP packet dimensions.
    99  *
    100  * @return EOK on success.
    101  * @return EBADMEM if the packet_dimension parameter is NULL.
    102  * @return ENOMEM if there is not enough memory left.
    103  * @return EINVAL if the packet_dimensions cache is not valid.
    104  * @return Other codes as defined for the ip_packet_size_req() function.
    105  *
    106  */
    107 int tl_get_ip_packet_dimension(int ip_phone,
     110 * @param[in] ip_phone  The IP moduel phone for (semi)remote calls.
     111 * @param[in] packet_dimensions The packet dimensions cache.
     112 * @param[in] device_id The device identifier.
     113 * @param[out] packet_dimension The IP packet dimensions.
     114 * @return              EOK on success.
     115 * @return              EBADMEM if the packet_dimension parameter is NULL.
     116 * @return              ENOMEM if there is not enough memory left.
     117 * @return              EINVAL if the packet_dimensions cache is not valid.
     118 * @return              Other codes as defined for the ip_packet_size_req()
     119 *                      function.
     120 */
     121int
     122tl_get_ip_packet_dimension(int ip_phone,
    108123    packet_dimensions_ref packet_dimensions, device_id_t device_id,
    109124    packet_dimension_ref *packet_dimension)
    … …  
    139154}
    140155
     156/** Updates IP device packet dimensions cache.
     157 *
     158 * @param[in,out] packet_dimensions The packet dimensions cache.
     159 * @param[in] device_id The device identifier.
     160 * @param[in] content   The new maximum content size.
     161 * @returns             EOK on success.
     162 * @return              ENOENT if the packet dimension is not cached.
     163 */
    141164int
    142165tl_update_ip_packet_dimension(packet_dimensions_ref packet_dimensions,
    … …  
    148171        if (!packet_dimension)
    149172                return ENOENT;
     173
    150174        packet_dimension->content = content;
    151175
    … …  
    160184                                packet_dimensions_exclude(packet_dimensions,
    161185                                    DEVICE_INVALID_ID);
    162 
    163186                }
    164187        }
    … …  
    167190}
    168191
     192/** Sets the address port.
     193 *
     194 * Supports AF_INET and AF_INET6 address families.
     195 *
     196 * @param[in,out] addr  The address to be updated.
     197 * @param[in] addrlen   The address length.
     198 * @param[in] port      The port to be set.
     199 * @returns             EOK on success.
     200 * @returns             EINVAL if the address length does not match the address
     201 *                      family.
     202 * @returns             EAFNOSUPPORT if the address family is not supported.
     203 */
    169204int tl_set_address_port(struct sockaddr * addr, int addrlen, uint16_t port)
    170205{
    … …  
    187222                address_in->sin_port = htons(port);
    188223                return EOK;
     224       
    189225        case AF_INET6:
    190226                if (length != sizeof(struct sockaddr_in6))
    … …  
    193229                address_in6->sin6_port = htons(port);
    194230                return EOK;
     231       
    195232        default:
    196233                return EAFNOSUPPORT;
    … …  
    198235}
    199236
     237/** Prepares the packet for ICMP error notification.
     238 *
     239 * Keeps the first packet and releases all the others.
     240 * Releases all the packets on error.
     241 *
     242 * @param[in] packet_phone The packet server module phone.
     243 * @param[in] icmp_phone The ICMP module phone.
     244 * @param[in] packet    The packet to be send.
     245 * @param[in] error     The packet error reporting service. Prefixes the
     246 *                      received packet.
     247 * @returns             EOK on success.
     248 * @returns             ENOENT if no packet may be sent.
     249 */
    200250int
    201251tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t packet,
    … …  
    223273}
    224274
     275/** Receives data from the socket into a packet.
     276 *
     277 * @param[in] packet_phone The packet server module phone.
     278 * @param[out] packet   The new created packet.
     279 * @param[in] prefix    Reserved packet data prefix length.
     280 * @param[in] dimension The packet dimension.
     281 * @param[in] addr      The destination address.
     282 * @param[in] addrlen   The address length.
     283 * @returns             Number of bytes received.
     284 * @returns             EINVAL if the client does not send data.
     285 * @returns             ENOMEM if there is not enough memory left.
     286 * @returns             Other error codes as defined for the
     287 *                      async_data_read_finalize() function.
     288 */
    225289int
    226290tl_socket_read_packet_data(int packet_phone, packet_ref packet, size_t prefix,

  • uspace/lib/packet/generic/packet_server.c

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup packet
     29/** @addtogroup libpacket
    3030 *  @{
    3131 */
    3232
    3333/** @file
    34  *  Packet server implementation.
    35  */
     34 * Packet server implementation.
     35 */
     36
     37#include <packet_server.h>
     38#include <packet_local.h>
    3639
    3740#include <align.h>
    … …  
    5154#include <net/packet_header.h>
    5255
    53 #include <packet_server.h>
    54 #include <packet_local.h>
    55 
    5656#define FREE_QUEUES_COUNT       7
    5757
    58 /** The default address length reserved for new packets.
    59  */
     58/** The default address length reserved for new packets. */
    6059#define DEFAULT_ADDR_LEN        32
    6160
    62 /** The default prefix reserved for new packets.
    63  */
     61/** The default prefix reserved for new packets. */
    6462#define DEFAULT_PREFIX          64
    6563
    66 /** The default suffix reserved for new packets.
    67  */
     64/** The default suffix reserved for new packets. */
    6865#define DEFAULT_SUFFIX          64
    6966
    70 /** Packet server global data.
    71  */
    72 static struct{
    73         /** Safety lock.
    74          */
     67/** Packet server global data. */
     68static struct {
     69        /** Safety lock. */
    7570        fibril_mutex_t lock;
    76         /** Free packet queues.
    77          */
     71        /** Free packet queues. */
    7872        packet_t free[FREE_QUEUES_COUNT];
    79         /** Packet length upper bounds of the free packet queues.
    80          *  The maximal lengths of packets in each queue in the ascending order.
    81          *  The last queue is not limited.
     73       
     74        /**
     75         * Packet length upper bounds of the free packet queues. The maximal
     76         * lengths of packets in each queue in the ascending order. The last
     77         * queue is not limited.
    8278         */
    8379        size_t sizes[FREE_QUEUES_COUNT];
    84         /** Total packets allocated.
    85         */
     80       
     81        /** Total packets allocated. */
    8682        unsigned int count;
    8783} ps_globals = {
    8884        .lock = FIBRIL_MUTEX_INITIALIZER(ps_globals.lock),
    89         .free = {NULL, NULL, NULL, NULL, NULL, NULL, NULL},
    90         .sizes = {PAGE_SIZE, PAGE_SIZE * 2, PAGE_SIZE * 4, PAGE_SIZE * 8, PAGE_SIZE * 16, PAGE_SIZE * 32, PAGE_SIZE * 64},
     85        .free = {
     86                NULL,
     87                NULL,
     88                NULL,
     89                NULL,
     90                NULL,
     91                NULL,
     92                NULL
     93        },
     94        .sizes = {
     95                PAGE_SIZE,
     96                PAGE_SIZE * 2,
     97                PAGE_SIZE * 4,
     98                PAGE_SIZE * 8,
     99                PAGE_SIZE * 16,
     100                PAGE_SIZE * 32,
     101                PAGE_SIZE * 64
     102        },
    91103        .count = 0
    92104};
    … …  
    102114
    103115/** Clears and initializes the packet according to the given dimensions.
    104  *  @param[in] packet The packet to be initialized.
    105  *  @param[in] addr_len The source and destination addresses maximal length in bytes.
    106  *  @param[in] max_prefix The maximal prefix length in bytes.
    107  *  @param[in] max_content The maximal content length in bytes.
    108  *  @param[in] max_suffix The maximal suffix length in bytes.
    109  */
    110 static void packet_init(packet_t packet, size_t addr_len, size_t max_prefix, size_t max_content, size_t max_suffix){
     116 *
     117 * @param[in] packet    The packet to be initialized.
     118 * @param[in] addr_len  The source and destination addresses maximal length in
     119 *                      bytes.
     120 * @param[in] max_prefix The maximal prefix length in bytes.
     121 * @param[in] max_content The maximal content length in bytes.
     122 * @param[in] max_suffix The maximal suffix length in bytes.
     123 */
     124static void
     125packet_init(packet_t packet, size_t addr_len, size_t max_prefix,
     126    size_t max_content, size_t max_suffix)
     127{
    111128        // clear the packet content
    112         bzero(((void *) packet) + sizeof(struct packet), packet->length - sizeof(struct packet));
     129        bzero(((void *) packet) + sizeof(struct packet),
     130            packet->length - sizeof(struct packet));
     131       
    113132        // clear the packet header
    114133        packet->order = 0;
    … …  
    125144}
    126145
    127 /** Creates a&nbsp;new packet of dimensions at least as given.
    128  *  Should be used only when the global data are locked.
    129  *  @param[in] length The total length of the packet, including the header, the addresses and the data of the packet.
    130  *  @param[in] addr_len The source and destination addresses maximal length in bytes.
    131  *  @param[in] max_prefix The maximal prefix length in bytes.
    132  *  @param[in] max_content The maximal content length in bytes.
    133  *  @param[in] max_suffix The maximal suffix length in bytes.
    134  *  @returns The packet of dimensions at least as given.
    135  *  @returns NULL if there is not enough memory left.
    136  */
    137 static packet_t packet_create(size_t length, size_t addr_len, size_t max_prefix, size_t max_content, size_t max_suffix){
     146/** Creates a new packet of dimensions at least as given.
     147 *
     148 * Should be used only when the global data are locked.
     149 *
     150 * @param[in] length    The total length of the packet, including the header,
     151 *                      the addresses and the data of the packet.
     152 * @param[in] addr_len  The source and destination addresses maximal length in
     153 *                      bytes.
     154 * @param[in] max_prefix The maximal prefix length in bytes.
     155 * @param[in] max_content The maximal content length in bytes.
     156 * @param[in] max_suffix The maximal suffix length in bytes.
     157 * @returns             The packet of dimensions at least as given.
     158 * @returns             NULL if there is not enough memory left.
     159 */
     160static packet_t
     161packet_create(size_t length, size_t addr_len, size_t max_prefix,
     162    size_t max_content, size_t max_suffix)
     163{
    138164        ERROR_DECLARE;
    139165
    … …  
    141167
    142168        // already locked
    143         packet = (packet_t) mmap(NULL, length, PROTO_READ | PROTO_WRITE, MAP_SHARED | MAP_ANONYMOUS, 0, 0);
    144         if(packet == MAP_FAILED){
     169        packet = (packet_t) mmap(NULL, length, PROTO_READ | PROTO_WRITE,
     170            MAP_SHARED | MAP_ANONYMOUS, 0, 0);
     171        if (packet == MAP_FAILED)
    145172                return NULL;
    146         }
    147         ++ ps_globals.count;
     173
     174        ps_globals.count++;
    148175        packet->packet_id = ps_globals.count;
    149176        packet->length = length;
    150177        packet_init(packet, addr_len, max_prefix, max_content, max_suffix);
    151178        packet->magic_value = PACKET_MAGIC_VALUE;
    152         if(ERROR_OCCURRED(pm_add(packet))){
     179        if (ERROR_OCCURRED(pm_add(packet))) {
    153180                munmap(packet, packet->length);
    154181                return NULL;
    155182        }
     183       
    156184        return packet;
    157185}
    … …  
    163191 * Lock the global data during its processing.
    164192 *
    165  * @param[in] addr_len    The source and destination addresses
    166  *                        maximal length in bytes.
    167  * @param[in] max_prefix  The maximal prefix length in bytes.
     193 * @param[in] addr_len  The source and destination addresses maximal length in
     194 *                      bytes.
     195 * @param[in] max_prefix The maximal prefix length in bytes.
    168196 * @param[in] max_content The maximal content length in bytes.
    169  * @param[in] max_suffix  The maximal suffix length in bytes.
    170  *
    171  * @return The packet of dimensions at least as given.
    172  * @return NULL if there is not enough memory left.
    173  *
    174  */
    175 static packet_t packet_get_local(size_t addr_len, size_t max_prefix,
    176     size_t max_content, size_t max_suffix)
    177 {
    178         size_t length = ALIGN_UP(sizeof(struct packet) + 2 * addr_len + max_prefix
    179             + max_content + max_suffix, PAGE_SIZE);
     197 * @param[in] max_suffix The maximal suffix length in bytes.
     198 * @return              The packet of dimensions at least as given.
     199 * @return              NULL if there is not enough memory left.
     200 */
     201static packet_t
     202packet_get_local(size_t addr_len, size_t max_prefix, size_t max_content,
     203    size_t max_suffix)
     204{
     205        size_t length = ALIGN_UP(sizeof(struct packet) + 2 * addr_len +
     206            max_prefix + max_content + max_suffix, PAGE_SIZE);
    180207       
    181208        fibril_mutex_lock(&ps_globals.lock);
    … …  
    184211        unsigned int index;
    185212       
    186         for (index = 0; index < FREE_QUEUES_COUNT - 1; index++) {
    187                 if (length <= ps_globals.sizes[index]) {
    188                         packet = ps_globals.free[index];
     213        for (index = 0; index < FREE_QUEUES_COUNT; index++) {
     214                if (length > ps_globals.sizes[index])
     215                        continue;
     216               
     217                packet = ps_globals.free[index];
     218                while (packet_is_valid(packet) && (packet->length < length))
     219                        packet = pm_find(packet->next);
     220               
     221                if (packet_is_valid(packet)) {
     222                        if (packet == ps_globals.free[index])
     223                                ps_globals.free[index] = pq_detach(packet);
     224                        else
     225                                pq_detach(packet);
    189226                       
    190                         while (packet_is_valid(packet) && (packet->length < length))
    191                                 packet = pm_find(packet->next);
     227                        packet_init(packet, addr_len, max_prefix, max_content,
     228                            max_suffix);
     229                        fibril_mutex_unlock(&ps_globals.lock);
    192230                       
    193                         if (packet_is_valid(packet)) {
    194                                 if (packet == ps_globals.free[index])
    195                                         ps_globals.free[index] = pq_detach(packet);
    196                                 else
    197                                         pq_detach(packet);
    198                                
    199                                 packet_init(packet, addr_len, max_prefix, max_content,
    200                                     max_suffix);
    201                                 fibril_mutex_unlock(&ps_globals.lock);
    202                                
    203                                 return packet;
    204                         }
     231                        return packet;
    205232                }
    206233        }
    … …  
    228255/** Release the packet and returns it to the appropriate free packet queue.
    229256 *
    230  *  Should be used only when the global data are locked.
    231  *
    232  *  @param[in] packet The packet to be released.
    233  *
    234  */
    235 static void packet_release(packet_t packet){
     257 * Should be used only when the global data are locked.
     258 *
     259 * @param[in] packet    The packet to be released.
     260 *
     261 */
     262static void packet_release(packet_t packet)
     263{
    236264        int index;
    237265        int result;
    238266
    239         // remove debug dump
    240 //      printf("packet %d released\n", packet->packet_id);
    241         for(index = 0; (index < FREE_QUEUES_COUNT - 1) && (packet->length > ps_globals.sizes[index]); ++ index);
    242         result = pq_add(&ps_globals.free[index], packet, packet->length, packet->length);
     267        for (index = 0; (index < FREE_QUEUES_COUNT - 1) &&
     268            (packet->length > ps_globals.sizes[index]); index++) {
     269                ;
     270        }
     271       
     272        result = pq_add(&ps_globals.free[index], packet, packet->length,
     273            packet->length);
    243274        assert(result == EOK);
    244275}
    245276
    246277/** Releases the packet queue.
    247  *  @param[in] packet_id The first packet identifier.
    248  *  @returns EOK on success.
    249  *  @returns ENOENT if there is no such packet.
    250  */
    251 static int packet_release_wrapper(packet_id_t packet_id){
     278 *
     279 * @param[in] packet_id The first packet identifier.
     280 * @returns             EOK on success.
     281 * @returns             ENOENT if there is no such packet.
     282 */
     283static int packet_release_wrapper(packet_id_t packet_id)
     284{
    252285        packet_t packet;
    253286
    254287        packet = pm_find(packet_id);
    255         if(! packet_is_valid(packet)){
     288        if (!packet_is_valid(packet))
    256289                return ENOENT;
    257         }
     290
    258291        fibril_mutex_lock(&ps_globals.lock);
    259292        pq_destroy(packet, packet_release);
    260293        fibril_mutex_unlock(&ps_globals.lock);
     294
    261295        return EOK;
    262296}
    … …  
    268302
    269303/** Shares the packet memory block.
    270  *  @param[in] packet The packet to be shared.
    271  *  @returns EOK on success.
    272  *  @returns EINVAL if the packet is not valid.
    273  *  @returns EINVAL if the calling module does not accept the memory.
    274  *  @returns ENOMEM if the desired and actual sizes differ.
    275  *  @returns Other error codes as defined for the async_share_in_finalize() function.
    276  */
    277 static int packet_reply(const packet_t packet){
     304 * @param[in] packet    The packet to be shared.
     305 * @returns             EOK on success.
     306 * @returns             EINVAL if the packet is not valid.
     307 * @returns             EINVAL if the calling module does not accept the memory.
     308 * @returns             ENOMEM if the desired and actual sizes differ.
     309 * @returns             Other error codes as defined for the
     310 *                      async_share_in_finalize() function.
     311 */
     312static int packet_reply(const packet_t packet)
     313{
    278314        ipc_callid_t callid;
    279315        size_t size;
    280316
    281         if(! packet_is_valid(packet)){
     317        if (!packet_is_valid(packet))
    282318                return EINVAL;
    283         }
    284         if(async_share_in_receive(&callid, &size) <= 0) return EINVAL;
    285         if(size != packet->length){
     319
     320        if (!async_share_in_receive(&callid, &size)) {
     321                ipc_answer_0(callid, EINVAL);
     322                return EINVAL;
     323        }
     324
     325        if (size != packet->length) {
     326                ipc_answer_0(callid, ENOMEM);
    286327                return ENOMEM;
    287328        }
    288         return async_share_in_finalize(callid, packet, PROTO_READ | PROTO_WRITE);
    289 }
    290 
    291 int packet_server_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
     329       
     330        return async_share_in_finalize(callid, packet,
     331            PROTO_READ | PROTO_WRITE);
     332}
     333
     334/** Processes the packet server message.
     335 *
     336 * @param[in] callid    The message identifier.
     337 * @param[in] call      The message parameters.
     338 * @param[out] answer   The message answer parameters.
     339 * @param[out] answer_count The last parameter for the actual answer in the
     340 *                      answer parameter.
     341 * @returns             EOK on success.
     342 * @returns             ENOMEM if there is not enough memory left.
     343 * @returns             ENOENT if there is no such packet as in the packet
     344 *                      message parameter.
     345 * @returns             ENOTSUP if the message is not known.
     346 * @returns             Other error codes as defined for the
     347 *                      packet_release_wrapper() function.
     348 */
     349int
     350packet_server_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer,
     351    int *answer_count)
     352{
    292353        packet_t packet;
    293354
    294355        *answer_count = 0;
    295         switch(IPC_GET_METHOD(*call)){
    296                 case IPC_M_PHONE_HUNGUP:
    297                         return EOK;
    298                 case NET_PACKET_CREATE_1:
    299                         packet = packet_get_local(DEFAULT_ADDR_LEN, DEFAULT_PREFIX, IPC_GET_CONTENT(call), DEFAULT_SUFFIX);
    300                         if(! packet){
    301                                 return ENOMEM;
    302                         }
    303                         *answer_count = 2;
    304                         IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id);
    305                         IPC_SET_ARG2(*answer, (ipcarg_t) packet->length);
    306                         return EOK;
    307                 case NET_PACKET_CREATE_4:
    308                         packet = packet_get_local(((DEFAULT_ADDR_LEN < IPC_GET_ADDR_LEN(call)) ? IPC_GET_ADDR_LEN(call) : DEFAULT_ADDR_LEN), DEFAULT_PREFIX + IPC_GET_PREFIX(call), IPC_GET_CONTENT(call), DEFAULT_SUFFIX + IPC_GET_SUFFIX(call));
    309                         if(! packet){
    310                                 return ENOMEM;
    311                         }
    312                         *answer_count = 2;
    313                         IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id);
    314                         IPC_SET_ARG2(*answer, (ipcarg_t) packet->length);
    315                         return EOK;
    316                 case NET_PACKET_GET:
    317                         packet = pm_find(IPC_GET_ID(call));
    318                         if(! packet_is_valid(packet)){
    319                                 return ENOENT;
    320                         }
    321                         return packet_reply(packet);
    322                 case NET_PACKET_GET_SIZE:
    323                         packet = pm_find(IPC_GET_ID(call));
    324                         if(! packet_is_valid(packet)){
    325                                 return ENOENT;
    326                         }
    327                         IPC_SET_ARG1(*answer, (ipcarg_t) packet->length);
    328                         *answer_count = 1;
    329                         return EOK;
    330                 case NET_PACKET_RELEASE:
    331                         return packet_release_wrapper(IPC_GET_ID(call));
    332         }
     356        switch (IPC_GET_METHOD(*call)) {
     357        case IPC_M_PHONE_HUNGUP:
     358                return EOK;
     359       
     360        case NET_PACKET_CREATE_1:
     361                packet = packet_get_local(DEFAULT_ADDR_LEN, DEFAULT_PREFIX,
     362                    IPC_GET_CONTENT(call), DEFAULT_SUFFIX);
     363                if (!packet)
     364                        return ENOMEM;
     365                *answer_count = 2;
     366                IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id);
     367                IPC_SET_ARG2(*answer, (ipcarg_t) packet->length);
     368                return EOK;
     369       
     370        case NET_PACKET_CREATE_4:
     371                packet = packet_get_local(
     372                    ((DEFAULT_ADDR_LEN < IPC_GET_ADDR_LEN(call)) ?
     373                    IPC_GET_ADDR_LEN(call) : DEFAULT_ADDR_LEN),
     374                    DEFAULT_PREFIX + IPC_GET_PREFIX(call),
     375                    IPC_GET_CONTENT(call),
     376                    DEFAULT_SUFFIX + IPC_GET_SUFFIX(call));
     377                if (!packet)
     378                        return ENOMEM;
     379                *answer_count = 2;
     380                IPC_SET_ARG1(*answer, (ipcarg_t) packet->packet_id);
     381                IPC_SET_ARG2(*answer, (ipcarg_t) packet->length);
     382                return EOK;
     383       
     384        case NET_PACKET_GET:
     385                packet = pm_find(IPC_GET_ID(call));
     386                if (!packet_is_valid(packet))
     387                        return ENOENT;
     388                return packet_reply(packet);
     389       
     390        case NET_PACKET_GET_SIZE:
     391                packet = pm_find(IPC_GET_ID(call));
     392                if (!packet_is_valid(packet))
     393                        return ENOENT;
     394                IPC_SET_ARG1(*answer, (ipcarg_t) packet->length);
     395                *answer_count = 1;
     396                return EOK;
     397       
     398        case NET_PACKET_RELEASE:
     399                return packet_release_wrapper(IPC_GET_ID(call));
     400        }
     401       
    333402        return ENOTSUP;
    334403}

  • uspace/lib/packet/include/packet_local.h

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup packet
    30  *  @{
     29/** @addtogroup libpacket
     30 * @{
    3131 */
    3232
    … …  
    3434 */
    3535
    36 #ifndef __NET_PACKET_LOCAL_H__
    37 #define __NET_PACKET_LOCAL_H__
     36#ifndef LIBPACKET_PACKET_LOCAL_H_
     37#define LIBPACKET_PACKET_LOCAL_H_
    3838
    3939#include <net/packet.h>

  • uspace/lib/packet/include/packet_server.h

    r84b7384 re503d3a9  
    2727 */
    2828
    29 /** @addtogroup packet
    30  *  @{
     29/** @addtogroup libpacket
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  Packet server.
    35  *  The hosting module has to be compiled with both the packet.c and the packet_server.c source files.
    36  *  To function correctly, initialization of the packet map by the pm_init() function has to happen at the first place.
    37  *  Then the packet messages have to be processed by the packet_server_message() function.
    38  *  The packet map should be released by the pm_destroy() function during the module termination.
    39  *  @see IS_NET_PACKET_MESSAGE()
     34 * Packet server.
     35 * The hosting module has to be compiled with both the packet.c and the
     36 * packet_server.c source files. To function correctly, initialization of the
     37 * packet map by the pm_init() function has to happen at the first place. Then
     38 * the packet messages have to be processed by the packet_server_message()
     39 * function. The packet map should be released by the pm_destroy() function
     40 * during the module termination.
     41 * @see IS_NET_PACKET_MESSAGE()
    4042 */
    4143
    42 #ifndef __NET_PACKET_SERVER_H__
    43 #define __NET_PACKET_SERVER_H__
     44#ifndef LIBPACKET_PACKET_SERVER_H_
     45#define LIBPACKET_PACKET_SERVER_H_
    4446
    4547#include <ipc/ipc.h>
    4648
    47 /** Processes the packet server message.
    48  *  @param[in] callid The message identifier.
    49  *  @param[in] call The message parameters.
    50  *  @param[out] answer The message answer parameters.
    51  *  @param[out] answer_count The last parameter for the actual answer in the answer parameter.
    52  *  @returns EOK on success.
    53  *  @returns ENOMEM if there is not enough memory left.
    54  *  @returns ENOENT if there is no such packet as in the packet message parameter..
    55  *  @returns ENOTSUP if the message is not known.
    56  *  @returns Other error codes as defined for the packet_release_wrapper() function.
    57  */
    58 extern int packet_server_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
     49extern int packet_server_message(ipc_callid_t, ipc_call_t *, ipc_call_t *,
     50    int *);
    5951
    6052#endif

  • uspace/srv/fs/fat/fat_ops.c

    r84b7384 re503d3a9  
    369369        unsigned blocks;
    370370        fat_dentry_t *d;
     371        dev_handle_t dev_handle;
    371372        block_t *b;
    372373        int rc;
    373374
    374375        fibril_mutex_lock(&parentp->idx->lock);
    375         bs = block_bb_get(parentp->idx->dev_handle);
     376        dev_handle = parentp->idx->dev_handle;
     377        fibril_mutex_unlock(&parentp->idx->lock);
     378
     379        bs = block_bb_get(dev_handle);
    376380        blocks = parentp->size / BPS(bs);
    377381        for (i = 0; i < blocks; i++) {
    378382                rc = fat_block_get(&b, bs, parentp, i, BLOCK_FLAGS_NONE);
    379                 if (rc != EOK) {
    380                         fibril_mutex_unlock(&parentp->idx->lock);
     383                if (rc != EOK)
    381384                        return rc;
    382                 }
    383385                for (j = 0; j < DPS(bs); j++) {
    384386                        d = ((fat_dentry_t *)b->data) + j;
    … …  
    390392                                /* miss */
    391393                                rc = block_put(b);
    392                                 fibril_mutex_unlock(&parentp->idx->lock);
    393394                                *rfn = NULL;
    394395                                return rc;
    … …  
    401402                                /* hit */
    402403                                fat_node_t *nodep;
    403                                 /*
    404                                  * Assume tree hierarchy for locking.  We
    405                                  * already have the parent and now we are going
    406                                  * to lock the child.  Never lock in the oposite
    407                                  * order.
    408                                  */
    409                                 fat_idx_t *idx = fat_idx_get_by_pos(
    410                                     parentp->idx->dev_handle, parentp->firstc,
    411                                     i * DPS(bs) + j);
    412                                 fibril_mutex_unlock(&parentp->idx->lock);
     404                                fat_idx_t *idx = fat_idx_get_by_pos(dev_handle,
     405                                    parentp->firstc, i * DPS(bs) + j);
    413406                                if (!idx) {
    414407                                        /*
    … …  
    433426                }
    434427                rc = block_put(b);
    435                 if (rc != EOK) {
    436                         fibril_mutex_unlock(&parentp->idx->lock);
     428                if (rc != EOK)
    437429                        return rc;
    438                 }
    439         }
    440 
    441         fibril_mutex_unlock(&parentp->idx->lock);
     430        }
     431
    442432        *rfn = NULL;
    443433        return EOK;

  • uspace/srv/net/il/arp/arp_module.c

    r84b7384 re503d3a9  
    5757extern arp_globals_t    arp_globals;
    5858
    59 /** Processes the ARP message.
    60  *  @param[in] callid The message identifier.
    61  *  @param[in] call The message parameters.
    62  *  @param[out] answer The message answer parameters.
    63  *  @param[out] answer_count The last parameter for the actual answer in the answer parameter.
    64  *  @returns EOK on success.
    65  *  @returns Other error codes as defined for the arp_message() function.
    66  */
    6759int il_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
    6860        return arp_message_standalone(callid, call, answer, answer_count);
    6961}
    7062
    71 /** Starts the ARP module.
    72  *  Initializes the client connection serving function, initializes the module, registers the module service and starts the async manager, processing IPC messages in an infinite loop.
    73  *  @param[in] client_connection The client connection processing function. The module skeleton propagates its own one.
    74  *  @returns EOK on successful module termination.
    75  *  @returns Other error codes as defined for the arp_initialize() function.
    76  *  @returns Other error codes as defined for the REGISTER_ME() macro function.
    77  */
    7863int il_module_start_standalone(async_client_conn_t client_connection){
    7964        ERROR_DECLARE;

  • uspace/srv/net/il/ip/ip.c

    r84b7384 re503d3a9  
    6767#include <ip_client.h>
    6868#include <ip_interface.h>
     69#include <ip_header.h>
    6970#include <net_interface.h>
    7071#include <nil_interface.h>
    … …  
    7778
    7879#include "ip.h"
    79 #include "ip_header.h"
    8080#include "ip_module.h"
    8181#include "ip_local.h"

  • uspace/srv/net/il/ip/ip_module.c

    r84b7384 re503d3a9  
    5656extern ip_globals_t ip_globals;
    5757
    58 /** Processes the IP message.
    59  *  @param[in] callid The message identifier.
    60  *  @param[in] call The message parameters.
    61  *  @param[out] answer The message answer parameters.
    62  *  @param[out] answer_count The last parameter for the actual answer in the answer parameter.
    63  *  @returns EOK on success.
    64  *  @returns Other error codes as defined for the ip_message() function.
    65  */
    6658int il_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
    6759        return ip_message_standalone(callid, call, answer, answer_count);
    6860}
    6961
    70 /** Starts the IP module.
    71  *  Initializes the client connection serving function, initializes the module, registers the module service and starts the async manager, processing IPC messages in an infinite loop.
    72  *  @param[in] client_connection The client connection processing function. The module skeleton propagates its own one.
    73  *  @returns EOK on successful module termination.
    74  *  @returns Other error codes as defined for the ip_initialize() function.
    75  *  @returns Other error codes as defined for the REGISTER_ME() macro function.
    76  */
    7762int il_module_start_standalone(async_client_conn_t client_connection){
    7863        ERROR_DECLARE;

  • uspace/srv/net/nil/eth/eth_module.c

    r84b7384 re503d3a9  
    5050#include "eth.h"
    5151
    52 /** Starts the Ethernet module.
    53  *  Initializes the client connection serving function, initializes the module, registers the module service and starts the async manager, processing IPC messages in an infinite loop.
    54  *  @param[in] client_connection The client connection processing function. The module skeleton propagates its own one.
    55  *  @returns EOK on success.
    56  *  @returns Other error codes as defined for the pm_init() function.
    57  *  @returns Other error codes as defined for the nil_initialize() function.
    58  *  @returns Other error codes as defined for the REGISTER_ME() macro function.
    59  */
    6052int nil_module_start_standalone(async_client_conn_t client_connection)
    6153{
    … …  
    7971}
    8072
    81 /** Pass the parameters to the module specific nil_message() function.
    82  *
    83  * @param[in]  name         Module name.
    84  * @param[in]  callid       The message identifier.
    85  * @param[in]  call         The message parameters.
    86  * @param[out] answer       The message answer parameters.
    87  * @param[out] answer_count The last parameter for the actual answer
    88  *                          in the answer parameter.
    89  *
    90  * @return EOK on success.
    91  * @return ENOTSUP if the message is not known.
    92  * @return Other error codes as defined for each
    93  *         specific module message function.
    94  *
    95  */
    9673int nil_module_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call,
    9774    ipc_call_t *answer, int *answer_count)

  • uspace/srv/net/nil/nildummy/nildummy_module.c

    r84b7384 re503d3a9  
    5050#include "nildummy.h"
    5151
    52 /** Start the dummy nil module.
    53  *
    54  * Initialize the client connection serving function, initialize
    55  * the module, register the module service and start the async
    56  * manager, processing IPC messages in an infinite loop.
    57  *
    58  * @param[in] client_connection The client connection processing
    59  *                              function. The module skeleton propagates
    60  *                              its own one.
    61  *
    62  * @return EOK on success.
    63  * @return Other error codes as defined for the pm_init() function.
    64  * @return Other error codes as defined for the nil_initialize() function.
    65  * @return Other error codes as defined for the REGISTER_ME() macro function.
    66  *
    67  */
    6852int nil_module_start_standalone(async_client_conn_t client_connection)
    6953{
    … …  
    8771}
    8872
    89 /** Pass the parameters to the module specific nil_message() function.
    90  *
    91  * @param[in]  name         Module name.
    92  * @param[in]  callid       The message identifier.
    93  * @param[in]  call         The message parameters.
    94  * @param[out] answer       The message answer parameters.
    95  * @param[out] answer_count The last parameter for the actual answer
    96  *                          in the answer parameter.
    97  *
    98  * @return EOK on success.
    99  * @return ENOTSUP if the message is not known.
    100  * @return Other error codes as defined for each specific
    101  *          module message function.
    102  *
    103  */
    10473int nil_module_message_standalone(const char *name, ipc_callid_t callid,
    10574    ipc_call_t *call, ipc_call_t *answer, int *answer_count)

  • uspace/srv/net/tl/tcp/tcp.c

    r84b7384 re503d3a9  
    20332033        if (!fibril) {
    20342034                free(operation_timeout);
    2035                 return EPARTY;
     2035                return EPARTY;  /* FIXME: use another EC */
    20362036        }
    20372037//      fibril_mutex_lock(&socket_data->operation.mutex);
Note: See TracChangeset for help on using the changeset viewer.