Index: uspace/srv/net/tl/udp/udp.c =================================================================== --- uspace/srv/net/tl/udp/udp.c (revision d8f95529327912baa6fa84211af27012838af18e) +++ uspace/srv/net/tl/udp/udp.c (revision 46ae62c9a2369d196eef6493849d7b1153e09cf5) @@ -51,5 +51,4 @@ #include #include -#include #include @@ -103,6 +102,4 @@ int udp_initialize(async_client_conn_t client_connection) { - ERROR_DECLARE; - measured_string_t names[] = { { @@ -118,4 +115,5 @@ size_t count = sizeof(names) / sizeof(measured_string_t); char *data; + int rc; fibril_rwlock_initialize(&udp_globals.lock); @@ -124,18 +122,33 @@ udp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP, ICMP_CONNECT_TIMEOUT); + udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP, SERVICE_UDP, client_connection); - if (udp_globals.ip_phone < 0) + if (udp_globals.ip_phone < 0) { + fibril_rwlock_write_unlock(&udp_globals.lock); return udp_globals.ip_phone; + } // read default packet dimensions - ERROR_PROPAGATE(ip_packet_size_req(udp_globals.ip_phone, -1, - &udp_globals.packet_dimension)); - ERROR_PROPAGATE(socket_ports_initialize(&udp_globals.sockets)); - if (ERROR_OCCURRED(packet_dimensions_initialize( - &udp_globals.dimensions))) { + rc = ip_packet_size_req(udp_globals.ip_phone, -1, + &udp_globals.packet_dimension); + if (rc != EOK) { + fibril_rwlock_write_unlock(&udp_globals.lock); + return rc; + } + + rc = socket_ports_initialize(&udp_globals.sockets); + if (rc != EOK) { + fibril_rwlock_write_unlock(&udp_globals.lock); + return rc; + } + + rc = packet_dimensions_initialize(&udp_globals.dimensions); + if (rc != EOK) { socket_ports_destroy(&udp_globals.sockets); - return ERROR_CODE; - } + fibril_rwlock_write_unlock(&udp_globals.lock); + return rc; + } + udp_globals.packet_dimension.prefix += sizeof(udp_header_t); udp_globals.packet_dimension.content -= sizeof(udp_header_t); @@ -147,6 +160,12 @@ // get configuration configuration = &names[0]; - ERROR_PROPAGATE(net_get_conf_req(udp_globals.net_phone, &configuration, - count, &data)); + rc = net_get_conf_req(udp_globals.net_phone, &configuration, count, + &data); + if (rc != EOK) { + socket_ports_destroy(&udp_globals.sockets); + fibril_rwlock_write_unlock(&udp_globals.lock); + return rc; + } + if (configuration) { if (configuration[0].value) @@ -201,6 +220,4 @@ udp_process_packet(device_id_t device_id, packet_t packet, services_t error) { - ERROR_DECLARE; - size_t length; size_t offset; @@ -219,4 +236,5 @@ struct sockaddr *dest; packet_dimension_ref packet_dimension; + int rc; switch (error) { @@ -232,7 +250,7 @@ return udp_release_and_return(packet, result); length = (size_t) result; - if (ERROR_OCCURRED(packet_trim(packet, length, 0))) - return udp_release_and_return(packet, - ERROR_CODE); + rc = packet_trim(packet, length, 0); + if (rc != EOK) + return udp_release_and_return(packet, rc); break; default: @@ -253,6 +271,7 @@ // trim all but UDP header - if (ERROR_OCCURRED(packet_trim(packet, offset, 0))) - return udp_release_and_return(packet, ERROR_CODE); + rc = packet_trim(packet, offset, 0); + if (rc != EOK) + return udp_release_and_return(packet, rc); // get udp header @@ -284,9 +303,9 @@ if (result <= 0) return udp_release_and_return(packet, result); - - if (ERROR_OCCURRED(ip_client_get_pseudo_header(IPPROTO_UDP, - src, result, dest, result, total_length, &ip_header, - &length))) { - return udp_release_and_return(packet, ERROR_CODE); + + rc = ip_client_get_pseudo_header(IPPROTO_UDP, src, result, dest, + result, total_length, &ip_header, &length); + if (rc != EOK) { + return udp_release_and_return(packet, rc); } else { checksum = compute_checksum(0, ip_header, length); @@ -307,9 +326,7 @@ if (total_length < length) { - if (ERROR_OCCURRED(packet_trim(next_packet, 0, - length - total_length))) { - return udp_release_and_return(packet, - ERROR_CODE); - } + rc = packet_trim(next_packet, 0, length - total_length); + if (rc != EOK) + return udp_release_and_return(packet, rc); // add partial checksum if set @@ -360,10 +377,13 @@ // queue the received packet - if (ERROR_OCCURRED(dyn_fifo_push(&socket->received, - packet_get_id(packet), SOCKET_MAX_RECEIVED_SIZE)) || - ERROR_OCCURRED(tl_get_ip_packet_dimension(udp_globals.ip_phone, - &udp_globals.dimensions, device_id, &packet_dimension))) { - return udp_release_and_return(packet, ERROR_CODE); - } + rc = dyn_fifo_push(&socket->received, packet_get_id(packet), + SOCKET_MAX_RECEIVED_SIZE); + if (rc != EOK) + return udp_release_and_return(packet, rc); + + rc = tl_get_ip_packet_dimension(udp_globals.ip_phone, + &udp_globals.dimensions, device_id, &packet_dimension); + if (rc != EOK) + return udp_release_and_return(packet, rc); // notify the destination socket @@ -436,6 +456,4 @@ size_t *data_fragment_size, int flags) { - ERROR_DECLARE; - socket_core_ref socket; packet_t packet; @@ -451,6 +469,9 @@ device_id_t device_id; packet_dimension_ref packet_dimension; - - ERROR_PROPAGATE(tl_get_address_port(addr, addrlen, &dest_port)); + int rc; + + rc = tl_get_address_port(addr, addrlen, &dest_port); + if (rc != EOK) + return rc; socket = socket_cores_find(local_sockets, socket_id); @@ -466,13 +487,14 @@ // might be changed in the meantime // if (socket->port <= 0) { - if (ERROR_OCCURRED(socket_bind_free_port( - &udp_globals.sockets, socket, - UDP_FREE_PORTS_START, UDP_FREE_PORTS_END, - udp_globals.last_used_port))) { + rc = socket_bind_free_port(&udp_globals.sockets, + socket, UDP_FREE_PORTS_START, + UDP_FREE_PORTS_END, + udp_globals.last_used_port); + if (rc != EOK) { // fibril_rwlock_write_unlock( // &udp_globals.lock); // fibril_rwlock_read_lock( // &udp_globals.lock); - return ERROR_CODE; + return rc; } // set the next port as the search starting port @@ -487,17 +509,20 @@ if (udp_globals.checksum_computing) { - if (ERROR_OCCURRED(ip_get_route_req(udp_globals.ip_phone, - IPPROTO_UDP, addr, addrlen, &device_id, &ip_header, - &headerlen))) { - return udp_release_and_return(packet, ERROR_CODE); - } + rc = ip_get_route_req(udp_globals.ip_phone, IPPROTO_UDP, addr, + addrlen, &device_id, &ip_header, &headerlen); + if (rc != EOK) + return udp_release_and_return(packet, rc); // get the device packet dimension -// ERROR_PROPAGATE(tl_get_ip_packet_dimension(udp_globals.ip_phone, -// &udp_globals.dimensions, device_id, &packet_dimension)); +// rc = tl_get_ip_packet_dimension(udp_globals.ip_phone, +// &udp_globals.dimensions, device_id, &packet_dimension); +// if (rc != EOK) +// return rc; } // } else { // do not ask all the time - ERROR_PROPAGATE(ip_packet_size_req(udp_globals.ip_phone, -1, - &udp_globals.packet_dimension)); + rc = ip_packet_size_req(udp_globals.ip_phone, -1, + &udp_globals.packet_dimension); + if (rc != EOK) + return rc; packet_dimension = &udp_globals.packet_dimension; // } @@ -529,6 +554,7 @@ return udp_release_and_return(packet, result); - if (ERROR_OCCURRED(pq_add(&packet, next_packet, index, 0))) - return udp_release_and_return(packet, ERROR_CODE); + rc = pq_add(&packet, next_packet, index, 0); + if (rc != EOK) + return udp_release_and_return(packet, rc); total_length += (size_t) result; @@ -547,8 +573,9 @@ if (udp_globals.checksum_computing) { // update the pseudo header - if (ERROR_OCCURRED(ip_client_set_pseudo_header_data_length( - ip_header, headerlen, total_length + UDP_HEADER_SIZE))) { + rc = ip_client_set_pseudo_header_data_length(ip_header, + headerlen, total_length + UDP_HEADER_SIZE); + if (rc != EOK) { free(ip_header); - return udp_release_and_return(packet, ERROR_CODE); + return udp_release_and_return(packet, rc); } @@ -565,8 +592,7 @@ // prepare the first packet fragment - if (ERROR_OCCURRED(ip_client_prepare_packet(packet, IPPROTO_UDP, 0, 0, - 0, 0))) { - return udp_release_and_return(packet, ERROR_CODE); - } + rc = ip_client_prepare_packet(packet, IPPROTO_UDP, 0, 0, 0, 0); + if (rc != EOK) + return udp_release_and_return(packet, rc); // send the packet @@ -600,6 +626,4 @@ size_t *addrlen) { - ERROR_DECLARE; - socket_core_ref socket; int packet_id; @@ -610,4 +634,5 @@ uint8_t *data; int result; + int rc; // find the socket @@ -620,7 +645,8 @@ if (packet_id < 0) return NO_DATA; - - ERROR_PROPAGATE(packet_translate_remote(udp_globals.net_phone, &packet, - packet_id)); + + rc = packet_translate_remote(udp_globals.net_phone, &packet, packet_id); + if (rc != EOK) + return rc; // get udp header @@ -634,19 +660,25 @@ // set the source address port result = packet_get_addr(packet, (uint8_t **) &addr, NULL); - if (ERROR_OCCURRED(tl_set_address_port(addr, result, - ntohs(header->source_port)))) { + rc = tl_set_address_port(addr, result, ntohs(header->source_port)); + if (rc != EOK) { pq_release_remote(udp_globals.net_phone, packet_id); - return ERROR_CODE; + return rc; } *addrlen = (size_t) result; // send the source address - ERROR_PROPAGATE(data_reply(addr, *addrlen)); + rc = data_reply(addr, *addrlen); + if (rc != EOK) + return rc; // trim the header - ERROR_PROPAGATE(packet_trim(packet, UDP_HEADER_SIZE, 0)); + rc = packet_trim(packet, UDP_HEADER_SIZE, 0); + if (rc != EOK) + return rc; // reply the packets - ERROR_PROPAGATE(socket_reply_packets(packet, &length)); + rc = socket_reply_packets(packet, &length); + if (rc != EOK) + return rc; // release the packet @@ -826,7 +858,6 @@ ipc_call_t *answer, int *answer_count) { - ERROR_DECLARE; - packet_t packet; + int rc; *answer_count = 0; @@ -834,11 +865,10 @@ switch (IPC_GET_METHOD(*call)) { case NET_TL_RECEIVED: - if (ERROR_NONE(packet_translate_remote(udp_globals.net_phone, - &packet, IPC_GET_PACKET(call)))) { - ERROR_CODE = udp_received_msg(IPC_GET_DEVICE(call), - packet, SERVICE_UDP, IPC_GET_ERROR(call)); - } - return ERROR_CODE; - + rc = packet_translate_remote(udp_globals.net_phone, &packet, + IPC_GET_PACKET(call)); + if (rc != EOK) + return rc; + return udp_received_msg(IPC_GET_DEVICE(call), packet, + SERVICE_UDP, IPC_GET_ERROR(call)); case IPC_M_CONNECT_TO_ME: return udp_process_client_messages(callid, * call); @@ -850,7 +880,6 @@ /** Default thread for new connections. * - * @param[in] iid The initial message identifier. - * @param[in] icall The initial message call structure. - * + * @param[in] iid The initial message identifier. + * @param[in] icall The initial message call structure. */ static void tl_client_connection(ipc_callid_t iid, ipc_call_t * icall) @@ -898,11 +927,9 @@ int main(int argc, char *argv[]) { - ERROR_DECLARE; + int rc; /* Start the module */ - if (ERROR_OCCURRED(tl_module_start_standalone(tl_client_connection))) - return ERROR_CODE; - - return EOK; + rc = tl_module_start_standalone(tl_client_connection); + return rc; } Index: uspace/srv/net/tl/udp/udp_module.c =================================================================== --- uspace/srv/net/tl/udp/udp_module.c (revision d8f95529327912baa6fa84211af27012838af18e) +++ uspace/srv/net/tl/udp/udp_module.c (revision 46ae62c9a2369d196eef6493849d7b1153e09cf5) @@ -44,5 +44,5 @@ #include #include -#include +#include #include #include @@ -59,7 +59,6 @@ int tl_module_start_standalone(async_client_conn_t client_connection) { - ERROR_DECLARE; - ipcarg_t phonehash; + int rc; async_set_client_connection(client_connection); @@ -67,16 +66,22 @@ if (udp_globals.net_phone < 0) return udp_globals.net_phone; - - ERROR_PROPAGATE(pm_init()); - if (ERROR_OCCURRED(udp_initialize(client_connection)) || - ERROR_OCCURRED(REGISTER_ME(SERVICE_UDP, &phonehash))) { - pm_destroy(); - return ERROR_CODE; - } + + rc = pm_init(); + if (rc != EOK) + return EOK; + + rc = udp_initialize(client_connection); + if (rc != EOK) + goto out; + + rc = REGISTER_ME(SERVICE_UDP, &phonehash); + if (rc != EOK) + goto out; async_manager(); +out: pm_destroy(); - return EOK; + return rc; }