Index: uspace/srv/net/tl/udp/udp.c =================================================================== --- uspace/srv/net/tl/udp/udp.c (revision bf1728257878be61830ed8a583f39ba76e6d3b18) +++ uspace/srv/net/tl/udp/udp.c (revision 03bc76a7fb314e6f8a8a718e724a331923b447b8) @@ -37,5 +37,4 @@ #include -#include #include #include @@ -71,7 +70,4 @@ #include "udp_header.h" -// FIXME: remove this header -#include - /** UDP module name. */ #define NAME "udp" @@ -103,5 +99,5 @@ static int udp_release_and_return(packet_t *packet, int result) { - pq_release_remote(udp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(udp_globals.net_sess, packet_get_id(packet)); return result; } @@ -196,7 +192,7 @@ ntohs(header->destination_port), (uint8_t *) SOCKET_MAP_KEY_LISTENING, 0); if (!socket) { - if (tl_prepare_icmp_packet(udp_globals.net_phone, - udp_globals.icmp_phone, packet, error) == EOK) { - icmp_destination_unreachable_msg(udp_globals.icmp_phone, + if (tl_prepare_icmp_packet(udp_globals.net_sess, + udp_globals.icmp_sess, packet, error) == EOK) { + icmp_destination_unreachable_msg(udp_globals.icmp_sess, ICMP_PORT_UNREACH, 0, packet); } @@ -255,5 +251,5 @@ while (tmp_packet) { next_packet = pq_detach(tmp_packet); - pq_release_remote(udp_globals.net_phone, + pq_release_remote(udp_globals.net_sess, packet_get_id(tmp_packet)); tmp_packet = next_packet; @@ -278,9 +274,9 @@ if (flip_checksum(compact_checksum(checksum)) != IP_CHECKSUM_ZERO) { - if (tl_prepare_icmp_packet(udp_globals.net_phone, - udp_globals.icmp_phone, packet, error) == EOK) { + if (tl_prepare_icmp_packet(udp_globals.net_sess, + udp_globals.icmp_sess, packet, error) == EOK) { /* Checksum error ICMP */ icmp_parameter_problem_msg( - udp_globals.icmp_phone, ICMP_PARAM_POINTER, + udp_globals.icmp_sess, ICMP_PARAM_POINTER, ((size_t) ((void *) &header->checksum)) - ((size_t) ((void *) header)), packet); @@ -296,5 +292,5 @@ return udp_release_and_return(packet, rc); - rc = tl_get_ip_packet_dimension(udp_globals.ip_phone, + rc = tl_get_ip_packet_dimension(udp_globals.ip_sess, &udp_globals.dimensions, device_id, &packet_dimension); if (rc != EOK) @@ -303,7 +299,9 @@ /* Notify the destination socket */ fibril_rwlock_write_unlock(&udp_globals.lock); - async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED, - (sysarg_t) socket->socket_id, packet_dimension->content, 0, 0, - (sysarg_t) fragments); + + async_exch_t *exch = async_exchange_begin(socket->sess); + async_msg_5(exch, NET_SOCKET_RECEIVED, (sysarg_t) socket->socket_id, + packet_dimension->content, 0, 0, (sysarg_t) fragments); + async_exchange_end(exch); return EOK; @@ -342,4 +340,5 @@ * @param[in,out] icall Message parameters. * @param[in] arg Local argument. + * */ static void udp_receiver(ipc_callid_t iid, ipc_call_t *icall, void *arg) @@ -351,5 +350,5 @@ switch (IPC_GET_IMETHOD(*icall)) { case NET_TL_RECEIVED: - rc = packet_translate_remote(udp_globals.net_phone, &packet, + rc = packet_translate_remote(udp_globals.net_sess, &packet, IPC_GET_PACKET(*icall)); if (rc == EOK) @@ -369,5 +368,5 @@ /** Initialize the UDP module. * - * @param[in] net_phone Network module phone. + * @param[in] sess Network module session. * * @return EOK on success. @@ -375,5 +374,5 @@ * */ -int tl_initialize(int net_phone) +int tl_initialize(async_sess_t *sess) { measured_string_t names[] = { @@ -394,17 +393,16 @@ fibril_rwlock_write_lock(&udp_globals.lock); - udp_globals.net_phone = net_phone; - - udp_globals.icmp_phone = icmp_connect_module(); - - udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP, - SERVICE_UDP, udp_receiver); - if (udp_globals.ip_phone < 0) { - fibril_rwlock_write_unlock(&udp_globals.lock); - return udp_globals.ip_phone; + udp_globals.net_sess = sess; + udp_globals.icmp_sess = icmp_connect_module(); + + udp_globals.ip_sess = ip_bind_service(SERVICE_IP, IPPROTO_UDP, + SERVICE_UDP, udp_receiver); + if (udp_globals.ip_sess == NULL) { + fibril_rwlock_write_unlock(&udp_globals.lock); + return ENOENT; } /* Read default packet dimensions */ - int rc = ip_packet_size_req(udp_globals.ip_phone, -1, + int rc = ip_packet_size_req(udp_globals.ip_sess, -1, &udp_globals.packet_dimension); if (rc != EOK) { @@ -435,5 +433,5 @@ /* Get configuration */ configuration = &names[0]; - rc = net_get_conf_req(udp_globals.net_phone, &configuration, count, + rc = net_get_conf_req(udp_globals.net_sess, &configuration, count, &data); if (rc != EOK) { @@ -529,10 +527,10 @@ if (udp_globals.checksum_computing) { - rc = ip_get_route_req(udp_globals.ip_phone, IPPROTO_UDP, addr, + rc = ip_get_route_req(udp_globals.ip_sess, IPPROTO_UDP, addr, addrlen, &device_id, &ip_header, &headerlen); if (rc != EOK) return rc; /* Get the device packet dimension */ -// rc = tl_get_ip_packet_dimension(udp_globals.ip_phone, +// rc = tl_get_ip_packet_dimension(udp_globals.ip_sess, // &udp_globals.dimensions, device_id, &packet_dimension); // if (rc != EOK) @@ -541,5 +539,5 @@ // } else { /* Do not ask all the time */ - rc = ip_packet_size_req(udp_globals.ip_phone, -1, + rc = ip_packet_size_req(udp_globals.ip_sess, -1, &udp_globals.packet_dimension); if (rc != EOK) @@ -559,5 +557,5 @@ /* Read the first packet fragment */ - result = tl_socket_read_packet_data(udp_globals.net_phone, &packet, + result = tl_socket_read_packet_data(udp_globals.net_sess, &packet, UDP_HEADER_SIZE, packet_dimension, addr, addrlen); if (result < 0) @@ -580,5 +578,5 @@ /* Read the rest of the packet fragments */ for (index = 1; index < fragments; index++) { - result = tl_socket_read_packet_data(udp_globals.net_phone, + result = tl_socket_read_packet_data(udp_globals.net_sess, &next_packet, 0, packet_dimension, addr, addrlen); if (result < 0) @@ -632,5 +630,5 @@ /* Send the packet */ - ip_send_msg(udp_globals.ip_phone, device_id, packet, SERVICE_UDP, 0); + ip_send_msg(udp_globals.ip_sess, device_id, packet, SERVICE_UDP, 0); return EOK; @@ -679,5 +677,5 @@ return NO_DATA; - rc = packet_translate_remote(udp_globals.net_phone, &packet, packet_id); + rc = packet_translate_remote(udp_globals.net_sess, &packet, packet_id); if (rc != EOK) { (void) dyn_fifo_pop(&socket->received); @@ -739,19 +737,22 @@ } -/** Processes the socket client messages. - * - * Runs until the client module disconnects. - * - * @param[in] callid The message identifier. - * @param[in] call The message parameters. - * @return EOK on success. - * - * @see socket.h - */ -static int udp_process_client_messages(ipc_callid_t callid, ipc_call_t call) +/** Process the socket client messages. + * + * Run until the client module disconnects. + * + * @see socket.h + * + * @param[in] sess Callback session. + * @param[in] callid Message identifier. + * @param[in] call Message parameters. + * + * @return EOK on success. + * + */ +static int udp_process_client_messages(async_sess_t *sess, ipc_callid_t callid, + ipc_call_t call) { int res; socket_cores_t local_sockets; - int app_phone = IPC_GET_PHONE(call); struct sockaddr *addr; int socket_id; @@ -786,15 +787,15 @@ /* Get the next call */ callid = async_get_call(&call); - + + /* Process the call */ if (!IPC_GET_IMETHOD(call)) { res = EHANGUP; break; } - - /* Process the call */ + switch (IPC_GET_IMETHOD(call)) { case NET_SOCKET: socket_id = SOCKET_GET_SOCKET_ID(call); - res = socket_create(&local_sockets, app_phone, NULL, + res = socket_create(&local_sockets, sess, NULL, &socket_id); SOCKET_SET_SOCKET_ID(answer, socket_id); @@ -804,5 +805,5 @@ size = MAX_UDP_FRAGMENT_SIZE; - if (tl_get_ip_packet_dimension(udp_globals.ip_phone, + if (tl_get_ip_packet_dimension(udp_globals.ip_sess, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK) { @@ -868,5 +869,5 @@ case NET_SOCKET_CLOSE: fibril_rwlock_write_lock(&udp_globals.lock); - res = socket_destroy(udp_globals.net_phone, + res = socket_destroy(udp_globals.net_sess, SOCKET_GET_SOCKET_ID(call), &local_sockets, &udp_globals.sockets, NULL); @@ -882,9 +883,9 @@ } - /* Release the application phone */ - async_obsolete_hangup(app_phone); + /* Release the application session */ + async_hangup(sess); /* Release all local sockets */ - socket_cores_release(udp_globals.net_phone, &local_sockets, + socket_cores_release(udp_globals.net_sess, &local_sockets, &udp_globals.sockets, NULL); @@ -916,10 +917,10 @@ { *answer_count = 0; - - switch (IPC_GET_IMETHOD(*call)) { - case IPC_M_CONNECT_TO_ME: - return udp_process_client_messages(callid, *call); - } - + + async_sess_t *callback = + async_callback_receive_start(EXCHANGE_SERIALIZE, call); + if (callback) + return udp_process_client_messages(callback, callid, *call); + return ENOTSUP; }