Index: uspace/lib/net/adt/module_map.c =================================================================== --- uspace/lib/net/adt/module_map.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/adt/module_map.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -39,9 +39,5 @@ #include #include - -#include - #include - #include #include @@ -49,19 +45,20 @@ GENERIC_CHAR_MAP_IMPLEMENT(modules, module_t) -/** Adds module to the module map. +/** Add module to the module map. * - * @param[out] module The module structure added. - * @param[in] modules The module map. - * @param[in] name The module name. - * @param[in] filename The full path filename. - * @param[in] service The module service. - * @param[in] task_id The module current task identifier. Zero means not - * running. - * @param[in] connect_module The module connecting function. - * @return EOK on success. - * @return ENOMEM if there is not enough memory left. + * @param[out] module Module structure added. + * @param[in] modules Module map. + * @param[in] name Module name. + * @param[in] filename Full path filename. + * @param[in] service Module service. + * @param[in] task_id Module current task identifier. + * Zero means not running. + * @param[in] connect_module Module connecting function. + * + * @return EOK on success. + * @return ENOMEM if there is not enough memory left. + * */ -int -add_module(module_t **module, modules_t *modules, const uint8_t *name, +int add_module(module_t **module, modules_t *modules, const uint8_t *name, const uint8_t *filename, services_t service, task_id_t task_id, connect_module_t connect_module) @@ -69,11 +66,11 @@ module_t *tmp_module; int rc; - + tmp_module = (module_t *) malloc(sizeof(module_t)); if (!tmp_module) return ENOMEM; - + tmp_module->task_id = task_id; - tmp_module->phone = 0; + tmp_module->sess = NULL; tmp_module->usage = 0; tmp_module->name = name; @@ -81,5 +78,5 @@ tmp_module->service = service; tmp_module->connect_module = connect_module; - + rc = modules_add(modules, tmp_module->name, 0, tmp_module); if (rc != EOK) { @@ -87,29 +84,30 @@ return rc; } + if (module) *module = tmp_module; - + return EOK; } -/** Searches and returns the specified module. +/** Search and return the specified module. * * If the module is not running, the module filaname is spawned. * If the module is not connected, the connect_function is called. * - * @param[in] modules The module map. - * @param[in] name The module name. - * @return The running module found. It does not have to be - * connected. - * @return NULL if there is no such module. + * @param[in] modules Module map. + * @param[in] name Module name. + * + * @return The running module found. It does not have to be + * connected. + * @return NULL if there is no such module. + * */ module_t *get_running_module(modules_t *modules, uint8_t *name) { - module_t *module; - - module = modules_find(modules, name, 0); + module_t *module = modules_find(modules, name, 0); if (!module) return NULL; - + if (!module->task_id) { module->task_id = net_spawn(module->filename); @@ -117,7 +115,8 @@ return NULL; } - if (!module->phone) - module->phone = module->connect_module(module->service); - + + if (!module->sess) + module->sess = module->connect_module(module->service); + return module; } Index: uspace/lib/net/generic/generic.c =================================================================== --- uspace/lib/net/generic/generic.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/generic/generic.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -37,5 +37,4 @@ #include #include -#include #include #include @@ -45,18 +44,19 @@ /** Notify the module about the device state change. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[in] state The new device state. - * @param[in] target The target module service. - * @return EOK on success. - * - */ -int -generic_device_state_msg_remote(int phone, int message, device_id_t device_id, - int state, services_t target) -{ - async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id, - (sysarg_t) state, target); + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[in] state New device state. + * @param[in] target Target module service. + * + * @return EOK on success. + * + */ +int generic_device_state_msg_remote(async_sess_t *sess, sysarg_t message, + device_id_t device_id, sysarg_t state, services_t target) +{ + async_exch_t *exch = async_exchange_begin(sess); + async_msg_3(exch, message, (sysarg_t) device_id, state, target); + async_exchange_end(exch); return EOK; @@ -65,54 +65,59 @@ /** Notify a module about the device. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[in] arg2 The second argument of the message. - * @param[in] service The device module service. - * @return EOK on success. - * @return Other error codes as defined for the specific service - * message. - * - */ -int -generic_device_req_remote(int phone, int message, device_id_t device_id, - int arg2, services_t service) -{ - return (int) async_obsolete_req_3_0(phone, (sysarg_t) message, - (sysarg_t) device_id, (sysarg_t) arg2, (sysarg_t) service); + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[in] arg2 Second argument of the message. + * @param[in] service Device module service. + * + * @return EOK on success. + * @return Other error codes as defined for the specific service + * message. + * + */ +int generic_device_req_remote(async_sess_t *sess, sysarg_t message, + device_id_t device_id, sysarg_t arg2, services_t service) +{ + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_3_0(exch, message, (sysarg_t) device_id, + arg2, (sysarg_t) service); + async_exchange_end(exch); + + return rc; } /** Returns the address. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[out] address The desired address. - * @param[out] data The address data container. - * @return EOK on success. - * @return EBADMEM if the address parameter and/or the data - * parameter is NULL. - * @return Other error codes as defined for the specific service - * message. - */ -int -generic_get_addr_req(int phone, int message, device_id_t device_id, - measured_string_t **address, uint8_t **data) -{ - aid_t message_id; + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[out] address Desired address. + * @param[out] data Address data container. + * + * @return EOK on success. + * @return EBADMEM if the address parameter and/or the data + * parameter is NULL. + * @return Other error codes as defined for the specific service + * message. + * + */ +int generic_get_addr_req(async_sess_t *sess, sysarg_t message, + device_id_t device_id, measured_string_t **address, uint8_t **data) +{ + if ((!address) || (!data)) + return EBADMEM; + + /* Request the address */ + async_exch_t *exch = async_exchange_begin(sess); + aid_t message_id = async_send_1(exch, message, (sysarg_t) device_id, + NULL); + int rc = measured_strings_return(exch, address, data, 1); + async_exchange_end(exch); + sysarg_t result; - int string; - - if (!address || !data) - return EBADMEM; - - /* Request the address */ - message_id = async_obsolete_send_1(phone, (sysarg_t) message, - (sysarg_t) device_id, NULL); - string = measured_strings_return(phone, address, data, 1); async_wait_for(message_id, &result); - + /* If not successful */ - if ((string == EOK) && (result != EOK)) { + if ((rc == EOK) && (result != EOK)) { /* Clear the data */ free(*address); @@ -125,16 +130,17 @@ /** Return the device packet dimension for sending. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[out] packet_dimension The packet dimension. - * @return EOK on success. - * @return EBADMEM if the packet_dimension parameter is NULL. - * @return Other error codes as defined for the specific service - * message. - */ -int -generic_packet_size_req_remote(int phone, int message, device_id_t device_id, - packet_dimension_t *packet_dimension) + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[out] packet_dimension Packet dimension. + * + * @return EOK on success. + * @return EBADMEM if the packet_dimension parameter is NULL. + * @return Other error codes as defined for the specific service + * message. + * + */ +int generic_packet_size_req_remote(async_sess_t *sess, sysarg_t message, + device_id_t device_id, packet_dimension_t *packet_dimension) { if (!packet_dimension) @@ -146,6 +152,8 @@ sysarg_t suffix; - sysarg_t result = async_obsolete_req_1_4(phone, (sysarg_t) message, - (sysarg_t) device_id, &addr_len, &prefix, &content, &suffix); + async_exch_t *exch = async_exchange_begin(sess); + sysarg_t result = async_req_1_4(exch, message, (sysarg_t) device_id, + &addr_len, &prefix, &content, &suffix); + async_exchange_end(exch); packet_dimension->prefix = (size_t) prefix; @@ -159,25 +167,31 @@ /** Pass the packet queue to the module. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[in] packet_id The received packet or the received packet queue - * identifier. - * @param[in] target The target module service. - * @param[in] error The error module service. - * @return EOK on success. - */ -int -generic_received_msg_remote(int phone, int message, device_id_t device_id, - packet_id_t packet_id, services_t target, services_t error) -{ + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[in] packet_id Received packet or the received packet queue + * identifier. + * @param[in] target Target module service. + * @param[in] error Error module service. + * + * @return EOK on success. + * + */ +int generic_received_msg_remote(async_sess_t *sess, sysarg_t message, + device_id_t device_id, packet_id_t packet_id, services_t target, + services_t error) +{ + async_exch_t *exch = async_exchange_begin(sess); + if (error) { - async_obsolete_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id, + async_msg_4(exch, message, (sysarg_t) device_id, (sysarg_t) packet_id, (sysarg_t) target, (sysarg_t) error); } else { - async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id, + async_msg_3(exch, message, (sysarg_t) device_id, (sysarg_t) packet_id, (sysarg_t) target); } + async_exchange_end(exch); + return EOK; } @@ -185,25 +199,30 @@ /** Send the packet queue. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[in] packet_id The packet or the packet queue identifier. - * @param[in] sender The sending module service. - * @param[in] error The error module service. - * @return EOK on success. - * - */ -int -generic_send_msg_remote(int phone, int message, device_id_t device_id, - packet_id_t packet_id, services_t sender, services_t error) -{ + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[in] packet_id Packet or the packet queue identifier. + * @param[in] sender Sending module service. + * @param[in] error Error module service. + * + * @return EOK on success. + * + */ +int generic_send_msg_remote(async_sess_t *sess, sysarg_t message, + device_id_t device_id, packet_id_t packet_id, services_t sender, + services_t error) +{ + async_exch_t *exch = async_exchange_begin(sess); + if (error) { - async_obsolete_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id, + async_msg_4(exch, message, (sysarg_t) device_id, (sysarg_t) packet_id, (sysarg_t) sender, (sysarg_t) error); } else { - async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id, + async_msg_3(exch, message, (sysarg_t) device_id, (sysarg_t) packet_id, (sysarg_t) sender); } + async_exchange_end(exch); + return EOK; } @@ -213,48 +232,51 @@ * Allocates and returns the needed memory block as the data parameter. * - * @param[in] phone The service module phone. - * @param[in] message The service specific message. - * @param[in] device_id The device identifier. - * @param[in] service The module service. - * @param[in] configuration The key strings. - * @param[in] count The number of configuration keys. - * @param[out] translation The translated values. - * @param[out] data The translation data container. - * @return EOK on success. - * @return EINVAL if the configuration parameter is NULL. - * @return EINVAL if the count parameter is zero. - * @return EBADMEM if the translation or the data parameters are - * NULL. - * @return Other error codes as defined for the specific service - * message. - */ -int -generic_translate_req(int phone, int message, device_id_t device_id, - services_t service, measured_string_t *configuration, size_t count, + * @param[in] sess Service module session. + * @param[in] message Service specific message. + * @param[in] device_id Device identifier. + * @param[in] service Module service. + * @param[in] configuration Key strings. + * @param[in] count Number of configuration keys. + * @param[out] translation Translated values. + * @param[out] data Translation data container. + * + * @return EOK on success. + * @return EINVAL if the configuration parameter is NULL. + * @return EINVAL if the count parameter is zero. + * @return EBADMEM if the translation or the data parameters are + * NULL. + * @return Other error codes as defined for the specific service + * message. + * + */ +int generic_translate_req(async_sess_t *sess, sysarg_t message, + device_id_t device_id, services_t service, + measured_string_t *configuration, size_t count, measured_string_t **translation, uint8_t **data) { - aid_t message_id; + if ((!configuration) || (count == 0)) + return EINVAL; + + if ((!translation) || (!data)) + return EBADMEM; + + /* Request the translation */ + async_exch_t *exch = async_exchange_begin(sess); + aid_t message_id = async_send_3(exch, message, (sysarg_t) device_id, + (sysarg_t) count, (sysarg_t) service, NULL); + measured_strings_send(exch, configuration, count); + int rc = measured_strings_return(exch, translation, data, count); + async_exchange_end(exch); + sysarg_t result; - int string; - - if (!configuration || (count == 0)) - return EINVAL; - if (!translation || !data) - return EBADMEM; - - /* Request the translation */ - message_id = async_obsolete_send_3(phone, (sysarg_t) message, - (sysarg_t) device_id, (sysarg_t) count, (sysarg_t) service, NULL); - measured_strings_send(phone, configuration, count); - string = measured_strings_return(phone, translation, data, count); async_wait_for(message_id, &result); - + /* If not successful */ - if ((string == EOK) && (result != EOK)) { + if ((rc == EOK) && (result != EOK)) { /* Clear the data */ free(*translation); free(*data); } - + return (int) result; } Index: uspace/lib/net/generic/net_remote.c =================================================================== --- uspace/lib/net/generic/net_remote.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/generic/net_remote.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -47,19 +47,22 @@ #include -/** Connects to the networking module. +/** Connect to the networking module. * - * @return The networking module phone on success. + * @return Networking module session on success. + * */ -int net_connect_module(void) +async_sess_t *net_connect_module(void) { return connect_to_service(SERVICE_NETWORKING); } -/** Frees the received settings. +/** Free the received settings. * - * @param[in] settings The received settings. - * @param[in] data The received settings data. - * @see net_get_device_conf_req() + * @param[in] settings Received settings. + * @param[in] data Received settings data. + * + * @see net_get_device_conf_req() * @see net_get_conf_req() + * */ void net_free_settings(measured_string_t *settings, uint8_t *data) @@ -71,5 +74,5 @@ } -/** Returns the global configuration. +/** Return the global configuration. * * The configuration names are read and the appropriate settings are set @@ -77,48 +80,52 @@ * configuration. * - * @param[in] net_phone The networking module phone. - * @param[in,out] configuration The requested configuration. The names are read - * and the appropriate settings are set instead. + * @param[in] sess Networking module session. + * @param[in,out] configuration Requested configuration. The names are + * read and the appropriate settings are set + * instead. * - * @param[in] count The configuration entries count. - * @param[in,out] data The configuration and settings data. - * @return EOK on success. - * @return EINVAL if the configuration is NULL. - * @return EINVAL if the count is zero. - * @return Other error codes as defined for the - * generic_translate_req() function. + * @param[in] count Configuration entries count. + * @param[in,out] data Configuration and settings data. + * + * @return EOK on success. + * @return EINVAL if the configuration is NULL. + * @return EINVAL if the count is zero. + * @return Other error codes as defined for the + * generic_translate_req() function. + * */ -int -net_get_conf_req(int net_phone, measured_string_t **configuration, +int net_get_conf_req(async_sess_t *sess, measured_string_t **configuration, size_t count, uint8_t **data) { - return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, 0, 0, + return generic_translate_req(sess, NET_NET_GET_DEVICE_CONF, 0, 0, *configuration, count, configuration, data); } -/** Returns the device specific configuration. +/** Return the device specific configuration. * - * Returns the global configuration if the device specific is not found. + * Return the global configuration if the device specific is not found. * The configuration names are read and the appropriate settings are set * instead. Call net_free_settings() function to release the returned * configuration. * - * @param[in] net_phone The networking module phone. - * @param[in] device_id The device identifier. - * @param[in,out] configuration The requested device configuration. The names - * are read and the appropriate settings are set instead. - * @param[in] count The configuration entries count. - * @param[in,out] data The configuration and settings data. - * @return EOK on success. - * @return EINVAL if the configuration is NULL. - * @return EINVAL if the count is zero. - * @return Other error codes as defined for the - * generic_translate_req() function. + * @param[in] sess The networking module session. + * @param[in] device_id Device identifier. + * @param[in,out] configuration Requested device configuration. The names + * are read and the appropriate settings are + * set instead. + * @param[in] count Configuration entries count. + * @param[in,out] data Configuration and settings data. + * + * @return EOK on success. + * @return EINVAL if the configuration is NULL. + * @return EINVAL if the count is zero. + * @return Other error codes as defined for the + * generic_translate_req() function. + * */ -int -net_get_device_conf_req(int net_phone, device_id_t device_id, +int net_get_device_conf_req(async_sess_t *sess, device_id_t device_id, measured_string_t **configuration, size_t count, uint8_t **data) { - return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, + return generic_translate_req(sess, NET_NET_GET_DEVICE_CONF, device_id, 0, *configuration, count, configuration, data); } Index: uspace/lib/net/generic/packet_client.c =================================================================== --- uspace/lib/net/generic/packet_client.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/generic/packet_client.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -247,33 +247,34 @@ } -/** Returns the packet copy. - * - * Copies the addresses, data, order and metric values. - * Does not copy the queue placement. - * - * @param[in] phone The packet server module phone. - * @param[in] packet The original packet. - * @return The packet copy. - * @return NULL on error. - */ -packet_t *packet_get_copy(int phone, packet_t *packet) -{ - packet_t *copy; - uint8_t * src = NULL; - uint8_t * dest = NULL; - size_t addrlen; - - if (!packet_is_valid(packet)) - return NULL; - +/** Return the packet copy. + * + * Copy the addresses, data, order and metric values. + * Queue placement is not copied. + * + * @param[in] sess Packet server module session. + * @param[in] packet Original packet. + * + * @return Packet copy. + * @return NULL on error. + * + */ +packet_t *packet_get_copy(async_sess_t *sess, packet_t *packet) +{ + if (!packet_is_valid(packet)) + return NULL; + /* Get a new packet */ - copy = packet_get_4_remote(phone, PACKET_DATA_LENGTH(packet), + packet_t *copy = packet_get_4_remote(sess, PACKET_DATA_LENGTH(packet), PACKET_MAX_ADDRESS_LENGTH(packet), packet->max_prefix, PACKET_MIN_SUFFIX(packet)); + if (!copy) return NULL; - + /* Get addresses */ - addrlen = packet_get_addr(packet, &src, &dest); + uint8_t *src = NULL; + uint8_t *dest = NULL; + size_t addrlen = packet_get_addr(packet, &src, &dest); + /* Copy data */ if ((packet_copy_data(copy, packet_get_data(packet), @@ -286,5 +287,5 @@ return copy; } else { - pq_release_remote(phone, copy->packet_id); + pq_release_remote(sess, copy->packet_id); return NULL; } Index: uspace/lib/net/generic/packet_remote.c =================================================================== --- uspace/lib/net/generic/packet_remote.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/generic/packet_remote.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -37,5 +37,4 @@ #include -#include #include #include @@ -52,63 +51,64 @@ * Create the local packet mapping as well. * - * @param[in] phone The packet server module phone. - * @param[out] packet The packet reference pointer to store the received + * @param[in] sess Packet server module session. + * @param[out] packet Packet reference pointer to store the received * packet reference. - * @param[in] packet_id The packet identifier. - * @param[in] size The packet total size in bytes. + * @param[in] packet_id Packet identifier. + * @param[in] size Packet total size in bytes. * * @return EOK on success. * @return Other error codes as defined for the pm_add() function. - * @return Other error codes as defined for the async_obsolete_share_in_start() function. - * - */ -static int -packet_return(int phone, packet_t **packet, packet_id_t packet_id, size_t size) -{ + * @return Other error codes as defined for the async_share_in_start() + * function. + * + */ +static int packet_return(async_sess_t *sess, packet_t **packet, + packet_id_t packet_id, size_t size) +{ + *packet = (packet_t *) as_get_mappable_page(size); + + async_exch_t *exch = async_exchange_begin(sess); ipc_call_t answer; - aid_t message; - int rc; - - message = async_obsolete_send_1(phone, NET_PACKET_GET, packet_id, &answer); - - *packet = (packet_t *) as_get_mappable_page(size); - rc = async_obsolete_share_in_start_0_0(phone, *packet, size); + aid_t message = async_send_1(exch, NET_PACKET_GET, packet_id, &answer); + int rc = async_share_in_start_0_0(exch, *packet, size); + async_exchange_end(exch); + + sysarg_t result; + async_wait_for(message, &result); + if (rc != EOK) { munmap(*packet, size); - async_wait_for(message, NULL); return rc; } + rc = pm_add(*packet); if (rc != EOK) { munmap(*packet, size); - async_wait_for(message, NULL); return rc; } - sysarg_t result; - async_wait_for(message, &result); - return result; } -/** Translates the packet identifier to the packet reference. - * - * Tries to find mapping first. - * Contacts the packet server to share the packet if the mapping is not present. - * - * @param[in] phone The packet server module phone. - * @param[out] packet The packet reference. - * @param[in] packet_id The packet identifier. - * @return EOK on success. - * @return EINVAL if the packet parameter is NULL. - * @return Other error codes as defined for the NET_PACKET_GET_SIZE - * message. - * @return Other error codes as defined for the packet_return() - * function. - */ -int packet_translate_remote(int phone, packet_t **packet, packet_id_t packet_id) -{ - int rc; - +/** Translate the packet identifier to the packet reference. + * + * Try to find mapping first. The packet server is asked to share + * the packet if the mapping is not present. + * + * @param[in] sess Packet server module session. + * @param[out] packet Packet reference. + * @param[in] packet_id Packet identifier. + * + * @return EOK on success. + * @return EINVAL if the packet parameter is NULL. + * @return Other error codes as defined for the NET_PACKET_GET_SIZE + * message. + * @return Other error codes as defined for the packet_return() + * function. + * + */ +int packet_translate_remote(async_sess_t *sess, packet_t **packet, + packet_id_t packet_id) +{ if (!packet) return EINVAL; @@ -116,18 +116,21 @@ *packet = pm_find(packet_id); if (!*packet) { + async_exch_t *exch = async_exchange_begin(sess); sysarg_t size; + int rc = async_req_1_1(exch, NET_PACKET_GET_SIZE, packet_id, + &size); + async_exchange_end(exch); - rc = async_obsolete_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id, - &size); if (rc != EOK) return rc; - rc = packet_return(phone, packet, packet_id, size); + + rc = packet_return(sess, packet, packet_id, size); if (rc != EOK) return rc; } + if ((*packet)->next) { packet_t *next; - - return packet_translate_remote(phone, &next, (*packet)->next); + return packet_translate_remote(sess, &next, (*packet)->next); } @@ -135,33 +138,35 @@ } -/** Obtains the packet of the given dimensions. - * - * Contacts the packet server to return the appropriate packet. - * - * @param[in] phone The packet server module phone. - * @param[in] addr_len The source and destination addresses maximal length in - * bytes. - * @param[in] max_prefix The maximal prefix length in bytes. - * @param[in] max_content The maximal content length in bytes. - * @param[in] max_suffix The maximal suffix length in bytes. - * @return The packet reference. - * @return NULL on error. - */ -packet_t *packet_get_4_remote(int phone, size_t max_content, size_t addr_len, - size_t max_prefix, size_t max_suffix) -{ +/** Obtain the packet of given dimensions. + * + * Contact the packet server to return the appropriate packet. + * + * @param[in] sess Packet server module session. + * @param[in] addr_len Source and destination addresses maximal length + * in bytes. + * @param[in] max_prefix Maximal prefix length in bytes. + * @param[in] max_content Maximal content length in bytes. + * @param[in] max_suffix Maximal suffix length in bytes. + * + * @return The packet reference. + * @return NULL on error. + * + */ +packet_t *packet_get_4_remote(async_sess_t *sess, size_t max_content, + size_t addr_len, size_t max_prefix, size_t max_suffix) +{ + async_exch_t *exch = async_exchange_begin(sess); sysarg_t packet_id; sysarg_t size; - int rc; - - rc = async_obsolete_req_4_2(phone, NET_PACKET_CREATE_4, max_content, addr_len, + int rc = async_req_4_2(exch, NET_PACKET_CREATE_4, max_content, addr_len, max_prefix, max_suffix, &packet_id, &size); + async_exchange_end(exch); + if (rc != EOK) return NULL; - packet_t *packet = pm_find(packet_id); if (!packet) { - rc = packet_return(phone, &packet, packet_id, size); + rc = packet_return(sess, &packet, packet_id, size); if (rc != EOK) return NULL; @@ -171,21 +176,24 @@ } -/** Obtains the packet of the given content size. - * - * Contacts the packet server to return the appropriate packet. - * - * @param[in] phone The packet server module phone. - * @param[in] content The maximal content length in bytes. - * @return The packet reference. - * @return NULL on error. - */ -packet_t *packet_get_1_remote(int phone, size_t content) -{ +/** Obtain the packet of given content size. + * + * Contact the packet server to return the appropriate packet. + * + * @param[in] sess Packet server module session. + * @param[in] content Maximal content length in bytes. + * + * @return The packet reference. + * @return NULL on error. + * + */ +packet_t *packet_get_1_remote(async_sess_t *sess, size_t content) +{ + async_exch_t *exch = async_exchange_begin(sess); sysarg_t packet_id; sysarg_t size; - int rc; - - rc = async_obsolete_req_1_2(phone, NET_PACKET_CREATE_1, content, &packet_id, + int rc = async_req_1_2(exch, NET_PACKET_CREATE_1, content, &packet_id, &size); + async_exchange_end(exch); + if (rc != EOK) return NULL; @@ -193,5 +201,5 @@ packet_t *packet = pm_find(packet_id); if (!packet) { - rc = packet_return(phone, &packet, packet_id, size); + rc = packet_return(sess, &packet, packet_id, size); if (rc != EOK) return NULL; @@ -201,5 +209,5 @@ } -/** Releases the packet queue. +/** Release the packet queue. * * All packets in the queue are marked as free for use. @@ -208,10 +216,13 @@ * received or obtained again. * - * @param[in] phone The packet server module phone. - * @param[in] packet_id The packet identifier. - */ -void pq_release_remote(int phone, packet_id_t packet_id) -{ - async_obsolete_msg_1(phone, NET_PACKET_RELEASE, packet_id); + * @param[in] sess Packet server module session. + * @param[in] packet_id Packet identifier. + * + */ +void pq_release_remote(async_sess_t *sess, packet_id_t packet_id) +{ + async_exch_t *exch = async_exchange_begin(sess); + async_msg_1(exch, NET_PACKET_RELEASE, packet_id); + async_exchange_end(exch); } Index: uspace/lib/net/il/arp_remote.c =================================================================== --- uspace/lib/net/il/arp_remote.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/il/arp_remote.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -38,25 +38,20 @@ #include #include - -#include -#include -#include #include #include - #include #include #include +#include +#include -/** Connects to the ARP module. +/** Connect to the ARP module. * - * @param service The ARP module service. Ignored parameter. - * @return The ARP module phone on success. + * @return ARP module session on success. + * */ -int arp_connect_module(services_t service) +async_sess_t *arp_connect_module(services_t service) { - if (service != SERVICE_ARP) - return EINVAL; - + // FIXME: Get rid of the useless argument return connect_to_service(SERVICE_ARP); } @@ -64,31 +59,98 @@ /** Cleans the cache. * - * @param[in] arp_phone The ARP module phone used for (semi)remote calls. - * @return EOK on success. + * @param[in] sess ARP module session. + * + * @return EOK on success. + * */ -int arp_clean_cache_req(int arp_phone) +int arp_clean_cache_req(async_sess_t *sess) { - return (int) async_obsolete_req_0_0(arp_phone, NET_ARP_CLEAN_CACHE); + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_0_0(exch, NET_ARP_CLEAN_CACHE); + async_exchange_end(exch); + + return rc; } -/** Clears the given protocol address from the cache. +/** Clear the given protocol address from the cache. * - * @param[in] arp_phone The ARP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] protocol The requesting protocol service. - * @param[in] address The protocol address to be cleared. - * @return EOK on success. - * @return ENOENT if the mapping is not found. + * @param[in] sess ARP module session. + * @param[in] device_id Device identifier. + * @param[in] protocol Requesting protocol service. + * @param[in] address Protocol address to be cleared. + * + * @return EOK on success. + * @return ENOENT if the mapping is not found. + * */ -int -arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol, - measured_string_t *address) +int arp_clear_address_req(async_sess_t *sess, device_id_t device_id, + services_t protocol, measured_string_t *address) { - aid_t message_id; + async_exch_t *exch = async_exchange_begin(sess); + aid_t message_id = async_send_2(exch, NET_ARP_CLEAR_ADDRESS, + (sysarg_t) device_id, protocol, NULL); + measured_strings_send(exch, address, 1); + async_exchange_end(exch); + sysarg_t result; + async_wait_for(message_id, &result); + + return (int) result; +} - message_id = async_obsolete_send_2(arp_phone, NET_ARP_CLEAR_ADDRESS, - (sysarg_t) device_id, protocol, NULL); - measured_strings_send(arp_phone, address, 1); +/** Clear the device cache. + * + * @param[in] sess ARP module session. + * @param[in] device_id Device identifier. + * + * @return EOK on success. + * @return ENOENT if the device is not found. + * + */ +int arp_clear_device_req(async_sess_t *sess, device_id_t device_id) +{ + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_1_0(exch, NET_ARP_CLEAR_DEVICE, + (sysarg_t) device_id); + async_exchange_end(exch); + + return rc; +} + +/** Register new device and the requesting protocol service. + * + * Connect to the network interface layer service. + * Determine the device broadcast address, its address lengths and packet size. + * + * @param[in] sess ARP module session. + * @param[in] device_id New device identifier. + * @param[in] protocol Requesting protocol service. + * @param[in] netif Underlying device network interface layer service. + * @param[in] address Local requesting protocol address of the device. + * + * @return EOK on success. + * @return EEXIST if the device is already used. + * @return ENOMEM if there is not enough memory left. + * @return ENOENT if the network interface service is not known. + * @return EREFUSED if the network interface service is not + * responding. + * @return Other error codes as defined for the + * nil_packet_get_size() function. + * @return Other error codes as defined for the nil_get_addr() + * function. + * @return Other error codes as defined for the + * nil_get_broadcast_addr() function. + * + */ +int arp_device_req(async_sess_t *sess, device_id_t device_id, + services_t protocol, services_t netif, measured_string_t *address) +{ + async_exch_t *exch = async_exchange_begin(sess); + aid_t message_id = async_send_3(exch, NET_ARP_DEVICE, + (sysarg_t) device_id, protocol, netif, NULL); + measured_strings_send(exch, address, 1); + async_exchange_end(exch); + + sysarg_t result; async_wait_for(message_id, &result); @@ -96,76 +158,28 @@ } -/** Clears the device cache. +/** Translate the given protocol address to the network interface address. * - * @param[in] arp_phone The ARP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @return EOK on success. - * @return ENOENT if the device is not found. + * Broadcast the ARP request if the mapping is not found. + * Allocate and returns the needed memory block as the data parameter. + * + * @param[in] sess ARP module session. + * @param[in] device_id Device identifier. + * @param[in] protocol Requesting protocol service. + * @param[in] address Local requesting protocol address. + * @param[out] translation Translation of the local protocol address. + * @param[out] data Allocated raw translation data container. + * + * @return EOK on success. + * @return EINVAL if the address parameter is NULL. + * @return EBADMEM if the translation or the data parameters are + * NULL. + * @return ENOENT if the mapping is not found. + * */ -int arp_clear_device_req(int arp_phone, device_id_t device_id) +int arp_translate_req(async_sess_t *sess, device_id_t device_id, + services_t protocol, measured_string_t *address, + measured_string_t **translation, uint8_t **data) { - return (int) async_obsolete_req_1_0(arp_phone, NET_ARP_CLEAR_DEVICE, - (sysarg_t) device_id); -} - -/** Registers the new device and the requesting protocol service. - * - * Connects to the network interface layer service. - * Determines the device broadcast address, its address lengths and packet size. - * - * @param[in] arp_phone The ARP module phone used for (semi)remote calls. - * @param[in] device_id The new device identifier. - * @param[in] protocol The requesting protocol service. - * @param[in] netif The underlying device network interface layer service. - * @param[in] address The local requesting protocol address of the device. - * @return EOK on success. - * @return EEXIST if the device is already used. - * @return ENOMEM if there is not enough memory left. - * @return ENOENT if the network interface service is not known. - * @return EREFUSED if the network interface service is not - * responding. - * @return Other error codes as defined for the - * nil_packet_get_size() function. - * @return Other error codes as defined for the nil_get_addr() - * function. - * @return Other error codes as defined for the - * nil_get_broadcast_addr() function. - */ -int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol, - services_t netif, measured_string_t *address) -{ - aid_t message_id; - sysarg_t result; - - message_id = async_obsolete_send_3(arp_phone, NET_ARP_DEVICE, - (sysarg_t) device_id, protocol, netif, NULL); - measured_strings_send(arp_phone, address, 1); - async_wait_for(message_id, &result); - - return (int) result; -} - -/** Translates the given protocol address to the network interface address. - * - * Broadcasts the ARP request if the mapping is not found. - * Allocates and returns the needed memory block as the data parameter. - * - * @param[in] arp_phone The ARP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] protocol The requesting protocol service. - * @param[in] address The local requesting protocol address. - * @param[out] translation The translation of the local protocol address. - * @param[out] data The allocated raw translation data container. - * @return EOK on success. - * @return EINVAL if the address parameter is NULL. - * @return EBADMEM if the translation or the data parameters are - * NULL. - * @return ENOENT if the mapping is not found. - */ -int -arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol, - measured_string_t *address, measured_string_t **translation, uint8_t **data) -{ - return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id, + return generic_translate_req(sess, NET_ARP_TRANSLATE, device_id, protocol, address, 1, translation, data); } Index: uspace/lib/net/il/il_remote.c =================================================================== --- uspace/lib/net/il/il_remote.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/il/il_remote.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -39,8 +39,6 @@ #include #include - #include #include - #include #include @@ -48,9 +46,8 @@ /** Notify the internetwork layer modules about the device state change. * - * @param[in] il_phone The internetwork layer module phone used for - * (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] state The new device state. - * @param[in] target The target internetwork module service to be + * @param[in] sess Internetwork layer module session. + * @param[in] device_id Device identifier. + * @param[in] state New device state. + * @param[in] target Target internetwork module service to be * delivered to. * @@ -58,8 +55,8 @@ * */ -int il_device_state_msg(int il_phone, device_id_t device_id, +int il_device_state_msg(async_sess_t *sess, device_id_t device_id, device_state_t state, services_t target) { - return generic_device_state_msg_remote(il_phone, NET_IL_DEVICE_STATE, + return generic_device_state_msg_remote(sess, NET_IL_DEVICE_STATE, device_id, state, target); } @@ -67,9 +64,8 @@ /** Notify the internetwork layer modules about the received packet/s. * - * @param[in] il_phone The internetwork layer module phone used for - * (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] packet The received packet or the received packet queue. - * @param[in] target The target internetwork module service to be + * @param[in] sess Internetwork layer module session. + * @param[in] device_id Device identifier. + * @param[in] packet Received packet or the received packet queue. + * @param[in] target Target internetwork module service to be * delivered to. * @@ -77,8 +73,8 @@ * */ -int il_received_msg(int il_phone, device_id_t device_id, packet_t *packet, +int il_received_msg(async_sess_t *sess, device_id_t device_id, packet_t *packet, services_t target) { - return generic_received_msg_remote(il_phone, NET_IL_RECEIVED, device_id, + return generic_received_msg_remote(sess, NET_IL_RECEIVED, device_id, packet_get_id(packet), target, 0); } @@ -86,9 +82,8 @@ /** Notify the internetwork layer modules about the mtu change. * - * @param[in] il_phone The internetwork layer module phone used for - * (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] mtu The new mtu value. - * @param[in] target The target internetwork module service to be + * @param[in] sess Internetwork layer module session. + * @param[in] device_id Device identifier. + * @param[in] mtu New MTU value. + * @param[in] target Target internetwork module service to be * delivered to. * @@ -96,9 +91,9 @@ * */ -int il_mtu_changed_msg(int il_phone, device_id_t device_id, size_t mtu, +int il_mtu_changed_msg(async_sess_t *sess, device_id_t device_id, size_t mtu, services_t target) { - return generic_device_state_msg_remote(il_phone, NET_IL_MTU_CHANGED, - device_id, (int) mtu, target); + return generic_device_state_msg_remote(sess, NET_IL_MTU_CHANGED, + device_id, mtu, target); } Index: uspace/lib/net/il/il_skel.c =================================================================== --- uspace/lib/net/il/il_skel.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/il/il_skel.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -38,11 +38,8 @@ #include #include +#include #include #include #include -#include - -// FIXME: remove this header -#include /** Default thread for new connections. @@ -100,14 +97,12 @@ * @return Other error codes as defined for the il_initialize() * function. - * @return Other error codes as defined for the REGISTER_ME() macro - * function. * */ -int il_module_start(int service) +int il_module_start(sysarg_t service) { async_set_client_connection(il_client_connection); - int net_phone = net_connect_module(); - if (net_phone < 0) - return net_phone; + async_sess_t *sess = net_connect_module(); + if (!sess) + return ENOENT; int rc = pm_init(); @@ -115,9 +110,9 @@ return rc; - rc = il_initialize(net_phone); + rc = il_initialize(sess); if (rc != EOK) goto out; - rc = async_obsolete_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL); + rc = service_register(service); if (rc != EOK) goto out; Index: uspace/lib/net/il/ip_remote.c =================================================================== --- uspace/lib/net/il/ip_remote.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/il/ip_remote.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -44,9 +44,7 @@ #include #include -#include #include #include #include - #include #include @@ -57,44 +55,50 @@ * The target network is routed using this device. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] address The target network address. - * @param[in] netmask The target network mask. - * @param[in] gateway The target network gateway. Not used if zero. - */ -int ip_add_route_req_remote(int ip_phone, device_id_t device_id, + * @param[in] sess IP module sessions. + * @param[in] device_id Device identifier. + * @param[in] address Target network address. + * @param[in] netmask Target network mask. + * @param[in] gateway Target network gateway. Not used if zero. + * + */ +int ip_add_route_req_remote(async_sess_t *sess, device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway) { - return (int) async_obsolete_req_4_0(ip_phone, NET_IP_ADD_ROUTE, + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_4_0(exch, NET_IP_ADD_ROUTE, (sysarg_t) device_id, (sysarg_t) gateway.s_addr, (sysarg_t) address.s_addr, (sysarg_t) netmask.s_addr); -} - -/** Creates bidirectional connection with the ip module service and registers + async_exchange_end(exch); + + return rc; +} + +/** Create bidirectional connection with the ip module service and register * the message receiver. * - * @param[in] service The IP module service. - * @param[in] protocol The transport layer protocol. - * @param[in] me The requesting module service. - * @param[in] receiver The message receiver. Used for remote connection. - * @return The phone of the needed service. - * @return EOK on success. - * @return Other error codes as defined for the bind_service() - * function. - */ -int ip_bind_service(services_t service, int protocol, services_t me, + * @param[in] service IP module service. + * @param[in] protocol Transport layer protocol. + * @param[in] me Rquesting module service. + * @param[in] receiver Message receiver. Used for remote connection. + * + * @return Session to the needed service. + * @return NULL on failure. + * + */ +async_sess_t *ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver) { - return (int) bind_service(service, (sysarg_t) protocol, me, service, + return bind_service(service, (sysarg_t) protocol, me, service, receiver); } -/** Connects to the IP module. - * - * @param service The IP module service. Ignored parameter. - * @return The IP module phone on success. - */ -int ip_connect_module(services_t service) -{ +/** Connect to the IP module. + * + * @return The IP module session. + * + */ +async_sess_t *ip_connect_module(services_t service) +{ + // FIXME: Get rid of the useless argument return connect_to_service(SERVICE_IP); } @@ -105,22 +109,21 @@ * If the device uses ARP registers also the new ARP device. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] device_id The new device identifier. - * @param[in] netif The underlying device network interface layer service. - * @return EOK on success. - * @return ENOMEM if there is not enough memory left. - * @return EINVAL if the device configuration is invalid. - * @return ENOTSUP if the device uses IPv6. - * @return ENOTSUP if the device uses DHCP. - * @return Other error codes as defined for the - * net_get_device_conf_req() function. - * @return Other error codes as defined for the arp_device_req() - * function. - */ -int ip_device_req_remote(int ip_phone, device_id_t device_id, - services_t service) -{ - return generic_device_req_remote(ip_phone, NET_IP_DEVICE, device_id, 0, - service); + * @param[in] sess IP module session. + * @param[in] device_id New device identifier. + * + * @return EOK on success. + * @return ENOMEM if there is not enough memory left. + * @return EINVAL if the device configuration is invalid. + * @return ENOTSUP if the device uses IPv6. + * @return ENOTSUP if the device uses DHCP. + * @return Other error codes as defined for the + * net_get_device_conf_req() function. + * @return Other error codes as defined for the arp_device_req() + * function. + * + */ +int ip_device_req_remote(async_sess_t *sess, device_id_t device_id) +{ + return generic_device_req_remote(sess, NET_IP_DEVICE, device_id, 0, 0); } @@ -128,35 +131,37 @@ * destination address. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] protocol The transport protocol. - * @param[in] destination The destination address. - * @param[in] addrlen The destination address length. - * @param[out] device_id The device identifier. - * @param[out] header The constructed IP pseudo header. - * @param[out] headerlen The IP pseudo header length. - * - */ -int ip_get_route_req_remote(int ip_phone, ip_protocol_t protocol, + * @param[in] sess IP module session. + * @param[in] protocol Transport protocol. + * @param[in] destination Destination address. + * @param[in] addrlen Destination address length. + * @param[out] device_id Device identifier. + * @param[out] header Constructed IP pseudo header. + * @param[out] headerlen IP pseudo header length. + * + */ +int ip_get_route_req_remote(async_sess_t *sess, ip_protocol_t protocol, const struct sockaddr *destination, socklen_t addrlen, device_id_t *device_id, void **header, size_t *headerlen) { - if (!destination || (addrlen == 0)) + if ((!destination) || (addrlen == 0)) return EINVAL; - if (!device_id || !header || !headerlen) + if ((!device_id) || (!header) || (!headerlen)) return EBADMEM; *header = NULL; + async_exch_t *exch = async_exchange_begin(sess); + ipc_call_t answer; - aid_t message_id = async_obsolete_send_1(ip_phone, NET_IP_GET_ROUTE, + aid_t message_id = async_send_1(exch, NET_IP_GET_ROUTE, (sysarg_t) protocol, &answer); - if ((async_obsolete_data_write_start(ip_phone, destination, addrlen) == EOK) && - (async_obsolete_data_read_start(ip_phone, headerlen, - sizeof(*headerlen)) == EOK) && (*headerlen > 0)) { + if ((async_data_write_start(exch, destination, addrlen) == EOK) && + (async_data_read_start(exch, headerlen, sizeof(*headerlen)) == EOK) && + (*headerlen > 0)) { *header = malloc(*headerlen); if (*header) { - if (async_obsolete_data_read_start(ip_phone, *header, + if (async_data_read_start(exch, *header, *headerlen) != EOK) free(*header); @@ -164,4 +169,6 @@ } + async_exchange_end(exch); + sysarg_t result; async_wait_for(message_id, &result); @@ -177,16 +184,18 @@ /** Return the device packet dimension for sending. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[out] packet_dimension The packet dimension. - * @return EOK on success. - * @return ENOENT if there is no such device. - * @return Other error codes as defined for the - * generic_packet_size_req_remote() function. - */ -int ip_packet_size_req_remote(int ip_phone, device_id_t device_id, + * @param[in] sess IP module session. + * @param[in] device_id Device identifier. + * @param[out] packet_dimension Packet dimension. + * + * @return EOK on success. + * @return ENOENT if there is no such device. + * @return Other error codes as defined for the + * generic_packet_size_req_remote() function. + * + */ +int ip_packet_size_req_remote(async_sess_t *sess, device_id_t device_id, packet_dimension_t *packet_dimension) { - return generic_packet_size_req_remote(ip_phone, NET_IP_PACKET_SPACE, + return generic_packet_size_req_remote(sess, NET_IP_PACKET_SPACE, device_id, packet_dimension); } @@ -194,17 +203,19 @@ /** Notify the IP module about the received error notification packet. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] packet The received packet or the received packet queue. - * @param[in] target The target internetwork module service to be - * delivered to. - * @param[in] error The packet error reporting service. Prefixes the - * received packet. - * @return EOK on success. - */ -int ip_received_error_msg_remote(int ip_phone, device_id_t device_id, + * @param[in] sess IP module session. + * @param[in] device_id Device identifier. + * @param[in] packet Received packet or the received packet queue. + * @param[in] target Target internetwork module service to be + * delivered to. + * @param[in] error Packet error reporting service. Prefixes the + * received packet. + * + * @return EOK on success. + * + */ +int ip_received_error_msg_remote(async_sess_t *sess, device_id_t device_id, packet_t *packet, services_t target, services_t error) { - return generic_received_msg_remote(ip_phone, NET_IP_RECEIVED_ERROR, + return generic_received_msg_remote(sess, NET_IP_RECEIVED_ERROR, device_id, packet_get_id(packet), target, error); } @@ -214,19 +225,21 @@ * The packets may get fragmented if needed. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] packet The packet fragments as a packet queue. All the - * packets have to have the same destination address. - * @param[in] sender The sending module service. - * @param[in] error The packet error reporting service. Prefixes the - * received packet. - * @return EOK on success. - * @return Other error codes as defined for the generic_send_msg() - * function. - */ -int ip_send_msg_remote(int ip_phone, device_id_t device_id, packet_t *packet, - services_t sender, services_t error) -{ - return generic_send_msg_remote(ip_phone, NET_IP_SEND, device_id, + * @param[in] sess IP module session. + * @param[in] device_id Device identifier. + * @param[in] packet Packet fragments as a packet queue. All the + * packets have to have the same destination address. + * @param[in] sender Sending module service. + * @param[in] error Packet error reporting service. Prefixes the + * received packet. + * + * @return EOK on success. + * @return Other error codes as defined for the generic_send_msg() + * function. + * + */ +int ip_send_msg_remote(async_sess_t *sess, device_id_t device_id, + packet_t *packet, services_t sender, services_t error) +{ + return generic_send_msg_remote(sess, NET_IP_SEND, device_id, packet_get_id(packet), sender, error); } @@ -236,13 +249,18 @@ * This gateway is used if no other route is found. * - * @param[in] ip_phone The IP module phone used for (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] gateway The default gateway. - */ -int ip_set_gateway_req_remote(int ip_phone, device_id_t device_id, + * @param[in] sess IP module session. + * @param[in] device_id Device identifier. + * @param[in] gateway Default gateway. + * + */ +int ip_set_gateway_req_remote(async_sess_t *sess, device_id_t device_id, in_addr_t gateway) { - return (int) async_obsolete_req_2_0(ip_phone, NET_IP_SET_GATEWAY, + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_2_0(exch, NET_IP_SET_GATEWAY, (sysarg_t) device_id, (sysarg_t) gateway.s_addr); + async_exchange_end(exch); + + return rc; } Index: uspace/lib/net/include/adt/module_map.h =================================================================== --- uspace/lib/net/include/adt/module_map.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/adt/module_map.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -39,5 +39,5 @@ #include -#include +#include #include #include @@ -60,6 +60,6 @@ /** Module service identifier. */ services_t service; - /** Module phone if running and connected. */ - int phone; + /** Module session if running and connected. */ + async_sess_t *sess; /** Usage counter. */ int usage; Index: uspace/lib/net/include/arp_interface.h =================================================================== --- uspace/lib/net/include/arp_interface.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/arp_interface.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -36,9 +36,8 @@ #include #include - #include - #include #include +#include /** @name ARP module interface @@ -47,13 +46,13 @@ /*@{*/ -extern int arp_device_req(int, device_id_t, services_t, services_t, +extern int arp_device_req(async_sess_t *, device_id_t, services_t, services_t, measured_string_t *); -extern int arp_translate_req(int, device_id_t, services_t, measured_string_t *, - measured_string_t **, uint8_t **); -extern int arp_clear_device_req(int, device_id_t); -extern int arp_clear_address_req(int, device_id_t, services_t, +extern int arp_translate_req(async_sess_t *, device_id_t, services_t, + measured_string_t *, measured_string_t **, uint8_t **); +extern int arp_clear_device_req(async_sess_t *, device_id_t); +extern int arp_clear_address_req(async_sess_t *, device_id_t, services_t, measured_string_t *); -extern int arp_clean_cache_req(int); -extern int arp_connect_module(services_t); +extern int arp_clean_cache_req(async_sess_t *); +extern async_sess_t *arp_connect_module(services_t); /*@}*/ Index: uspace/lib/net/include/generic.h =================================================================== --- uspace/lib/net/include/generic.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/generic.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -38,24 +38,24 @@ #define LIBNET_GENERIC_H_ -#include #include - #include #include #include +#include -extern int generic_device_state_msg_remote(int, int, device_id_t, int, - services_t); -extern int generic_device_req_remote(int, int, device_id_t, int, services_t); -extern int generic_get_addr_req(int, int, device_id_t, measured_string_t **, - uint8_t **); -extern int generic_packet_size_req_remote(int, int, device_id_t, +extern int generic_device_state_msg_remote(async_sess_t *, sysarg_t, + device_id_t, sysarg_t, services_t); +extern int generic_device_req_remote(async_sess_t *, sysarg_t, device_id_t, + sysarg_t, services_t); +extern int generic_get_addr_req(async_sess_t *, sysarg_t, device_id_t, + measured_string_t **, uint8_t **); +extern int generic_packet_size_req_remote(async_sess_t *, sysarg_t, device_id_t, packet_dimension_t *); -extern int generic_received_msg_remote(int, int, device_id_t, packet_id_t, - services_t, services_t); -extern int generic_send_msg_remote(int, int, device_id_t, packet_id_t, - services_t, services_t); -extern int generic_translate_req(int, int, device_id_t, services_t, - measured_string_t *, size_t, measured_string_t **, uint8_t **); +extern int generic_received_msg_remote(async_sess_t *, sysarg_t, device_id_t, + packet_id_t, services_t, services_t); +extern int generic_send_msg_remote(async_sess_t *, sysarg_t, device_id_t, + packet_id_t, services_t, services_t); +extern int generic_translate_req(async_sess_t *, sysarg_t, device_id_t, + services_t, measured_string_t *, size_t, measured_string_t **, uint8_t **); #endif Index: uspace/lib/net/include/icmp_remote.h =================================================================== --- uspace/lib/net/include/icmp_remote.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/icmp_remote.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -36,5 +36,4 @@ #include #include - #include #include @@ -44,4 +43,5 @@ #include #include +#include /** @name ICMP module interface @@ -50,9 +50,9 @@ /*@{*/ -extern int icmp_destination_unreachable_msg(int, icmp_code_t, icmp_param_t, - packet_t *); -extern int icmp_source_quench_msg(int, packet_t *); -extern int icmp_time_exceeded_msg(int, icmp_code_t, packet_t *); -extern int icmp_parameter_problem_msg(int, icmp_code_t, icmp_param_t, +extern int icmp_destination_unreachable_msg(async_sess_t *, icmp_code_t, + icmp_param_t, packet_t *); +extern int icmp_source_quench_msg(async_sess_t *, packet_t *); +extern int icmp_time_exceeded_msg(async_sess_t *, icmp_code_t, packet_t *); +extern int icmp_parameter_problem_msg(async_sess_t *, icmp_code_t, icmp_param_t, packet_t *); Index: uspace/lib/net/include/il_remote.h =================================================================== --- uspace/lib/net/include/il_remote.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/il_remote.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -41,7 +41,7 @@ #include #include - #include #include +#include /** @name Internetwork layer module interface @@ -50,7 +50,8 @@ /*@{*/ -extern int il_device_state_msg(int, device_id_t, device_state_t, services_t); -extern int il_received_msg(int, device_id_t, packet_t *, services_t); -extern int il_mtu_changed_msg(int, device_id_t, size_t, services_t); +extern int il_device_state_msg(async_sess_t *, device_id_t, device_state_t, + services_t); +extern int il_received_msg(async_sess_t *, device_id_t, packet_t *, services_t); +extern int il_mtu_changed_msg(async_sess_t *, device_id_t, size_t, services_t); /*@}*/ Index: uspace/lib/net/include/il_skel.h =================================================================== --- uspace/lib/net/include/il_skel.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/il_skel.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -39,11 +39,9 @@ */ -#include -#include #include - #include #include #include +#include /** Module initialization. @@ -51,5 +49,5 @@ * This has to be implemented in user code. * - * @param[in] net_phone Networking module phone. + * @param[in] sess Networking module session. * * @return EOK on success. @@ -58,5 +56,5 @@ * */ -extern int il_initialize(int net_phone); +extern int il_initialize(async_sess_t *sess); /** Process the internetwork layer module message. @@ -76,5 +74,5 @@ ipc_call_t *answer, size_t *answer_count); -extern int il_module_start(int); +extern int il_module_start(sysarg_t); #endif Index: uspace/lib/net/include/ip_interface.h =================================================================== --- uspace/lib/net/include/ip_interface.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/ip_interface.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -35,14 +35,11 @@ #include -#include #include - #include #include - #include #include - #include +#include #define ip_received_error_msg ip_received_error_msg_remote @@ -61,18 +58,20 @@ /** The transport layer notification function type definition. * - * Notifies the transport layer modules about the received packet/s. + * Notify the transport layer modules about the received packet/s. * - * @param[in] device_id The device identifier. - * @param[in] packet The received packet or the received packet queue. - * @param[in] receiver The receiving module service. - * @param[in] error The packet error reporting service. Prefixes the - * received packet. - * @return EOK on success. + * @param[in] device_id Device identifier. + * @param[in] packet Received packet or the received packet queue. + * @param[in] receiver Receiving module service. + * @param[in] error Packet error reporting service. Prefixes the + * received packet. + * + * @return EOK on success. + * */ typedef int (*tl_received_msg_t)(device_id_t device_id, packet_t *packet, services_t receiver, services_t error); -extern int ip_bind_service(services_t, int, services_t, async_client_conn_t); -extern int ip_connect_module(services_t); +extern async_sess_t *ip_bind_service(services_t, int, services_t, async_client_conn_t); +extern async_sess_t *ip_connect_module(services_t); /*@}*/ Index: uspace/lib/net/include/ip_remote.h =================================================================== --- uspace/lib/net/include/ip_remote.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/ip_remote.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -35,5 +35,4 @@ #include - #include #include @@ -42,16 +41,18 @@ #include #include +#include -extern int ip_set_gateway_req_remote(int, device_id_t, in_addr_t); -extern int ip_packet_size_req_remote(int, device_id_t, packet_dimension_t *); -extern int ip_received_error_msg_remote(int, device_id_t, packet_t *, services_t, - services_t); -extern int ip_device_req_remote(int, device_id_t, services_t); -extern int ip_add_route_req_remote(int, device_id_t, in_addr_t, in_addr_t, - in_addr_t); -extern int ip_send_msg_remote(int, device_id_t, packet_t *, services_t, - services_t); -extern int ip_get_route_req_remote(int, ip_protocol_t, const struct sockaddr *, - socklen_t, device_id_t *, void **, size_t *); +extern int ip_set_gateway_req_remote(async_sess_t *, device_id_t, in_addr_t); +extern int ip_packet_size_req_remote(async_sess_t *, device_id_t, + packet_dimension_t *); +extern int ip_received_error_msg_remote(async_sess_t *, device_id_t, packet_t *, + services_t, services_t); +extern int ip_device_req_remote(async_sess_t *, device_id_t); +extern int ip_add_route_req_remote(async_sess_t *, device_id_t, in_addr_t, + in_addr_t, in_addr_t); +extern int ip_send_msg_remote(async_sess_t *, device_id_t, packet_t *, + services_t, services_t); +extern int ip_get_route_req_remote(async_sess_t *, ip_protocol_t, + const struct sockaddr *, socklen_t, device_id_t *, void **, size_t *); #endif Index: uspace/lib/net/include/net_interface.h =================================================================== --- uspace/lib/net/include/net_interface.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/net_interface.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -38,4 +38,5 @@ #include #include +#include /** @name Networking module interface @@ -44,9 +45,10 @@ /*@{*/ -extern int net_get_device_conf_req(int, device_id_t, measured_string_t **, - size_t, uint8_t **); -extern int net_get_conf_req(int, measured_string_t **, size_t, uint8_t **); +extern int net_get_device_conf_req(async_sess_t *, device_id_t, + measured_string_t **, size_t, uint8_t **); +extern int net_get_conf_req(async_sess_t *, measured_string_t **, size_t, + uint8_t **); extern void net_free_settings(measured_string_t *, uint8_t *); -extern int net_connect_module(void); +extern async_sess_t *net_connect_module(void); /*@}*/ Index: uspace/lib/net/include/netif_remote.h =================================================================== --- uspace/lib/net/include/netif_remote.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/netif_remote.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -34,19 +34,18 @@ #define LIBNET_NETIF_REMOTE_H_ -#include #include #include - #include #include +#include -extern int netif_get_addr_req(int, device_id_t, measured_string_t **, +extern int netif_get_addr_req(async_sess_t *, device_id_t, measured_string_t **, uint8_t **); -extern int netif_probe_req(int, device_id_t, int, void *); -extern int netif_send_msg(int, device_id_t, packet_t *, services_t); -extern int netif_start_req(int, device_id_t); -extern int netif_stop_req(int, device_id_t); -extern int netif_stats_req(int, device_id_t, device_stats_t *); -extern int netif_bind_service(services_t, device_id_t, services_t, +extern int netif_probe_req(async_sess_t *, device_id_t, int, void *); +extern int netif_send_msg(async_sess_t *, device_id_t, packet_t *, services_t); +extern int netif_start_req(async_sess_t *, device_id_t); +extern int netif_stop_req(async_sess_t *, device_id_t); +extern int netif_stats_req(async_sess_t *, device_id_t, device_stats_t *); +extern async_sess_t *netif_bind_service(services_t, device_id_t, services_t, async_client_conn_t); Index: uspace/lib/net/include/netif_skel.h =================================================================== --- uspace/lib/net/include/netif_skel.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/netif_skel.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -39,18 +39,16 @@ #define NET_NETIF_SKEL_H_ -#include #include #include - #include #include #include +#include /** Network interface device specific data. */ typedef struct { - device_id_t device_id; /**< Device identifier. */ - int nil_phone; /**< Receiving network interface layer phone. */ - device_state_t state; /**< Actual device state. */ - void *specific; /**< Driver specific data. */ + device_id_t device_id; /**< Device identifier. */ + device_state_t state; /**< Actual device state. */ + void *specific; /**< Driver specific data. */ } netif_device_t; @@ -65,5 +63,6 @@ /** Network interface module skeleton global data. */ typedef struct { - int net_phone; /**< Networking module phone. */ + async_sess_t *sess; /**< Networking module session. */ + async_sess_t *nil_sess; /**< Network interface layer session. */ netif_device_map_t device_map; /**< Device map. */ fibril_rwlock_t lock; /**< Safety lock. */ @@ -127,5 +126,4 @@ * @return Other error codes as defined for the specific module * message implementation. - * */ @@ -207,5 +205,5 @@ extern packet_t *netif_packet_get_1(size_t); -extern int netif_module_start(void); +extern int netif_module_start(sysarg_t); #endif Index: uspace/lib/net/include/nil_remote.h =================================================================== --- uspace/lib/net/include/nil_remote.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/nil_remote.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -38,29 +38,30 @@ #include #include +#include #define nil_bind_service(service, device_id, me, receiver) \ bind_service(service, device_id, me, 0, receiver) -#define nil_packet_size_req(nil_phone, device_id, packet_dimension) \ - generic_packet_size_req_remote(nil_phone, NET_NIL_PACKET_SPACE, \ +#define nil_packet_size_req(sess, device_id, packet_dimension) \ + generic_packet_size_req_remote(sess, NET_NIL_PACKET_SPACE, \ device_id, packet_dimension) -#define nil_get_addr_req(nil_phone, device_id, address, data) \ - generic_get_addr_req(nil_phone, NET_NIL_ADDR, device_id, address, data) +#define nil_get_addr_req(sess, device_id, address, data) \ + generic_get_addr_req(sess, NET_NIL_ADDR, device_id, address, data) -#define nil_get_broadcast_addr_req(nil_phone, device_id, address, data) \ - generic_get_addr_req(nil_phone, NET_NIL_BROADCAST_ADDR, device_id, \ +#define nil_get_broadcast_addr_req(sess, device_id, address, data) \ + generic_get_addr_req(sess, NET_NIL_BROADCAST_ADDR, device_id, \ address, data) -#define nil_send_msg(nil_phone, device_id, packet, sender) \ - generic_send_msg_remote(nil_phone, NET_NIL_SEND, device_id, \ +#define nil_send_msg(sess, device_id, packet, sender) \ + generic_send_msg_remote(sess, NET_NIL_SEND, device_id, \ packet_get_id(packet), sender, 0) -#define nil_device_req(nil_phone, device_id, mtu, netif_service) \ - generic_device_req_remote(nil_phone, NET_NIL_DEVICE, device_id, mtu, \ - netif_service) +#define nil_device_req(sess, device_id, mtu) \ + generic_device_req_remote(sess, NET_NIL_DEVICE, device_id, mtu, 0)\ -extern int nil_device_state_msg(int, device_id_t, int); -extern int nil_received_msg(int, device_id_t, packet_t *, services_t); +extern int nil_device_state_msg(async_sess_t *, device_id_t, sysarg_t); +extern int nil_received_msg(async_sess_t *, device_id_t, packet_t *, + services_t); #endif Index: uspace/lib/net/include/nil_skel.h =================================================================== --- uspace/lib/net/include/nil_skel.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/nil_skel.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -39,11 +39,9 @@ #define LIBNET_NIL_SKEL_H_ -#include -#include #include - #include #include #include +#include /** Module initialization. @@ -51,5 +49,5 @@ * This has to be implemented in user code. * - * @param[in] net_phone Networking module phone. + * @param[in] sess Networking module session. * * @return EOK on success. @@ -58,5 +56,5 @@ * */ -extern int nil_initialize(int net_phone); +extern int nil_initialize(async_sess_t *sess); /** Notify the network interface layer about the device state change. @@ -64,5 +62,4 @@ * This has to be implemented in user code. * - * @param[in] nil_phone Network interface layer phone. * @param[in] device_id Device identifier. * @param[in] state New device state. @@ -73,5 +70,5 @@ * */ -extern int nil_device_state_msg_local(int, device_id_t, int); +extern int nil_device_state_msg_local(device_id_t device_id, sysarg_t state); /** Pass the packet queue to the network interface layer. @@ -82,5 +79,4 @@ * This has to be implemented in user code. * - * @param[in] nil_phone Network interface layer phone. * @param[in] device_id Source device identifier. * @param[in] packet Received packet or the received packet queue. @@ -92,5 +88,6 @@ * */ -extern int nil_received_msg_local(int, device_id_t, packet_t *, services_t); +extern int nil_received_msg_local(device_id_t device_id, packet_t *packet, + services_t target); /** Message processing function. @@ -98,5 +95,4 @@ * This has to be implemented in user code. * - * @param[in] name Module name. * @param[in] callid Message identifier. * @param[in] call Message parameters. @@ -112,8 +108,8 @@ * */ -extern int nil_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, - size_t *); +extern int nil_module_message(ipc_callid_t callid, ipc_call_t *call, + ipc_call_t *answer, size_t *count); -extern int nil_module_start(int); +extern int nil_module_start(sysarg_t); #endif Index: uspace/lib/net/include/packet_client.h =================================================================== --- uspace/lib/net/include/packet_client.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/packet_client.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -49,4 +49,5 @@ #include +#include /** @name Packet client interface */ @@ -108,5 +109,5 @@ extern int packet_get_addr(const packet_t *, uint8_t **, uint8_t **); extern int packet_set_addr(packet_t *, const uint8_t *, const uint8_t *, size_t); -extern packet_t *packet_get_copy(int, packet_t *); +extern packet_t *packet_get_copy(async_sess_t *, packet_t *); /*@}*/ Index: uspace/lib/net/include/packet_remote.h =================================================================== --- uspace/lib/net/include/packet_remote.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/packet_remote.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -36,9 +36,11 @@ #include #include +#include -extern int packet_translate_remote(int, packet_t **, packet_id_t); -extern packet_t *packet_get_4_remote(int, size_t, size_t, size_t, size_t); -extern packet_t *packet_get_1_remote(int, size_t); -extern void pq_release_remote(int, packet_id_t); +extern int packet_translate_remote(async_sess_t *, packet_t **, packet_id_t); +extern packet_t *packet_get_4_remote(async_sess_t *, size_t, size_t, size_t, + size_t); +extern packet_t *packet_get_1_remote(async_sess_t *, size_t); +extern void pq_release_remote(async_sess_t *, packet_id_t); #endif Index: uspace/lib/net/include/socket_core.h =================================================================== --- uspace/lib/net/include/socket_core.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/socket_core.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -27,5 +27,5 @@ */ -/** @addtogroup libnet +/** @addtogroup libnet * @{ */ @@ -45,19 +45,20 @@ #include #include +#include /** Initial size of the received packet queue. */ -#define SOCKET_INITIAL_RECEIVED_SIZE 4 +#define SOCKET_INITIAL_RECEIVED_SIZE 4 /** Maximum size of the received packet queue. */ -#define SOCKET_MAX_RECEIVED_SIZE 0 +#define SOCKET_MAX_RECEIVED_SIZE 0 /** Initial size of the sockets for acceptance queue. */ -#define SOCKET_INITIAL_ACCEPTED_SIZE 1 +#define SOCKET_INITIAL_ACCEPTED_SIZE 1 /** Maximum size of the sockets for acceptance queue. */ -#define SOCKET_MAX_ACCEPTEDED_SIZE 0 +#define SOCKET_MAX_ACCEPTEDED_SIZE 0 /** Listening sockets' port map key. */ -#define SOCKET_MAP_KEY_LISTENING "L" +#define SOCKET_MAP_KEY_LISTENING "L" /** Type definition of the socket core. @@ -75,6 +76,6 @@ /** Socket identifier. */ int socket_id; - /** Client application phone. */ - int phone; + /** Client application session. */ + async_sess_t *sess; /** Bound port. */ int port; @@ -108,13 +109,13 @@ INT_MAP_DECLARE(socket_ports, socket_port_t); -extern void socket_cores_release(int, socket_cores_t *, socket_ports_t *, - void (*)(socket_core_t *)); +extern void socket_cores_release(async_sess_t *, socket_cores_t *, + socket_ports_t *, void (*)(socket_core_t *)); extern int socket_bind(socket_cores_t *, socket_ports_t *, int, void *, size_t, int, int, int); extern int socket_bind_free_port(socket_ports_t *, socket_core_t *, int, int, int); -extern int socket_create(socket_cores_t *, int, void *, int *); -extern int socket_destroy(int, int, socket_cores_t *, socket_ports_t *, - void (*)(socket_core_t *)); +extern int socket_create(socket_cores_t *, async_sess_t *, void *, int *); +extern int socket_destroy(async_sess_t *, int, socket_cores_t *, + socket_ports_t *, void (*)(socket_core_t *)); extern int socket_reply_packets(packet_t *, size_t *); extern socket_core_t *socket_port_find(socket_ports_t *, int, const uint8_t *, Index: uspace/lib/net/include/tl_common.h =================================================================== --- uspace/lib/net/include/tl_common.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/tl_common.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -27,5 +27,5 @@ */ -/** @addtogroup libnet +/** @addtogroup libnet * @{ */ @@ -39,9 +39,9 @@ #include - #include #include #include #include +#include /** Device packet dimensions. @@ -51,5 +51,5 @@ DEVICE_MAP_DECLARE(packet_dimensions, packet_dimension_t); -extern int tl_get_ip_packet_dimension(int, packet_dimensions_t *, +extern int tl_get_ip_packet_dimension(async_sess_t *, packet_dimensions_t *, device_id_t, packet_dimension_t **); extern int tl_get_address_port(const struct sockaddr *, int, uint16_t *); @@ -57,6 +57,7 @@ size_t); extern int tl_set_address_port(struct sockaddr *, int, uint16_t); -extern int tl_prepare_icmp_packet(int, int, packet_t *, services_t); -extern int tl_socket_read_packet_data(int, packet_t **, size_t, +extern int tl_prepare_icmp_packet(async_sess_t *, async_sess_t *, packet_t *, + services_t); +extern int tl_socket_read_packet_data(async_sess_t *, packet_t **, size_t, const packet_dimension_t *, const struct sockaddr *, socklen_t); @@ -65,3 +66,2 @@ /** @} */ - Index: uspace/lib/net/include/tl_remote.h =================================================================== --- uspace/lib/net/include/tl_remote.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/tl_remote.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -38,12 +38,11 @@ #define LIBNET_TL_REMOTE_H_ -#include #include #include - #include #include #include #include +#include /** @name Transport layer module interface @@ -52,5 +51,5 @@ /*@{*/ -extern int tl_received_msg(int, device_id_t, packet_t *, services_t, +extern int tl_received_msg(async_sess_t *, device_id_t, packet_t *, services_t, services_t); Index: uspace/lib/net/include/tl_skel.h =================================================================== --- uspace/lib/net/include/tl_skel.h (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/include/tl_skel.h (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -39,11 +39,10 @@ */ -#include #include #include - #include #include #include +#include /** Module initialization. @@ -51,5 +50,5 @@ * This has to be implemented in user code. * - * @param[in] net_phone Networking module phone. + * @param[in] sess Networking module session. * * @return EOK on success. @@ -58,5 +57,5 @@ * */ -extern int tl_initialize(int net_phone); +extern int tl_initialize(async_sess_t *sess); /** Per-connection module initialization. @@ -83,5 +82,5 @@ ipc_call_t *, size_t *); -extern int tl_module_start(int); +extern int tl_module_start(sysarg_t); #endif Index: uspace/lib/net/netif/netif_remote.c =================================================================== --- uspace/lib/net/netif/netif_remote.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/netif/netif_remote.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -38,8 +38,6 @@ #include #include -#include #include #include - #include #include @@ -49,8 +47,8 @@ /** Return the device local hardware address. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. - * @param[out] address Device local hardware address. - * @param[out] data Address data. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. + * @param[out] address Device local hardware address. + * @param[out] data Address data. * * @return EOK on success. @@ -61,8 +59,8 @@ * */ -int netif_get_addr_req(int netif_phone, device_id_t device_id, +int netif_get_addr_req(async_sess_t *sess, device_id_t device_id, measured_string_t **address, uint8_t **data) { - return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id, + return generic_get_addr_req(sess, NET_NETIF_GET_ADDR, device_id, address, data); } @@ -70,8 +68,8 @@ /** Probe the existence of the device. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. - * @param[in] irq Device interrupt number. - * @param[in] io Device input/output address. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. + * @param[in] irq Device interrupt number. + * @param[in] io Device input/output address. * * @return EOK on success. @@ -80,16 +78,20 @@ * */ -int netif_probe_req(int netif_phone, device_id_t device_id, int irq, void *io) +int netif_probe_req(async_sess_t *sess, device_id_t device_id, int irq, void *io) { - return async_obsolete_req_3_0(netif_phone, NET_NETIF_PROBE, device_id, irq, + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_3_0(exch, NET_NETIF_PROBE, device_id, (sysarg_t) irq, (sysarg_t) io); + async_exchange_end(exch); + + return rc; } /** Send the packet queue. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. - * @param[in] packet Packet queue. - * @param[in] sender Sending module service. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. + * @param[in] packet Packet queue. + * @param[in] sender Sending module service. * * @return EOK on success. @@ -98,8 +100,8 @@ * */ -int netif_send_msg(int netif_phone, device_id_t device_id, packet_t *packet, +int netif_send_msg(async_sess_t *sess, device_id_t device_id, packet_t *packet, services_t sender) { - return generic_send_msg_remote(netif_phone, NET_NETIF_SEND, device_id, + return generic_send_msg_remote(sess, NET_NETIF_SEND, device_id, packet_get_id(packet), sender, 0); } @@ -107,6 +109,6 @@ /** Start the device. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. * * @return EOK on success. @@ -117,13 +119,17 @@ * */ -int netif_start_req(int netif_phone, device_id_t device_id) +int netif_start_req(async_sess_t *sess, device_id_t device_id) { - return async_obsolete_req_1_0(netif_phone, NET_NETIF_START, device_id); + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_1_0(exch, NET_NETIF_START, device_id); + async_exchange_end(exch); + + return rc; } /** Stop the device. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. * * @return EOK on success. @@ -134,19 +140,23 @@ * */ -int netif_stop_req(int netif_phone, device_id_t device_id) +int netif_stop_req(async_sess_t *sess, device_id_t device_id) { - return async_obsolete_req_1_0(netif_phone, NET_NETIF_STOP, device_id); + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_1_0(exch, NET_NETIF_STOP, device_id); + async_exchange_end(exch); + + return rc; } /** Return the device usage statistics. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. - * @param[out] stats Device usage statistics. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. + * @param[out] stats Device usage statistics. * * @return EOK on success. * */ -int netif_stats_req(int netif_phone, device_id_t device_id, +int netif_stats_req(async_sess_t *sess, device_id_t device_id, device_stats_t *stats) { @@ -154,7 +164,9 @@ return EBADMEM; - aid_t message_id = async_obsolete_send_1(netif_phone, NET_NETIF_STATS, + async_exch_t *exch = async_exchange_begin(sess); + aid_t message_id = async_send_1(exch, NET_NETIF_STATS, (sysarg_t) device_id, NULL); - async_obsolete_data_read_start(netif_phone, stats, sizeof(*stats)); + async_data_read_start(exch, stats, sizeof(*stats)); + async_exchange_end(exch); sysarg_t result; @@ -169,16 +181,14 @@ * register the message receiver. * - * @param[in] service The network interface module service. - * @param[in] device_id The device identifier. - * @param[in] me The requesting module service. - * @param[in] receiver The message receiver. + * @param[in] service Network interface module service. + * @param[in] device_id Device identifier. + * @param[in] me Requesting module service. + * @param[in] receiver Message receiver. * - * @return The phone of the needed service. - * @return EOK on success. - * @return Other error codes as defined for the bind_service() - * function. + * @return Session to the needed service. + * @return NULL on failure. * */ -int netif_bind_service(services_t service, device_id_t device_id, +async_sess_t *netif_bind_service(services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver) { Index: uspace/lib/net/netif/netif_skel.c =================================================================== --- uspace/lib/net/netif/netif_skel.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/netif/netif_skel.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -54,7 +54,4 @@ #include -// FIXME: remove this header -#include - DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t); @@ -64,5 +61,4 @@ /** Probe the existence of the device. * - * @param[in] netif_phone Network interface phone. * @param[in] device_id Device identifier. * @param[in] irq Device interrupt number. @@ -74,6 +70,5 @@ * */ -static int netif_probe_req_local(int netif_phone, device_id_t device_id, - int irq, void *io) +static int netif_probe_req_local(device_id_t device_id, int irq, void *io) { fibril_rwlock_write_lock(&netif_globals.lock); @@ -86,5 +81,4 @@ /** Send the packet queue. * - * @param[in] netif_phone Network interface phone. * @param[in] device_id Device identifier. * @param[in] packet Packet queue. @@ -96,6 +90,6 @@ * */ -static int netif_send_msg_local(int netif_phone, device_id_t device_id, - packet_t *packet, services_t sender) +static int netif_send_msg_local(device_id_t device_id, packet_t *packet, + services_t sender) { fibril_rwlock_write_lock(&netif_globals.lock); @@ -108,5 +102,4 @@ /** Start the device. * - * @param[in] netif_phone Network interface phone. * @param[in] device_id Device identifier. * @@ -118,5 +111,5 @@ * */ -static int netif_start_req_local(int netif_phone, device_id_t device_id) +static int netif_start_req_local(device_id_t device_id) { fibril_rwlock_write_lock(&netif_globals.lock); @@ -131,6 +124,5 @@ int result = netif_start_message(device); if (result > NETIF_NULL) { - int phone = device->nil_phone; - nil_device_state_msg(phone, device_id, result); + nil_device_state_msg(netif_globals.nil_sess, device_id, result); fibril_rwlock_write_unlock(&netif_globals.lock); return EOK; @@ -144,5 +136,4 @@ /** Stop the device. * - * @param[in] netif_phone Network interface phone. * @param[in] device_id Device identifier. * @@ -154,5 +145,5 @@ * */ -static int netif_stop_req_local(int netif_phone, device_id_t device_id) +static int netif_stop_req_local(device_id_t device_id) { fibril_rwlock_write_lock(&netif_globals.lock); @@ -167,6 +158,5 @@ int result = netif_stop_message(device); if (result > NETIF_NULL) { - int phone = device->nil_phone; - nil_device_state_msg(phone, device_id, result); + nil_device_state_msg(netif_globals.nil_sess, device_id, result); fibril_rwlock_write_unlock(&netif_globals.lock); return EOK; @@ -222,5 +212,5 @@ void netif_pq_release(packet_id_t packet_id) { - pq_release_remote(netif_globals.net_phone, packet_id); + pq_release_remote(netif_globals.sess, packet_id); } @@ -235,32 +225,5 @@ packet_t *netif_packet_get_1(size_t content) { - return packet_get_1_remote(netif_globals.net_phone, content); -} - -/** Register the device notification receiver, - * - * Register a network interface layer module as the device - * notification receiver. - * - * @param[in] device_id Device identifier. - * @param[in] phone Network interface layer module phone. - * - * @return EOK on success. - * @return ENOENT if there is no such device. - * @return ELIMIT if there is another module registered. - * - */ -static int register_message(device_id_t device_id, int phone) -{ - netif_device_t *device; - int rc = find_device(device_id, &device); - if (rc != EOK) - return rc; - - if (device->nil_phone >= 0) - return ELIMIT; - - device->nil_phone = phone; - return EOK; + return packet_get_1_remote(netif_globals.sess, content); } @@ -296,26 +259,18 @@ switch (IPC_GET_IMETHOD(*call)) { case NET_NETIF_PROBE: - return netif_probe_req_local(0, IPC_GET_DEVICE(*call), + return netif_probe_req_local(IPC_GET_DEVICE(*call), NETIF_GET_IRQ(*call), NETIF_GET_IO(*call)); - case IPC_M_CONNECT_TO_ME: - fibril_rwlock_write_lock(&netif_globals.lock); - - rc = register_message(IPC_GET_DEVICE(*call), IPC_GET_PHONE(*call)); - - fibril_rwlock_write_unlock(&netif_globals.lock); - return rc; - case NET_NETIF_SEND: - rc = packet_translate_remote(netif_globals.net_phone, &packet, + rc = packet_translate_remote(netif_globals.sess, &packet, IPC_GET_PACKET(*call)); if (rc != EOK) return rc; - return netif_send_msg_local(0, IPC_GET_DEVICE(*call), packet, + return netif_send_msg_local(IPC_GET_DEVICE(*call), packet, IPC_GET_SENDER(*call)); case NET_NETIF_START: - return netif_start_req_local(0, IPC_GET_DEVICE(*call)); + return netif_start_req_local(IPC_GET_DEVICE(*call)); case NET_NETIF_STATS: @@ -343,5 +298,5 @@ case NET_NETIF_STOP: - return netif_stop_req_local(0, IPC_GET_DEVICE(*call)); + return netif_stop_req_local(IPC_GET_DEVICE(*call)); case NET_NETIF_GET_ADDR: @@ -403,4 +358,6 @@ * messages in an infinite loop. * + * @param[in] nil_service Network interface layer service. + * * @return EOK on success. * @return Other error codes as defined for each specific module @@ -408,9 +365,10 @@ * */ -int netif_module_start(void) +int netif_module_start(sysarg_t nil_service) { async_set_client_connection(netif_client_connection); - netif_globals.net_phone = connect_to_service(SERVICE_NETWORKING); + netif_globals.sess = connect_to_service(SERVICE_NETWORKING); + netif_globals.nil_sess = connect_to_service(nil_service); netif_device_map_initialize(&netif_globals.device_map); Index: uspace/lib/net/nil/nil_remote.c =================================================================== --- uspace/lib/net/nil/nil_remote.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/nil/nil_remote.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -45,5 +45,5 @@ /** Notify the network interface layer about the device state change. * - * @param[in] nil_phone Network interface layer phone. + * @param[in] sess Network interface layer session. * @param[in] device_id Device identifier. * @param[in] state New device state. @@ -54,7 +54,8 @@ * */ -int nil_device_state_msg(int nil_phone, device_id_t device_id, int state) +int nil_device_state_msg(async_sess_t *sess, device_id_t device_id, + sysarg_t state) { - return generic_device_state_msg_remote(nil_phone, NET_NIL_DEVICE_STATE, + return generic_device_state_msg_remote(sess, NET_NIL_DEVICE_STATE, device_id, state, 0); } @@ -65,5 +66,5 @@ * upper layers. * - * @param[in] nil_phone Network interface layer phone. + * @param[in] sess Network interface layer session. * @param[in] device_id Source device identifier. * @param[in] packet Received packet or the received packet queue. @@ -75,8 +76,8 @@ * */ -int nil_received_msg(int nil_phone, device_id_t device_id, +int nil_received_msg(async_sess_t *sess, device_id_t device_id, packet_t *packet, services_t target) { - return generic_received_msg_remote(nil_phone, NET_NIL_RECEIVED, + return generic_received_msg_remote(sess, NET_NIL_RECEIVED, device_id, packet_get_id(packet), target, 0); } Index: uspace/lib/net/nil/nil_skel.c =================================================================== --- uspace/lib/net/nil/nil_skel.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/nil/nil_skel.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -38,11 +38,8 @@ #include #include +#include #include #include #include -#include - -// FIXME: remove this header -#include /** Default thread for new connections. @@ -100,14 +97,12 @@ * @return Other error codes as defined for the nil_initialize() * function. - * @return Other error codes as defined for the REGISTER_ME() macro - * function. * */ -int nil_module_start(int service) +int nil_module_start(sysarg_t service) { async_set_client_connection(nil_client_connection); - int net_phone = net_connect_module(); - if (net_phone < 0) - return net_phone; + async_sess_t *sess = net_connect_module(); + if (!sess) + return ENOENT; int rc = pm_init(); @@ -115,9 +110,9 @@ return rc; - rc = nil_initialize(net_phone); + rc = nil_initialize(sess); if (rc != EOK) goto out; - rc = async_obsolete_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL); + rc = service_register(service); if (rc != EOK) goto out; Index: uspace/lib/net/tl/icmp_remote.c =================================================================== --- uspace/lib/net/tl/icmp_remote.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/tl/icmp_remote.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -39,13 +39,11 @@ #include #include - -#include -#include -#include #include #include #include +#include +#include -/** Sends the Destination Unreachable error notification packet. +/** Send the Destination Unreachable error notification packet. * * Beginning of the packet is sent as the notification packet data. @@ -53,22 +51,26 @@ * packet. * - * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. - * @param[in] code The error specific code. - * @param[in] mtu The error MTU value. - * @param[in] packet The original packet. - * @return EOK on success. - * @return EPERM if the ICMP error notifications are disabled. - * @return ENOMEM if there is not enough memory left. + * @param[in] sess ICMP module session. + * @param[in] code Error specific code. + * @param[in] mtu Error MTU value. + * @param[in] packet Original packet. + * + * @return EOK on success. + * @return EPERM if the ICMP error notifications are disabled. + * @return ENOMEM if there is not enough memory left. + * */ -int -icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code, +int icmp_destination_unreachable_msg(async_sess_t *sess, icmp_code_t code, icmp_param_t mtu, packet_t *packet) { - async_obsolete_msg_3(icmp_phone, NET_ICMP_DEST_UNREACH, (sysarg_t) code, + async_exch_t *exch = async_exchange_begin(sess); + async_msg_3(exch, NET_ICMP_DEST_UNREACH, (sysarg_t) code, (sysarg_t) packet_get_id(packet), (sysarg_t) mtu); + async_exchange_end(exch); + return EOK; } -/** Sends the Source Quench error notification packet. +/** Send the Source Quench error notification packet. * * Beginning of the packet is sent as the notification packet data. @@ -76,18 +78,23 @@ * packet. * - * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. - * @param[in] packet The original packet. - * @return EOK on success. - * @return EPERM if the ICMP error notifications are disabled. - * @return ENOMEM if there is not enough memory left. + * @param[in] sess ICMP module session. + * @param[in] packet Original packet. + * + * @return EOK on success. + * @return EPERM if the ICMP error notifications are disabled. + * @return ENOMEM if there is not enough memory left. + * */ -int icmp_source_quench_msg(int icmp_phone, packet_t *packet) +int icmp_source_quench_msg(async_sess_t *sess, packet_t *packet) { - async_obsolete_msg_2(icmp_phone, NET_ICMP_SOURCE_QUENCH, 0, + async_exch_t *exch = async_exchange_begin(sess); + async_msg_2(exch, NET_ICMP_SOURCE_QUENCH, 0, (sysarg_t) packet_get_id(packet)); + async_exchange_end(exch); + return EOK; } -/** Sends the Time Exceeded error notification packet. +/** Send the Time Exceeded error notification packet. * * Beginning of the packet is sent as the notification packet data. @@ -95,19 +102,25 @@ * packet. * - * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. - * @param[in] code The error specific code. - * @param[in] packet The original packet. - * @return EOK on success. - * @return EPERM if the ICMP error notifications are disabled. - * @return ENOMEM if there is not enough memory left. + * @param[in] sess ICMP module session. + * @param[in] code Error specific code. + * @param[in] packet Original packet. + * + * @return EOK on success. + * @return EPERM if the ICMP error notifications are disabled. + * @return ENOMEM if there is not enough memory left. + * */ -int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t *packet) +int icmp_time_exceeded_msg(async_sess_t *sess, icmp_code_t code, + packet_t *packet) { - async_obsolete_msg_2(icmp_phone, NET_ICMP_TIME_EXCEEDED, (sysarg_t) code, + async_exch_t *exch = async_exchange_begin(sess); + async_msg_2(exch, NET_ICMP_TIME_EXCEEDED, (sysarg_t) code, (sysarg_t) packet_get_id(packet)); + async_exchange_end(exch); + return EOK; } -/** Sends the Parameter Problem error notification packet. +/** Send the Parameter Problem error notification packet. * * Beginning of the packet is sent as the notification packet data. @@ -115,17 +128,22 @@ * packet. * - * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. - * @param[in] code The error specific code. - * @param[in] pointer The problematic parameter offset. - * @param[in] packet The original packet. - * @return EOK on success. - * @return EPERM if the ICMP error notifications are disabled. - * @return ENOMEM if there is not enough memory left. + * @param[in] sess ICMP module session. + * @param[in] code Error specific code. + * @param[in] pointer Problematic parameter offset. + * @param[in] packet Original packet. + * + * @return EOK on success. + * @return EPERM if the ICMP error notifications are disabled. + * @return ENOMEM if there is not enough memory left. + * */ -int icmp_parameter_problem_msg(int icmp_phone, icmp_code_t code, +int icmp_parameter_problem_msg(async_sess_t *sess, icmp_code_t code, icmp_param_t pointer, packet_t *packet) { - async_obsolete_msg_3(icmp_phone, NET_ICMP_PARAMETERPROB, (sysarg_t) code, + async_exch_t *exch = async_exchange_begin(sess); + async_msg_3(exch, NET_ICMP_PARAMETERPROB, (sysarg_t) code, (sysarg_t) packet_get_id(packet), (sysarg_t) pointer); + async_exchange_end(exch); + return EOK; } @@ -133,3 +151,2 @@ /** @} */ - Index: uspace/lib/net/tl/socket_core.c =================================================================== --- uspace/lib/net/tl/socket_core.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/tl/socket_core.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -38,5 +38,4 @@ #include #include - #include #include @@ -44,9 +43,7 @@ #include #include - #include #include #include - #include #include @@ -56,5 +53,5 @@ * switching to the sequence. */ -#define SOCKET_ID_TRIES 100 +#define SOCKET_ID_TRIES 100 /** Bound port sockets.*/ @@ -72,23 +69,21 @@ INT_MAP_IMPLEMENT(socket_ports, socket_port_t); -/** Destroys the socket. +/** Destroy the socket. * * If the socket is bound, the port is released. - * Releases all buffered packets, calls the release function and removes the + * Release all buffered packets, call the release function and remove the * socket from the local sockets. * - * @param[in] packet_phone The packet server phone to release buffered packets. - * @param[in] socket The socket to be destroyed. - * @param[in,out] local_sockets The local sockets to be updated. - * @param[in,out] global_sockets The global sockets to be updated. - * @param[in] socket_release The client release callback function. - */ -static void -socket_destroy_core(int packet_phone, socket_core_t *socket, + * @param[in] sess Packet server session. + * @param[in] socket Socket to be destroyed. + * @param[in,out] local_sockets Local sockets to be updated. + * @param[in,out] global_sockets Global sockets to be updated. + * @param[in] socket_release Client release callback function. + * + */ +static void socket_destroy_core(async_sess_t *sess, socket_core_t *socket, socket_cores_t *local_sockets, socket_ports_t *global_sockets, void (* socket_release)(socket_core_t *socket)) { - int packet_id; - /* If bound */ if (socket->port) { @@ -98,44 +93,44 @@ /* Release all received packets */ + int packet_id; while ((packet_id = dyn_fifo_pop(&socket->received)) >= 0) - pq_release_remote(packet_phone, packet_id); - + pq_release_remote(sess, packet_id); + dyn_fifo_destroy(&socket->received); dyn_fifo_destroy(&socket->accepted); - + if (socket_release) socket_release(socket); - + socket_cores_exclude(local_sockets, socket->socket_id, free); } -/** Destroys local sockets. - * - * Releases all buffered packets and calls the release function for each of the +/** Destroy local sockets. + * + * Release all buffered packets and call the release function for each of the * sockets. * - * @param[in] packet_phone The packet server phone to release buffered packets. - * @param[in] local_sockets The local sockets to be destroyed. - * @param[in,out] global_sockets The global sockets to be updated. - * @param[in] socket_release The client release callback function. - */ -void -socket_cores_release(int packet_phone, socket_cores_t *local_sockets, + * @param[in] sess Packet server session. + * @param[in] local_sockets Local sockets to be destroyed. + * @param[in,out] global_sockets Global sockets to be updated. + * @param[in] socket_release Client release callback function. + * + */ +void socket_cores_release(async_sess_t *sess, socket_cores_t *local_sockets, socket_ports_t *global_sockets, void (* socket_release)(socket_core_t *socket)) { - int index; - if (!socket_cores_is_valid(local_sockets)) return; - + local_sockets->magic = 0; - + + int index; for (index = 0; index < local_sockets->next; ++index) { if (socket_cores_item_is_valid(&local_sockets->items[index])) { local_sockets->items[index].magic = 0; - + if (local_sockets->items[index].value) { - socket_destroy_core(packet_phone, + socket_destroy_core(sess, local_sockets->items[index].value, local_sockets, global_sockets, @@ -146,5 +141,5 @@ } } - + free(local_sockets->items); } @@ -406,18 +401,20 @@ } -/** Creates a new socket. - * - * @param[in,out] local_sockets The local sockets to be updated. - * @param[in] app_phone The application phone. - * @param[in] specific_data The socket specific data. - * @param[in,out] socket_id The new socket identifier. A new identifier is - * chosen if set to zero or negative. A negative identifier - * is chosen if set to negative. - * @return EOK on success. - * @return EINVAL if the socket_id parameter is NULL. - * @return ENOMEM if there is not enough memory left. - */ -int -socket_create(socket_cores_t *local_sockets, int app_phone, +/** Create a new socket. + * + * @param[in,out] local_sockets Local sockets to be updated. + * @param[in] sess Application session. + * @param[in] specific_data Socket specific data. + * @param[in,out] socket_id New socket identifier. A new identifier + * is chosen if set to zero or negative. + * A negative identifier is chosen if set + * to negative. + * + * @return EOK on success. + * @return EINVAL if the socket_id parameter is NULL. + * @return ENOMEM if there is not enough memory left. + * + */ +int socket_create(socket_cores_t *local_sockets, async_sess_t* sess, void *specific_data, int *socket_id) { @@ -446,5 +443,5 @@ /* Initialize */ - socket->phone = app_phone; + socket->sess = sess; socket->port = -1; socket->key = NULL; @@ -475,37 +472,37 @@ } -/** Destroys the socket. +/** Destroy the socket. * * If the socket is bound, the port is released. - * Releases all buffered packets, calls the release function and removes the + * Release all buffered packets, call the release function and remove the * socket from the local sockets. * - * @param[in] packet_phone The packet server phone to release buffered packets. - * @param[in] socket_id The socket identifier. - * @param[in,out] local_sockets The local sockets to be updated. - * @param[in,out] global_sockets The global sockets to be updated. - * @param[in] socket_release The client release callback function. - * @return EOK on success. - * @return ENOTSOCK if the socket is not found. + * @param[in] sess Packet server session. + * @param[in] socket_id Socket identifier. + * @param[in,out] local_sockets Local sockets to be updated. + * @param[in,out] global_sockets Global sockets to be updated. + * @param[in] socket_release Client release callback function. + * + * @return EOK on success. + * @return ENOTSOCK if the socket is not found. + * */ int -socket_destroy(int packet_phone, int socket_id, socket_cores_t *local_sockets, +socket_destroy(async_sess_t *sess, int socket_id, socket_cores_t *local_sockets, socket_ports_t *global_sockets, void (*socket_release)(socket_core_t *socket)) { - socket_core_t *socket; - int accepted_id; - /* Find the socket */ - socket = socket_cores_find(local_sockets, socket_id); + socket_core_t *socket = socket_cores_find(local_sockets, socket_id); if (!socket) return ENOTSOCK; /* Destroy all accepted sockets */ + int accepted_id; while ((accepted_id = dyn_fifo_pop(&socket->accepted)) >= 0) - socket_destroy(packet_phone, accepted_id, local_sockets, + socket_destroy(sess, accepted_id, local_sockets, global_sockets, socket_release); - socket_destroy_core(packet_phone, socket, local_sockets, global_sockets, + socket_destroy_core(sess, socket, local_sockets, global_sockets, socket_release); Index: uspace/lib/net/tl/tl_common.c =================================================================== --- uspace/lib/net/tl/tl_common.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/tl/tl_common.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -43,5 +43,4 @@ #include #include - #include #include @@ -50,5 +49,4 @@ #include #include - #include #include @@ -107,22 +105,21 @@ * The reply is cached then. * - * @param[in] ip_phone The IP moduel phone for (semi)remote calls. - * @param[in] packet_dimensions The packet dimensions cache. - * @param[in] device_id The device identifier. - * @param[out] packet_dimension The IP packet dimensions. - * @return EOK on success. - * @return EBADMEM if the packet_dimension parameter is NULL. - * @return ENOMEM if there is not enough memory left. - * @return EINVAL if the packet_dimensions cache is not valid. - * @return Other codes as defined for the ip_packet_size_req() - * function. - */ -int -tl_get_ip_packet_dimension(int ip_phone, + * @param[in] sess IP module session. + * @param[in] packet_dimensions Packet dimensions cache. + * @param[in] device_id Device identifier. + * @param[out] packet_dimension IP packet dimensions. + * + * @return EOK on success. + * @return EBADMEM if the packet_dimension parameter is NULL. + * @return ENOMEM if there is not enough memory left. + * @return EINVAL if the packet_dimensions cache is not valid. + * @return Other codes as defined for the ip_packet_size_req() + * function. + * + */ +int tl_get_ip_packet_dimension(async_sess_t *sess, packet_dimensions_t *packet_dimensions, device_id_t device_id, packet_dimension_t **packet_dimension) { - int rc; - if (!packet_dimension) return EBADMEM; @@ -133,8 +130,8 @@ /* Ask for and remember them if not found */ *packet_dimension = malloc(sizeof(**packet_dimension)); - if(!*packet_dimension) + if (!*packet_dimension) return ENOMEM; - rc = ip_packet_size_req(ip_phone, device_id, *packet_dimension); + int rc = ip_packet_size_req(sess, device_id, *packet_dimension); if (rc != EOK) { free(*packet_dimension); @@ -236,30 +233,28 @@ /** Prepares the packet for ICMP error notification. * - * Keeps the first packet and releases all the others. - * Releases all the packets on error. - * - * @param[in] packet_phone The packet server module phone. - * @param[in] icmp_phone The ICMP module phone. - * @param[in] packet The packet to be send. - * @param[in] error The packet error reporting service. Prefixes the - * received packet. - * @return EOK on success. - * @return ENOENT if no packet may be sent. - */ -int -tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t *packet, - services_t error) -{ - packet_t *next; + * Keep the first packet and release all the others. + * Release all the packets on error. + * + * @param[in] packet_sess Packet server module session. + * @param[in] icmp_sess ICMP module phone. + * @param[in] packet Packet to be send. + * @param[in] error Packet error reporting service. Prefixes the + * received packet. + * + * @return EOK on success. + * @return ENOENT if no packet may be sent. + * + */ +int tl_prepare_icmp_packet(async_sess_t *packet_sess, async_sess_t *icmp_sess, + packet_t *packet, services_t error) +{ + /* Detach the first packet and release the others */ + packet_t *next = pq_detach(packet); + if (next) + pq_release_remote(packet_sess, packet_get_id(next)); + uint8_t *src; - int length; - - /* Detach the first packet and release the others */ - next = pq_detach(packet); - if (next) - pq_release_remote(packet_phone, packet_get_id(next)); - - length = packet_get_addr(packet, &src, NULL); - if ((length > 0) && (!error) && (icmp_phone >= 0) && + int length = packet_get_addr(packet, &src, NULL); + if ((length > 0) && (!error) && (icmp_sess) && /* * Set both addresses to the source one (avoids the source address @@ -269,6 +264,6 @@ return EOK; } else - pq_release_remote(packet_phone, packet_get_id(packet)); - + pq_release_remote(packet_sess, packet_get_id(packet)); + return ENOENT; } @@ -276,20 +271,21 @@ /** Receives data from the socket into a packet. * - * @param[in] packet_phone The packet server module phone. - * @param[out] packet The new created packet. - * @param[in] prefix Reserved packet data prefix length. - * @param[in] dimension The packet dimension. - * @param[in] addr The destination address. - * @param[in] addrlen The address length. - * @return Number of bytes received. - * @return EINVAL if the client does not send data. - * @return ENOMEM if there is not enough memory left. - * @return Other error codes as defined for the - * async_data_read_finalize() function. - */ -int -tl_socket_read_packet_data(int packet_phone, packet_t **packet, size_t prefix, - const packet_dimension_t *dimension, const struct sockaddr *addr, - socklen_t addrlen) + * @param[in] sess Packet server module session. + * @param[out] packet New created packet. + * @param[in] prefix Reserved packet data prefix length. + * @param[in] dimension Packet dimension. + * @param[in] addr Destination address. + * @param[in] addrlen Address length. + * + * @return Number of bytes received. + * @return EINVAL if the client does not send data. + * @return ENOMEM if there is not enough memory left. + * @return Other error codes as defined for the + * async_data_read_finalize() function. + * + */ +int tl_socket_read_packet_data(async_sess_t *sess, packet_t **packet, + size_t prefix, const packet_dimension_t *dimension, + const struct sockaddr *addr, socklen_t addrlen) { ipc_callid_t callid; @@ -306,5 +302,5 @@ /* Get a new packet */ - *packet = packet_get_4_remote(packet_phone, length, dimension->addr_len, + *packet = packet_get_4_remote(sess, length, dimension->addr_len, prefix + dimension->prefix, dimension->suffix); if (!packet) @@ -314,5 +310,5 @@ data = packet_suffix(*packet, length); if (!data) { - pq_release_remote(packet_phone, packet_get_id(*packet)); + pq_release_remote(sess, packet_get_id(*packet)); return ENOMEM; } @@ -321,5 +317,5 @@ rc = async_data_write_finalize(callid, data, length); if (rc != EOK) { - pq_release_remote(packet_phone, packet_get_id(*packet)); + pq_release_remote(sess, packet_get_id(*packet)); return rc; } @@ -328,5 +324,5 @@ rc = packet_set_addr(*packet, NULL, (uint8_t *) addr, addrlen); if (rc != EOK) { - pq_release_remote(packet_phone, packet_get_id(*packet)); + pq_release_remote(sess, packet_get_id(*packet)); return rc; } Index: uspace/lib/net/tl/tl_remote.c =================================================================== --- uspace/lib/net/tl/tl_remote.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/tl/tl_remote.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -34,22 +34,21 @@ #include #include - #include #include - #include #include +#include /** Notify the remote transport layer modules about the received packet/s. * - * @param[in] tl_phone The transport layer module phone used for remote calls. - * @param[in] device_id The device identifier. - * @param[in] packet The received packet or the received packet queue. + * @param[in] sess Transport layer module session. + * @param[in] device_id Device identifier. + * @param[in] packet Received packet or the received packet queue. * The packet queue is used to carry a fragmented * datagram. The first packet contains the headers, * the others contain only data. - * @param[in] target The target transport layer module service to be + * @param[in] target Target transport layer module service to be * delivered to. - * @param[in] error The packet error reporting service. Prefixes the + * @param[in] error Packet error reporting service. Prefixes the * received packet. * @@ -57,8 +56,8 @@ * */ -int tl_received_msg(int tl_phone, device_id_t device_id, packet_t *packet, +int tl_received_msg(async_sess_t *sess, device_id_t device_id, packet_t *packet, services_t target, services_t error) { - return generic_received_msg_remote(tl_phone, NET_TL_RECEIVED, device_id, + return generic_received_msg_remote(sess, NET_TL_RECEIVED, device_id, packet_get_id(packet), target, error); } Index: uspace/lib/net/tl/tl_skel.c =================================================================== --- uspace/lib/net/tl/tl_skel.c (revision 5509184741ecf843199d59e85d370dde14ac0923) +++ uspace/lib/net/tl/tl_skel.c (revision ef09a7ad92d2a727ade3cc5c9a88b9b28ec9a98b) @@ -38,17 +38,14 @@ #include #include +#include #include #include #include -#include - -// FIXME: remove this header -#include /** Default thread for new connections. * - * @param[in] iid The initial message identifier. - * @param[in] icall The initial message call structure. - * @param[in] arg Local argument. + * @param[in] iid The initial message identifier. + * @param[in] icall The initial message call structure. + * @param[in] arg Local argument. * */ @@ -107,10 +104,10 @@ * */ -int tl_module_start(int service) +int tl_module_start(sysarg_t service) { async_set_client_connection(tl_client_connection); - int net_phone = net_connect_module(); - if (net_phone < 0) - return net_phone; + async_sess_t *sess = net_connect_module(); + if (!sess) + return ENOENT; int rc = pm_init(); @@ -118,9 +115,9 @@ return rc; - rc = tl_initialize(net_phone); + rc = tl_initialize(sess); if (rc != EOK) goto out; - rc = async_obsolete_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL); + rc = service_register(service); if (rc != EOK) goto out;