Index: uspace/srv/net/tl/tcp/tcp.c =================================================================== --- uspace/srv/net/tl/tcp/tcp.c (revision bf1728257878be61830ed8a583f39ba76e6d3b18) +++ uspace/srv/net/tl/tcp/tcp.c (revision e4f8c77d2f0ec68a5943a6b063aaa901dc22d1b4) @@ -38,5 +38,4 @@ #include #include -#include #include #include @@ -74,7 +73,4 @@ #include "tcp_header.h" -// FIXME: remove this header -#include - /** TCP module name. */ #define NAME "tcp" @@ -210,5 +206,6 @@ static int tcp_received_msg(device_id_t, packet_t *, services_t, services_t); -static int tcp_process_client_messages(ipc_callid_t, ipc_call_t); +static int tcp_process_client_messages(async_sess_t *, ipc_callid_t, + ipc_call_t); static int tcp_listen_message(socket_cores_t *, int, int); @@ -328,7 +325,7 @@ if (!socket) { - if (tl_prepare_icmp_packet(tcp_globals.net_phone, - tcp_globals.icmp_phone, packet, error) == EOK) { - icmp_destination_unreachable_msg(tcp_globals.icmp_phone, + if (tl_prepare_icmp_packet(tcp_globals.net_sess, + tcp_globals.icmp_sess, packet, error) == EOK) { + icmp_destination_unreachable_msg(tcp_globals.icmp_sess, ICMP_PORT_UNREACH, 0, packet); } @@ -401,9 +398,9 @@ fibril_rwlock_write_unlock(socket_data->local_lock); - rc = tl_prepare_icmp_packet(tcp_globals.net_phone, - tcp_globals.icmp_phone, packet, error); + rc = tl_prepare_icmp_packet(tcp_globals.net_sess, + tcp_globals.icmp_sess, packet, error); if (rc == EOK) { /* Checksum error ICMP */ - icmp_parameter_problem_msg(tcp_globals.icmp_phone, + icmp_parameter_problem_msg(tcp_globals.icmp_sess, ICMP_PARAM_POINTER, ((size_t) ((void *) &header->checksum)) - @@ -443,5 +440,5 @@ break; default: - pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); } @@ -506,5 +503,5 @@ /* Release the acknowledged packets */ next_packet = pq_next(packet); - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); packet = next_packet; @@ -565,5 +562,5 @@ next_packet = pq_next(next_packet); pq_insert_after(tmp_packet, next_packet); - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(tmp_packet)); } @@ -602,5 +599,5 @@ if (packet == socket_data->incoming) socket_data->incoming = next_packet; - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); packet = next_packet; @@ -625,5 +622,5 @@ if (length <= 0) { /* Remove the empty packet */ - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); packet = next_packet; @@ -672,5 +669,5 @@ } /* Remove the duplicit or corrupted packet */ - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); packet = next_packet; @@ -699,7 +696,7 @@ if (rc != EOK) { /* Remove the corrupted packets */ - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(next_packet)); } else { @@ -712,10 +709,10 @@ new_sequence_number, length); if (rc != EOK) { - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(next_packet)); } rc = pq_insert_after(packet, next_packet); if (rc != EOK) { - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(next_packet)); } @@ -726,5 +723,5 @@ printf("unexpected\n"); /* Release duplicite or restricted */ - pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); forced_ack = true; } @@ -794,5 +791,5 @@ if (rc != EOK) return tcp_release_and_return(packet, rc); - rc = tl_get_ip_packet_dimension(tcp_globals.ip_phone, + rc = tl_get_ip_packet_dimension(tcp_globals.ip_sess, &tcp_globals.dimensions, socket_data->device_id, &packet_dimension); if (rc != EOK) @@ -803,9 +800,10 @@ /* Notify the destination socket */ - async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED, - (sysarg_t) socket->socket_id, + async_exch_t *exch = async_exchange_begin(socket->sess); + async_msg_5(exch, NET_SOCKET_RECEIVED, (sysarg_t) socket->socket_id, ((packet_dimension->content < socket_data->data_fragment_size) ? packet_dimension->content : socket_data->data_fragment_size), 0, 0, (sysarg_t) fragments); + async_exchange_end(exch); return EOK; @@ -824,8 +822,8 @@ /* Notify the destination socket */ - async_obsolete_msg_5(socket->phone, NET_SOCKET_RECEIVED, - (sysarg_t) socket->socket_id, - 0, 0, 0, - (sysarg_t) 0 /* 0 fragments == no more data */); + async_exch_t *exch = async_exchange_begin(socket->sess); + async_msg_5(exch, NET_SOCKET_RECEIVED, (sysarg_t) socket->socket_id, + 0, 0, 0, (sysarg_t) 0 /* 0 fragments == no more data */); + async_exchange_end(exch); } @@ -853,5 +851,5 @@ next_packet = pq_detach(packet); if (next_packet) { - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(next_packet)); } @@ -940,5 +938,5 @@ /* Create a socket */ socket_id = -1; - rc = socket_create(socket_data->local_sockets, listening_socket->phone, + rc = socket_create(socket_data->local_sockets, listening_socket->sess, socket_data, &socket_id); if (rc != EOK) { @@ -993,5 +991,5 @@ fibril_rwlock_write_unlock(&tcp_globals.lock); if (rc != EOK) { - socket_destroy(tcp_globals.net_phone, socket->socket_id, + socket_destroy(tcp_globals.net_sess, socket->socket_id, socket_data->local_sockets, &tcp_globals.sockets, tcp_free_socket_data); @@ -1005,5 +1003,5 @@ next_packet = pq_detach(packet); if (next_packet) { - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(next_packet)); } @@ -1014,5 +1012,5 @@ packet_get_data_length(packet) - sizeof(*header)); if (rc != EOK) { - socket_destroy(tcp_globals.net_phone, socket->socket_id, + socket_destroy(tcp_globals.net_sess, socket->socket_id, socket_data->local_sockets, &tcp_globals.sockets, tcp_free_socket_data); @@ -1025,5 +1023,5 @@ rc = tcp_queue_packet(socket, socket_data, packet, 1); if (rc != EOK) { - socket_destroy(tcp_globals.net_phone, socket->socket_id, + socket_destroy(tcp_globals.net_sess, socket->socket_id, socket_data->local_sockets, &tcp_globals.sockets, tcp_free_socket_data); @@ -1033,5 +1031,5 @@ packet = tcp_get_packets_to_send(socket, socket_data); if (!packet) { - socket_destroy(tcp_globals.net_phone, socket->socket_id, + socket_destroy(tcp_globals.net_sess, socket->socket_id, socket_data->local_sockets, &tcp_globals.sockets, tcp_free_socket_data); @@ -1068,5 +1066,5 @@ socket_data->next_incoming = ntohl(header->sequence_number); /* + 1; */ - pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); socket_data->state = TCP_SOCKET_ESTABLISHED; listening_socket = socket_cores_find(socket_data->local_sockets, @@ -1082,8 +1080,10 @@ if (rc == EOK) { /* Notify the destination socket */ - async_obsolete_msg_5(socket->phone, NET_SOCKET_ACCEPTED, + async_exch_t *exch = async_exchange_begin(socket->sess); + async_msg_5(exch, NET_SOCKET_ACCEPTED, (sysarg_t) listening_socket->socket_id, socket_data->data_fragment_size, TCP_HEADER_SIZE, 0, (sysarg_t) socket->socket_id); + async_exchange_end(exch); fibril_rwlock_write_unlock(socket_data->local_lock); @@ -1181,5 +1181,5 @@ /* Add to acknowledged or release */ if (pq_add(&acknowledged, packet, 0, 0) != EOK) - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); packet = next; @@ -1190,5 +1190,5 @@ /* Release acknowledged */ if (acknowledged) { - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(acknowledged)); } @@ -1234,11 +1234,12 @@ assert(answer); assert(answer_count); - + *answer_count = 0; - switch (IPC_GET_IMETHOD(*call)) { - case IPC_M_CONNECT_TO_ME: - return tcp_process_client_messages(callid, *call); - } - + + async_sess_t *callback = + async_callback_receive_start(EXCHANGE_SERIALIZE, call); + if (callback) + return tcp_process_client_messages(callback, callid, *call); + return ENOTSUP; } @@ -1270,9 +1271,9 @@ } -int tcp_process_client_messages(ipc_callid_t callid, ipc_call_t call) +int tcp_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; @@ -1325,5 +1326,5 @@ fibril_rwlock_write_lock(&lock); socket_id = SOCKET_GET_SOCKET_ID(call); - res = socket_create(&local_sockets, app_phone, + res = socket_create(&local_sockets, sess, socket_data, &socket_id); SOCKET_SET_SOCKET_ID(answer, socket_id); @@ -1333,5 +1334,5 @@ break; } - if (tl_get_ip_packet_dimension(tcp_globals.ip_phone, + if (tl_get_ip_packet_dimension(tcp_globals.ip_sess, &tcp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK) { @@ -1508,10 +1509,10 @@ } - /* Release the application phone */ - async_obsolete_hangup(app_phone); + /* Release the application session */ + async_hangup(sess); printf("release\n"); /* Release all local sockets */ - socket_cores_release(tcp_globals.net_phone, &local_sockets, + socket_cores_release(tcp_globals.net_sess, &local_sockets, &tcp_globals.sockets, tcp_free_socket_data); @@ -1621,5 +1622,5 @@ local_lock = socket_data->local_lock; fibril_rwlock_write_lock(local_lock); - socket_destroy(tcp_globals.net_phone, + socket_destroy(tcp_globals.net_sess, timeout->socket_id, timeout->local_sockets, &tcp_globals.sockets, tcp_free_socket_data); @@ -1754,5 +1755,5 @@ } - rc = ip_get_route_req(tcp_globals.ip_phone, IPPROTO_TCP, + rc = ip_get_route_req(tcp_globals.ip_sess, IPPROTO_TCP, addr, addrlen, &socket_data->device_id, &socket_data->pseudo_header, &socket_data->headerlen); @@ -1902,5 +1903,5 @@ rc = pq_insert_after(previous, copy); if (rc != EOK) { - pq_release_remote(tcp_globals.net_phone, + pq_release_remote(tcp_globals.net_sess, packet_get_id(copy)); return sending; @@ -1939,5 +1940,5 @@ socket_data->headerlen, packet_get_data_length(packet)); if (rc != EOK) { - pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); return NULL; } @@ -1946,5 +1947,5 @@ header = (tcp_header_t *) packet_get_data(packet); if (!header) { - pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); return NULL; } @@ -1971,5 +1972,5 @@ rc = ip_client_prepare_packet(packet, IPPROTO_TCP, 0, 0, 0, 0); if (rc != EOK) { - pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); return NULL; } @@ -1978,5 +1979,5 @@ sequence_number, socket_data->state, socket_data->timeout, true); if (rc != EOK) { - pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); return NULL; } @@ -1995,5 +1996,5 @@ /* Make a copy of the packet */ - copy = packet_get_copy(tcp_globals.net_phone, packet); + copy = packet_get_copy(tcp_globals.net_sess, packet); if (!copy) return NULL; @@ -2009,5 +2010,5 @@ while (packet) { next = pq_detach(packet); - ip_send_msg(tcp_globals.ip_phone, device_id, packet, + ip_send_msg(tcp_globals.ip_sess, device_id, packet, SERVICE_TCP, 0); packet = next; @@ -2122,5 +2123,5 @@ return NO_DATA; - rc = packet_translate_remote(tcp_globals.net_phone, &packet, packet_id); + rc = packet_translate_remote(tcp_globals.net_sess, &packet, packet_id); if (rc != EOK) return rc; @@ -2133,5 +2134,5 @@ /* Release the packet */ dyn_fifo_pop(&socket->received); - pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); /* Return the total length */ @@ -2171,5 +2172,5 @@ return ENOTCONN; - rc = tl_get_ip_packet_dimension(tcp_globals.ip_phone, + rc = tl_get_ip_packet_dimension(tcp_globals.ip_sess, &tcp_globals.dimensions, socket_data->device_id, &packet_dimension); if (rc != EOK) @@ -2182,5 +2183,5 @@ for (index = 0; index < fragments; index++) { /* Read the data fragment */ - result = tl_socket_read_packet_data(tcp_globals.net_phone, + result = tl_socket_read_packet_data(tcp_globals.net_sess, &packet, TCP_HEADER_SIZE, packet_dimension, socket_data->addr, socket_data->addrlen); @@ -2245,5 +2246,5 @@ default: /* Just destroy */ - rc = socket_destroy(tcp_globals.net_phone, socket_id, + rc = socket_destroy(tcp_globals.net_sess, socket_id, local_sockets, &tcp_globals.sockets, tcp_free_socket_data); @@ -2293,5 +2294,5 @@ /* Get the device packet dimension */ - rc = tl_get_ip_packet_dimension(tcp_globals.ip_phone, + rc = tl_get_ip_packet_dimension(tcp_globals.ip_sess, &tcp_globals.dimensions, socket_data->device_id, &packet_dimension); if (rc != EOK) @@ -2299,5 +2300,5 @@ /* Get a new packet */ - *packet = packet_get_4_remote(tcp_globals.net_phone, TCP_HEADER_SIZE, + *packet = packet_get_4_remote(tcp_globals.net_sess, TCP_HEADER_SIZE, packet_dimension->addr_len, packet_dimension->prefix, packet_dimension->suffix); @@ -2362,5 +2363,5 @@ if (rc != EOK) return rc; - rc = tl_get_ip_packet_dimension(tcp_globals.ip_phone, + rc = tl_get_ip_packet_dimension(tcp_globals.ip_sess, &tcp_globals.dimensions, socket_data->device_id, &packet_dimension); @@ -2434,5 +2435,5 @@ int tcp_release_and_return(packet_t *packet, int result) { - pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_sess, packet_get_id(packet)); return result; } @@ -2443,4 +2444,5 @@ * @param[in,out] icall Message parameters. * @param[in] arg Local argument. + * */ static void tcp_receiver(ipc_callid_t iid, ipc_call_t *icall, void *arg) @@ -2452,5 +2454,5 @@ switch (IPC_GET_IMETHOD(*icall)) { case NET_TL_RECEIVED: - rc = packet_translate_remote(tcp_globals.net_phone, &packet, + rc = packet_translate_remote(tcp_globals.net_sess, &packet, IPC_GET_PACKET(*icall)); if (rc == EOK) @@ -2470,5 +2472,5 @@ /** Initialize the TCP module. * - * @param[in] net_phone Network module phone. + * @param[in] sess Network module session. * * @return EOK on success. @@ -2476,17 +2478,17 @@ * */ -int tl_initialize(int net_phone) +int tl_initialize(async_sess_t *sess) { fibril_rwlock_initialize(&tcp_globals.lock); fibril_rwlock_write_lock(&tcp_globals.lock); - tcp_globals.net_phone = net_phone; + tcp_globals.net_sess = sess; - tcp_globals.icmp_phone = icmp_connect_module(); - tcp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_TCP, + tcp_globals.icmp_sess = icmp_connect_module(); + tcp_globals.ip_sess = ip_bind_service(SERVICE_IP, IPPROTO_TCP, SERVICE_TCP, tcp_receiver); - if (tcp_globals.ip_phone < 0) { + if (tcp_globals.ip_sess == NULL) { fibril_rwlock_write_unlock(&tcp_globals.lock); - return tcp_globals.ip_phone; + return ENOENT; }