Changes in / [2a786f9:ec1bdc8] in mainline
- Location:
- uspace
- Files:
-
- 9 added
- 11 deleted
- 41 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/netecho/netecho.c
r2a786f9 rec1bdc8 41 41 #include <task.h> 42 42 #include <arg_parse.h> 43 #include <err.h> 43 44 44 45 #include <in.h> … … 46 47 #include <inet.h> 47 48 #include <socket.h> 48 #include <net_err.h>49 49 #include <socket_parse.h> 50 50 -
uspace/app/netecho/print_error.c
r2a786f9 rec1bdc8 36 36 37 37 #include <stdio.h> 38 #include <errno.h> 38 39 39 40 #include <icmp_codes.h> 40 #include <socket_errno.h>41 41 42 42 #include "print_error.h" -
uspace/app/nettest1/nettest.c
r2a786f9 rec1bdc8 36 36 37 37 #include <stdio.h> 38 #include <err.h> 38 39 39 40 #include <socket.h> 40 #include <net_err.h>41 41 42 42 #include "nettest.h" -
uspace/app/nettest1/nettest1.c
r2a786f9 rec1bdc8 41 41 #include <time.h> 42 42 #include <arg_parse.h> 43 #include <err.h> 43 44 44 45 #include <in.h> … … 46 47 #include <inet.h> 47 48 #include <socket.h> 48 #include <net_err.h>49 49 #include <socket_parse.h> 50 50 -
uspace/app/nettest2/nettest2.c
r2a786f9 rec1bdc8 41 41 #include <time.h> 42 42 #include <arg_parse.h> 43 #include <err.h> 43 44 44 45 #include <in.h> … … 46 47 #include <inet.h> 47 48 #include <socket.h> 48 #include <net_err.h>49 49 #include <socket_parse.h> 50 50 -
uspace/app/ping/ping.c
r2a786f9 rec1bdc8 42 42 #include <ipc/services.h> 43 43 #include <str_error.h> 44 #include <errno.h> 44 45 #include <arg_parse.h> 45 46 … … 49 50 #include <inet.h> 50 51 #include <ip_codes.h> 51 #include <socket_errno.h>52 52 #include <socket_parse.h> 53 53 -
uspace/lib/c/Makefile
r2a786f9 rec1bdc8 89 89 generic/adt/list.o \ 90 90 generic/adt/hash_table.o \ 91 generic/adt/dynamic_fifo.c \ 92 generic/adt/measured_strings.c \ 93 generic/adt/char_map.c \ 91 94 generic/time.c \ 92 95 generic/err.c \ -
uspace/lib/c/include/err.h
r2a786f9 rec1bdc8 36 36 #define LIBC_ERR_H_ 37 37 38 #include <stdio.h> 39 #include <errno.h> 40 41 #ifdef CONFIG_DEBUG 42 #include <str_error.h> 43 #endif 44 38 45 #define errx(status, fmt, ...) { \ 39 46 printf((fmt), ##__VA_ARGS__); \ … … 41 48 } 42 49 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 43 98 #endif 44 99 -
uspace/lib/c/include/errno.h
r2a786f9 rec1bdc8 56 56 #define EMLINK (-266) 57 57 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 58 94 #endif 59 95 -
uspace/lib/net/adt/module_map.c
r2a786f9 rec1bdc8 38 38 #include <task.h> 39 39 #include <unistd.h> 40 #include <err.h> 40 41 41 42 #include <ipc/services.h> 42 43 43 #include <net_err.h>44 44 #include <net_modules.h> 45 45 -
uspace/lib/net/generic/packet_remote.c
r2a786f9 rec1bdc8 38 38 #include <async.h> 39 39 #include <errno.h> 40 #include <err.h> 40 41 #include <ipc/ipc.h> 41 42 #include <sys/mman.h> 42 43 43 #include <net_err.h>44 44 #include <net_messages.h> 45 45 #include <packet/packet.h> -
uspace/lib/net/il/ip_client.c
r2a786f9 rec1bdc8 40 40 41 41 #include <ip_client.h> 42 #include <socket_errno.h>43 42 #include <packet/packet.h> 44 43 #include <packet/packet_client.h> -
uspace/lib/net/include/netif_local.h
r2a786f9 rec1bdc8 44 44 #include <ipc/ipc.h> 45 45 #include <ipc/services.h> 46 #include <err.h> 46 47 47 48 #include <adt/measured_strings.h> 48 #include <net_err.h>49 49 #include <net_device.h> 50 50 #include <packet/packet.h> -
uspace/lib/net/netif/netif_local.c
r2a786f9 rec1bdc8 42 42 #include <ipc/ipc.h> 43 43 #include <ipc/services.h> 44 45 #include <net_err.h> 44 #include <err.h> 45 46 46 #include <net_messages.h> 47 47 #include <net_modules.h> -
uspace/lib/net/tl/tl_common.c
r2a786f9 rec1bdc8 38 38 #include <async.h> 39 39 #include <ipc/services.h> 40 41 #include <net_err.h> 40 #include <errno.h> 41 #include <err.h> 42 42 43 #include <packet/packet.h> 43 44 #include <packet/packet_client.h> … … 51 52 #include <ip_remote.h> 52 53 #include <socket_codes.h> 53 #include <socket_errno.h>54 54 #include <ip_interface.h> 55 55 #include <tl_interface.h> -
uspace/lib/socket/Makefile
r2a786f9 rec1bdc8 42 42 packet/packet.c \ 43 43 packet/packet_client.c \ 44 packet/packet_server.c \ 45 adt/dynamic_fifo.c \ 46 adt/measured_strings.c \ 47 adt/char_map.c 44 packet/packet_server.c 48 45 49 46 include $(USPACE_PREFIX)/Makefile.common -
uspace/lib/socket/generic/net_modules.c
r2a786f9 rec1bdc8 37 37 #include <async.h> 38 38 #include <malloc.h> 39 #include <err.h> 39 40 40 41 #include <ipc/ipc.h> … … 43 44 #include <sys/time.h> 44 45 45 #include <net_err.h>46 46 #include <net_modules.h> 47 47 -
uspace/lib/socket/generic/socket_client.c
r2a786f9 rec1bdc8 42 42 #include <stdint.h> 43 43 #include <stdlib.h> 44 #include <errno.h> 45 #include <err.h> 44 46 45 47 #include <ipc/services.h> 46 48 47 #include <net_err.h>48 49 #include <net_modules.h> 49 50 #include <in.h> 50 51 #include <socket.h> 51 #include <socket_errno.h>52 52 #include <adt/dynamic_fifo.h> 53 53 #include <adt/int_map.h> -
uspace/lib/socket/generic/socket_core.c
r2a786f9 rec1bdc8 37 37 #include <stdint.h> 38 38 #include <stdlib.h> 39 40 #include <net_err.h> 39 #include <errno.h> 40 #include <err.h> 41 41 42 #include <in.h> 42 43 #include <inet.h> 43 44 #include <socket_codes.h> 44 #include <socket_errno.h>45 45 #include <adt/dynamic_fifo.h> 46 46 #include <adt/int_map.h> -
uspace/lib/socket/include/socket.h
r2a786f9 rec1bdc8 45 45 #include <inet.h> 46 46 #include <socket_codes.h> 47 #include < socket_errno.h>47 #include <errno.h> 48 48 49 49 /** @name Socket application programming interface -
uspace/lib/socket/packet/packet.c
r2a786f9 rec1bdc8 36 36 */ 37 37 38 #include <errno.h>39 38 #include <malloc.h> 40 39 #include <mem.h> 41 40 #include <fibril_synch.h> 42 41 #include <unistd.h> 42 #include <errno.h> 43 #include <err.h> 43 44 44 45 #include <sys/mman.h> 45 46 46 #include <net_err.h>47 47 #include <adt/generic_field.h> 48 48 #include <packet/packet.h> -
uspace/lib/socket/packet/packet_client.c
r2a786f9 rec1bdc8 46 46 #include <packet/packet_client.h> 47 47 48 int packet_copy_data(packet_t packet, const void * data, size_t length){ 49 if(! packet_is_valid(packet)){ 50 return EINVAL; 51 } 52 if(packet->data_start + length >= packet->length){ 48 int packet_copy_data(packet_t packet, const void * data, size_t length) 49 { 50 if (!packet_is_valid(packet)) 51 return EINVAL; 52 53 if (packet->data_start + length >= packet->length) 53 54 return ENOMEM; 54 } 55 55 56 memcpy((void *) packet + packet->data_start, data, length); 56 if (packet->data_start + length > packet->data_end){57 if (packet->data_start + length > packet->data_end) 57 58 packet->data_end = packet->data_start + length; 58 } 59 59 60 return EOK; 60 61 } 61 62 62 void * 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)){ 64 return NULL; 65 } 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)) { 68 return NULL; 69 } 70 66 71 packet->data_start -= length; 67 72 return (void *) packet + packet->data_start; 68 73 } 69 74 70 void * packet_suffix(packet_t packet, size_t length){ 71 if((! packet_is_valid(packet)) || (packet->data_end + length >= packet->length)){ 72 return NULL; 73 } 75 void *packet_suffix(packet_t packet, size_t length) 76 { 77 if ((!packet_is_valid(packet)) || 78 (packet->data_end + length >= packet->length)) { 79 return NULL; 80 } 81 74 82 packet->data_end += length; 75 83 return (void *) packet + packet->data_end - length; 76 84 } 77 85 78 int packet_trim(packet_t packet, size_t prefix, size_t suffix){ 79 if(! packet_is_valid(packet)){ 80 return EINVAL; 81 } 82 if(prefix + suffix > PACKET_DATA_LENGTH(packet)){ 86 int packet_trim(packet_t packet, size_t prefix, size_t suffix) 87 { 88 if (!packet_is_valid(packet)) 89 return EINVAL; 90 91 if (prefix + suffix > PACKET_DATA_LENGTH(packet)) 83 92 return ENOMEM; 84 } 93 85 94 packet->data_start += prefix; 86 95 packet->data_end -= suffix; … … 88 97 } 89 98 90 packet_id_t packet_get_id(const packet_t packet){ 99 packet_id_t packet_get_id(const packet_t packet) 100 { 91 101 return packet_is_valid(packet) ? packet->packet_id : 0; 92 102 } 93 103 94 int packet_get_addr(const packet_t packet, uint8_t ** src, uint8_t ** dest) {95 if(! packet_is_valid(packet)){96 return EINVAL;97 }98 if (! packet->addr_len){104 int packet_get_addr(const packet_t packet, uint8_t ** src, uint8_t ** dest) 105 { 106 if (!packet_is_valid(packet)) 107 return EINVAL; 108 if (!packet->addr_len) 99 109 return 0; 100 } 101 if(src){ 110 if (src) 102 111 *src = (void *) packet + packet->src_addr; 103 } 104 if(dest){ 112 if (dest) 105 113 *dest = (void *) packet + packet->dest_addr; 106 } 114 107 115 return packet->addr_len; 108 116 } 109 117 110 size_t packet_get_data_length(const packet_t packet){ 111 if(! packet_is_valid(packet)){ 118 size_t packet_get_data_length(const packet_t packet) 119 { 120 if (!packet_is_valid(packet)) 112 121 return 0; 113 } 122 114 123 return PACKET_DATA_LENGTH(packet); 115 124 } 116 125 117 void * packet_get_data(const packet_t packet){ 118 if(! packet_is_valid(packet)){ 119 return NULL; 120 } 126 void *packet_get_data(const packet_t packet) 127 { 128 if (!packet_is_valid(packet)) 129 return NULL; 130 121 131 return (void *) packet + packet->data_start; 122 132 } … … 160 170 } 161 171 162 packet_t packet_get_copy(int phone, packet_t packet){ 172 packet_t packet_get_copy(int phone, packet_t packet) 173 { 163 174 packet_t copy; 164 175 uint8_t * src = NULL; … … 166 177 size_t addrlen; 167 178 168 if (! packet_is_valid(packet)){169 return NULL; 170 } 179 if (!packet_is_valid(packet)) 180 return NULL; 181 171 182 // get a new packet 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){ 174 return NULL; 175 } 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) 187 return NULL; 188 176 189 // get addresses 177 190 addrlen = packet_get_addr(packet, &src, &dest); 178 191 // copy data 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))){ 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))) { 182 197 copy->order = packet->order; 183 198 copy->metric = packet->metric; 184 199 return copy; 185 } else{200 } else { 186 201 pq_release_local(phone, copy->packet_id); 187 202 return NULL; -
uspace/lib/socket/packet/packet_server.c
r2a786f9 rec1bdc8 39 39 #include <async.h> 40 40 #include <errno.h> 41 #include <err.h> 41 42 #include <fibril_synch.h> 42 43 #include <unistd.h> … … 45 46 #include <sys/mman.h> 46 47 47 #include <net_err.h>48 48 #include <net_messages.h> 49 49 #include <packet/packet.h> -
uspace/srv/hw/netif/dp8390/dp8390_module.c
r2a786f9 rec1bdc8 39 39 #include <ddi.h> 40 40 #include <errno.h> 41 #include <err.h> 41 42 #include <malloc.h> 42 43 #include <ipc/ipc.h> 43 44 #include <ipc/services.h> 44 45 45 #include <net_err.h>46 46 #include <net_messages.h> 47 47 #include <net_modules.h> -
uspace/srv/net/il/arp/arp.c
r2a786f9 rec1bdc8 45 45 #include <ipc/ipc.h> 46 46 #include <ipc/services.h> 47 48 #include <net_err.h> 47 #include <err.h> 48 49 49 #include <net_messages.h> 50 50 #include <net_modules.h> -
uspace/srv/net/il/arp/arp_module.c
r2a786f9 rec1bdc8 40 40 #include <async.h> 41 41 #include <stdio.h> 42 #include <err.h> 42 43 43 44 #include <ipc/ipc.h> 44 45 #include <ipc/services.h> 45 46 46 #include <net_err.h>47 47 #include <net_modules.h> 48 48 #include <net_interface.h> -
uspace/srv/net/il/ip/ip.c
r2a786f9 rec1bdc8 38 38 #include <async.h> 39 39 #include <errno.h> 40 #include <err.h> 40 41 #include <fibril_synch.h> 41 42 #include <stdio.h> … … 45 46 #include <sys/types.h> 46 47 47 #include <net_err.h>48 48 #include <net_messages.h> 49 49 #include <net_modules.h> … … 65 65 #include <tl_interface.h> 66 66 #include <socket_codes.h> 67 #include <socket_errno.h>68 67 #include <adt/measured_strings.h> 69 68 #include <adt/module_map.h> -
uspace/srv/net/il/ip/ip_module.c
r2a786f9 rec1bdc8 42 42 #include <ipc/ipc.h> 43 43 #include <ipc/services.h> 44 #include <err.h> 44 45 45 #include <net_err.h>46 46 #include <net_modules.h> 47 47 #include <net_interface.h> -
uspace/srv/net/net/net.c
r2a786f9 rec1bdc8 40 40 #include <ddi.h> 41 41 #include <errno.h> 42 #include <err.h> 42 43 #include <malloc.h> 43 44 #include <stdio.h> … … 47 48 #include <ipc/services.h> 48 49 49 #include <net_err.h>50 50 #include <net_messages.h> 51 51 #include <net_modules.h> -
uspace/srv/net/netif/lo/lo.c
r2a786f9 rec1bdc8 37 37 #include <async.h> 38 38 #include <errno.h> 39 #include <err.h> 39 40 #include <stdio.h> 40 41 #include <str.h> … … 43 44 #include <ipc/services.h> 44 45 45 #include <net_err.h>46 46 #include <net_messages.h> 47 47 #include <net_modules.h> -
uspace/srv/net/netstart/netstart.c
r2a786f9 rec1bdc8 45 45 #include <task.h> 46 46 #include <str_error.h> 47 #include <err.h> 47 48 #include <ipc/ipc.h> 48 49 #include <ipc/services.h> 49 50 50 #include <net_err.h>51 51 #include <net_modules.h> 52 52 #include <net_net_messages.h> -
uspace/srv/net/nil/eth/eth.c
r2a786f9 rec1bdc8 41 41 #include <stdio.h> 42 42 #include <str.h> 43 #include <err.h> 43 44 44 45 #include <ipc/ipc.h> 45 46 #include <ipc/services.h> 46 47 47 #include <net_err.h>48 48 #include <net_messages.h> 49 49 #include <net_modules.h> -
uspace/srv/net/nil/eth/eth_module.c
r2a786f9 rec1bdc8 38 38 #include <async.h> 39 39 #include <stdio.h> 40 #include <err.h> 40 41 41 42 #include <ipc/ipc.h> 42 43 #include <ipc/services.h> 43 44 44 #include <net_err.h>45 45 #include <net_modules.h> 46 46 #include <net_interface.h> -
uspace/srv/net/nil/nildummy/nildummy.c
r2a786f9 rec1bdc8 41 41 #include <stdio.h> 42 42 #include <str.h> 43 #include <err.h> 43 44 #include <ipc/ipc.h> 44 45 #include <ipc/services.h> 45 46 46 #include <net_err.h>47 47 #include <net_messages.h> 48 48 #include <net_modules.h> -
uspace/srv/net/nil/nildummy/nildummy_module.c
r2a786f9 rec1bdc8 38 38 #include <async.h> 39 39 #include <stdio.h> 40 #include <err.h> 40 41 41 42 #include <ipc/ipc.h> 42 43 #include <ipc/services.h> 43 44 44 #include <net_err.h>45 45 #include <net_modules.h> 46 46 #include <net_interface.h> -
uspace/srv/net/tl/icmp/icmp.c
r2a786f9 rec1bdc8 46 46 #include <sys/time.h> 47 47 #include <sys/types.h> 48 49 #include <net_err.h> 48 #include <errno.h> 49 #include <err.h> 50 50 51 #include <net_messages.h> 51 52 #include <net_modules.h> … … 66 67 #include <net_interface.h> 67 68 #include <socket_codes.h> 68 #include <socket_errno.h>69 69 #include <tl_messages.h> 70 70 #include <tl_interface.h> -
uspace/srv/net/tl/icmp/icmp_module.c
r2a786f9 rec1bdc8 40 40 #include <async.h> 41 41 #include <stdio.h> 42 #include <err.h> 42 43 #include <ipc/ipc.h> 43 44 #include <ipc/services.h> 44 45 45 #include <net_err.h>46 46 #include <net_modules.h> 47 47 #include <packet/packet.h> -
uspace/srv/net/tl/tcp/tcp.c
r2a786f9 rec1bdc8 42 42 //TODO remove stdio 43 43 #include <stdio.h> 44 #include <errno.h> 45 #include <err.h> 44 46 45 47 #include <ipc/ipc.h> 46 48 #include <ipc/services.h> 47 49 48 #include <net_err.h>49 50 #include <net_messages.h> 50 51 #include <net_modules.h> … … 63 64 #include <net_interface.h> 64 65 #include <socket_codes.h> 65 #include <socket_errno.h>66 66 #include <tcp_codes.h> 67 67 #include <socket_core.h> -
uspace/srv/net/tl/tcp/tcp_module.c
r2a786f9 rec1bdc8 40 40 #include <async.h> 41 41 #include <stdio.h> 42 #include <err.h> 42 43 #include <ipc/ipc.h> 43 44 #include <ipc/services.h> 44 45 45 #include <net_err.h>46 46 #include <net_modules.h> 47 47 #include <packet/packet.h> -
uspace/srv/net/tl/udp/udp.c
r2a786f9 rec1bdc8 42 42 #include <ipc/ipc.h> 43 43 #include <ipc/services.h> 44 45 #include <net_err.h> 44 #include <errno.h> 45 #include <err.h> 46 46 47 #include <net_messages.h> 47 48 #include <net_modules.h> … … 60 61 #include <net_interface.h> 61 62 #include <socket_codes.h> 62 #include <socket_errno.h>63 63 #include <socket_core.h> 64 64 #include <socket_messages.h> -
uspace/srv/net/tl/udp/udp_module.c
r2a786f9 rec1bdc8 40 40 #include <async.h> 41 41 #include <stdio.h> 42 #include <err.h> 42 43 #include <ipc/ipc.h> 43 44 #include <ipc/services.h> 44 45 45 #include <net_err.h>46 46 #include <net_modules.h> 47 47 #include <packet/packet.h>
Note:
See TracChangeset
for help on using the changeset viewer.