Index: uspace/srv/net/tl/icmp/Makefile =================================================================== --- uspace/srv/net/tl/icmp/Makefile (revision 797b704b28bced20e17a9eb959845c20363ce662) +++ uspace/srv/net/tl/icmp/Makefile (revision a613fea187afab7543e6d2423ab0b3b2bb44df2b) @@ -34,6 +34,5 @@ SOURCES = \ - icmp.c \ - icmp_module.c + icmp.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/tl/icmp/icmp.c =================================================================== --- uspace/srv/net/tl/icmp/icmp.c (revision 797b704b28bced20e17a9eb959845c20363ce662) +++ uspace/srv/net/tl/icmp/icmp.c (revision a613fea187afab7543e6d2423ab0b3b2bb44df2b) @@ -35,7 +35,4 @@ * @see icmp.h */ - -#include "icmp.h" -#include "icmp_module.h" #include @@ -72,10 +69,12 @@ #include #include -#include -#include +#include +#include #include +#include "icmp.h" + /** ICMP module name. */ -#define NAME "ICMP protocol" +#define NAME "icmp" /** Default ICMP error reporting. */ @@ -394,78 +393,4 @@ } -/** Initializes the ICMP module. - * - * @param[in] client_connection The client connection processing function. The - * module skeleton propagates its own one. - * @return EOK on success. - * @return ENOMEM if there is not enough memory left. - */ -int icmp_initialize(async_client_conn_t client_connection) -{ - measured_string_t names[] = { - { - (uint8_t *) "ICMP_ERROR_REPORTING", - 20 - }, - { - (uint8_t *) "ICMP_ECHO_REPLYING", - 18 - } - }; - measured_string_t *configuration; - size_t count = sizeof(names) / sizeof(measured_string_t); - uint8_t *data; - int rc; - - fibril_rwlock_initialize(&icmp_globals.lock); - fibril_rwlock_write_lock(&icmp_globals.lock); - icmp_replies_initialize(&icmp_globals.replies); - icmp_echo_data_initialize(&icmp_globals.echo_data); - - icmp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_ICMP, - SERVICE_ICMP, client_connection); - if (icmp_globals.ip_phone < 0) { - fibril_rwlock_write_unlock(&icmp_globals.lock); - return icmp_globals.ip_phone; - } - - rc = ip_packet_size_req(icmp_globals.ip_phone, -1, - &icmp_globals.packet_dimension); - if (rc != EOK) { - fibril_rwlock_write_unlock(&icmp_globals.lock); - return rc; - } - - icmp_globals.packet_dimension.prefix += ICMP_HEADER_SIZE; - icmp_globals.packet_dimension.content -= ICMP_HEADER_SIZE; - - icmp_globals.error_reporting = NET_DEFAULT_ICMP_ERROR_REPORTING; - icmp_globals.echo_replying = NET_DEFAULT_ICMP_ECHO_REPLYING; - - /* Get configuration */ - configuration = &names[0]; - rc = net_get_conf_req(icmp_globals.net_phone, &configuration, count, - &data); - if (rc != EOK) { - fibril_rwlock_write_unlock(&icmp_globals.lock); - return rc; - } - - if (configuration) { - if (configuration[0].value) { - icmp_globals.error_reporting = - (configuration[0].value[0] == 'y'); - } - if (configuration[1].value) { - icmp_globals.echo_replying = - (configuration[1].value[0] == 'y'); - } - net_free_settings(configuration, data); - } - - fibril_rwlock_write_unlock(&icmp_globals.lock); - return EOK; -} - /** Tries to set the pending reply result as the received message type. * @@ -667,4 +592,110 @@ return icmp_release_and_return(packet, rc); + return EOK; +} + +/** Process IPC messages from the IP module + * + * @param[in] iid Message identifier. + * @param[in,out] icall Message parameters. + * + */ +static void icmp_receiver(ipc_callid_t iid, ipc_call_t *icall) +{ + packet_t *packet; + int rc; + + while (true) { + switch (IPC_GET_IMETHOD(*icall)) { + case NET_TL_RECEIVED: + rc = packet_translate_remote(icmp_globals.net_phone, &packet, + IPC_GET_PACKET(*icall)); + if (rc == EOK) + rc = icmp_received_msg_local(IPC_GET_DEVICE(*icall), packet, + SERVICE_ICMP, IPC_GET_ERROR(*icall)); + + ipc_answer_0(iid, (sysarg_t) rc); + break; + default: + ipc_answer_0(iid, (sysarg_t) ENOTSUP); + } + + iid = async_get_call(icall); + } +} + +/** Initialize the ICMP module. + * + * @param[in] net_phone Network module phone. + * + * @return EOK on success. + * @return ENOMEM if there is not enough memory left. + * + */ +int tl_initialize(int net_phone) +{ + measured_string_t names[] = { + { + (uint8_t *) "ICMP_ERROR_REPORTING", + 20 + }, + { + (uint8_t *) "ICMP_ECHO_REPLYING", + 18 + } + }; + measured_string_t *configuration; + size_t count = sizeof(names) / sizeof(measured_string_t); + uint8_t *data; + + fibril_rwlock_initialize(&icmp_globals.lock); + fibril_rwlock_write_lock(&icmp_globals.lock); + icmp_replies_initialize(&icmp_globals.replies); + icmp_echo_data_initialize(&icmp_globals.echo_data); + + icmp_globals.net_phone = net_phone; + + icmp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_ICMP, + SERVICE_ICMP, icmp_receiver); + if (icmp_globals.ip_phone < 0) { + fibril_rwlock_write_unlock(&icmp_globals.lock); + return icmp_globals.ip_phone; + } + + int rc = ip_packet_size_req(icmp_globals.ip_phone, -1, + &icmp_globals.packet_dimension); + if (rc != EOK) { + fibril_rwlock_write_unlock(&icmp_globals.lock); + return rc; + } + + icmp_globals.packet_dimension.prefix += ICMP_HEADER_SIZE; + icmp_globals.packet_dimension.content -= ICMP_HEADER_SIZE; + + icmp_globals.error_reporting = NET_DEFAULT_ICMP_ERROR_REPORTING; + icmp_globals.echo_replying = NET_DEFAULT_ICMP_ECHO_REPLYING; + + /* Get configuration */ + configuration = &names[0]; + rc = net_get_conf_req(icmp_globals.net_phone, &configuration, count, + &data); + if (rc != EOK) { + fibril_rwlock_write_unlock(&icmp_globals.lock); + return rc; + } + + if (configuration) { + if (configuration[0].value) { + icmp_globals.error_reporting = + (configuration[0].value[0] == 'y'); + } + if (configuration[1].value) { + icmp_globals.echo_replying = + (configuration[1].value[0] == 'y'); + } + net_free_settings(configuration, data); + } + + fibril_rwlock_write_unlock(&icmp_globals.lock); return EOK; } @@ -893,89 +924,24 @@ * @see IS_NET_ICMP_MESSAGE() */ -int icmp_message_standalone(ipc_callid_t callid, ipc_call_t *call, +int tl_module_message (ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, size_t *answer_count) { - packet_t *packet; - int rc; - *answer_count = 0; switch (IPC_GET_IMETHOD(*call)) { - case NET_TL_RECEIVED: - rc = packet_translate_remote(icmp_globals.net_phone, &packet, - IPC_GET_PACKET(*call)); - if (rc != EOK) - return rc; - return icmp_received_msg_local(IPC_GET_DEVICE(*call), packet, - SERVICE_ICMP, IPC_GET_ERROR(*call)); - case NET_ICMP_INIT: return icmp_process_client_messages(callid, *call); - default: return icmp_process_message(call); } - + return ENOTSUP; } - -/** Default thread for new connections. - * - * @param[in] iid The initial message identifier. - * @param[in] icall The initial message call structure. - * - */ -static void tl_client_connection(ipc_callid_t iid, ipc_call_t *icall) -{ - /* - * Accept the connection - * - Answer the first IPC_M_CONNECT_ME_TO call. - */ - ipc_answer_0(iid, EOK); - - while (true) { - ipc_call_t answer; - size_t answer_count; - - /* Clear the answer structure */ - refresh_answer(&answer, &answer_count); - - /* Fetch the next message */ - ipc_call_t call; - ipc_callid_t callid = async_get_call(&call); - - /* Process the message */ - int res = tl_module_message_standalone(callid, &call, &answer, - &answer_count); - - /* - * End if told to either by the message or the processing - * result. - */ - if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) || - (res == EHANGUP)) - return; - - /* Answer the message */ - answer_call(callid, res, &answer, answer_count); - } -} - -/** Starts the module. - * - * @return EOK on success. - * @return Other error codes as defined for each specific module - * start function. - */ int main(int argc, char *argv[]) { - int rc; - /* Start the module */ - rc = tl_module_start_standalone(tl_client_connection); - return rc; + return tl_module_start(SERVICE_ICMP); } /** @} */ - Index: uspace/srv/net/tl/icmp/icmp_module.c =================================================================== --- uspace/srv/net/tl/icmp/icmp_module.c (revision 797b704b28bced20e17a9eb959845c20363ce662) +++ (revision ) @@ -1,94 +1,0 @@ -/* - * Copyright (c) 2008 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 icmp - * @{ - */ - -/** @file - * ICMP standalone module implementation. - * Contains skeleton module functions mapping. - * The functions are used by the module skeleton as module specific entry points. - * @see module.c - */ - -#include "icmp.h" -#include "icmp_module.h" - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include - -/** ICMP module global data. */ -extern icmp_globals_t icmp_globals; - -int tl_module_start_standalone(async_client_conn_t client_connection) -{ - sysarg_t phonehash; - int rc; - - async_set_client_connection(client_connection); - icmp_globals.net_phone = net_connect_module(); - if (icmp_globals.net_phone < 0) - return icmp_globals.net_phone; - - rc = pm_init(); - if (rc != EOK) - return rc; - - rc = icmp_initialize(client_connection); - if (rc != EOK) - goto out; - - rc = ipc_connect_to_me(PHONE_NS, SERVICE_ICMP, 0, 0, &phonehash); - if (rc != EOK) - goto out; - - async_manager(); - -out: - pm_destroy(); - return rc; -} - -int tl_module_message_standalone(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, size_t *count) -{ - return icmp_message_standalone(callid, call, answer, count); -} - -/** @} - */ Index: uspace/srv/net/tl/icmp/icmp_module.h =================================================================== --- uspace/srv/net/tl/icmp/icmp_module.h (revision 797b704b28bced20e17a9eb959845c20363ce662) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * Copyright (c) 2008 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 icmp - * @{ - */ - -/** @file - * ICMP module functions. - * The functions are used as ICMP module entry points. - */ - -#ifndef NET_ICMP_MODULE_H_ -#define NET_ICMP_MODULE_H_ - -#include -#include - -extern int icmp_initialize(async_client_conn_t); -extern int icmp_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *, - size_t *); - -#endif - -/** @} - */ Index: uspace/srv/net/tl/tcp/Makefile =================================================================== --- uspace/srv/net/tl/tcp/Makefile (revision 797b704b28bced20e17a9eb959845c20363ce662) +++ uspace/srv/net/tl/tcp/Makefile (revision a613fea187afab7543e6d2423ab0b3b2bb44df2b) @@ -34,6 +34,5 @@ SOURCES = \ - tcp.c \ - tcp_module.c + tcp.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/tl/tcp/tcp.c =================================================================== --- uspace/srv/net/tl/tcp/tcp.c (revision 797b704b28bced20e17a9eb959845c20363ce662) +++ uspace/srv/net/tl/tcp/tcp.c (revision a613fea187afab7543e6d2423ab0b3b2bb44df2b) @@ -36,8 +36,4 @@ */ -#include "tcp.h" -#include "tcp_header.h" -#include "tcp_module.h" - #include #include @@ -72,9 +68,12 @@ #include #include -#include -#include +#include +#include + +#include "tcp.h" +#include "tcp_header.h" /** TCP module name. */ -#define NAME "TCP protocol" +#define NAME "tcp" /** The TCP window default value. */ @@ -220,46 +219,4 @@ /** TCP global data. */ tcp_globals_t tcp_globals; - -/** Initializes the TCP module. - * - * @param[in] client_connection The client connection processing function. The - * module skeleton propagates its own one. - * @return EOK on success. - * @return ENOMEM if there is not enough memory left. - */ -int tcp_initialize(async_client_conn_t client_connection) -{ - int rc; - - assert(client_connection); - - fibril_rwlock_initialize(&tcp_globals.lock); - fibril_rwlock_write_lock(&tcp_globals.lock); - - tcp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP, - ICMP_CONNECT_TIMEOUT); - tcp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_TCP, - SERVICE_TCP, client_connection); - if (tcp_globals.ip_phone < 0) { - fibril_rwlock_write_unlock(&tcp_globals.lock); - return tcp_globals.ip_phone; - } - - rc = socket_ports_initialize(&tcp_globals.sockets); - if (rc != EOK) - goto out; - - rc = packet_dimensions_initialize(&tcp_globals.dimensions); - if (rc != EOK) { - socket_ports_destroy(&tcp_globals.sockets); - goto out; - } - - tcp_globals.last_used_port = TCP_FREE_PORTS_START - 1; - -out: - fibril_rwlock_write_unlock(&tcp_globals.lock); - return rc; -} int tcp_received_msg(device_id_t device_id, packet_t *packet, @@ -1260,11 +1217,7 @@ * @see IS_NET_TCP_MESSAGE() */ -int -tcp_message_standalone(ipc_callid_t callid, ipc_call_t *call, +int tl_module_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, size_t *answer_count) { - packet_t *packet; - int rc; - assert(call); assert(answer); @@ -1273,16 +1226,4 @@ *answer_count = 0; switch (IPC_GET_IMETHOD(*call)) { - case NET_TL_RECEIVED: -// fibril_rwlock_read_lock(&tcp_globals.lock); - rc = packet_translate_remote(tcp_globals.net_phone, &packet, - IPC_GET_PACKET(*call)); - if (rc != EOK) { -// fibril_rwlock_read_unlock(&tcp_globals.lock); - return rc; - } - rc = tcp_received_msg(IPC_GET_DEVICE(*call), packet, SERVICE_TCP, - IPC_GET_ERROR(*call)); -// fibril_rwlock_read_unlock(&tcp_globals.lock); - return rc; case IPC_M_CONNECT_TO_ME: return tcp_process_client_messages(callid, *call); @@ -2486,61 +2427,78 @@ } -/** Default thread for new connections. +/** Process IPC messages from the IP module * - * @param[in] iid The initial message identifier. - * @param[in] icall The initial message call structure. + * @param[in] iid Message identifier. + * @param[in,out] icall Message parameters. * */ -static void tl_client_connection(ipc_callid_t iid, ipc_call_t * icall) -{ - /* - * Accept the connection - * - Answer the first IPC_M_CONNECT_ME_TO call. - */ - ipc_answer_0(iid, EOK); - +static void tcp_receiver(ipc_callid_t iid, ipc_call_t *icall) +{ + packet_t *packet; + int rc; + while (true) { - ipc_call_t answer; - size_t answer_count; - - /* Clear the answer structure */ - refresh_answer(&answer, &answer_count); - - /* Fetch the next message */ - ipc_call_t call; - ipc_callid_t callid = async_get_call(&call); - - /* Process the message */ - int res = tl_module_message_standalone(callid, &call, &answer, - &answer_count); - - /* - * End if told to either by the message or the processing - * result. - */ - if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) || - (res == EHANGUP)) - return; - - /* - * Answer the message - */ - answer_call(callid, res, &answer, answer_count); - } -} - -/** Starts the module. + switch (IPC_GET_IMETHOD(*icall)) { + case NET_TL_RECEIVED: + rc = packet_translate_remote(tcp_globals.net_phone, &packet, + IPC_GET_PACKET(*icall)); + if (rc == EOK) + rc = tcp_received_msg(IPC_GET_DEVICE(*icall), packet, + SERVICE_TCP, IPC_GET_ERROR(*icall)); + + ipc_answer_0(iid, (sysarg_t) rc); + break; + default: + ipc_answer_0(iid, (sysarg_t) ENOTSUP); + } + + iid = async_get_call(icall); + } +} + +/** Initialize the TCP module. * - * @return EOK on success. - * @return Other error codes as defined for each specific module - * start function. + * @param[in] net_phone Network module phone. + * + * @return EOK on success. + * @return ENOMEM if there is not enough memory left. + * */ -int -main(int argc, char *argv[]) -{ - int rc; - - rc = tl_module_start_standalone(tl_client_connection); +int tl_initialize(int net_phone) +{ + fibril_rwlock_initialize(&tcp_globals.lock); + fibril_rwlock_write_lock(&tcp_globals.lock); + + tcp_globals.net_phone = net_phone; + + tcp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP, + ICMP_CONNECT_TIMEOUT); + tcp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_TCP, + SERVICE_TCP, tcp_receiver); + if (tcp_globals.ip_phone < 0) { + fibril_rwlock_write_unlock(&tcp_globals.lock); + return tcp_globals.ip_phone; + } + + int rc = socket_ports_initialize(&tcp_globals.sockets); + if (rc != EOK) + goto out; + + rc = packet_dimensions_initialize(&tcp_globals.dimensions); + if (rc != EOK) { + socket_ports_destroy(&tcp_globals.sockets); + goto out; + } + + tcp_globals.last_used_port = TCP_FREE_PORTS_START - 1; + +out: + fibril_rwlock_write_unlock(&tcp_globals.lock); return rc; +} + +int main(int argc, char *argv[]) +{ + return tl_module_start(SERVICE_TCP); } Index: uspace/srv/net/tl/tcp/tcp_module.c =================================================================== --- uspace/srv/net/tl/tcp/tcp_module.c (revision 797b704b28bced20e17a9eb959845c20363ce662) +++ (revision ) @@ -1,95 +1,0 @@ -/* - * Copyright (c) 2008 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 tcp - * @{ - */ - -/** @file - * TCP standalone module implementation. - * Contains skeleton module functions mapping. - * The functions are used by the module skeleton as module specific entry - * points. - * @see module.c - */ - -#include "tcp.h" -#include "tcp_module.h" - -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include - -/** TCP module global data. */ -extern tcp_globals_t tcp_globals; - -int tl_module_start_standalone(async_client_conn_t client_connection) -{ - sysarg_t phonehash; - int rc; - - async_set_client_connection(client_connection); - tcp_globals.net_phone = net_connect_module(); - - rc = pm_init(); - if (rc != EOK) - return rc; - - rc = tcp_initialize(client_connection); - if (rc != EOK) - goto out; - - rc = ipc_connect_to_me(PHONE_NS, SERVICE_TCP, 0, 0, &phonehash); - if (rc != EOK) - goto out; - - async_manager(); - -out: - pm_destroy(); - return rc; -} - -int tl_module_message_standalone(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, size_t *count) -{ - return tcp_message_standalone(callid, call, answer, count); -} - -/** @} - */ Index: uspace/srv/net/tl/tcp/tcp_module.h =================================================================== --- uspace/srv/net/tl/tcp/tcp_module.h (revision 797b704b28bced20e17a9eb959845c20363ce662) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * Copyright (c) 2008 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 tcp - * @{ - */ - -/** @file - * TCP module functions. - * The functions are used as TCP module entry points. - */ - -#ifndef NET_TCP_MODULE_H_ -#define NET_TCP_MODULE_H_ - -#include -#include - -extern int tcp_initialize(async_client_conn_t); -extern int tcp_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *, - size_t *); - -#endif - -/** @} - */ Index: uspace/srv/net/tl/udp/Makefile =================================================================== --- uspace/srv/net/tl/udp/Makefile (revision 797b704b28bced20e17a9eb959845c20363ce662) +++ uspace/srv/net/tl/udp/Makefile (revision a613fea187afab7543e6d2423ab0b3b2bb44df2b) @@ -34,6 +34,5 @@ SOURCES = \ - udp.c \ - udp_module.c + udp.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/net/tl/udp/udp.c =================================================================== --- uspace/srv/net/tl/udp/udp.c (revision 797b704b28bced20e17a9eb959845c20363ce662) +++ uspace/srv/net/tl/udp/udp.c (revision a613fea187afab7543e6d2423ab0b3b2bb44df2b) @@ -35,8 +35,4 @@ * @see udp.h */ - -#include "udp.h" -#include "udp_header.h" -#include "udp_module.h" #include @@ -69,9 +65,12 @@ #include #include -#include -#include +#include +#include + +#include "udp.h" +#include "udp_header.h" /** UDP module name. */ -#define NAME "UDP protocol" +#define NAME "udp" /** Default UDP checksum computing. */ @@ -92,95 +91,4 @@ /** UDP global data. */ udp_globals_t udp_globals; - -/** Initializes the UDP module. - * - * @param[in] client_connection The client connection processing function. The - * module skeleton propagates its own one. - * @return EOK on success. - * @return ENOMEM if there is not enough memory left. - */ -int udp_initialize(async_client_conn_t client_connection) -{ - measured_string_t names[] = { - { - (uint8_t *) "UDP_CHECKSUM_COMPUTING", - 22 - }, - { - (uint8_t *) "UDP_AUTOBINDING", - 15 - } - }; - measured_string_t *configuration; - size_t count = sizeof(names) / sizeof(measured_string_t); - uint8_t *data; - int rc; - - fibril_rwlock_initialize(&udp_globals.lock); - fibril_rwlock_write_lock(&udp_globals.lock); - - udp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP, - ICMP_CONNECT_TIMEOUT); - - udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP, - SERVICE_UDP, client_connection); - if (udp_globals.ip_phone < 0) { - fibril_rwlock_write_unlock(&udp_globals.lock); - return udp_globals.ip_phone; - } - - /* Read default packet dimensions */ - rc = ip_packet_size_req(udp_globals.ip_phone, -1, - &udp_globals.packet_dimension); - if (rc != EOK) { - fibril_rwlock_write_unlock(&udp_globals.lock); - return rc; - } - - rc = socket_ports_initialize(&udp_globals.sockets); - if (rc != EOK) { - fibril_rwlock_write_unlock(&udp_globals.lock); - return rc; - } - - rc = packet_dimensions_initialize(&udp_globals.dimensions); - if (rc != EOK) { - socket_ports_destroy(&udp_globals.sockets); - fibril_rwlock_write_unlock(&udp_globals.lock); - return rc; - } - - udp_globals.packet_dimension.prefix += sizeof(udp_header_t); - udp_globals.packet_dimension.content -= sizeof(udp_header_t); - udp_globals.last_used_port = UDP_FREE_PORTS_START - 1; - - udp_globals.checksum_computing = NET_DEFAULT_UDP_CHECKSUM_COMPUTING; - udp_globals.autobinding = NET_DEFAULT_UDP_AUTOBINDING; - - /* Get configuration */ - configuration = &names[0]; - rc = net_get_conf_req(udp_globals.net_phone, &configuration, count, - &data); - if (rc != EOK) { - socket_ports_destroy(&udp_globals.sockets); - fibril_rwlock_write_unlock(&udp_globals.lock); - return rc; - } - - if (configuration) { - if (configuration[0].value) - udp_globals.checksum_computing = - (configuration[0].value[0] == 'y'); - - if (configuration[1].value) - udp_globals.autobinding = - (configuration[1].value[0] == 'y'); - - net_free_settings(configuration, data); - } - - fibril_rwlock_write_unlock(&udp_globals.lock); - return EOK; -} /** Releases the packet and returns the result. @@ -426,4 +334,127 @@ } +/** Process IPC messages from the IP module + * + * @param[in] iid Message identifier. + * @param[in,out] icall Message parameters. + * + */ +static void udp_receiver(ipc_callid_t iid, ipc_call_t *icall) +{ + packet_t *packet; + int rc; + + while (true) { + switch (IPC_GET_IMETHOD(*icall)) { + case NET_TL_RECEIVED: + rc = packet_translate_remote(udp_globals.net_phone, &packet, + IPC_GET_PACKET(*icall)); + if (rc == EOK) + rc = udp_received_msg(IPC_GET_DEVICE(*icall), packet, + SERVICE_UDP, IPC_GET_ERROR(*icall)); + + ipc_answer_0(iid, (sysarg_t) rc); + break; + default: + ipc_answer_0(iid, (sysarg_t) ENOTSUP); + } + + iid = async_get_call(icall); + } +} + +/** Initialize the UDP module. + * + * @param[in] net_phone Network module phone. + * + * @return EOK on success. + * @return ENOMEM if there is not enough memory left. + * + */ +int tl_initialize(int net_phone) +{ + measured_string_t names[] = { + { + (uint8_t *) "UDP_CHECKSUM_COMPUTING", + 22 + }, + { + (uint8_t *) "UDP_AUTOBINDING", + 15 + } + }; + measured_string_t *configuration; + size_t count = sizeof(names) / sizeof(measured_string_t); + uint8_t *data; + + fibril_rwlock_initialize(&udp_globals.lock); + fibril_rwlock_write_lock(&udp_globals.lock); + + udp_globals.net_phone = net_phone; + + udp_globals.icmp_phone = icmp_connect_module(SERVICE_ICMP, + ICMP_CONNECT_TIMEOUT); + + udp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_UDP, + SERVICE_UDP, udp_receiver); + if (udp_globals.ip_phone < 0) { + fibril_rwlock_write_unlock(&udp_globals.lock); + return udp_globals.ip_phone; + } + + /* Read default packet dimensions */ + int rc = ip_packet_size_req(udp_globals.ip_phone, -1, + &udp_globals.packet_dimension); + if (rc != EOK) { + fibril_rwlock_write_unlock(&udp_globals.lock); + return rc; + } + + rc = socket_ports_initialize(&udp_globals.sockets); + if (rc != EOK) { + fibril_rwlock_write_unlock(&udp_globals.lock); + return rc; + } + + rc = packet_dimensions_initialize(&udp_globals.dimensions); + if (rc != EOK) { + socket_ports_destroy(&udp_globals.sockets); + fibril_rwlock_write_unlock(&udp_globals.lock); + return rc; + } + + udp_globals.packet_dimension.prefix += sizeof(udp_header_t); + udp_globals.packet_dimension.content -= sizeof(udp_header_t); + udp_globals.last_used_port = UDP_FREE_PORTS_START - 1; + + udp_globals.checksum_computing = NET_DEFAULT_UDP_CHECKSUM_COMPUTING; + udp_globals.autobinding = NET_DEFAULT_UDP_AUTOBINDING; + + /* Get configuration */ + configuration = &names[0]; + rc = net_get_conf_req(udp_globals.net_phone, &configuration, count, + &data); + if (rc != EOK) { + socket_ports_destroy(&udp_globals.sockets); + fibril_rwlock_write_unlock(&udp_globals.lock); + return rc; + } + + if (configuration) { + if (configuration[0].value) + udp_globals.checksum_computing = + (configuration[0].value[0] == 'y'); + + if (configuration[1].value) + udp_globals.autobinding = + (configuration[1].value[0] == 'y'); + + net_free_settings(configuration, data); + } + + fibril_rwlock_write_unlock(&udp_globals.lock); + return EOK; +} + /** Sends data from the socket to the remote address. * @@ -860,20 +891,10 @@ * @see IS_NET_UDP_MESSAGE() */ -int udp_message_standalone(ipc_callid_t callid, ipc_call_t *call, +int tl_module_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, size_t *answer_count) { - packet_t *packet; - int rc; - *answer_count = 0; switch (IPC_GET_IMETHOD(*call)) { - case NET_TL_RECEIVED: - rc = packet_translate_remote(udp_globals.net_phone, &packet, - IPC_GET_PACKET(*call)); - if (rc != EOK) - return rc; - return udp_received_msg(IPC_GET_DEVICE(*call), packet, - SERVICE_UDP, IPC_GET_ERROR(*call)); case IPC_M_CONNECT_TO_ME: return udp_process_client_messages(callid, *call); @@ -883,58 +904,8 @@ } -/** Default thread for new connections. - * - * @param[in] iid The initial message identifier. - * @param[in] icall The initial message call structure. - */ -static void tl_client_connection(ipc_callid_t iid, ipc_call_t * icall) -{ - /* - * Accept the connection - * - Answer the first IPC_M_CONNECT_ME_TO call. - */ - ipc_answer_0(iid, EOK); - - while (true) { - ipc_call_t answer; - size_t answer_count; - - /* Clear the answer structure */ - refresh_answer(&answer, &answer_count); - - /* Fetch the next message */ - ipc_call_t call; - ipc_callid_t callid = async_get_call(&call); - - /* Process the message */ - int res = tl_module_message_standalone(callid, &call, &answer, - &answer_count); - - /* - * End if told to either by the message or the processing - * result. - */ - if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) || - (res == EHANGUP)) - return; - - /* Answer the message */ - answer_call(callid, res, &answer, answer_count); - } -} - -/** Starts the module. - * - * @return EOK on success. - * @return Other error codes as defined for each specific module - * start function. - */ int main(int argc, char *argv[]) { - int rc; - /* Start the module */ - rc = tl_module_start_standalone(tl_client_connection); - return rc; + return tl_module_start(SERVICE_UDP); } Index: uspace/srv/net/tl/udp/udp_module.c =================================================================== --- uspace/srv/net/tl/udp/udp_module.c (revision 797b704b28bced20e17a9eb959845c20363ce662) +++ (revision ) @@ -1,95 +1,0 @@ -/* - * Copyright (c) 2008 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 udp - * @{ - */ - -/** @file - * UDP standalone module implementation. - * Contains skeleton module functions mapping. - * The functions are used by the module skeleton as module specific entry - * points. - * @see module.c - */ - -#include "udp.h" -#include "udp_module.h" - -#include -#include -#include -#include -#include - -#include -#include - -#include -#include - -/** UDP module global data. */ -extern udp_globals_t udp_globals; - -int tl_module_start_standalone(async_client_conn_t client_connection) -{ - sysarg_t phonehash; - int rc; - - async_set_client_connection(client_connection); - udp_globals.net_phone = net_connect_module(); - if (udp_globals.net_phone < 0) - return udp_globals.net_phone; - - rc = pm_init(); - if (rc != EOK) - return EOK; - - rc = udp_initialize(client_connection); - if (rc != EOK) - goto out; - - rc = ipc_connect_to_me(PHONE_NS, SERVICE_UDP, 0, 0, &phonehash); - if (rc != EOK) - goto out; - - async_manager(); - -out: - pm_destroy(); - return rc; -} - -int tl_module_message_standalone(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, size_t *count) -{ - return udp_message_standalone(callid, call, answer, count); -} - -/** @} - */ Index: uspace/srv/net/tl/udp/udp_module.h =================================================================== --- uspace/srv/net/tl/udp/udp_module.h (revision 797b704b28bced20e17a9eb959845c20363ce662) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * Copyright (c) 2008 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 udp - * @{ - */ - -/** @file - * UDP module functions. - * The functions are used as UDP module entry points. - */ - -#ifndef NET_UDP_MODULE_H_ -#define NET_UDP_MODULE_H_ - -#include -#include - -extern int udp_initialize(async_client_conn_t); -extern int udp_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *, - size_t *); - -#endif - -/** @} - */