Changes in uspace/srv/net/tl/udp/udp.c [c5b59ce:14f1db0] in mainline
- File:
-
- 1 edited
-
uspace/srv/net/tl/udp/udp.c (modified) (25 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/tl/udp/udp.c
rc5b59ce r14f1db0 42 42 #include <ipc/ipc.h> 43 43 #include <ipc/services.h> 44 #include <errno.h> 45 #include <err.h> 46 44 45 #include <net_err.h> 47 46 #include <net_messages.h> 48 47 #include <net_modules.h> … … 61 60 #include <net_interface.h> 62 61 #include <socket_codes.h> 62 #include <socket_errno.h> 63 63 #include <socket_core.h> 64 64 #include <socket_messages.h> … … 72 72 #include "udp_module.h" 73 73 74 /** UDP module name. */ 74 /** UDP module name. 75 */ 75 76 #define NAME "UDP protocol" 76 77 77 /** Default UDP checksum computing. */ 78 /** Default UDP checksum computing. 79 */ 78 80 #define NET_DEFAULT_UDP_CHECKSUM_COMPUTING true 79 81 80 /** Default UDP autobind when sending via unbound sockets. */ 82 /** Default UDP autobind when sending via unbound sockets. 83 */ 81 84 #define NET_DEFAULT_UDP_AUTOBINDING true 82 85 83 /** Maximum UDP fragment size. */ 84 #define MAX_UDP_FRAGMENT_SIZE 65535 85 86 /** Free ports pool start. */ 87 #define UDP_FREE_PORTS_START 1025 88 89 /** Free ports pool end. */ 86 /** Maximum UDP fragment size. 87 */ 88 #define MAX_UDP_FRAGMENT_SIZE 65535 89 90 /** Free ports pool start. 91 */ 92 #define UDP_FREE_PORTS_START 1025 93 94 /** Free ports pool end. 95 */ 90 96 #define UDP_FREE_PORTS_END 65535 91 97 92 98 /** Processes the received UDP packet queue. 93 *94 99 * Is used as an entry point from the underlying IP module. 95 100 * Locks the global lock and calls udp_process_packet() function. 96 *97 101 * @param[in] device_id The receiving device identifier. 98 102 * @param[in,out] packet The received packet queue. 99 * @param receiver The target service. Ignored parameter. 100 * @param[in] error The packet error reporting service. Prefixes the 101 * received packet. 102 * @returns EOK on success. 103 * @returns Other error codes as defined for the 104 * udp_process_packet() function. 105 */ 106 int 107 udp_received_msg(device_id_t device_id, packet_t packet, services_t receiver, 108 services_t error); 103 * @param receiver The target service. Ignored parameter. 104 * @param[in] error The packet error reporting service. Prefixes the received packet. 105 * @returns EOK on success. 106 * @returns Other error codes as defined for the udp_process_packet() function. 107 */ 108 int udp_received_msg(device_id_t device_id, packet_t packet, services_t receiver, services_t error); 109 109 110 110 /** Processes the received UDP packet queue. 111 *112 111 * Notifies the destination socket application. 113 * Releases the packet on error or sends an ICMP error notification. 114 * 112 * Releases the packet on error or sends an ICMP error notification.. 115 113 * @param[in] device_id The receiving device identifier. 116 114 * @param[in,out] packet The received packet queue. 117 * @param[in] error The packet error reporting service. Prefixes the 118 * received packet. 119 * @returns EOK on success. 120 * @returns EINVAL if the packet is not valid. 121 * @returns EINVAL if the stored packet address is not the 122 * an_addr_t. 123 * @returns EINVAL if the packet does not contain any data. 124 * @returns NO_DATA if the packet content is shorter than the user 125 * datagram header. 126 * @returns ENOMEM if there is not enough memory left. 127 * @returns EADDRNOTAVAIL if the destination socket does not exist. 128 * @returns Other error codes as defined for the 129 * ip_client_process_packet() function. 130 */ 131 int 132 udp_process_packet(device_id_t device_id, packet_t packet, services_t error); 115 * @param[in] error The packet error reporting service. Prefixes the received packet. 116 * @returns EOK on success. 117 * @returns EINVAL if the packet is not valid. 118 * @returns EINVAL if the stored packet address is not the an_addr_t. 119 * @returns EINVAL if the packet does not contain any data. 120 * @returns NO_DATA if the packet content is shorter than the user datagram header. 121 * @returns ENOMEM if there is not enough memory left. 122 * @returns EADDRNOTAVAIL if the destination socket does not exist. 123 * @returns Other error codes as defined for the ip_client_process_packet() function. 124 */ 125 int udp_process_packet(device_id_t device_id, packet_t packet, services_t error); 133 126 134 127 /** Releases the packet and returns the result. 135 * 136 * @param[in] packet The packet queue to be released. 137 * @param[in] result The result to be returned. 138 * @return The result parameter. 128 * @param[in] packet The packet queue to be released. 129 * @param[in] result The result to be returned. 130 * @return The result parameter. 139 131 */ 140 132 int udp_release_and_return(packet_t packet, int result); … … 145 137 146 138 /** Processes the socket client messages. 147 *148 139 * Runs until the client module disconnects. 149 * 150 * @param[in] callid The message identifier. 151 * @param[in] call The message parameters. 152 * @returns EOK on success. 153 * @see socket.h 140 * @param[in] callid The message identifier. 141 * @param[in] call The message parameters. 142 * @returns EOK on success. 143 * @see socket.h 154 144 */ 155 145 int udp_process_client_messages(ipc_callid_t callid, ipc_call_t call); 156 146 157 147 /** Sends data from the socket to the remote address. 158 *159 148 * Binds the socket to a free port if not already connected/bound. 160 149 * Handles the NET_SOCKET_SENDTO message. 161 150 * Supports AF_INET and AF_INET6 address families. 162 *163 151 * @param[in,out] local_sockets The application local sockets. 164 152 * @param[in] socket_id Socket identifier. 165 * @param[in] addr 166 * @param[in] addrlen 153 * @param[in] addr The destination address. 154 * @param[in] addrlen The address length. 167 155 * @param[in] fragments The number of data fragments. 168 156 * @param[out] data_fragment_size The data fragment size in bytes. 169 * @param[in] flags Various send flags. 170 * @returns EOK on success. 171 * @returns EAFNOTSUPPORT if the address family is not supported. 172 * @returns ENOTSOCK if the socket is not found. 173 * @returns EINVAL if the address is invalid. 174 * @returns ENOTCONN if the sending socket is not and cannot be 175 * bound. 176 * @returns ENOMEM if there is not enough memory left. 177 * @returns Other error codes as defined for the 178 * socket_read_packet_data() function. 179 * @returns Other error codes as defined for the 180 * ip_client_prepare_packet() function. 181 * @returns Other error codes as defined for the ip_send_msg() 182 * function. 183 */ 184 int 185 udp_sendto_message(socket_cores_ref local_sockets, int socket_id, 186 const struct sockaddr * addr, socklen_t addrlen, int fragments, 187 size_t * data_fragment_size, int flags); 157 * @param[in] flags Various send flags. 158 * @returns EOK on success. 159 * @returns EAFNOTSUPPORT if the address family is not supported. 160 * @returns ENOTSOCK if the socket is not found. 161 * @returns EINVAL if the address is invalid. 162 * @returns ENOTCONN if the sending socket is not and cannot be bound. 163 * @returns ENOMEM if there is not enough memory left. 164 * @returns Other error codes as defined for the socket_read_packet_data() function. 165 * @returns Other error codes as defined for the ip_client_prepare_packet() function. 166 * @returns Other error codes as defined for the ip_send_msg() function. 167 */ 168 int udp_sendto_message(socket_cores_ref local_sockets, int socket_id, const struct sockaddr * addr, socklen_t addrlen, int fragments, size_t * data_fragment_size, int flags); 188 169 189 170 /** Receives data to the socket. 190 *191 171 * Handles the NET_SOCKET_RECVFROM message. 192 172 * Replies the source address as well. 193 *194 173 * @param[in] local_sockets The application local sockets. 195 174 * @param[in] socket_id Socket identifier. 196 * @param[in] flags Various receive flags. 197 * @param[out] addrlen The source address length. 198 * @returns The number of bytes received. 199 * @returns ENOTSOCK if the socket is not found. 200 * @returns NO_DATA if there are no received packets or data. 201 * @returns ENOMEM if there is not enough memory left. 202 * @returns EINVAL if the received address is not an IP address. 203 * @returns Other error codes as defined for the packet_translate() 204 * function. 205 * @returns Other error codes as defined for the data_reply() 206 * function. 207 */ 208 int 209 udp_recvfrom_message(socket_cores_ref local_sockets, int socket_id, int flags, 210 size_t * addrlen); 175 * @param[in] flags Various receive flags. 176 * @param[out] addrlen The source address length. 177 * @returns The number of bytes received. 178 * @returns ENOTSOCK if the socket is not found. 179 * @returns NO_DATA if there are no received packets or data. 180 * @returns ENOMEM if there is not enough memory left. 181 * @returns EINVAL if the received address is not an IP address. 182 * @returns Other error codes as defined for the packet_translate() function. 183 * @returns Other error codes as defined for the data_reply() function. 184 */ 185 int udp_recvfrom_message(socket_cores_ref local_sockets, int socket_id, int flags, size_t * addrlen); 211 186 212 187 /*@}*/ … … 214 189 /** UDP global data. 215 190 */ 216 udp_globals_t udp_globals; 217 218 int udp_initialize(async_client_conn_t client_connection) 219 { 191 udp_globals_t udp_globals; 192 193 int udp_initialize(async_client_conn_t client_connection){ 220 194 ERROR_DECLARE; 221 195 222 measured_string_t names[] = { 223 { 224 str_dup("UDP_CHECKSUM_COMPUTING"), 225 22 226 }, 227 { 228 str_dup("UDP_AUTOBINDING"), 229 15 230 } 231 }; 196 measured_string_t names[] = {{str_dup("UDP_CHECKSUM_COMPUTING"), 22}, {str_dup("UDP_AUTOBINDING"), 15}}; 232 197 measured_string_ref configuration; 233 198 size_t count = sizeof(names) / sizeof(measured_string_t); … … 236 201 fibril_rwlock_initialize(&udp_globals.lock); 237 202 fibril_rwlock_write_lock(&udp_globals.lock); 238 239 udp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP, 240 ICMP_CONNECT_TIMEOUT); 241 udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP, 242 SERVICE_UDP, client_connection, udp_received_msg); 243 if (udp_globals.ip_phone < 0) 203 udp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP, ICMP_CONNECT_TIMEOUT); 204 udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP, SERVICE_UDP, client_connection, udp_received_msg); 205 if(udp_globals.ip_phone < 0){ 244 206 return udp_globals.ip_phone; 245 207 } 246 208 // read default packet dimensions 247 ERROR_PROPAGATE(ip_packet_size_req(udp_globals.ip_phone, -1, 248 &udp_globals.packet_dimension)); 209 ERROR_PROPAGATE(ip_packet_size_req(udp_globals.ip_phone, -1, &udp_globals.packet_dimension)); 249 210 ERROR_PROPAGATE(socket_ports_initialize(&udp_globals.sockets)); 250 if (ERROR_OCCURRED(packet_dimensions_initialize( 251 &udp_globals.dimensions))) { 211 if(ERROR_OCCURRED(packet_dimensions_initialize(&udp_globals.dimensions))){ 252 212 socket_ports_destroy(&udp_globals.sockets); 253 213 return ERROR_CODE; … … 256 216 udp_globals.packet_dimension.content -= sizeof(udp_header_t); 257 217 udp_globals.last_used_port = UDP_FREE_PORTS_START - 1; 258 259 218 // get configuration 260 219 udp_globals.checksum_computing = NET_DEFAULT_UDP_CHECKSUM_COMPUTING; 261 220 udp_globals.autobinding = NET_DEFAULT_UDP_AUTOBINDING; 262 221 configuration = &names[0]; 263 ERROR_PROPAGATE(net_get_conf_req(udp_globals.net_phone, &configuration, 264 count, &data)); 265 if (configuration) { 266 if (configuration[0].value) 267 udp_globals.checksum_computing = 268 (configuration[0].value[0] == 'y'); 269 270 if (configuration[1].value) 271 udp_globals.autobinding = 272 (configuration[1].value[0] == 'y'); 273 222 ERROR_PROPAGATE(net_get_conf_req(udp_globals.net_phone, &configuration, count, &data)); 223 if(configuration){ 224 if(configuration[0].value){ 225 udp_globals.checksum_computing = (configuration[0].value[0] == 'y'); 226 } 227 if(configuration[1].value){ 228 udp_globals.autobinding = (configuration[1].value[0] == 'y'); 229 } 274 230 net_free_settings(configuration, data); 275 231 } 276 277 232 fibril_rwlock_write_unlock(&udp_globals.lock); 278 233 return EOK; 279 234 } 280 235 281 int 282 udp_received_msg(device_id_t device_id, packet_t packet, services_t receiver, 283 services_t error) 284 { 236 int udp_received_msg(device_id_t device_id, packet_t packet, services_t receiver, services_t error){ 285 237 int result; 286 238 287 239 fibril_rwlock_write_lock(&udp_globals.lock); 288 240 result = udp_process_packet(device_id, packet, error); 289 if (result != EOK)241 if(result != EOK){ 290 242 fibril_rwlock_write_unlock(&udp_globals.lock); 243 } 291 244 292 245 return result; 293 246 } 294 247 295 int udp_process_packet(device_id_t device_id, packet_t packet, services_t error) 296 { 248 int udp_process_packet(device_id_t device_id, packet_t packet, services_t error){ 297 249 ERROR_DECLARE; 298 250 … … 310 262 icmp_code_t code; 311 263 void *ip_header; 312 struct sockaddr * src;313 struct sockaddr * dest;264 struct sockaddr * src; 265 struct sockaddr * dest; 314 266 packet_dimension_ref packet_dimension; 315 267 316 if (error) { 317 switch (error) { 318 case SERVICE_ICMP: 319 // ignore error 320 // length = icmp_client_header_length(packet); 321 // process error 322 result = icmp_client_process_packet(packet, &type, 323 &code, NULL, NULL); 324 if (result < 0) 325 return udp_release_and_return(packet, result); 326 length = (size_t) result; 327 if (ERROR_OCCURRED(packet_trim(packet, length, 0))) 328 return udp_release_and_return(packet, 329 ERROR_CODE); 330 break; 331 default: 332 return udp_release_and_return(packet, ENOTSUP); 333 } 334 } 335 268 if(error){ 269 switch(error){ 270 case SERVICE_ICMP: 271 // ignore error 272 // length = icmp_client_header_length(packet); 273 // process error 274 result = icmp_client_process_packet(packet, &type, &code, NULL, NULL); 275 if(result < 0){ 276 return udp_release_and_return(packet, result); 277 } 278 length = (size_t) result; 279 if(ERROR_OCCURRED(packet_trim(packet, length, 0))){ 280 return udp_release_and_return(packet, ERROR_CODE); 281 } 282 break; 283 default: 284 return udp_release_and_return(packet, ENOTSUP); 285 } 286 } 336 287 // TODO process received ipopts? 337 288 result = ip_client_process_packet(packet, NULL, NULL, NULL, NULL, NULL); 338 if (result < 0)289 if(result < 0){ 339 290 return udp_release_and_return(packet, result); 291 } 340 292 offset = (size_t) result; 341 293 342 294 length = packet_get_data_length(packet); 343 if (length <= 0)295 if(length <= 0){ 344 296 return udp_release_and_return(packet, EINVAL); 345 if (length < UDP_HEADER_SIZE + offset) 297 } 298 if(length < UDP_HEADER_SIZE + offset){ 346 299 return udp_release_and_return(packet, NO_DATA); 300 } 347 301 348 302 // trim all but UDP header 349 if (ERROR_OCCURRED(packet_trim(packet, offset, 0)))303 if(ERROR_OCCURRED(packet_trim(packet, offset, 0))){ 350 304 return udp_release_and_return(packet, ERROR_CODE); 305 } 351 306 352 307 // get udp header 353 308 header = (udp_header_ref) packet_get_data(packet); 354 if (!header)309 if(! header){ 355 310 return udp_release_and_return(packet, NO_DATA); 356 311 } 357 312 // find the destination socket 358 socket = socket_port_find(&udp_globals.sockets, 359 ntohs(header->destination_port), SOCKET_MAP_KEY_LISTENING, 0); 360 if (!socket) { 361 if (tl_prepare_icmp_packet(udp_globals.net_phone, 362 udp_globals.icmp_phone, packet, error) == EOK) { 363 icmp_destination_unreachable_msg(udp_globals.icmp_phone, 364 ICMP_PORT_UNREACH, 0, packet); 313 socket = socket_port_find(&udp_globals.sockets, ntohs(header->destination_port), SOCKET_MAP_KEY_LISTENING, 0); 314 if(! socket){ 315 if(tl_prepare_icmp_packet(udp_globals.net_phone, udp_globals.icmp_phone, packet, error) == EOK){ 316 icmp_destination_unreachable_msg(udp_globals.icmp_phone, ICMP_PORT_UNREACH, 0, packet); 365 317 } 366 318 return EADDRNOTAVAIL; … … 371 323 fragments = 0; 372 324 total_length = ntohs(header->total_length); 373 374 325 // compute header checksum if set 375 if (header->checksum && (!error)) { 376 result = packet_get_addr(packet, (uint8_t **) &src, 377 (uint8_t **) &dest); 378 if( result <= 0) 326 if(header->checksum && (! error)){ 327 result = packet_get_addr(packet, (uint8_t **) &src, (uint8_t **) &dest); 328 if(result <= 0){ 379 329 return udp_release_and_return(packet, result); 380 381 if (ERROR_OCCURRED(ip_client_get_pseudo_header(IPPROTO_UDP, 382 src, result, dest, result, total_length, &ip_header, 383 &length))) { 330 } 331 if(ERROR_OCCURRED(ip_client_get_pseudo_header(IPPROTO_UDP, src, result, dest, result, total_length, &ip_header, &length))){ 384 332 return udp_release_and_return(packet, ERROR_CODE); 385 } else{333 }else{ 386 334 checksum = compute_checksum(0, ip_header, length); 387 // the udp header checksum will be added with the first 388 // fragment later 335 // the udp header checksum will be added with the first fragment later 389 336 free(ip_header); 390 337 } 391 } else{338 }else{ 392 339 header->checksum = 0; 393 340 checksum = 0; 394 341 } 395 342 396 do 343 do{ 397 344 ++ fragments; 398 345 length = packet_get_data_length(next_packet); 399 if (length <= 0)346 if(length <= 0){ 400 347 return udp_release_and_return(packet, NO_DATA); 401 402 if (total_length < length) { 403 if (ERROR_OCCURRED(packet_trim(next_packet, 0, 404 length - total_length))) { 405 return udp_release_and_return(packet, 406 ERROR_CODE); 348 } 349 if(total_length < length){ 350 if(ERROR_OCCURRED(packet_trim(next_packet, 0, length - total_length))){ 351 return udp_release_and_return(packet, ERROR_CODE); 407 352 } 408 409 353 // add partial checksum if set 410 if (header->checksum) { 411 checksum = compute_checksum(checksum, 412 packet_get_data(packet), 413 packet_get_data_length(packet)); 354 if(header->checksum){ 355 checksum = compute_checksum(checksum, packet_get_data(packet), packet_get_data_length(packet)); 414 356 } 415 416 357 // relese the rest of the packet fragments 417 358 tmp_packet = pq_next(next_packet); 418 while (tmp_packet){359 while(tmp_packet){ 419 360 next_packet = pq_detach(tmp_packet); 420 pq_release_remote(udp_globals.net_phone, 421 packet_get_id(tmp_packet)); 361 pq_release_remote(udp_globals.net_phone, packet_get_id(tmp_packet)); 422 362 tmp_packet = next_packet; 423 363 } 424 425 364 // exit the loop 426 365 break; 427 366 } 428 367 total_length -= length; 429 430 368 // add partial checksum if set 431 if (header->checksum) { 432 checksum = compute_checksum(checksum, 433 packet_get_data(packet), 434 packet_get_data_length(packet)); 435 } 436 437 } while ((next_packet = pq_next(next_packet)) && (total_length > 0)); 369 if(header->checksum){ 370 checksum = compute_checksum(checksum, packet_get_data(packet), packet_get_data_length(packet)); 371 } 372 }while((next_packet = pq_next(next_packet)) && (total_length > 0)); 438 373 439 374 // check checksum 440 if (header->checksum) { 441 if (flip_checksum(compact_checksum(checksum)) != 442 IP_CHECKSUM_ZERO) { 443 if (tl_prepare_icmp_packet(udp_globals.net_phone, 444 udp_globals.icmp_phone, packet, error) == EOK) { 375 if(header->checksum){ 376 if(flip_checksum(compact_checksum(checksum)) != IP_CHECKSUM_ZERO){ 377 if(tl_prepare_icmp_packet(udp_globals.net_phone, udp_globals.icmp_phone, packet, error) == EOK){ 445 378 // checksum error ICMP 446 icmp_parameter_problem_msg( 447 udp_globals.icmp_phone, ICMP_PARAM_POINTER, 448 ((size_t) ((void *) &header->checksum)) - 449 ((size_t) ((void *) header)), packet); 379 icmp_parameter_problem_msg(udp_globals.icmp_phone, ICMP_PARAM_POINTER, ((size_t) ((void *) &header->checksum)) - ((size_t) ((void *) header)), packet); 450 380 } 451 381 return EINVAL; … … 454 384 455 385 // queue the received packet 456 if (ERROR_OCCURRED(dyn_fifo_push(&socket->received, 457 packet_get_id(packet), SOCKET_MAX_RECEIVED_SIZE)) || 458 ERROR_OCCURRED(tl_get_ip_packet_dimension(udp_globals.ip_phone, 459 &udp_globals.dimensions, device_id, &packet_dimension))) { 386 if(ERROR_OCCURRED(dyn_fifo_push(&socket->received, packet_get_id(packet), SOCKET_MAX_RECEIVED_SIZE)) 387 || ERROR_OCCURRED(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, device_id, &packet_dimension))){ 460 388 return udp_release_and_return(packet, ERROR_CODE); 461 389 } … … 463 391 // notify the destination socket 464 392 fibril_rwlock_write_unlock(&udp_globals.lock); 465 async_msg_5(socket->phone, NET_SOCKET_RECEIVED, 466 (ipcarg_t) socket->socket_id, packet_dimension->content, 0, 0, 467 (ipcarg_t) fragments); 468 393 async_msg_5(socket->phone, NET_SOCKET_RECEIVED, (ipcarg_t) socket->socket_id, packet_dimension->content, 0, 0, (ipcarg_t) fragments); 469 394 return EOK; 470 395 } 471 396 472 int 473 udp_message_standalone(ipc_callid_t callid, ipc_call_t * call, 474 ipc_call_t * answer, int * answer_count) 475 { 397 int udp_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ 476 398 ERROR_DECLARE; 477 399 … … 479 401 480 402 *answer_count = 0; 481 482 switch (IPC_GET_METHOD(*call)) { 483 case NET_TL_RECEIVED: 484 if (!ERROR_OCCURRED(packet_translate_remote( 485 udp_globals.net_phone, &packet, IPC_GET_PACKET(call)))) { 486 ERROR_CODE = udp_received_msg(IPC_GET_DEVICE(call), 487 packet, SERVICE_UDP, IPC_GET_ERROR(call)); 488 } 489 return ERROR_CODE; 490 491 case IPC_M_CONNECT_TO_ME: 492 return udp_process_client_messages(callid, * call); 493 } 494 403 switch(IPC_GET_METHOD(*call)){ 404 case NET_TL_RECEIVED: 405 if(! ERROR_OCCURRED(packet_translate_remote(udp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ 406 ERROR_CODE = udp_received_msg(IPC_GET_DEVICE(call), packet, SERVICE_UDP, IPC_GET_ERROR(call)); 407 } 408 return ERROR_CODE; 409 case IPC_M_CONNECT_TO_ME: 410 return udp_process_client_messages(callid, * call); 411 } 495 412 return ENOTSUP; 496 413 } 497 414 498 int udp_process_client_messages(ipc_callid_t callid, ipc_call_t call) 499 { 415 int udp_process_client_messages(ipc_callid_t callid, ipc_call_t call){ 500 416 int res; 501 417 bool keep_on_going = true; 502 418 socket_cores_t local_sockets; 503 419 int app_phone = IPC_GET_PHONE(&call); 504 struct sockaddr * addr;420 struct sockaddr * addr; 505 421 int socket_id; 506 422 size_t addrlen; … … 517 433 answer_count = 0; 518 434 519 // The client connection is only in one fibril and therefore no 520 // additional locks are needed. 435 // The client connection is only in one fibril and therefore no additional locks are needed. 521 436 522 437 socket_cores_initialize(&local_sockets); 523 438 524 while (keep_on_going){439 while(keep_on_going){ 525 440 526 441 // answer the call … … 534 449 535 450 // process the call 536 switch (IPC_GET_METHOD(call)) { 537 case IPC_M_PHONE_HUNGUP: 538 keep_on_going = false; 539 res = EHANGUP; 540 break; 541 542 case NET_SOCKET: 543 socket_id = SOCKET_GET_SOCKET_ID(call); 544 res = socket_create(&local_sockets, app_phone, NULL, 545 &socket_id); 546 SOCKET_SET_SOCKET_ID(answer, socket_id); 547 548 if (res != EOK) 451 switch(IPC_GET_METHOD(call)){ 452 case IPC_M_PHONE_HUNGUP: 453 keep_on_going = false; 454 res = EHANGUP; 549 455 break; 550 551 if (tl_get_ip_packet_dimension(udp_globals.ip_phone, 552 &udp_globals.dimensions, DEVICE_INVALID_ID, 553 &packet_dimension) == EOK) { 554 SOCKET_SET_DATA_FRAGMENT_SIZE(answer, 555 packet_dimension->content); 556 } 557 558 // SOCKET_SET_DATA_FRAGMENT_SIZE(answer, 559 // MAX_UDP_FRAGMENT_SIZE); 560 SOCKET_SET_HEADER_SIZE(answer, UDP_HEADER_SIZE); 561 answer_count = 3; 562 break; 563 564 case NET_SOCKET_BIND: 565 res = data_receive((void **) &addr, &addrlen); 566 if (res != EOK) 456 case NET_SOCKET: 457 socket_id = SOCKET_GET_SOCKET_ID(call); 458 res = socket_create(&local_sockets, app_phone, NULL, &socket_id); 459 SOCKET_SET_SOCKET_ID(answer, socket_id); 460 461 if(res == EOK){ 462 if (tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){ 463 SOCKET_SET_DATA_FRAGMENT_SIZE(answer, packet_dimension->content); 464 } 465 // SOCKET_SET_DATA_FRAGMENT_SIZE(answer, MAX_UDP_FRAGMENT_SIZE); 466 SOCKET_SET_HEADER_SIZE(answer, UDP_HEADER_SIZE); 467 answer_count = 3; 468 } 567 469 break; 568 fibril_rwlock_write_lock(&udp_globals.lock); 569 res = socket_bind(&local_sockets, &udp_globals.sockets, 570 SOCKET_GET_SOCKET_ID(call), addr, addrlen, 571 UDP_FREE_PORTS_START, UDP_FREE_PORTS_END, 572 udp_globals.last_used_port); 573 fibril_rwlock_write_unlock(&udp_globals.lock); 574 free(addr); 575 break; 576 577 case NET_SOCKET_SENDTO: 578 res = data_receive((void **) &addr, &addrlen); 579 if (res != EOK) 470 case NET_SOCKET_BIND: 471 res = data_receive((void **) &addr, &addrlen); 472 if(res == EOK){ 473 fibril_rwlock_write_lock(&udp_globals.lock); 474 res = socket_bind(&local_sockets, &udp_globals.sockets, SOCKET_GET_SOCKET_ID(call), addr, addrlen, UDP_FREE_PORTS_START, UDP_FREE_PORTS_END, udp_globals.last_used_port); 475 fibril_rwlock_write_unlock(&udp_globals.lock); 476 free(addr); 477 } 580 478 break; 581 582 fibril_rwlock_write_lock(&udp_globals.lock); 583 res = udp_sendto_message(&local_sockets, 584 SOCKET_GET_SOCKET_ID(call), addr, addrlen, 585 SOCKET_GET_DATA_FRAGMENTS(call), &size, 586 SOCKET_GET_FLAGS(call)); 587 SOCKET_SET_DATA_FRAGMENT_SIZE(answer, size); 588 589 if (res != EOK) 479 case NET_SOCKET_SENDTO: 480 res = data_receive((void **) &addr, &addrlen); 481 if(res == EOK){ 482 fibril_rwlock_write_lock(&udp_globals.lock); 483 res = udp_sendto_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), addr, addrlen, SOCKET_GET_DATA_FRAGMENTS(call), &size, SOCKET_GET_FLAGS(call)); 484 SOCKET_SET_DATA_FRAGMENT_SIZE(answer, size); 485 if(res != EOK){ 486 fibril_rwlock_write_unlock(&udp_globals.lock); 487 }else{ 488 answer_count = 2; 489 } 490 free(addr); 491 } 492 break; 493 case NET_SOCKET_RECVFROM: 494 fibril_rwlock_write_lock(&udp_globals.lock); 495 res = udp_recvfrom_message(&local_sockets, SOCKET_GET_SOCKET_ID(call), SOCKET_GET_FLAGS(call), &addrlen); 590 496 fibril_rwlock_write_unlock(&udp_globals.lock); 591 else 592 answer_count = 2; 593 594 free(addr); 595 break; 596 597 case NET_SOCKET_RECVFROM: 598 fibril_rwlock_write_lock(&udp_globals.lock); 599 res = udp_recvfrom_message(&local_sockets, 600 SOCKET_GET_SOCKET_ID(call), SOCKET_GET_FLAGS(call), 601 &addrlen); 602 fibril_rwlock_write_unlock(&udp_globals.lock); 603 604 if (res <= 0) 497 if(res > 0){ 498 SOCKET_SET_READ_DATA_LENGTH(answer, res); 499 SOCKET_SET_ADDRESS_LENGTH(answer, addrlen); 500 answer_count = 3; 501 res = EOK; 502 } 605 503 break; 606 607 SOCKET_SET_READ_DATA_LENGTH(answer, res); 608 SOCKET_SET_ADDRESS_LENGTH(answer, addrlen); 609 answer_count = 3; 610 res = EOK; 611 break; 612 613 case NET_SOCKET_CLOSE: 614 fibril_rwlock_write_lock(&udp_globals.lock); 615 res = socket_destroy(udp_globals.net_phone, 616 SOCKET_GET_SOCKET_ID(call), &local_sockets, 617 &udp_globals.sockets, NULL); 618 fibril_rwlock_write_unlock(&udp_globals.lock); 619 break; 620 621 case NET_SOCKET_GETSOCKOPT: 622 case NET_SOCKET_SETSOCKOPT: 623 default: 624 res = ENOTSUP; 625 break; 504 case NET_SOCKET_CLOSE: 505 fibril_rwlock_write_lock(&udp_globals.lock); 506 res = socket_destroy(udp_globals.net_phone, SOCKET_GET_SOCKET_ID(call), &local_sockets, &udp_globals.sockets, NULL); 507 fibril_rwlock_write_unlock(&udp_globals.lock); 508 break; 509 case NET_SOCKET_GETSOCKOPT: 510 case NET_SOCKET_SETSOCKOPT: 511 default: 512 res = ENOTSUP; 513 break; 626 514 } 627 515 } … … 631 519 632 520 // release all local sockets 633 socket_cores_release(udp_globals.net_phone, &local_sockets, 634 &udp_globals.sockets, NULL); 521 socket_cores_release(udp_globals.net_phone, &local_sockets, &udp_globals.sockets, NULL); 635 522 636 523 return res; 637 524 } 638 525 639 int 640 udp_sendto_message(socket_cores_ref local_sockets, int socket_id, 641 const struct sockaddr *addr, socklen_t addrlen, int fragments, 642 size_t *data_fragment_size, int flags) 643 { 526 int udp_sendto_message(socket_cores_ref local_sockets, int socket_id, const struct sockaddr * addr, socklen_t addrlen, int fragments, size_t * data_fragment_size, int flags){ 644 527 ERROR_DECLARE; 645 528 … … 661 544 662 545 socket = socket_cores_find(local_sockets, socket_id); 663 if (!socket)546 if(! socket){ 664 547 return ENOTSOCK; 665 666 if ((socket->port <= 0) && udp_globals.autobinding) { 548 } 549 550 if((socket->port <= 0) && udp_globals.autobinding){ 667 551 // bind the socket to a random free port if not bound 668 // do 552 // do{ 669 553 // try to find a free port 670 554 // fibril_rwlock_read_unlock(&udp_globals.lock); 671 555 // fibril_rwlock_write_lock(&udp_globals.lock); 672 556 // might be changed in the meantime 673 // if (socket->port <= 0) { 674 if (ERROR_OCCURRED(socket_bind_free_port( 675 &udp_globals.sockets, socket, 676 UDP_FREE_PORTS_START, UDP_FREE_PORTS_END, 677 udp_globals.last_used_port))) { 678 // fibril_rwlock_write_unlock( 679 // &udp_globals.lock); 680 // fibril_rwlock_read_lock( 681 // &udp_globals.lock); 557 // if(socket->port <= 0){ 558 if(ERROR_OCCURRED(socket_bind_free_port(&udp_globals.sockets, socket, UDP_FREE_PORTS_START, UDP_FREE_PORTS_END, udp_globals.last_used_port))){ 559 // fibril_rwlock_write_unlock(&udp_globals.lock); 560 // fibril_rwlock_read_lock(&udp_globals.lock); 682 561 return ERROR_CODE; 683 562 } 684 // set the next port as the search starting port 685 // number 563 // set the next port as the search starting port number 686 564 udp_globals.last_used_port = socket->port; 687 565 // } … … 689 567 // fibril_rwlock_read_lock(&udp_globals.lock); 690 568 // might be changed in the meantime 691 // } while (socket->port <= 0); 692 } 693 694 if (udp_globals.checksum_computing) { 695 if (ERROR_OCCURRED(ip_get_route_req(udp_globals.ip_phone, 696 IPPROTO_UDP, addr, addrlen, &device_id, &ip_header, 697 &headerlen))) { 569 // }while(socket->port <= 0); 570 } 571 572 if(udp_globals.checksum_computing){ 573 if(ERROR_OCCURRED(ip_get_route_req(udp_globals.ip_phone, IPPROTO_UDP, addr, addrlen, &device_id, &ip_header, &headerlen))){ 698 574 return udp_release_and_return(packet, ERROR_CODE); 699 575 } 700 576 // get the device packet dimension 701 // ERROR_PROPAGATE(tl_get_ip_packet_dimension(udp_globals.ip_phone, 702 // &udp_globals.dimensions, device_id, &packet_dimension)); 703 } 704 // } else { 577 // ERROR_PROPAGATE(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, device_id, &packet_dimension)); 578 } 579 // }else{ 705 580 // do not ask all the time 706 ERROR_PROPAGATE(ip_packet_size_req(udp_globals.ip_phone, -1, 707 &udp_globals.packet_dimension)); 581 ERROR_PROPAGATE(ip_packet_size_req(udp_globals.ip_phone, -1, &udp_globals.packet_dimension)); 708 582 packet_dimension = &udp_globals.packet_dimension; 709 583 // } 710 584 711 585 // read the first packet fragment 712 result = tl_socket_read_packet_data(udp_globals.net_phone, &packet, 713 UDP_HEADER_SIZE, packet_dimension, addr, addrlen); 714 if (result < 0) 586 result = tl_socket_read_packet_data(udp_globals.net_phone, &packet, UDP_HEADER_SIZE, packet_dimension, addr, addrlen); 587 if(result < 0){ 715 588 return result; 716 589 } 717 590 total_length = (size_t) result; 718 if (udp_globals.checksum_computing) 719 checksum = compute_checksum(0, packet_get_data(packet), 720 packet_get_data_length(packet)); 721 else 591 if(udp_globals.checksum_computing){ 592 checksum = compute_checksum(0, packet_get_data(packet), packet_get_data_length(packet)); 593 }else{ 722 594 checksum = 0; 723 595 } 724 596 // prefix the udp header 725 597 header = PACKET_PREFIX(packet, udp_header_t); 726 if(! header) 598 if(! header){ 727 599 return udp_release_and_return(packet, ENOMEM); 728 600 } 729 601 bzero(header, sizeof(*header)); 730 602 // read the rest of the packet fragments 731 for (index = 1; index < fragments; ++ index) { 732 result = tl_socket_read_packet_data(udp_globals.net_phone, 733 &next_packet, 0, packet_dimension, addr, addrlen); 734 if (result < 0) 603 for(index = 1; index < fragments; ++ index){ 604 result = tl_socket_read_packet_data(udp_globals.net_phone, &next_packet, 0, packet_dimension, addr, addrlen); 605 if(result < 0){ 735 606 return udp_release_and_return(packet, result); 736 737 if (ERROR_OCCURRED(pq_add(&packet, next_packet, index, 0)))607 } 608 if(ERROR_OCCURRED(pq_add(&packet, next_packet, index, 0))){ 738 609 return udp_release_and_return(packet, ERROR_CODE); 739 610 } 740 611 total_length += (size_t) result; 741 if (udp_globals.checksum_computing) { 742 checksum = compute_checksum(checksum, 743 packet_get_data(next_packet), 744 packet_get_data_length(next_packet)); 745 } 746 } 747 612 if(udp_globals.checksum_computing){ 613 checksum = compute_checksum(checksum, packet_get_data(next_packet), packet_get_data_length(next_packet)); 614 } 615 } 748 616 // set the udp header 749 617 header->source_port = htons((socket->port > 0) ? socket->port : 0); … … 751 619 header->total_length = htons(total_length + sizeof(*header)); 752 620 header->checksum = 0; 753 if (udp_globals.checksum_computing){621 if(udp_globals.checksum_computing){ 754 622 // update the pseudo header 755 if (ERROR_OCCURRED(ip_client_set_pseudo_header_data_length( 756 ip_header, headerlen, total_length + UDP_HEADER_SIZE))) { 623 if(ERROR_OCCURRED(ip_client_set_pseudo_header_data_length(ip_header, headerlen, total_length + UDP_HEADER_SIZE))){ 757 624 free(ip_header); 758 625 return udp_release_and_return(packet, ERROR_CODE); 759 626 } 760 761 627 // finish the checksum computation 762 628 checksum = compute_checksum(checksum, ip_header, headerlen); 763 checksum = compute_checksum(checksum, (uint8_t *) header, 764 sizeof(*header)); 765 header->checksum = 766 htons(flip_checksum(compact_checksum(checksum))); 629 checksum = compute_checksum(checksum, (uint8_t *) header, sizeof(*header)); 630 header->checksum = htons(flip_checksum(compact_checksum(checksum))); 767 631 free(ip_header); 768 } else{632 }else{ 769 633 device_id = DEVICE_INVALID_ID; 770 634 } 771 772 635 // prepare the first packet fragment 773 if (ERROR_OCCURRED(ip_client_prepare_packet(packet, IPPROTO_UDP, 0, 0, 774 0, 0))) { 636 if(ERROR_OCCURRED(ip_client_prepare_packet(packet, IPPROTO_UDP, 0, 0, 0, 0))){ 775 637 return udp_release_and_return(packet, ERROR_CODE); 776 638 } 777 778 639 // send the packet 779 640 fibril_rwlock_write_unlock(&udp_globals.lock); 780 641 ip_send_msg(udp_globals.ip_phone, device_id, packet, SERVICE_UDP, 0); 781 782 642 return EOK; 783 643 } 784 644 785 int 786 udp_recvfrom_message(socket_cores_ref local_sockets, int socket_id, int flags, 787 size_t *addrlen) 788 { 645 int udp_recvfrom_message(socket_cores_ref local_sockets, int socket_id, int flags, size_t * addrlen){ 789 646 ERROR_DECLARE; 790 647 … … 793 650 packet_t packet; 794 651 udp_header_ref header; 795 struct sockaddr * addr;652 struct sockaddr * addr; 796 653 size_t length; 797 uint8_t * data;654 uint8_t * data; 798 655 int result; 799 656 800 657 // find the socket 801 658 socket = socket_cores_find(local_sockets, socket_id); 802 if (!socket)659 if(! socket){ 803 660 return ENOTSOCK; 804 661 } 805 662 // get the next received packet 806 663 packet_id = dyn_fifo_value(&socket->received); 807 if (packet_id < 0)664 if(packet_id < 0){ 808 665 return NO_DATA; 809 810 ERROR_PROPAGATE(packet_translate_remote(udp_globals.net_phone, &packet, 811 packet_id)); 812 666 } 667 ERROR_PROPAGATE(packet_translate_remote(udp_globals.net_phone, &packet, packet_id)); 813 668 // get udp header 814 669 data = packet_get_data(packet); 815 if (!data){670 if(! data){ 816 671 pq_release_remote(udp_globals.net_phone, packet_id); 817 672 return NO_DATA; … … 821 676 // set the source address port 822 677 result = packet_get_addr(packet, (uint8_t **) &addr, NULL); 823 if (ERROR_OCCURRED(tl_set_address_port(addr, result, 824 ntohs(header->source_port)))) { 678 if(ERROR_OCCURRED(tl_set_address_port(addr, result, ntohs(header->source_port)))){ 825 679 pq_release_remote(udp_globals.net_phone, packet_id); 826 680 return ERROR_CODE; 827 681 } 828 682 *addrlen = (size_t) result; 829 830 683 // send the source address 831 684 ERROR_PROPAGATE(data_reply(addr, * addrlen)); … … 840 693 dyn_fifo_pop(&socket->received); 841 694 pq_release_remote(udp_globals.net_phone, packet_get_id(packet)); 842 843 695 // return the total length 844 696 return (int) length; 845 697 } 846 698 847 int udp_release_and_return(packet_t packet, int result) 848 { 699 int udp_release_and_return(packet_t packet, int result){ 849 700 pq_release_remote(udp_globals.net_phone, packet_get_id(packet)); 850 701 return result; … … 853 704 /** Default thread for new connections. 854 705 * 855 * @param[in] iid 856 * @param[in] icall 706 * @param[in] iid The initial message identifier. 707 * @param[in] icall The initial message call structure. 857 708 * 858 709 */ … … 865 716 ipc_answer_0(iid, EOK); 866 717 867 while 718 while(true) { 868 719 ipc_call_t answer; 869 720 int answer_count; … … 880 731 &answer_count); 881 732 882 /* 883 * End if said to either by the message or the processing result 884 */ 885 if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || 886 (res == EHANGUP)) 733 /* End if said to either by the message or the processing result */ 734 if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP)) 887 735 return; 888 736 … … 894 742 /** Starts the module. 895 743 * 896 * @param argc The count of the command line arguments. Ignored 897 * parameter. 898 * @param argv The command line parameters. Ignored parameter. 744 * @param argc The count of the command line arguments. Ignored parameter. 745 * @param argv The command line parameters. Ignored parameter. 899 746 * 900 * @returns 901 * @returns Other error codes as defined for each specific module902 * start function.747 * @returns EOK on success. 748 * @returns Other error codes as defined for each specific module start function. 749 * 903 750 */ 904 751 int main(int argc, char *argv[])
Note:
See TracChangeset
for help on using the changeset viewer.
