Changes in / [ec1bdc8:2a786f9] in mainline


Ignore:
Location:
uspace
Files:
11 added
9 deleted
41 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/netecho/netecho.c

    rec1bdc8 r2a786f9  
    4141#include <task.h>
    4242#include <arg_parse.h>
    43 #include <err.h>
    4443
    4544#include <in.h>
    … …  
    4746#include <inet.h>
    4847#include <socket.h>
     48#include <net_err.h>
    4949#include <socket_parse.h>
    5050

  • uspace/app/netecho/print_error.c

    rec1bdc8 r2a786f9  
    3636
    3737#include <stdio.h>
    38 #include <errno.h>
    3938
    4039#include <icmp_codes.h>
     40#include <socket_errno.h>
    4141
    4242#include "print_error.h"

  • uspace/app/nettest1/nettest.c

    rec1bdc8 r2a786f9  
    3636
    3737#include <stdio.h>
    38 #include <err.h>
    3938
    4039#include <socket.h>
     40#include <net_err.h>
    4141
    4242#include "nettest.h"

  • uspace/app/nettest1/nettest1.c

    rec1bdc8 r2a786f9  
    4141#include <time.h>
    4242#include <arg_parse.h>
    43 #include <err.h>
    4443
    4544#include <in.h>
    … …  
    4746#include <inet.h>
    4847#include <socket.h>
     48#include <net_err.h>
    4949#include <socket_parse.h>
    5050

  • uspace/app/nettest2/nettest2.c

    rec1bdc8 r2a786f9  
    4141#include <time.h>
    4242#include <arg_parse.h>
    43 #include <err.h>
    4443
    4544#include <in.h>
    … …  
    4746#include <inet.h>
    4847#include <socket.h>
     48#include <net_err.h>
    4949#include <socket_parse.h>
    5050

  • uspace/app/ping/ping.c

    rec1bdc8 r2a786f9  
    4242#include <ipc/services.h>
    4343#include <str_error.h>
    44 #include <errno.h>
    4544#include <arg_parse.h>
    4645
    … …  
    5049#include <inet.h>
    5150#include <ip_codes.h>
     51#include <socket_errno.h>
    5252#include <socket_parse.h>
    5353

  • uspace/lib/c/Makefile

    rec1bdc8 r2a786f9  
    8989        generic/adt/list.o \
    9090        generic/adt/hash_table.o \
    91         generic/adt/dynamic_fifo.c \
    92         generic/adt/measured_strings.c \
    93         generic/adt/char_map.c \
    9491        generic/time.c \
    9592        generic/err.c \

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

    rec1bdc8 r2a786f9  
    3636#define LIBC_ERR_H_
    3737
    38 #include <stdio.h>
    39 #include <errno.h>
    40 
    41 #ifdef CONFIG_DEBUG
    42 #include <str_error.h>
    43 #endif
    44 
    4538#define errx(status, fmt, ...) { \
    4639        printf((fmt), ##__VA_ARGS__); \
    … …  
    4841}
    4942
    50 
    51 /** An actual stored error code.  */
    52 #define ERROR_CODE  error_check_return_value
    53 
    54 /** An error processing routines declaration.
    55  *
    56  * This has to be declared in the block where the error processing
    57  * is desired.
    58  */
    59 #define ERROR_DECLARE  int ERROR_CODE
    60 
    61 /** Store the value as an error code and checks if an error occurred.
    62  *
    63  * @param[in] value     The value to be checked. May be a function call.
    64  * @return              False if the value indicates success (EOK).
    65  * @return              True otherwise.
    66  */
    67 #ifdef CONFIG_DEBUG
    68 
    69 #define ERROR_OCCURRED(value) \
    70         (((ERROR_CODE = (value)) != EOK) && \
    71         ({ \
    72                 fprintf(stderr, "libsocket error at %s:%d (%s)\n", \
    73                 __FILE__, __LINE__, str_error(ERROR_CODE)); \
    74                 1; \
    75         }))
    76 
    77 #else
    78 
    79 #define ERROR_OCCURRED(value)   ((ERROR_CODE = (value)) != EOK)
    80 
    81 #endif
    82 
    83 #define ERROR_NONE(value)       !ERROR_OCCURRED((value))
    84 
    85 /** Error propagation
    86  *
    87  * Check if an error occurred and immediately exit the actual
    88  * function returning the error code.
    89  *
    90  * @param[in] value     The value to be checked. May be a function call.
    91  *
    92  */
    93 
    94 #define ERROR_PROPAGATE(value) \
    95         if (ERROR_OCCURRED(value)) \
    96                 return ERROR_CODE
    97 
    9843#endif
    9944

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

    rec1bdc8 r2a786f9  
    5656#define EMLINK        (-266)
    5757
    58 /** An API function is called while another blocking function is in progress. */
    59 #define EINPROGRESS     (-10036)
    60 
    61 /** The socket identifier is not valid. */
    62 #define ENOTSOCK        (-10038)
    63 
    64 /** The destination address required. */
    65 #define EDESTADDRREQ    (-10039)
    66 
    67 /** Protocol is not supported.  */
    68 #define EPROTONOSUPPORT (-10043)
    69 
    70 /** Socket type is not supported. */
    71 #define ESOCKTNOSUPPORT (-10044)
    72 
    73 /** Protocol family is not supported. */
    74 #define EPFNOSUPPORT    (-10046)
    75 
    76 /** Address family is not supported. */
    77 #define EAFNOSUPPORT    (-10047)
    78 
    79 /** Address is already in use. */
    80 #define EADDRINUSE      (-10048)
    81 
    82 /** The socket is not connected or bound. */
    83 #define ENOTCONN        (-10057)
    84 
    85 /** The requested operation was not performed.
    86  *  Try again later.
    87  */
    88 #define TRY_AGAIN       (-11002)
    89 
    90 /** No data.
    91  */
    92 #define NO_DATA         (-11004)
    93 
    9458#endif
    9559

  • uspace/lib/net/adt/module_map.c

    rec1bdc8 r2a786f9  
    3838#include <task.h>
    3939#include <unistd.h>
    40 #include <err.h>
    4140
    4241#include <ipc/services.h>
    4342
     43#include <net_err.h>
    4444#include <net_modules.h>
    4545

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

    rec1bdc8 r2a786f9  
    3838#include <async.h>
    3939#include <errno.h>
    40 #include <err.h>
    4140#include <ipc/ipc.h>
    4241#include <sys/mman.h>
    4342
     43#include <net_err.h>
    4444#include <net_messages.h>
    4545#include <packet/packet.h>

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

    rec1bdc8 r2a786f9  
    4040
    4141#include <ip_client.h>
     42#include <socket_errno.h>
    4243#include <packet/packet.h>
    4344#include <packet/packet_client.h>

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

    rec1bdc8 r2a786f9  
    4444#include <ipc/ipc.h>
    4545#include <ipc/services.h>
    46 #include <err.h>
    4746
    4847#include <adt/measured_strings.h>
     48#include <net_err.h>
    4949#include <net_device.h>
    5050#include <packet/packet.h>

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

    rec1bdc8 r2a786f9  
    4242#include <ipc/ipc.h>
    4343#include <ipc/services.h>
    44 #include <err.h>
    45 
     44
     45#include <net_err.h>
    4646#include <net_messages.h>
    4747#include <net_modules.h>

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

    rec1bdc8 r2a786f9  
    3838#include <async.h>
    3939#include <ipc/services.h>
    40 #include <errno.h>
    41 #include <err.h>
    42 
     40
     41#include <net_err.h>
    4342#include <packet/packet.h>
    4443#include <packet/packet_client.h>
    … …  
    5251#include <ip_remote.h>
    5352#include <socket_codes.h>
     53#include <socket_errno.h>
    5454#include <ip_interface.h>
    5555#include <tl_interface.h>

  • uspace/lib/socket/Makefile

    rec1bdc8 r2a786f9  
    4242        packet/packet.c \
    4343        packet/packet_client.c \
    44         packet/packet_server.c
     44        packet/packet_server.c \
     45        adt/dynamic_fifo.c \
     46        adt/measured_strings.c \
     47        adt/char_map.c
    4548
    4649include $(USPACE_PREFIX)/Makefile.common

  • uspace/lib/socket/generic/net_modules.c

    rec1bdc8 r2a786f9  
    3737#include <async.h>
    3838#include <malloc.h>
    39 #include <err.h>
    4039
    4140#include <ipc/ipc.h>
    … …  
    4443#include <sys/time.h>
    4544
     45#include <net_err.h>
    4646#include <net_modules.h>
    4747

  • uspace/lib/socket/generic/socket_client.c

    rec1bdc8 r2a786f9  
    4242#include <stdint.h>
    4343#include <stdlib.h>
    44 #include <errno.h>
    45 #include <err.h>
    4644
    4745#include <ipc/services.h>
    4846
     47#include <net_err.h>
    4948#include <net_modules.h>
    5049#include <in.h>
    5150#include <socket.h>
     51#include <socket_errno.h>
    5252#include <adt/dynamic_fifo.h>
    5353#include <adt/int_map.h>

  • uspace/lib/socket/generic/socket_core.c

    rec1bdc8 r2a786f9  
    3737#include <stdint.h>
    3838#include <stdlib.h>
    39 #include <errno.h>
    40 #include <err.h>
    41 
     39
     40#include <net_err.h>
    4241#include <in.h>
    4342#include <inet.h>
    4443#include <socket_codes.h>
     44#include <socket_errno.h>
    4545#include <adt/dynamic_fifo.h>
    4646#include <adt/int_map.h>

  • uspace/lib/socket/include/socket.h

    rec1bdc8 r2a786f9  
    4545#include <inet.h>
    4646#include <socket_codes.h>
    47 #include <errno.h>
     47#include <socket_errno.h>
    4848
    4949/** @name Socket application programming interface

  • uspace/lib/socket/packet/packet.c

    rec1bdc8 r2a786f9  
    3636 */
    3737
     38#include <errno.h>
    3839#include <malloc.h>
    3940#include <mem.h>
    4041#include <fibril_synch.h>
    4142#include <unistd.h>
    42 #include <errno.h>
    43 #include <err.h>
    4443
    4544#include <sys/mman.h>
    4645
     46#include <net_err.h>
    4747#include <adt/generic_field.h>
    4848#include <packet/packet.h>

  • uspace/lib/socket/packet/packet_client.c

    rec1bdc8 r2a786f9  
    4646#include <packet/packet_client.h>
    4747
    48 int packet_copy_data(packet_t packet, const void * data, size_t length)
    49 {
    50         if (!packet_is_valid(packet))
     48int packet_copy_data(packet_t packet, const void * data, size_t length){
     49        if(! packet_is_valid(packet)){
    5150                return EINVAL;
    52 
    53         if (packet->data_start + length >= packet->length)
     51        }
     52        if(packet->data_start + length >= packet->length){
    5453                return ENOMEM;
    55 
     54        }
    5655        memcpy((void *) packet + packet->data_start, data, length);
    57         if (packet->data_start + length > packet->data_end)
     56        if(packet->data_start + length > packet->data_end){
    5857                packet->data_end = packet->data_start + length;
    59 
     58        }
    6059        return EOK;
    6160}
    6261
    63 void *packet_prefix(packet_t packet, size_t length)
    64 {
    65         if ((!packet_is_valid(packet)) ||
    66             (packet->data_start - sizeof(struct packet) -
    67             2 * (packet->dest_addr - packet->src_addr) < length)) {
     62void * packet_prefix(packet_t packet, size_t length){
     63        if((! packet_is_valid(packet)) || (packet->data_start - sizeof(struct packet) - 2 * (packet->dest_addr - packet->src_addr) < length)){
    6864                return NULL;
    6965        }
    70 
    7166        packet->data_start -= length;
    7267        return (void *) packet + packet->data_start;
    7368}
    7469
    75 void *packet_suffix(packet_t packet, size_t length)
    76 {
    77         if ((!packet_is_valid(packet)) ||
    78             (packet->data_end + length >= packet->length)) {
     70void * packet_suffix(packet_t packet, size_t length){
     71        if((! packet_is_valid(packet)) || (packet->data_end + length >= packet->length)){
    7972                return NULL;
    8073        }
    81 
    8274        packet->data_end += length;
    8375        return (void *) packet + packet->data_end - length;
    8476}
    8577
    86 int packet_trim(packet_t packet, size_t prefix, size_t suffix)
    87 {
    88         if (!packet_is_valid(packet))
     78int packet_trim(packet_t packet, size_t prefix, size_t suffix){
     79        if(! packet_is_valid(packet)){
    8980                return EINVAL;
    90 
    91         if (prefix + suffix > PACKET_DATA_LENGTH(packet))
     81        }
     82        if(prefix + suffix > PACKET_DATA_LENGTH(packet)){
    9283                return ENOMEM;
    93 
     84        }
    9485        packet->data_start += prefix;
    9586        packet->data_end -= suffix;
    … …  
    9788}
    9889
    99 packet_id_t packet_get_id(const packet_t packet)
    100 {
     90packet_id_t packet_get_id(const packet_t packet){
    10191        return packet_is_valid(packet) ? packet->packet_id : 0;
    10292}
    10393
    104 int packet_get_addr(const packet_t packet, uint8_t ** src, uint8_t ** dest)
    105 {
    106         if (!packet_is_valid(packet))
     94int packet_get_addr(const packet_t packet, uint8_t ** src, uint8_t ** dest){
     95        if(! packet_is_valid(packet)){
    10796                return EINVAL;
    108         if (!packet->addr_len)
     97        }
     98        if(! packet->addr_len){
    10999                return 0;
    110         if (src)
     100        }
     101        if(src){
    111102                *src = (void *) packet + packet->src_addr;
    112         if (dest)
     103        }
     104        if(dest){
    113105                *dest = (void *) packet + packet->dest_addr;
    114 
     106        }
    115107        return packet->addr_len;
    116108}
    117109
    118 size_t packet_get_data_length(const packet_t packet)
    119 {
    120         if (!packet_is_valid(packet))
     110size_t packet_get_data_length(const packet_t packet){
     111        if(! packet_is_valid(packet)){
    121112                return 0;
    122 
     113        }
    123114        return PACKET_DATA_LENGTH(packet);
    124115}
    125116
    126 void *packet_get_data(const packet_t packet)
    127 {
    128         if (!packet_is_valid(packet))
     117void * packet_get_data(const packet_t packet){
     118        if(! packet_is_valid(packet)){
    129119                return NULL;
    130 
     120        }
    131121        return (void *) packet + packet->data_start;
    132122}
    … …  
    170160}
    171161
    172 packet_t packet_get_copy(int phone, packet_t packet)
    173 {
     162packet_t packet_get_copy(int phone, packet_t packet){
    174163        packet_t copy;
    175164        uint8_t * src = NULL;
    … …  
    177166        size_t addrlen;
    178167
    179         if (!packet_is_valid(packet))
     168        if(! packet_is_valid(packet)){
    180169                return NULL;
    181 
     170        }
    182171        // get a new packet
    183         copy = packet_get_4_local(phone, PACKET_DATA_LENGTH(packet),
    184             PACKET_MAX_ADDRESS_LENGTH(packet), packet->max_prefix,
    185             PACKET_MIN_SUFFIX(packet));
    186         if (!copy)
     172        copy = packet_get_4_local(phone, PACKET_DATA_LENGTH(packet), PACKET_MAX_ADDRESS_LENGTH(packet), packet->max_prefix, PACKET_MIN_SUFFIX(packet));
     173        if(! copy){
    187174                return NULL;
    188 
     175        }
    189176        // get addresses
    190177        addrlen = packet_get_addr(packet, &src, &dest);
    191178        // copy data
    192         if ((packet_copy_data(copy, packet_get_data(packet),
    193             PACKET_DATA_LENGTH(packet)) == EOK) &&
    194             // copy addresses if present
    195             ((addrlen <= 0) ||
    196             (packet_set_addr(copy, src, dest, addrlen) == EOK))) {
     179        if((packet_copy_data(copy, packet_get_data(packet), PACKET_DATA_LENGTH(packet)) == EOK)
     180        // copy addresses if present
     181                && ((addrlen <= 0) || (packet_set_addr(copy, src, dest, addrlen) == EOK))){
    197182                copy->order = packet->order;
    198183                copy->metric = packet->metric;
    199184                return copy;
    200         } else {
     185        }else{
    201186                pq_release_local(phone, copy->packet_id);
    202187                return NULL;

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

    rec1bdc8 r2a786f9  
    3939#include <async.h>
    4040#include <errno.h>
    41 #include <err.h>
    4241#include <fibril_synch.h>
    4342#include <unistd.h>
    … …  
    4645#include <sys/mman.h>
    4746
     47#include <net_err.h>
    4848#include <net_messages.h>
    4949#include <packet/packet.h>

  • uspace/srv/hw/netif/dp8390/dp8390_module.c

    rec1bdc8 r2a786f9  
    3939#include <ddi.h>
    4040#include <errno.h>
    41 #include <err.h>
    4241#include <malloc.h>
    4342#include <ipc/ipc.h>
    4443#include <ipc/services.h>
    4544
     45#include <net_err.h>
    4646#include <net_messages.h>
    4747#include <net_modules.h>

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

    rec1bdc8 r2a786f9  
    4545#include <ipc/ipc.h>
    4646#include <ipc/services.h>
    47 #include <err.h>
    48 
     47
     48#include <net_err.h>
    4949#include <net_messages.h>
    5050#include <net_modules.h>

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

    rec1bdc8 r2a786f9  
    4040#include <async.h>
    4141#include <stdio.h>
    42 #include <err.h>
    4342
    4443#include <ipc/ipc.h>
    4544#include <ipc/services.h>
    4645
     46#include <net_err.h>
    4747#include <net_modules.h>
    4848#include <net_interface.h>

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

    rec1bdc8 r2a786f9  
    3838#include <async.h>
    3939#include <errno.h>
    40 #include <err.h>
    4140#include <fibril_synch.h>
    4241#include <stdio.h>
    … …  
    4645#include <sys/types.h>
    4746
     47#include <net_err.h>
    4848#include <net_messages.h>
    4949#include <net_modules.h>
    … …  
    6565#include <tl_interface.h>
    6666#include <socket_codes.h>
     67#include <socket_errno.h>
    6768#include <adt/measured_strings.h>
    6869#include <adt/module_map.h>

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

    rec1bdc8 r2a786f9  
    4242#include <ipc/ipc.h>
    4343#include <ipc/services.h>
    44 #include <err.h>
    4544
     45#include <net_err.h>
    4646#include <net_modules.h>
    4747#include <net_interface.h>

  • uspace/srv/net/net/net.c

    rec1bdc8 r2a786f9  
    4040#include <ddi.h>
    4141#include <errno.h>
    42 #include <err.h>
    4342#include <malloc.h>
    4443#include <stdio.h>
    … …  
    4847#include <ipc/services.h>
    4948
     49#include <net_err.h>
    5050#include <net_messages.h>
    5151#include <net_modules.h>

  • uspace/srv/net/netif/lo/lo.c

    rec1bdc8 r2a786f9  
    3737#include <async.h>
    3838#include <errno.h>
    39 #include <err.h>
    4039#include <stdio.h>
    4140#include <str.h>
    … …  
    4443#include <ipc/services.h>
    4544
     45#include <net_err.h>
    4646#include <net_messages.h>
    4747#include <net_modules.h>

  • uspace/srv/net/netstart/netstart.c

    rec1bdc8 r2a786f9  
    4545#include <task.h>
    4646#include <str_error.h>
    47 #include <err.h>
    4847#include <ipc/ipc.h>
    4948#include <ipc/services.h>
    5049
     50#include <net_err.h>
    5151#include <net_modules.h>
    5252#include <net_net_messages.h>

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

    rec1bdc8 r2a786f9  
    4141#include <stdio.h>
    4242#include <str.h>
    43 #include <err.h>
    4443
    4544#include <ipc/ipc.h>
    4645#include <ipc/services.h>
    4746
     47#include <net_err.h>
    4848#include <net_messages.h>
    4949#include <net_modules.h>

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

    rec1bdc8 r2a786f9  
    3838#include <async.h>
    3939#include <stdio.h>
    40 #include <err.h>
    4140
    4241#include <ipc/ipc.h>
    4342#include <ipc/services.h>
    4443
     44#include <net_err.h>
    4545#include <net_modules.h>
    4646#include <net_interface.h>

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

    rec1bdc8 r2a786f9  
    4141#include <stdio.h>
    4242#include <str.h>
    43 #include <err.h>
    4443#include <ipc/ipc.h>
    4544#include <ipc/services.h>
    4645
     46#include <net_err.h>
    4747#include <net_messages.h>
    4848#include <net_modules.h>

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

    rec1bdc8 r2a786f9  
    3838#include <async.h>
    3939#include <stdio.h>
    40 #include <err.h>
    4140
    4241#include <ipc/ipc.h>
    4342#include <ipc/services.h>
    4443
     44#include <net_err.h>
    4545#include <net_modules.h>
    4646#include <net_interface.h>

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

    rec1bdc8 r2a786f9  
    4646#include <sys/time.h>
    4747#include <sys/types.h>
    48 #include <errno.h>
    49 #include <err.h>
    50 
     48
     49#include <net_err.h>
    5150#include <net_messages.h>
    5251#include <net_modules.h>
    … …  
    6766#include <net_interface.h>
    6867#include <socket_codes.h>
     68#include <socket_errno.h>
    6969#include <tl_messages.h>
    7070#include <tl_interface.h>

  • uspace/srv/net/tl/icmp/icmp_module.c

    rec1bdc8 r2a786f9  
    4040#include <async.h>
    4141#include <stdio.h>
    42 #include <err.h>
    4342#include <ipc/ipc.h>
    4443#include <ipc/services.h>
    4544
     45#include <net_err.h>
    4646#include <net_modules.h>
    4747#include <packet/packet.h>

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

    rec1bdc8 r2a786f9  
    4242//TODO remove stdio
    4343#include <stdio.h>
    44 #include <errno.h>
    45 #include <err.h>
    4644
    4745#include <ipc/ipc.h>
    4846#include <ipc/services.h>
    4947
     48#include <net_err.h>
    5049#include <net_messages.h>
    5150#include <net_modules.h>
    … …  
    6463#include <net_interface.h>
    6564#include <socket_codes.h>
     65#include <socket_errno.h>
    6666#include <tcp_codes.h>
    6767#include <socket_core.h>

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

    rec1bdc8 r2a786f9  
    4040#include <async.h>
    4141#include <stdio.h>
    42 #include <err.h>
    4342#include <ipc/ipc.h>
    4443#include <ipc/services.h>
    4544
     45#include <net_err.h>
    4646#include <net_modules.h>
    4747#include <packet/packet.h>

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

    rec1bdc8 r2a786f9  
    4242#include <ipc/ipc.h>
    4343#include <ipc/services.h>
    44 #include <errno.h>
    45 #include <err.h>
    46 
     44
     45#include <net_err.h>
    4746#include <net_messages.h>
    4847#include <net_modules.h>
    … …  
    6160#include <net_interface.h>
    6261#include <socket_codes.h>
     62#include <socket_errno.h>
    6363#include <socket_core.h>
    6464#include <socket_messages.h>

  • uspace/srv/net/tl/udp/udp_module.c

    rec1bdc8 r2a786f9  
    4040#include <async.h>
    4141#include <stdio.h>
    42 #include <err.h>
    4342#include <ipc/ipc.h>
    4443#include <ipc/services.h>
    4544
     45#include <net_err.h>
    4646#include <net_modules.h>
    4747#include <packet/packet.h>
Note: See TracChangeset for help on using the changeset viewer.