Index: uspace/lib/net/generic/net_remote.c =================================================================== --- uspace/lib/net/generic/net_remote.c (revision b69ceea4b067fb9d220925ff712d816ed799d12b) +++ uspace/lib/net/generic/net_remote.c (revision 614d06567e34555e0ab2bb578905bfbafdbbbd63) @@ -47,18 +47,46 @@ #include -int net_connect_module(services_t service) +/** Connects to the networking module. + * + * @returns The networking module phone on success. + */ +int net_connect_module(void) { return connect_to_service(SERVICE_NETWORKING); } +/** Frees the received settings. + * + * @param[in] settings The received settings. + * @param[in] data The received settings data. + * @see net_get_device_conf_req() + * @see net_get_conf_req() + */ void net_free_settings(measured_string_ref settings, char *data) { if (settings) free(settings); - if (data) free(data); } +/** Returns the global configuration. + * + * 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,out] configuration The 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. + * @returns EOK on success. + * @returns EINVAL if the configuration is NULL. + * @returns EINVAL if the count is zero. + * @returns Other error codes as defined for the + * generic_translate_req() function. + */ int net_get_conf_req(int net_phone, measured_string_ref *configuration, @@ -69,4 +97,23 @@ } +/** Returns the device specific configuration. + * + * Returns 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. + * @returns EOK on success. + * @returns EINVAL if the configuration is NULL. + * @returns EINVAL if the count is zero. + * @returns 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, Index: uspace/lib/net/include/net_interface.h =================================================================== --- uspace/lib/net/include/net_interface.h (revision b69ceea4b067fb9d220925ff712d816ed799d12b) +++ uspace/lib/net/include/net_interface.h (revision 614d06567e34555e0ab2bb578905bfbafdbbbd63) @@ -27,10 +27,10 @@ */ -/** @addtogroup net +/** @addtogroup libnet * @{ */ -#ifndef __NET_NET_INTERFACE_H__ -#define __NET_NET_INTERFACE_H__ +#ifndef LIBNET_NET_INTERFACE_H_ +#define LIBNET_NET_INTERFACE_H_ #include @@ -40,51 +40,13 @@ /** @name Networking module interface - * This interface is used by other modules. + * This interface is used by other modules. */ /*@{*/ -/** Returns the device specific configuration. - * Returns 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. - * @returns EOK on success. - * @returns EINVAL if the configuration is NULL. - * @returns EINVAL if the count is zero (0). - * @returns Other error codes as defined for the generic_translate_req() function. - */ -extern int net_get_device_conf_req(int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data); - -/** Returns the global configuration. - * 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,out] configuration The 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. - * @returns EOK on success. - * @returns EINVAL if the configuration is NULL. - * @returns EINVAL if the count is zero (0). - * @returns Other error codes as defined for the generic_translate_req() function. - */ -extern int net_get_conf_req(int net_phone, measured_string_ref * configuration, size_t count, char ** data); - -/** Frees the received settings. - * @param[in] settings The received settings. - * @param[in] data The received settings data. - * @see net_get_device_conf_req() - * @see net_get_conf_req() - */ -extern void net_free_settings(measured_string_ref settings, char * data); - -/** Connects to the networking module. - * @param service The networking module service. Ignored parameter. - * @returns The networking module phone on success. - */ -extern int net_connect_module(services_t service); +extern int net_get_device_conf_req(int, device_id_t, measured_string_ref *, + size_t, char **); +extern int net_get_conf_req(int, measured_string_ref *, size_t, char **); +extern void net_free_settings(measured_string_ref, char *); +extern int net_connect_module(void); /*@}*/ Index: uspace/srv/net/il/arp/arp_module.c =================================================================== --- uspace/srv/net/il/arp/arp_module.c (revision b69ceea4b067fb9d220925ff712d816ed799d12b) +++ uspace/srv/net/il/arp/arp_module.c (revision 614d06567e34555e0ab2bb578905bfbafdbbbd63) @@ -80,5 +80,5 @@ async_set_client_connection(client_connection); - arp_globals.net_phone = net_connect_module(SERVICE_NETWORKING); + arp_globals.net_phone = net_connect_module(); ERROR_PROPAGATE(pm_init()); Index: uspace/srv/net/il/ip/ip_module.c =================================================================== --- uspace/srv/net/il/ip/ip_module.c (revision b69ceea4b067fb9d220925ff712d816ed799d12b) +++ uspace/srv/net/il/ip/ip_module.c (revision 614d06567e34555e0ab2bb578905bfbafdbbbd63) @@ -79,5 +79,5 @@ async_set_client_connection(client_connection); - ip_globals.net_phone = net_connect_module(SERVICE_NETWORKING); + ip_globals.net_phone = net_connect_module(); ERROR_PROPAGATE(pm_init()); Index: uspace/srv/net/nil/eth/eth_module.c =================================================================== --- uspace/srv/net/nil/eth/eth_module.c (revision b69ceea4b067fb9d220925ff712d816ed799d12b) +++ uspace/srv/net/nil/eth/eth_module.c (revision 614d06567e34555e0ab2bb578905bfbafdbbbd63) @@ -63,5 +63,5 @@ async_set_client_connection(client_connection); - int net_phone = net_connect_module(SERVICE_NETWORKING); + int net_phone = net_connect_module(); ERROR_PROPAGATE(pm_init()); Index: uspace/srv/net/nil/nildummy/nildummy_module.c =================================================================== --- uspace/srv/net/nil/nildummy/nildummy_module.c (revision b69ceea4b067fb9d220925ff712d816ed799d12b) +++ uspace/srv/net/nil/nildummy/nildummy_module.c (revision 614d06567e34555e0ab2bb578905bfbafdbbbd63) @@ -71,5 +71,5 @@ async_set_client_connection(client_connection); - int net_phone = net_connect_module(SERVICE_NETWORKING); + int net_phone = net_connect_module(); ERROR_PROPAGATE(pm_init()); Index: uspace/srv/net/tl/icmp/icmp_module.c =================================================================== --- uspace/srv/net/tl/icmp/icmp_module.c (revision b69ceea4b067fb9d220925ff712d816ed799d12b) +++ uspace/srv/net/tl/icmp/icmp_module.c (revision 614d06567e34555e0ab2bb578905bfbafdbbbd63) @@ -69,5 +69,5 @@ async_set_client_connection(client_connection); - icmp_globals.net_phone = net_connect_module(SERVICE_NETWORKING); + icmp_globals.net_phone = net_connect_module(); if(icmp_globals.net_phone < 0){ return icmp_globals.net_phone; Index: uspace/srv/net/tl/tcp/tcp_module.c =================================================================== --- uspace/srv/net/tl/tcp/tcp_module.c (revision b69ceea4b067fb9d220925ff712d816ed799d12b) +++ uspace/srv/net/tl/tcp/tcp_module.c (revision 614d06567e34555e0ab2bb578905bfbafdbbbd63) @@ -71,5 +71,5 @@ async_set_client_connection(client_connection); - tcp_globals.net_phone = net_connect_module(SERVICE_NETWORKING); + tcp_globals.net_phone = net_connect_module(); ERROR_PROPAGATE(pm_init()); Index: uspace/srv/net/tl/udp/udp_module.c =================================================================== --- uspace/srv/net/tl/udp/udp_module.c (revision b69ceea4b067fb9d220925ff712d816ed799d12b) +++ uspace/srv/net/tl/udp/udp_module.c (revision 614d06567e34555e0ab2bb578905bfbafdbbbd63) @@ -69,5 +69,5 @@ async_set_client_connection(client_connection); - udp_globals.net_phone = net_connect_module(SERVICE_NETWORKING); + udp_globals.net_phone = net_connect_module(); if(udp_globals.net_phone < 0){ return udp_globals.net_phone;