Index: HelenOS.config =================================================================== --- HelenOS.config (revision e721462418355c39b2b54d7db7404e894bf38468) +++ HelenOS.config (revision f99c1918142ef6c0e1fb4b2f4809a4d5a5a297ce) @@ -534,7 +534,4 @@ ! CONFIG_WRITE_CORE_FILES (n/y) -% Bundle netif/nil network layer -! CONFIG_NETIF_NIL_BUNDLE (n/y) - % Strip binaries ! CONFIG_STRIP_BINARIES (n/y) Index: uspace/lib/net/Makefile =================================================================== --- uspace/lib/net/Makefile (revision e721462418355c39b2b54d7db7404e894bf38468) +++ uspace/lib/net/Makefile (revision f99c1918142ef6c0e1fb4b2f4809a4d5a5a297ce) @@ -41,5 +41,4 @@ netif/netif_local.c \ netif/netif_remote.c \ - netif/netif_nil_bundle.c \ nil/nil_remote.c \ il/ip_remote.c \ Index: uspace/lib/net/include/arp_interface.h =================================================================== --- uspace/lib/net/include/arp_interface.h (revision e721462418355c39b2b54d7db7404e894bf38468) +++ uspace/lib/net/include/arp_interface.h (revision f99c1918142ef6c0e1fb4b2f4809a4d5a5a297ce) @@ -104,10 +104,8 @@ * @param service The ARP module service. Ignored parameter. * @returns The ARP module phone on success. - * @returns 0 if called by the bundle module. */ extern int arp_connect_module(services_t service); /** Returns the ARP task identifier. - * @returns The current task identifier if called by the bundle module. * @returns 0 if called by the remote module. */ Index: uspace/lib/net/include/ip_interface.h =================================================================== --- uspace/lib/net/include/ip_interface.h (revision e721462418355c39b2b54d7db7404e894bf38468) +++ uspace/lib/net/include/ip_interface.h (revision f99c1918142ef6c0e1fb4b2f4809a4d5a5a297ce) @@ -100,5 +100,4 @@ * @param service The IP module service. Ignored parameter. * @returns The IP module phone on success. - * @returns 0 if called by the bundle module. */ extern int ip_connect_module(services_t service); Index: uspace/lib/net/include/net_interface.h =================================================================== --- uspace/lib/net/include/net_interface.h (revision e721462418355c39b2b54d7db7404e894bf38468) +++ uspace/lib/net/include/net_interface.h (revision f99c1918142ef6c0e1fb4b2f4809a4d5a5a297ce) @@ -85,5 +85,4 @@ * @param service The networking module service. Ignored parameter. * @returns The networking module phone on success. - * @returns 0 if called by the bundle module. */ extern int net_connect_module(services_t service); Index: uspace/lib/net/include/netif_interface.h =================================================================== --- uspace/lib/net/include/netif_interface.h (revision e721462418355c39b2b54d7db7404e894bf38468) +++ uspace/lib/net/include/netif_interface.h (revision f99c1918142ef6c0e1fb4b2f4809a4d5a5a297ce) @@ -34,22 +34,4 @@ #define __NET_NETIF_INTERFACE_H__ -#ifdef CONFIG_NETIF_NIL_BUNDLE - -#include -#include -#include - -#define netif_module_message netif_nil_module_message -#define netif_module_start netif_nil_module_start -#define netif_get_addr_req netif_get_addr_req_local -#define netif_probe_req netif_probe_req_local -#define netif_send_msg netif_send_msg_local -#define netif_start_req netif_start_req_local -#define netif_stop_req netif_stop_req_local -#define netif_stats_req netif_stats_req_local -#define netif_bind_service netif_bind_service_local - -#else /* CONFIG_NETIF_NIL_BUNDLE */ - #include #include @@ -65,6 +47,4 @@ #define netif_bind_service netif_bind_service_remote -#endif /* CONFIG_NETIF_NIL_BUNDLE */ - #endif Index: uspace/lib/net/include/netif_local.h =================================================================== --- uspace/lib/net/include/netif_local.h (revision e721462418355c39b2b54d7db7404e894bf38468) +++ uspace/lib/net/include/netif_local.h (revision f99c1918142ef6c0e1fb4b2f4809a4d5a5a297ce) @@ -34,5 +34,4 @@ * Network interface module skeleton. * The skeleton has to be part of each network interface module. - * The skeleton can be also part of the module bundled with the network interface layer. */ Index: pace/lib/net/netif/netif_nil_bundle.c =================================================================== --- uspace/lib/net/netif/netif_nil_bundle.c (revision e721462418355c39b2b54d7db7404e894bf38468) +++ (revision ) @@ -1,105 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup netif - * @{ - */ - -/** @file - * Wrapper for the bundled network interface and network interface layer module. - * Distributes messages and initializes both module parts. - */ - -#include -#include -#include - -#include -#include -#include -#include - -/** Distribute the messages between the module parts. - * - * @param[in] name Module name. - * @param[in] callid The message identifier. - * @param[in] call The message parameters. - * @param[out] answer The message answer parameters. - * @param[out] answer_count The last parameter for the actual - * answer in the answer parameter. - * - * @return EOK on success. - * @return ENOTSUP if the message is not known. - * @return Other error codes as defined for each specific module message function. - * - */ -int netif_nil_module_message(const char *name, ipc_callid_t callid, - ipc_call_t *call, ipc_call_t *answer, int *answer_count) -{ - if ((IS_NET_NIL_MESSAGE(call)) - || (IPC_GET_METHOD(*call) == IPC_M_CONNECT_TO_ME)) - return nil_message_standalone(name, callid, call, answer, - answer_count); - else - return netif_module_message_standalone(name, callid, call, answer, - answer_count); -} - -/** Start the bundle network interface module. - * - * Initialize the client connection serving function, initialize - * both module parts, register the module service and start the - * async manager, processing IPC messages in an infinite loop. - * - * @param[in] client_connection The client connection processing - * function. The module skeleton propagates - * its own one. - * - * @return EOK on success. - * @return Other error codes as defined for each specific module message - * function. - * - */ -int netif_nil_module_start(async_client_conn_t client_connection) -{ - ERROR_DECLARE; - - ERROR_PROPAGATE(netif_init_module(client_connection)); - if (ERROR_OCCURRED(nil_initialize(netif_globals.net_phone))) { - pm_destroy(); - return ERROR_CODE; - } - - async_manager(); - - pm_destroy(); - return EOK; -} - -/** @} - */ Index: uspace/lib/socket/include/icmp_common.h =================================================================== --- uspace/lib/socket/include/icmp_common.h (revision e721462418355c39b2b54d7db7404e894bf38468) +++ uspace/lib/socket/include/icmp_common.h (revision f99c1918142ef6c0e1fb4b2f4809a4d5a5a297ce) @@ -50,5 +50,4 @@ * @param[in] timeout The connection timeout in microseconds. No timeout if set to zero (0). * @returns The ICMP module phone on success. - * @returns The ICMP socket identifier if called by the bundle module. * @returns ETIMEOUT if the connection timeouted. */ Index: pace/srv/net/net/net_bundle.c =================================================================== --- uspace/srv/net/net/net_bundle.c (revision e721462418355c39b2b54d7db7404e894bf38468) +++ (revision ) @@ -1,135 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup net - * @{ - */ - -/** @file - * Wrapper for the bundled networking and TCP/IP stact modules. - * Distributes messages and initializes all module parts. - */ - -#include - -#include - -#include "../messages.h" - -#include "../include/ip_interface.h" - -#include "../structures/measured_strings.h" -#include "../structures/module_map.h" -#include "../structures/packet/packet_server.h" - -#include "../il/arp/arp_module.h" -#include "../il/ip/ip_module.h" -#include "../tl/icmp/icmp_module.h" -#include "../tl/udp/udp_module.h" -#include "../tl/tcp/tcp_module.h" - -#include "net.h" - -/** Networking module global data. - */ -extern net_globals_t net_globals; - -/** Initializes the networking module for the chosen subsystem build type. - * @param[in] client_connection The client connection processing function. The module skeleton propagates its own one. - * @returns EOK on success. - * @returns ENOMEM if there is not enough memory left. - */ -int net_initialize_build(async_client_conn_t client_connection){ - ERROR_DECLARE; - - ipcarg_t phonehash; - - ERROR_PROPAGATE(REGISTER_ME(SERVICE_IP, &phonehash)); - ERROR_PROPAGATE(add_module(NULL, &net_globals.modules, IP_NAME, IP_FILENAME, SERVICE_IP, task_get_id(), ip_connect_module)); - ERROR_PROPAGATE(ip_initialize(client_connection)); - ERROR_PROPAGATE(REGISTER_ME(SERVICE_ARP, &phonehash)); - ERROR_PROPAGATE(arp_initialize(client_connection)); - ERROR_PROPAGATE(REGISTER_ME(SERVICE_ICMP, &phonehash)); - ERROR_PROPAGATE(icmp_initialize(client_connection)); - ERROR_PROPAGATE(REGISTER_ME(SERVICE_UDP, &phonehash)); - ERROR_PROPAGATE(udp_initialize(client_connection)); - ERROR_PROPAGATE(REGISTER_ME(SERVICE_TCP, &phonehash)); - ERROR_PROPAGATE(tcp_initialize(client_connection)); - return EOK; -} - -/** Processes the module message. - * Distributes the message to the right bundled module. - * @param[in] callid The message identifier. - * @param[in] call The message parameters. - * @param[out] answer The message answer parameters. - * @param[out] answer_count The last parameter for the actual answer in the answer parameter. - * @returns EOK on success. - * @returns ENOTSUP if the message is not known. - * @returns Other error codes as defined for each bundled module message function. - */ -int net_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ - if((IPC_GET_METHOD(*call) == IPC_M_CONNECT_TO_ME) - || IS_NET_IL_MESSAGE(call) - || IS_NET_TL_MESSAGE(call) - || IS_NET_SOCKET_MESSAGE(call)){ - switch(IPC_GET_TARGET(call)){ - case SERVICE_IP: - return ip_message(callid, call, answer, answer_count); - case SERVICE_ARP: - return arp_message(callid, call, answer, answer_count); - case SERVICE_ICMP: - return icmp_message(callid, call, answer, answer_count); - case SERVICE_UDP: - return udp_message(callid, call, answer, answer_count); - case SERVICE_TCP: - return tcp_message(callid, call, answer, answer_count); - default: - return EINVAL; - } - }else if(IS_NET_IP_MESSAGE(call)){ - return ip_message(callid, call, answer, answer_count); - }else if(IS_NET_ARP_MESSAGE(call)){ - return arp_message(callid, call, answer, answer_count); - }else if(IS_NET_ICMP_MESSAGE(call)){ - return icmp_message(callid, call, answer, answer_count); - }else if(IS_NET_UDP_MESSAGE(call)){ - return udp_message(callid, call, answer, answer_count); - }else if(IS_NET_TCP_MESSAGE(call)){ - return tcp_message(callid, call, answer, answer_count); - }else{ - if(IS_NET_PACKET_MESSAGE(call)){ - return packet_server_message(callid, call, answer, answer_count); - }else{ - return net_message(callid, call, answer, answer_count); - } - } -} - -/** @} - */ Index: uspace/srv/net/net/net_standalone.c =================================================================== --- uspace/srv/net/net/net_standalone.c (revision e721462418355c39b2b54d7db7404e894bf38468) +++ uspace/srv/net/net/net_standalone.c (revision f99c1918142ef6c0e1fb4b2f4809a4d5a5a297ce) @@ -94,6 +94,5 @@ * @return EOK on success. * @return ENOTSUP if the message is not known. - * @return Other error codes as defined for each bundled module - * message function. + * @return Other error codes. * */