Index: uspace/lib/net/Makefile =================================================================== --- uspace/lib/net/Makefile (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/Makefile (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -37,6 +37,6 @@ generic/packet_remote.c \ adt/module_map.c \ - netif/netif.c \ - netif/netif_standalone.c \ + netif/netif_local.c \ + netif/netif_remote.c \ netif/netif_nil_bundle.c \ nil/nil_remote.c \ Index: uspace/lib/net/generic/net_remote.c =================================================================== --- uspace/lib/net/generic/net_remote.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/generic/net_remote.c (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -32,5 +32,5 @@ /** @file - * Networking interface implementation for standalone remote modules. + * Networking interface implementation for remote modules. * @see net_interface.h */ Index: uspace/lib/net/generic/packet_remote.c =================================================================== --- uspace/lib/net/generic/packet_remote.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/generic/packet_remote.c (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -32,5 +32,5 @@ /** @file - * Packet client interface implementation for standalone remote modules. + * Packet client interface implementation for remote modules. * @see packet_client.h */ @@ -47,94 +47,107 @@ #include #include +#include -/** Obtains the packet from the packet server as the shared memory block. - * Creates 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 packet reference. - * @param[in] packet_id The packet identifier. - * @param[in] size The packet total size in bytes. - * @returns EOK on success. - * @returns Other error codes as defined for the pm_add() function. - * @returns Other error codes as defined for the async_share_in_start() function. +/** Obtain the packet from the packet server as the shared memory block. + * + * 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 + * packet reference. + * @param[in] packet_id The packet identifier. + * @param[in] size The 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_share_in_start() function. + * */ -int packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size); - -int packet_translate(int phone, packet_ref packet, packet_id_t packet_id){ +static int packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size){ ERROR_DECLARE; - - ipcarg_t size; - packet_t next; - - if(! packet){ - return EINVAL; - } - *packet = pm_find(packet_id); - if(!(*packet)){ - ERROR_PROPAGATE(async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id, &size)); - ERROR_PROPAGATE(packet_return(phone, packet, packet_id, size)); - } - if((** packet).next){ - return packet_translate(phone, &next, (** packet).next); - }else return EOK; -} - -int packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size){ - ERROR_DECLARE; - - aid_t message; + ipc_call_t answer; - ipcarg_t result; - - message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer); + aid_t message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer); *packet = (packet_t) as_get_mappable_page(size); - if(ERROR_OCCURRED(async_share_in_start_0_0(phone, * packet, size)) - || ERROR_OCCURRED(pm_add(*packet))){ + if (ERROR_OCCURRED(async_share_in_start_0_0(phone, *packet, size)) + || ERROR_OCCURRED(pm_add(*packet))) { munmap(*packet, size); async_wait_for(message, NULL); return ERROR_CODE; } + + ipcarg_t result; async_wait_for(message, &result); + return result; } -packet_t packet_get_4(int phone, size_t max_content, size_t addr_len, size_t max_prefix, size_t max_suffix){ +int packet_translate_remote(int phone, packet_ref packet, packet_id_t packet_id) +{ ERROR_DECLARE; + + if (!packet) + return EINVAL; + + *packet = pm_find(packet_id); + if (!(*packet)) { + ipcarg_t size; + + ERROR_PROPAGATE(async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id, &size)); + ERROR_PROPAGATE(packet_return(phone, packet, packet_id, size)); + } + if ((** packet).next) { + packet_t next; + + return packet_translate_remote(phone, &next, (** packet).next); + } + + return EOK; +} +packet_t packet_get_4_remote(int phone, size_t max_content, size_t addr_len, + size_t max_prefix, size_t max_suffix) +{ + ERROR_DECLARE; + ipcarg_t packet_id; ipcarg_t size; - packet_t packet; - - if(ERROR_OCCURRED(async_req_4_2(phone, NET_PACKET_CREATE_4, max_content, addr_len, max_prefix, max_suffix, &packet_id, &size))){ + + if (ERROR_OCCURRED(async_req_4_2(phone, NET_PACKET_CREATE_4, max_content, + addr_len, max_prefix, max_suffix, &packet_id, &size))) return NULL; + + + packet_t packet = pm_find(packet_id); + if (!packet) { + if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size))) + return NULL; } - packet = pm_find(packet_id); - if(! packet){ - if(ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size))){ - return NULL; - } - } + return packet; } -packet_t packet_get_1(int phone, size_t content){ +packet_t packet_get_1_remote(int phone, size_t content) +{ ERROR_DECLARE; - + ipcarg_t packet_id; ipcarg_t size; - packet_t packet; - - if(ERROR_OCCURRED(async_req_1_2(phone, NET_PACKET_CREATE_1, content, &packet_id, &size))){ + + if (ERROR_OCCURRED(async_req_1_2(phone, NET_PACKET_CREATE_1, content, + &packet_id, &size))) return NULL; + + packet_t packet = pm_find(packet_id); + if (!packet) { + if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size))) + return NULL; } - packet = pm_find(packet_id); - if(! packet){ - if(ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size))){ - return NULL; - } - } + return packet; } -void pq_release(int phone, packet_id_t packet_id){ +void pq_release_remote(int phone, packet_id_t packet_id) +{ async_msg_1(phone, NET_PACKET_RELEASE, packet_id); } Index: uspace/lib/net/il/arp_remote.c =================================================================== --- uspace/lib/net/il/arp_remote.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/il/arp_remote.c (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -32,5 +32,5 @@ /** @file - * ARP interface implementation for standalone remote modules. + * ARP interface implementation for remote modules. * @see arp_interface.h */ Index: uspace/lib/net/il/ip_client.c =================================================================== --- uspace/lib/net/il/ip_client.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/il/ip_client.c (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -56,5 +56,5 @@ } -int ip_client_get_pseudo_header(ip_protocol_t protocol, struct sockaddr * src, socklen_t srclen, struct sockaddr * dest, socklen_t destlen, size_t data_length, ip_pseudo_header_ref * header, size_t * headerlen){ +int ip_client_get_pseudo_header(ip_protocol_t protocol, struct sockaddr * src, socklen_t srclen, struct sockaddr * dest, socklen_t destlen, size_t data_length, void **header, size_t * headerlen){ ipv4_pseudo_header_ref header_in; struct sockaddr_in * address_in; @@ -84,5 +84,5 @@ header_in->protocol = protocol; header_in->data_length = htons(data_length); - *header = (ip_pseudo_header_ref) header_in; + *header = header_in; return EOK; // TODO IPv6 @@ -164,5 +164,5 @@ } -int ip_client_set_pseudo_header_data_length(ip_pseudo_header_ref header, size_t headerlen, size_t data_length){ +int ip_client_set_pseudo_header_data_length(void *header, size_t headerlen, size_t data_length){ ipv4_pseudo_header_ref header_in; Index: uspace/lib/net/il/ip_remote.c =================================================================== --- uspace/lib/net/il/ip_remote.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/il/ip_remote.c (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -33,5 +33,5 @@ /** @file * - * IP interface implementation for standalone remote modules. + * IP interface implementation for remote modules. * * @see ip_interface.h @@ -50,7 +50,19 @@ #include #include - -int ip_add_route_req(int ip_phone, device_id_t device_id, in_addr_t address, - in_addr_t netmask, in_addr_t gateway) +#include + +/** Add a route to the device routing table. + * + * 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, + in_addr_t address, in_addr_t netmask, in_addr_t gateway) { return (int) async_req_4_0(ip_phone, NET_IP_ADD_ROUTE, @@ -71,12 +83,44 @@ } -int ip_device_req(int ip_phone, device_id_t device_id, services_t service) -{ - return generic_device_req(ip_phone, NET_IL_DEVICE, device_id, 0, service); -} - -int ip_get_route_req(int ip_phone, ip_protocol_t protocol, +/** Register the new device. + * + * Register itself as the ip packet receiver. + * 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_IL_DEVICE, device_id, 0, + service); +} + +/** Return the device identifier and the IP pseudo header based on the 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, const struct sockaddr *destination, socklen_t addrlen, - device_id_t *device_id, ip_pseudo_header_ref *header, size_t *headerlen) + device_id_t *device_id, void **header, size_t *headerlen) { if ((!destination) || (addrlen == 0)) @@ -95,5 +139,5 @@ && (async_data_read_start(ip_phone, headerlen, sizeof(*headerlen)) == EOK) && (*headerlen > 0)) { - *header = (ip_pseudo_header_ref) malloc(*headerlen); + *header = malloc(*headerlen); if (*header) { if (async_data_read_start(ip_phone, *header, *headerlen) != EOK) @@ -113,26 +157,77 @@ } -int ip_packet_size_req(int ip_phone, device_id_t device_id, +/** 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, packet_dimension_ref packet_dimension) { - return generic_packet_size_req(ip_phone, NET_IL_PACKET_SPACE, device_id, + return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE, device_id, packet_dimension); } -int ip_received_error_msg(int ip_phone, device_id_t device_id, +/** 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, packet_t packet, services_t target, services_t error) { - return generic_received_msg(ip_phone, NET_IP_RECEIVED_ERROR, device_id, - packet_get_id(packet), target, error); -} - -int ip_send_msg(int ip_phone, device_id_t device_id, packet_t packet, + return generic_received_msg_remote(ip_phone, NET_IP_RECEIVED_ERROR, + device_id, packet_get_id(packet), target, error); +} + +/** Send the packet queue. + * + * 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(ip_phone, NET_IL_SEND, device_id, + return generic_send_msg_remote(ip_phone, NET_IL_SEND, device_id, packet_get_id(packet), sender, error); } -int ip_set_gateway_req(int ip_phone, device_id_t device_id, in_addr_t gateway) +/** Set the default gateway. + * + * 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, + in_addr_t gateway) { return (int) async_req_2_0(ip_phone, NET_IP_SET_GATEWAY, Index: uspace/lib/net/include/arp_interface.h =================================================================== --- uspace/lib/net/include/arp_interface.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/include/arp_interface.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -29,11 +29,4 @@ /** @addtogroup arp * @{ - */ - -/** @file - * ARP module interface. - * The same interface is used for standalone remote modules as well as for bundle modules. - * The standalone remote modules have to be compiled with the arp_remote.c source file. - * The bundle modules with the arp.c source file. */ Index: uspace/lib/net/include/icmp_interface.h =================================================================== --- uspace/lib/net/include/icmp_interface.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/include/icmp_interface.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -29,11 +29,4 @@ /** @addtogroup icmp * @{ - */ - -/** @file - * ICMP module interface. - * The same interface is used for standalone remote modules as well as for bundle modules. - * The standalone remote modules have to be compiled with the icmp_remote.c source file. - * The bundle modules with the icmp.c source file. */ Index: uspace/lib/net/include/il_interface.h =================================================================== --- uspace/lib/net/include/il_interface.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/include/il_interface.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -32,6 +32,6 @@ /** @file - * Internetwork layer module interface for the underlying network interface layer. - * This interface is always called by the standalone remote modules. + * Internetwork layer module interface for the underlying network interface layer. + * This interface is always called by the remote modules. */ @@ -50,39 +50,63 @@ /** @name Internetwork layer module interface - * This interface is used by other modules. + * This interface is used by other modules. */ /*@{*/ -/** Notifies 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 delivered to. - * @returns EOK on success. +/** 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 + * delivered to. + * + * @return EOK on success. + * */ -static inline int il_device_state_msg(int il_phone, device_id_t device_id, device_state_t state, services_t target){ - return generic_device_state_msg(il_phone, NET_IL_DEVICE_STATE, device_id, state, target); +static inline int il_device_state_msg(int il_phone, device_id_t device_id, + device_state_t state, services_t target) +{ + return generic_device_state_msg_remote(il_phone, NET_IL_DEVICE_STATE, + device_id, state, target); } -/** Notifies 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 delivered to. - * @returns EOK on success. +/** 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 + * delivered to. + * + * @return EOK on success. + * */ -inline static int il_received_msg(int il_phone, device_id_t device_id, packet_t packet, services_t target){ - return generic_received_msg(il_phone, NET_IL_RECEIVED, device_id, packet_get_id(packet), target, 0); +inline static int il_received_msg(int il_phone, device_id_t device_id, + packet_t packet, services_t target) +{ + return generic_received_msg_remote(il_phone, NET_IL_RECEIVED, device_id, + packet_get_id(packet), target, 0); } -/** Notifies 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 delivered to. - * @returns EOK on success. +/** 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 + * delivered to. + * + * @return EOK on success. + * */ -inline static int il_mtu_changed_msg(int il_phone, device_id_t device_id, size_t mtu, services_t target){ - return generic_device_state_msg(il_phone, NET_IL_MTU_CHANGED, device_id, (int) mtu, target); +inline static int il_mtu_changed_msg(int il_phone, 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); } Index: uspace/lib/net/include/il_local.h =================================================================== --- uspace/lib/net/include/il_local.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) +++ uspace/lib/net/include/il_local.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2010 Martin Decky + * 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 il_local + * @{ + */ + +#ifndef __IL_LOCAL_H__ +#define __IL_LOCAL_H__ + +#include +#include + +extern int il_module_message_standalone(ipc_callid_t callid, ipc_call_t *call, + ipc_call_t *answer, int *answer_count); +extern int il_module_start_standalone(async_client_conn_t client_connection); + +#endif + +/** @} + */ Index: uspace/lib/net/include/il_messages.h =================================================================== --- uspace/lib/net/include/il_messages.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/include/il_messages.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -28,11 +28,11 @@ /** @addtogroup net_il - * @{ + * @{ */ /** @file - * Internetwork layer modules messages. - * @see il_interface.h - * @see ip_interface.h + * Internetwork layer modules messages. + * @see il_interface.h + * @see ip_interface.h */ @@ -72,16 +72,19 @@ /** @name Internetwork layer specific message parameters definitions + * */ /*@{*/ -/** Returns the protocol number message parameter. - * @param[in] call The message call structure. +/** Return the protocol number message parameter. + * @param[in] call The message call structure. + * */ -#define IL_GET_PROTO(call) (int) IPC_GET_ARG1(*call) +#define IL_GET_PROTO(call) (int) IPC_GET_ARG1(*call) -/** Returns the registering service message parameter. - * @param[in] call The message call structure. +/** Return the registering service message parameter. + * @param[in] call The message call structure. + * */ -#define IL_GET_SERVICE(call) (services_t) IPC_GET_ARG2(*call) +#define IL_GET_SERVICE(call) (services_t) IPC_GET_ARG2(*call) /*@}*/ Index: uspace/lib/net/include/il_standalone.h =================================================================== --- uspace/lib/net/include/il_standalone.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2010 Martin Decky - * 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 il_standalone - * @{ - */ - -#ifndef __IL_STANDALONE_H__ -#define __IL_STANDALONE_H__ - -#include -#include - -extern int il_module_message(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, int *answer_count); -extern int il_module_start(async_client_conn_t client_connection); - -#endif - -/** @} - */ Index: uspace/lib/net/include/ip_client.h =================================================================== --- uspace/lib/net/include/ip_client.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/include/ip_client.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -87,5 +87,5 @@ * @returns EINVAL if the headerlen parameter is not IPv4 pseudo header length. */ -extern int ip_client_set_pseudo_header_data_length(ip_pseudo_header_ref header, size_t headerlen, size_t data_length); +extern int ip_client_set_pseudo_header_data_length(void *header, size_t headerlen, size_t data_length); /** Constructs the IPv4 pseudo header. @@ -107,5 +107,5 @@ * @returns ENOMEM if there is not enough memory left. */ -extern int ip_client_get_pseudo_header(ip_protocol_t protocol, struct sockaddr * src, socklen_t srclen, struct sockaddr * dest, socklen_t destlen, size_t data_length, ip_pseudo_header_ref * header, size_t * headerlen); +extern int ip_client_get_pseudo_header(ip_protocol_t protocol, struct sockaddr * src, socklen_t srclen, struct sockaddr * dest, socklen_t destlen, size_t data_length, void **header, size_t * headerlen); // TODO ipopt manipulation Index: uspace/lib/net/include/ip_interface.h =================================================================== --- uspace/lib/net/include/ip_interface.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/include/ip_interface.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -31,11 +31,4 @@ */ -/** @file - * IP module interface. - * The same interface is used for standalone remote modules as well as for bundle modules. - * The standalone remote modules have to be compiled with the ip_remote.c source file. - * The bundle modules with the ip.c source file. - */ - #ifndef __NET_IP_INTERFACE_H__ #define __NET_IP_INTERFACE_H__ @@ -51,12 +44,34 @@ #include +#ifdef CONFIG_IL_TL_BUNDLE + +#include + +#define ip_received_error_msg ip_received_error_msg_local +#define ip_set_gateway_req ip_set_gateway_req_local +#define ip_packet_size_req ip_packet_size_req_local +#define ip_device_req ip_device_req_local +#define ip_add_route_req ip_add_route_req_local +#define ip_send_msg ip_send_msg_local +#define ip_get_route_req ip_get_route_req_local + +#else + +#include + +#define ip_received_error_msg ip_received_error_msg_remote +#define ip_set_gateway_req ip_set_gateway_req_remote +#define ip_packet_size_req ip_packet_size_req_remote +#define ip_device_req ip_device_req_remote +#define ip_add_route_req ip_add_route_req_remote +#define ip_send_msg ip_send_msg_remote +#define ip_get_route_req ip_get_route_req_remote + +#endif + /** @name IP module interface * This interface is used by other modules. */ /*@{*/ - -/** Type definition of the internet pseudo header pointer. - */ -typedef void * ip_pseudo_header_ref; /** The transport layer notification function type definition. @@ -82,32 +97,4 @@ extern int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver, tl_received_msg_t tl_received_msg); -/** Registers the new device. - * Registers itself as the ip packet receiver. - * 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. - * @returns EOK on success. - * @returns ENOMEM if there is not enough memory left. - * @returns EINVAL if the device configuration is invalid. - * @returns ENOTSUP if the device uses IPv6. - * @returns ENOTSUP if the device uses DHCP. - * @returns Other error codes as defined for the net_get_device_conf_req() function. - * @returns Other error codes as defined for the arp_device_req() function. - */ -extern int ip_device_req(int, device_id_t, services_t); - -/** Sends the packet queue. - * 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. - * @returns EOK on success. - * @returns Other error codes as defined for the generic_send_msg() function. - */ -extern int ip_send_msg(int ip_phone, device_id_t device_id, packet_t packet, services_t sender, services_t error); - /** Connects to the IP module. * @param service The IP module service. Ignored parameter. @@ -117,53 +104,4 @@ extern int ip_connect_module(services_t service); -/** Adds a route to the device routing table. - * 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. - */ -extern int ip_add_route_req(int ip_phone, device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway); - -/** Sets the default gateway. - * 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. - */ -extern int ip_set_gateway_req(int ip_phone, device_id_t device_id, in_addr_t gateway); - -/** Returns 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. - * @returns EOK on success. - * @returns ENOENT if there is no such device. - * @returns Other error codes as defined for the generic_packet_size_req() function. - */ -extern int ip_packet_size_req(int ip_phone, device_id_t device_id, packet_dimension_ref packet_dimension); - -/** Notifies 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. - * @returns EOK on success. - */ -extern int ip_received_error_msg(int ip_phone, device_id_t device_id, packet_t packet, services_t target, services_t error); - -/** Returns the device identifier and the IP pseudo header based on the 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. - */ -extern int ip_get_route_req(int ip_phone, ip_protocol_t protocol, const struct sockaddr * destination, socklen_t addrlen, device_id_t * device_id, ip_pseudo_header_ref * header, size_t * headerlen); - /*@}*/ Index: uspace/lib/net/include/ip_local.h =================================================================== --- uspace/lib/net/include/ip_local.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) +++ uspace/lib/net/include/ip_local.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -0,0 +1,61 @@ +/* + * 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 ip + * @{ + */ + +#ifndef __NET_IP_LOCAL_H__ +#define __NET_IP_LOCAL_H__ + +#include +#include + +#include +#include +#include +#include + +extern int ip_received_error_msg_local(int, device_id_t, packet_t, services_t, + services_t); +extern int ip_set_gateway_req_local(int, device_id_t, in_addr_t); +extern int ip_packet_size_req_local(int, device_id_t, packet_dimension_ref); +extern int ip_received_error_msg_local(int, device_id_t, packet_t, services_t, + services_t); +extern int ip_device_req_local(int, device_id_t, services_t); +extern int ip_add_route_req_local(int, device_id_t, in_addr_t, in_addr_t, + in_addr_t); +extern int ip_send_msg_local(int, device_id_t, packet_t, services_t, + services_t); +extern int ip_get_route_req_local(int, ip_protocol_t, const struct sockaddr *, + socklen_t, device_id_t *, void **, size_t *); + +#endif + +/** @} + */ Index: uspace/lib/net/include/ip_remote.h =================================================================== --- uspace/lib/net/include/ip_remote.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) +++ uspace/lib/net/include/ip_remote.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -0,0 +1,59 @@ +/* + * 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 ip + * @{ + */ + +#ifndef __NET_IP_REMOTE_H__ +#define __NET_IP_REMOTE_H__ + +#include +#include + +#include +#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_ref); +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 *); + +#endif + +/** @} + */ Index: uspace/lib/net/include/net_interface.h =================================================================== --- uspace/lib/net/include/net_interface.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/include/net_interface.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -29,11 +29,4 @@ /** @addtogroup net * @{ - */ - -/** @file - * Networking module interface. - * The same interface is used for standalone remote modules as well as for bundle modules. - * The standalone remote modules have to be compiled with the net_remote.c source file. - * The bundle networking module is compiled with the net_bundle.c source file and the choosen bundle module implementation source files. */ Index: uspace/lib/net/include/netif.h =================================================================== --- uspace/lib/net/include/netif.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,168 +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 - * 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. - */ - -#ifndef __NET_NETIF_H__ -#define __NET_NETIF_H__ - -#include -#include - -#include - -#include -#include -#include - -/** Network interface module skeleton global data. - */ -typedef struct netif_globals netif_globals_t; - -/** Type definition of the device specific data. - * @see netif_device - */ -typedef struct netif_device device_t; - -/** Type definition of the device specific data pointer. - * @see netif_device - */ -typedef device_t * device_ref; - -/** Device map. - * Maps device identifiers to the network interface device specific data. - * @see device.h - */ -DEVICE_MAP_DECLARE(device_map, device_t); - -/** Network interface device specific data. - */ -struct netif_device{ - /** Device identifier. - */ - device_id_t device_id; - /** Receiving network interface layer phone. - */ - int nil_phone; - /** Actual device state. - */ - device_state_t state; - /** Driver specific data. - */ - void * specific; -}; - -/** Network interface module skeleton global data. - */ -struct netif_globals{ - /** Networking module phone. - */ - int net_phone; - /** Device map. - */ - device_map_t device_map; - /** Safety lock. - */ - fibril_rwlock_t lock; -}; - -extern netif_globals_t netif_globals; - -/** Finds the device specific data. - * @param[in] device_id The device identifier. - * @param[out] device The device specific data. - * @returns EOK on success. - * @returns ENOENT if device is not found. - * @returns EPERM if the device is not initialized. - */ -extern int find_device(device_id_t device_id, device_ref * device); - -/** Clears the usage statistics. - * @param[in] stats The usage statistics. - */ -extern void null_device_stats(device_stats_ref stats); - -// prepared for future optimalizations -/** Releases the given packet. - * @param[in] packet_id The packet identifier. - */ -extern void netif_pq_release(packet_id_t packet_id); - -/** Allocates new packet to handle the given content size. - * @param[in] content The minimum content size. - * @returns The allocated packet. - * @returns NULL if there is an error. - */ -extern packet_t netif_packet_get_1(size_t content); - -/** Process the netif module messages. - * - * @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. - * - * @see netif_interface.h - * @see IS_NET_NETIF_MESSAGE() - * - */ -extern int netif_message(const char *, ipc_callid_t, ipc_call_t *, - ipc_call_t *, int *); - -/** Initializes the netif module. - * The function has to be defined in each module. - * @param[in] net_client_connection The client connection functio to be registered. - * @returns EOK on success. - * @returns Other error codes as defined for each specific module message function. - */ -extern int netif_init_module(async_client_conn_t client_connection); - -/** Starts and maintains the netif module until terminated. - * @returns EOK after the module is terminated. - */ -extern int netif_run_module(void); - -#endif - -/** @} - */ - Index: uspace/lib/net/include/netif_interface.h =================================================================== --- uspace/lib/net/include/netif_interface.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/include/netif_interface.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -28,12 +28,5 @@ /** @addtogroup netif - * @{ - */ - -/** @file - * Network interface module interface. - * The same interface is used for standalone remote modules as well as for bundle network interface layer modules. - * The standalone remote modules have to be compiled with the netif_remote.c source file. - * The bundle network interface layer modules are compiled with the netif_nil_bundle.c source file and the choosen network interface layer implementation source file. + * @{ */ @@ -41,86 +34,36 @@ #define __NET_NETIF_INTERFACE_H__ -#include +#ifdef CONFIG_NETIF_NIL_BUNDLE -#include -#include -#include -#include +#include +#include +#include -/** @name Network interface module interface - * This interface is used by other modules. - */ -/*@{*/ +#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 -/** Returns the device local hardware address. - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @param[out] address The device local hardware address. - * @param[out] data The address data. - * @returns EOK on success. - * @returns EBADMEM if the address parameter is NULL. - * @returns ENOENT if there no such device. - * @returns Other error codes as defined for the netif_get_addr_message() function. - */ -extern int netif_get_addr_req(int netif_phone, device_id_t device_id, measured_string_ref * address, char ** data); +#else /* CONFIG_NETIF_NIL_BUNDLE */ -/** Probes the existence of the device. - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @param[in] irq The device interrupt number. - * @param[in] io The device input/output address. - * @returns EOK on success. - * @returns Other errro codes as defined for the netif_probe_message(). - */ -extern int netif_probe_req(int netif_phone, device_id_t device_id, int irq, int io); +#include +#include -/** Sends the packet queue. - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @param[in] packet The packet queue. - * @param[in] sender The sending module service. - * @returns EOK on success. - * @returns Other error codes as defined for the generic_send_msg() function. - */ -extern int netif_send_msg(int netif_phone, device_id_t device_id, packet_t packet, services_t sender); +#define netif_module_message netif_module_message_standalone +#define netif_module_start netif_module_start_standalone +#define netif_get_addr_req netif_get_addr_req_remote +#define netif_probe_req netif_probe_req_remote +#define netif_send_msg netif_send_msg_remote +#define netif_start_req netif_start_req_remote +#define netif_stop_req netif_stop_req_remote +#define netif_stats_req netif_stats_req_remote +#define netif_bind_service netif_bind_service_remote -/** Starts the device. - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @returns EOK on success. - * @returns Other error codes as defined for the find_device() function. - * @returns Other error codes as defined for the netif_start_message() function. - */ -extern int netif_start_req(int netif_phone, device_id_t device_id); - -/** Stops the device. - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @returns EOK on success. - * @returns Other error codes as defined for the find_device() function. - * @returns Other error codes as defined for the netif_stop_message() function. - */ -extern int netif_stop_req(int netif_phone, device_id_t device_id); - -/** Returns the device usage statistics. - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @param[out] stats The device usage statistics. - * @returns EOK on success. - */ -extern int netif_stats_req(int netif_phone, device_id_t device_id, device_stats_ref stats); - -/** Creates bidirectional connection with the network interface module and registers 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. - * @returns The phone of the needed service. - * @returns EOK on success. - * @returns Other error codes as defined for the bind_service() function. - */ -extern int netif_bind_service(services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver); - -/*@}*/ +#endif /* CONFIG_NETIF_NIL_BUNDLE */ #endif Index: uspace/lib/net/include/netif_local.h =================================================================== --- uspace/lib/net/include/netif_local.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) +++ uspace/lib/net/include/netif_local.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -0,0 +1,227 @@ +/* + * 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 + * 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. + */ + +#ifndef __NET_NETIF_LOCAL_H__ +#define __NET_NETIF_LOCAL_H__ + +#include +#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. */ +} netif_device_t; + +/** Device map. + * + * Maps device identifiers to the network interface device specific data. + * @see device.h + * + */ +DEVICE_MAP_DECLARE(netif_device_map, netif_device_t); + +/** Network interface module skeleton global data. + * + */ +typedef struct { + int net_phone; /**< Networking module phone. */ + netif_device_map_t device_map; /**< Device map. */ + fibril_rwlock_t lock; /**< Safety lock. */ +} netif_globals_t; + +extern netif_globals_t netif_globals; + +/** Initialize the specific module. + * + * This function has to be implemented in user code. + * + */ +extern int netif_initialize(void); + +/** Probe the existence of the device. + * + * This has to be implemented in user code. + * + * @param[in] device_id The device identifier. + * @param[in] irq The device interrupt number. + * @param[in] io The device input/output address. + * + * @return EOK on success. + * @return Other error codes as defined for the find_device() function. + * @return Other error codes as defined for the specific module message + * implementation. + * + */ +extern int netif_probe_message(device_id_t device_id, int irq, uintptr_t io); + +/** Send the packet queue. + * + * This has to be implemented in user code. + * + * @param[in] device_id The device identifier. + * @param[in] packet The packet queue. + * @param[in] sender The sending module service. + * + * @return EOK on success. + * @return EFORWARD if the device is not active (in the NETIF_ACTIVE state). + * @return Other error codes as defined for the find_device() function. + * @return Other error codes as defined for the specific module message + * implementation. + * + */ +extern int netif_send_message(device_id_t device_id, packet_t packet, + services_t sender); + +/** Start the device. + * + * This has to be implemented in user code. + * + * @param[in] device The device structure. + * + * @return EOK on success. + * @return Other error codes as defined for the find_device() function. + * @return Other error codes as defined for the specific module message + * implementation. + * + */ +extern int netif_start_message(netif_device_t *device); + +/** Stop the device. + * + * This has to be implemented in user code. + * + * @param[in] device The device structure. + * + * @return EOK on success. + * @return Other error codes as defined for the find_device() function. + * @return Other error codes as defined for the specific module message + * implementation. + * + */ +extern int netif_stop_message(netif_device_t *device); + +/** Return the device local hardware address. + * + * This has to be implemented in user code. + * + * @param[in] device_id The device identifier. + * @param[out] address The device local hardware address. + * + * @return EOK on success. + * @return EBADMEM if the address parameter is NULL. + * @return ENOENT if there no such device. + * @return Other error codes as defined for the find_device() function. + * @return Other error codes as defined for the specific module message + * implementation. + * + */ +extern int netif_get_addr_message(device_id_t device_id, + measured_string_ref address); + +/** Process the netif driver specific message. + * + * This function is called for uncommon messages received by the netif + * skeleton. This has to be implemented in user code. + * + * @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 the specific module message + * implementation. + * + */ +extern int netif_specific_message(ipc_callid_t callid, ipc_call_t *call, + ipc_call_t *answer, int *answer_count); + +/** Return the device usage statistics. + * + * This has to be implemented in user code. + * + * @param[in] device_id The device identifier. + * @param[out] stats The device usage statistics. + * + * @return EOK on success. + * @return Other error codes as defined for the find_device() function. + * @return Other error codes as defined for the specific module message + * implementation. + * + */ +extern int netif_get_device_stats(device_id_t device_id, + device_stats_ref stats); + +extern int netif_get_addr_req_local(int, device_id_t, measured_string_ref *, + char **); +extern int netif_probe_req_local(int, device_id_t, int, int); +extern int netif_send_msg_local(int, device_id_t, packet_t, services_t); +extern int netif_start_req_local(int, device_id_t); +extern int netif_stop_req_local(int, device_id_t); +extern int netif_stats_req_local(int, device_id_t, device_stats_ref); +extern int netif_bind_service_local(services_t, device_id_t, services_t, + async_client_conn_t); + +extern int find_device(device_id_t, netif_device_t **); +extern void null_device_stats(device_stats_ref); +extern void netif_pq_release(packet_id_t); +extern packet_t netif_packet_get_1(size_t); +extern int netif_init_module(async_client_conn_t); + +extern int netif_module_message_standalone(const char *, ipc_callid_t, + ipc_call_t *, ipc_call_t *, int *); +extern int netif_module_start_standalone(async_client_conn_t); + +#endif + +/** @} + */ Index: uspace/lib/net/include/netif_messages.h =================================================================== --- uspace/lib/net/include/netif_messages.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/include/netif_messages.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -28,10 +28,9 @@ /** @addtogroup netif - * @{ + * @{ */ /** @file - * Network interface common module messages. - * @see netif_interface.h + * Network interface common module messages. */ @@ -76,12 +75,12 @@ /*@{*/ -/** Returns the interrupt number message parameter. - * @param[in] call The message call structure. +/** Return the interrupt number message parameter. + * @param[in] call The message call structure. */ #define NETIF_GET_IRQ(call) \ ({int irq = (int) IPC_GET_ARG2(*call); irq;}) -/** Returns the input/output address message parameter. - * @param[in] call The message call structure. +/** Return the input/output address message parameter. + * @param[in] call The message call structure. */ #define NETIF_GET_IO(call) \ Index: uspace/lib/net/include/netif_module.h =================================================================== --- uspace/lib/net/include/netif_module.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,125 +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 - * Network interface module interface. - * The interface has to be implemented by each network interface module. - * The interface is used by the network interface module skeleton. - */ - -#ifndef __NET_NETIF_MODULE_H__ -#define __NET_NETIF_MODULE_H__ - -#include -#include - -#include -#include -#include - -/** Initializes the specific module. - */ -extern int netif_initialize(void); - -/** Probes the existence of the device. - * @param[in] device_id The device identifier. - * @param[in] irq The device interrupt number. - * @param[in] io The device input/output address. - * @returns EOK on success. - * @returns Other error codes as defined for the find_device() function. - * @returns Other error codes as defined for the specific module message implementation. - */ -extern int netif_probe_message(device_id_t device_id, int irq, uintptr_t io); - -/** Sends the packet queue. - * @param[in] device_id The device identifier. - * @param[in] packet The packet queue. - * @param[in] sender The sending module service. - * @returns EOK on success. - * @returns EFORWARD if the device is not active (in the NETIF_ACTIVE state). - * @returns Other error codes as defined for the find_device() function. - * @returns Other error codes as defined for the specific module message implementation. - */ -extern int netif_send_message(device_id_t device_id, packet_t packet, services_t sender); - -/** Starts the device. - * @param[in] device The device structure. - * @returns EOK on success. - * @returns Other error codes as defined for the find_device() function. - * @returns Other error codes as defined for the specific module message implementation. - */ -extern int netif_start_message(device_ref device); - -/** Stops the device. - * @param[in] device The device structure. - * @returns EOK on success. - * @returns Other error codes as defined for the find_device() function. - * @returns Other error codes as defined for the specific module message implementation. - */ -extern int netif_stop_message(device_ref device); - -/** Returns the device local hardware address. - * @param[in] device_id The device identifier. - * @param[out] address The device local hardware address. - * @returns EOK on success. - * @returns EBADMEM if the address parameter is NULL. - * @returns ENOENT if there no such device. - * @returns Other error codes as defined for the find_device() function. - * @returns Other error codes as defined for the specific module message implementation. - */ -extern int netif_get_addr_message(device_id_t device_id, measured_string_ref address); - -/** Processes the netif driver specific message. - * This function is called for uncommon messages received by the netif skeleton. - * @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 the specific module message implementation. - */ -extern int netif_specific_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count); - -/** Returns the device usage statistics. - * @param[in] device_id The device identifier. - * @param[out] stats The device usage statistics. - * @returns EOK on success. - * @returns Other error codes as defined for the find_device() function. - * @returns Other error codes as defined for the specific module message implementation. - */ -extern int netif_get_device_stats(device_id_t device_id, device_stats_ref stats); - -#endif - -/** @} - */ Index: uspace/lib/net/include/netif_remote.h =================================================================== --- uspace/lib/net/include/netif_remote.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) +++ uspace/lib/net/include/netif_remote.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -0,0 +1,53 @@ +/* + * 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 + * @{ + */ + +#ifndef __NET_NETIF_REMOTE_H__ +#define __NET_NETIF_REMOTE_H__ + +#include +#include +#include + +extern int netif_get_addr_req_remote(int, device_id_t, measured_string_ref *, + char **); +extern int netif_probe_req_remote(int, device_id_t, int, int); +extern int netif_send_msg_remote(int, device_id_t, packet_t, services_t); +extern int netif_start_req_remote(int, device_id_t); +extern int netif_stop_req_remote(int, device_id_t); +extern int netif_stats_req_remote(int, device_id_t, device_stats_ref); +extern int netif_bind_service_remote(services_t, device_id_t, services_t, + async_client_conn_t); + +#endif + +/** @} + */ Index: uspace/lib/net/include/netif_standalone.h =================================================================== --- uspace/lib/net/include/netif_standalone.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2010 Martin Decky - * 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_standalone - * @{ - */ - -#ifndef __NETIF_STANDALONE_H__ -#define __NETIF_STANDALONE_H__ - -#include -#include - -extern int netif_module_message(const char *, ipc_callid_t, ipc_call_t *, - ipc_call_t *, int *); -extern int netif_module_start(async_client_conn_t); - -#endif - -/** @} - */ Index: uspace/lib/net/include/nil_interface.h =================================================================== --- uspace/lib/net/include/nil_interface.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/include/nil_interface.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -31,12 +31,4 @@ */ -/** @file - * Network interface layer module interface. - * The same interface is used for standalone remote device modules as well as for bundle device modules. - * The standalone remote device modules have to be compiled with the nil_remote.c source file. - * The bundle device modules with the appropriate network interface layer source file (eth.c etc.). - * The upper layers cannot be bundled with the network interface layer. - */ - #ifndef __NET_NIL_INTERFACE_H__ #define __NET_NIL_INTERFACE_H__ @@ -53,102 +45,44 @@ #include -/** @name Network interface layer module interface - * This interface is used by other modules. - */ -/*@{*/ +#define nil_bind_service(service, device_id, me, receiver) \ + bind_service(service, device_id, me, 0, receiver) -/** Returns the device local hardware address. - * @param[in] nil_phone The network interface layer phone. - * @param[in] device_id The device identifier. - * @param[out] address The device local hardware address. - * @param[out] data The address data. - * @returns EOK on success. - * @returns EBADMEM if the address parameter and/or the data parameter is NULL. - * @returns ENOENT if there no such device. - * @returns Other error codes as defined for the generic_get_addr_req() function. - */ -#define nil_get_addr_req(nil_phone, device_id, address, data) \ +#define nil_packet_size_req(nil_phone, device_id, packet_dimension) \ + generic_packet_size_req_remote(nil_phone, 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) -/** Returns the device broadcast hardware address. - * @param[in] nil_phone The network interface layer phone. - * @param[in] device_id The device identifier. - * @param[out] address The device broadcast hardware address. - * @param[out] data The address data. - * @returns EOK on success. - * @returns EBADMEM if the address parameter is NULL. - * @returns ENOENT if there no such device. - * @returns Other error codes as defined for the generic_get_addr_req() function. - */ -#define nil_get_broadcast_addr_req(nil_phone, device_id, address, data) \ - generic_get_addr_req(nil_phone, NET_NIL_BROADCAST_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, \ + address, data) -/** Sends the packet queue. - * @param[in] nil_phone The network interface layer phone. - * @param[in] device_id The device identifier. - * @param[in] packet The packet queue. - * @param[in] sender The sending module service. - * @returns EOK on success. - * @returns Other error codes as defined for the generic_send_msg() function. - */ -#define nil_send_msg(nil_phone, device_id, packet, sender) \ - generic_send_msg(nil_phone, NET_NIL_SEND, device_id, packet_get_id(packet), sender, 0) +#define nil_send_msg(nil_phone, device_id, packet, sender) \ + generic_send_msg_remote(nil_phone, NET_NIL_SEND, device_id, \ + packet_get_id(packet), sender, 0) -/** Returns the device packet dimension for sending. - * @param[in] nil_phone The network interface layer phone. - * @param[in] device_id The device identifier. - * @param[out] packet_dimension The packet dimensions. - * @returns EOK on success. - * @returns ENOENT if there is no such device. - * @returns Other error codes as defined for the generic_packet_size_req() function. - */ -#define nil_packet_size_req(nil_phone, device_id, packet_dimension) \ - generic_packet_size_req(nil_phone, NET_NIL_PACKET_SPACE, device_id, packet_dimension) +#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) -/** Registers new device or updates the MTU of an existing one. - * @param[in] nil_phone The network interface layer phone. - * @param[in] device_id The new device identifier. - * @param[in] mtu The device maximum transmission unit. - * @param[in] netif_service The device driver service. - * @returns EOK on success. - * @returns EEXIST if the device with the different service exists. - * @returns ENOMEM if there is not enough memory left. - * @returns Other error codes as defined for the generic_device_req() function. - */ -#define nil_device_req(nil_phone, device_id, mtu, netif_service) \ - generic_device_req(nil_phone, NET_NIL_DEVICE, device_id, mtu, netif_service) -/** Notifies the network interface layer about the device state change. - * @param[in] nil_phone The network interface layer phone. - * @param[in] device_id The device identifier. - * @param[in] state The new device state. - * @returns EOK on success. - * @returns Other error codes as defined for each specific module device state function. - */ -extern int nil_device_state_msg(int nil_phone, device_id_t device_id, int state); +#ifdef CONFIG_NETIF_NIL_BUNDLE -/** Passes the packet queue to the network interface layer. - * Processes and redistributes the received packet queue to the registered upper layers. - * @param[in] nil_phone The network interface layer phone. - * @param[in] device_id The source device identifier. - * @param[in] packet The received packet or the received packet queue. - * @param target The target service. Ignored parameter. - * @returns EOK on success. - * @returns Other error codes as defined for each specific module received function. - */ -extern int nil_received_msg(int nil_phone, device_id_t device_id, packet_t packet, services_t target); +#include +#include -/** Creates bidirectional connection with the network interface layer module and registers the message receiver. - * @param[in] service The network interface layer module service. - * @param[in] device_id The device identifier. - * @param[in] me The requesting module service. - * @param[in] receiver The message receiver. - * @returns The phone of the needed service. - * @returns EOK on success. - * @returns Other error codes as defined for the bind_service() function. - */ -#define nil_bind_service(service, device_id, me, receiver) \ - bind_service(service, device_id, me, 0, receiver); -/*@}*/ +#define nil_device_state_msg nil_device_state_msg_local +#define nil_received_msg nil_received_msg_local + +#else /* CONFIG_NETIF_NIL_BUNDLE */ + +#include +#include + +#define nil_device_state_msg nil_device_state_msg_remote +#define nil_received_msg nil_received_msg_remote + +#endif /* CONFIG_NETIF_NIL_BUNDLE */ #endif Index: uspace/lib/net/include/nil_local.h =================================================================== --- uspace/lib/net/include/nil_local.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) +++ uspace/lib/net/include/nil_local.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -0,0 +1,86 @@ +/* + * 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_nil + * @{ + */ + +/** @file + * Network interface layer modules common skeleton. + * All network interface layer modules have to implement this interface. + */ + +#ifndef __NET_NIL_LOCAL_H__ +#define __NET_NIL_LOCAL_H__ + +#include + +/** Module initialization. + * + * Is called by the module_start() function. + * + * @param[in] net_phone The networking moduel phone. + * + * @return EOK on success. + * @return Other error codes as defined for each specific module initialize function. + * + */ +extern int nil_initialize(int); + +extern int nil_device_state_msg_local(int, device_id_t, int); +extern int nil_received_msg_local(int, device_id_t, packet_t, services_t); + +/** Message processing function. + * + * @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. + * + * @see nil_interface.h + * @see IS_NET_NIL_MESSAGE() + * + */ +extern int nil_message_standalone(const char *, ipc_callid_t, ipc_call_t *, ipc_call_t *, + int *); + +extern int nil_module_message_standalone(const char *, ipc_callid_t, + ipc_call_t *, ipc_call_t *, int *); +extern int nil_module_start_standalone(async_client_conn_t); + +#endif + +/** @} + */ Index: uspace/lib/net/include/nil_messages.h =================================================================== --- uspace/lib/net/include/nil_messages.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/include/nil_messages.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -28,10 +28,9 @@ /** @addtogroup net_nil - * @{ + * @{ */ /** @file - * Network interface layer module messages. - * @see nil_interface.h + * Network interface layer module messages. */ @@ -43,5 +42,5 @@ #include -/** Network interface layer module messages. +/** Network interface layer module messages. */ typedef enum { @@ -80,5 +79,5 @@ /*@{*/ -/** Returns the protocol service message parameter. +/** Return the protocol service message parameter. */ #define NIL_GET_PROTO(call) \ Index: uspace/lib/net/include/nil_module.h =================================================================== --- uspace/lib/net/include/nil_module.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,79 +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_nil - * @{ - */ - -/** @file - * Network interface layer modules common skeleton. - * All network interface layer modules have to implement this interface. - */ - -#ifndef __NET_NIL_MODULE_H__ -#define __NET_NIL_MODULE_H__ - -#include - -/** Module initialization. - * - * Is called by the module_start() function. - * - * @param[in] net_phone The networking moduel phone. - * - * @return EOK on success. - * @return Other error codes as defined for each specific module initialize function. - * - */ -extern int nil_initialize(int); - -/** Message processing function. - * - * @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. - * - * @see nil_interface.h - * @see IS_NET_NIL_MESSAGE() - * - */ -extern int nil_message(const char *, ipc_callid_t, ipc_call_t *, ipc_call_t *, - int *); - -#endif - -/** @} - */ Index: uspace/lib/net/include/nil_remote.h =================================================================== --- uspace/lib/net/include/nil_remote.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) +++ uspace/lib/net/include/nil_remote.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -0,0 +1,46 @@ +/* + * 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 + * @{ + */ + +#ifndef __NET_NIL_REMOTE_H__ +#define __NET_NIL_REMOTE_H__ + +#include +#include +#include + +extern int nil_device_state_msg_remote(int, device_id_t, int); +extern int nil_received_msg_remote(int, device_id_t, packet_t, services_t); + +#endif + +/** @} + */ Index: uspace/lib/net/include/nil_standalone.h =================================================================== --- uspace/lib/net/include/nil_standalone.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2010 Martin Decky - * 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 nil_standalone - * @{ - */ - -#ifndef __NIL_STANDALONE_H__ -#define __NIL_STANDALONE_H__ - -#include -#include - -extern int nil_module_message(const char *, ipc_callid_t, ipc_call_t *, - ipc_call_t *, int *); -extern int nil_module_start(async_client_conn_t); - -#endif - -/** @} - */ Index: uspace/lib/net/include/packet_remote.h =================================================================== --- uspace/lib/net/include/packet_remote.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) +++ uspace/lib/net/include/packet_remote.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -0,0 +1,46 @@ +/* + * 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 packet + * @{ + */ + +#ifndef __NET_PACKET_REMOTE_H__ +#define __NET_PACKET_REMOTE_H__ + +#include + +extern int packet_translate_remote(int, packet_ref, 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); + +#endif + +/** @} + */ Index: uspace/lib/net/include/tl_common.h =================================================================== --- uspace/lib/net/include/tl_common.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/include/tl_common.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -49,4 +49,7 @@ DEVICE_MAP_DECLARE(packet_dimensions, packet_dimension_t); +extern int tl_get_ip_packet_dimension(int, packet_dimensions_ref, + device_id_t, packet_dimension_ref *); + /** Gets the address port. * Supports AF_INET and AF_INET6 address families. @@ -59,19 +62,4 @@ */ extern int tl_get_address_port(const struct sockaddr * addr, int addrlen, uint16_t * port); - -/** Gets IP packet dimensions. - * Tries to search a cache and queries the IP module if not found. - * 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. - * @returns EOK on success. - * @returns EBADMEM if the packet_dimension parameter is NULL. - * @return ENOMEM if there is not enough memory left. - * @returns EINVAL if the packet_dimensions cache is not valid. - * @returns Other codes as defined for the ip_packet_size_req() function. - */ -extern int tl_get_ip_packet_dimension(int ip_phone, packet_dimensions_ref packet_dimensions, device_id_t device_id, packet_dimension_ref * packet_dimension); /** Updates IP device packet dimensions cache. Index: uspace/lib/net/include/tl_interface.h =================================================================== --- uspace/lib/net/include/tl_interface.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/include/tl_interface.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -32,5 +32,5 @@ /** @file - * Transport layer module interface for the underlying internetwork layer. + * Transport layer module interface for the underlying internetwork layer. */ @@ -48,18 +48,29 @@ /** @name Transport layer module interface - * This interface is used by other modules. + * This interface is used by other modules. */ /*@{*/ -/** Notifies 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. 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 delivered to. - * @param[in] error The packet error reporting service. Prefixes the received packet. - * @returns EOK on success. +/** 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. + * 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 + * delivered to. + * @param[in] error The packet error reporting service. Prefixes the + * received packet. + * + * @return EOK on success. + * */ -inline static int tl_received_msg(int tl_phone, device_id_t device_id, packet_t packet, services_t target, services_t error){ - return generic_received_msg(tl_phone, NET_TL_RECEIVED, device_id, packet_get_id(packet), target, error); +inline static int tl_received_msg(int tl_phone, 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, + packet_get_id(packet), target, error); } Index: uspace/lib/net/include/tl_local.h =================================================================== --- uspace/lib/net/include/tl_local.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) +++ uspace/lib/net/include/tl_local.h (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2010 Martin Decky + * 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 tl_local + * @{ + */ + +#ifndef __TL_LOCAL_H__ +#define __TL_LOCAL_H__ + +#include +#include + +extern int tl_module_message_standalone(ipc_callid_t, ipc_call_t *, + ipc_call_t *, int *); +extern int tl_module_start_standalone(async_client_conn_t); + +#endif + +/** @} + */ Index: uspace/lib/net/include/tl_standalone.h =================================================================== --- uspace/lib/net/include/tl_standalone.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2010 Martin Decky - * 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 tl_standalone - * @{ - */ - -#ifndef __TL_STANDALONE_H__ -#define __TL_STANDALONE_H__ - -#include -#include - -extern int tl_module_message(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, int *answer_count); -extern int tl_module_start(async_client_conn_t client_connection); - -#endif - -/** @} - */ Index: uspace/lib/net/netif/netif.c =================================================================== --- uspace/lib/net/netif/netif.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,293 +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 - * Network interface module skeleton implementation. - * @see netif.h - */ - -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -DEVICE_MAP_IMPLEMENT(device_map, device_t) - -/** Network interface global data. - */ -netif_globals_t netif_globals; - -int netif_probe_req(int netif_phone, device_id_t device_id, int irq, int io){ - int result; - - fibril_rwlock_write_lock(&netif_globals.lock); - result = netif_probe_message(device_id, irq, io); - fibril_rwlock_write_unlock(&netif_globals.lock); - return result; -} - -int netif_send_msg(int netif_phone, device_id_t device_id, packet_t packet, services_t sender){ - int result; - - fibril_rwlock_write_lock(&netif_globals.lock); - result = netif_send_message(device_id, packet, sender); - fibril_rwlock_write_unlock(&netif_globals.lock); - return result; -} - -int netif_start_req(int netif_phone, device_id_t device_id){ - ERROR_DECLARE; - - device_ref device; - int result; - int phone; - - fibril_rwlock_write_lock(&netif_globals.lock); - if(ERROR_OCCURRED(find_device(device_id, &device))){ - fibril_rwlock_write_unlock(&netif_globals.lock); - return ERROR_CODE; - } - result = netif_start_message(device); - if(result > NETIF_NULL){ - phone = device->nil_phone; - fibril_rwlock_write_unlock(&netif_globals.lock); - nil_device_state_msg(phone, device_id, result); - return EOK; - }else{ - fibril_rwlock_write_unlock(&netif_globals.lock); - } - return result; -} - -int netif_stop_req(int netif_phone, device_id_t device_id){ - ERROR_DECLARE; - - device_ref device; - int result; - int phone; - - fibril_rwlock_write_lock(&netif_globals.lock); - if(ERROR_OCCURRED(find_device(device_id, &device))){ - fibril_rwlock_write_unlock(&netif_globals.lock); - return ERROR_CODE; - } - result = netif_stop_message(device); - if(result > NETIF_NULL){ - phone = device->nil_phone; - fibril_rwlock_write_unlock(&netif_globals.lock); - nil_device_state_msg(phone, device_id, result); - return EOK; - }else{ - fibril_rwlock_write_unlock(&netif_globals.lock); - } - return result; -} - -int netif_stats_req(int netif_phone, device_id_t device_id, device_stats_ref stats){ - int res; - - fibril_rwlock_read_lock(&netif_globals.lock); - res = netif_get_device_stats(device_id, stats); - fibril_rwlock_read_unlock(&netif_globals.lock); - return res; -} - -int netif_get_addr_req(int netif_phone, device_id_t device_id, measured_string_ref * address, char ** data){ - ERROR_DECLARE; - - measured_string_t translation; - - if(!(address && data)){ - return EBADMEM; - } - fibril_rwlock_read_lock(&netif_globals.lock); - if(! ERROR_OCCURRED(netif_get_addr_message(device_id, &translation))){ - *address = measured_string_copy(&translation); - ERROR_CODE = (*address) ? EOK : ENOMEM; - } - fibril_rwlock_read_unlock(&netif_globals.lock); - *data = (** address).value; - return ERROR_CODE; -} - -int netif_bind_service(services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver){ - return EOK; -} - -int find_device(device_id_t device_id, device_ref * device){ - if(! device){ - return EBADMEM; - } - *device = device_map_find(&netif_globals.device_map, device_id); - if(! * device){ - return ENOENT; - } - if((** device).state == NETIF_NULL) return EPERM; - return EOK; -} - -void null_device_stats(device_stats_ref stats){ - bzero(stats, sizeof(device_stats_t)); -} - -/** Register the device notification receiver, the network interface layer module. - * - * @param[in] name Module name. - * @param[in] device_id The device identifier. - * @param[in] phone The 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(const char *name, device_id_t device_id, int phone) -{ - ERROR_DECLARE; - - device_ref device; - ERROR_PROPAGATE(find_device(device_id, &device)); - if(device->nil_phone > 0) - return ELIMIT; - - device->nil_phone = phone; - printf("%s: Receiver of device %d registered (phone: %d)\n", - name, device->device_id, device->nil_phone); - return EOK; -} - -int netif_message(const char *name, ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, int *answer_count) -{ - ERROR_DECLARE; - - size_t length; - device_stats_t stats; - packet_t packet; - measured_string_t address; - - *answer_count = 0; - switch(IPC_GET_METHOD(*call)){ - case IPC_M_PHONE_HUNGUP: - return EOK; - case NET_NETIF_PROBE: - return netif_probe_req(0, 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); - ERROR_CODE = register_message(name, IPC_GET_DEVICE(call), - IPC_GET_PHONE(call)); - fibril_rwlock_write_unlock(&netif_globals.lock); - return ERROR_CODE; - case NET_NETIF_SEND: - ERROR_PROPAGATE(packet_translate(netif_globals.net_phone, - &packet, IPC_GET_PACKET(call))); - return netif_send_msg(0, IPC_GET_DEVICE(call), packet, - IPC_GET_SENDER(call)); - case NET_NETIF_START: - return netif_start_req(0, IPC_GET_DEVICE(call)); - case NET_NETIF_STATS: - fibril_rwlock_read_lock(&netif_globals.lock); - if (!ERROR_OCCURRED(async_data_read_receive(&callid, &length))) { - if (length < sizeof(device_stats_t)) - ERROR_CODE = EOVERFLOW; - else { - if (!ERROR_OCCURRED(netif_get_device_stats( - IPC_GET_DEVICE(call), &stats))) - ERROR_CODE = async_data_read_finalize(callid, &stats, - sizeof(device_stats_t)); - } - } - fibril_rwlock_read_unlock(&netif_globals.lock); - return ERROR_CODE; - case NET_NETIF_STOP: - return netif_stop_req(0, IPC_GET_DEVICE(call)); - case NET_NETIF_GET_ADDR: - fibril_rwlock_read_lock(&netif_globals.lock); - if (!ERROR_OCCURRED(netif_get_addr_message(IPC_GET_DEVICE(call), - &address))) - ERROR_CODE = measured_strings_reply(&address, 1); - fibril_rwlock_read_unlock(&netif_globals.lock); - return ERROR_CODE; - } - - return netif_specific_message(callid, call, answer, answer_count); -} - -int netif_init_module(async_client_conn_t client_connection){ - ERROR_DECLARE; - - async_set_client_connection(client_connection); - netif_globals.net_phone = connect_to_service(SERVICE_NETWORKING); - device_map_initialize(&netif_globals.device_map); - ERROR_PROPAGATE(pm_init()); - fibril_rwlock_initialize(&netif_globals.lock); - if(ERROR_OCCURRED(netif_initialize())){ - pm_destroy(); - return ERROR_CODE; - } - return EOK; -} - -int netif_run_module(void){ - async_manager(); - - pm_destroy(); - return EOK; -} - -void netif_pq_release(packet_id_t packet_id){ - pq_release(netif_globals.net_phone, packet_id); -} - -packet_t netif_packet_get_1(size_t content){ - return packet_get_1(netif_globals.net_phone, content); -} - -/** @} - */ Index: uspace/lib/net/netif/netif_local.c =================================================================== --- uspace/lib/net/netif/netif_local.c (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) +++ uspace/lib/net/netif/netif_local.c (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -0,0 +1,468 @@ +/* + * 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 + * Network interface module skeleton implementation. + * @see netif.h + */ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t); + +/** Network interface global data. + */ +netif_globals_t netif_globals; + +/** Probe the existence of the device. + * + * @param[in] netif_phone The network interface phone. + * @param[in] device_id The device identifier. + * @param[in] irq The device interrupt number. + * @param[in] io The device input/output address. + * + * @return EOK on success. + * @return Other errro codes as defined for the netif_probe_message(). + * + */ +int netif_probe_req_local(int netif_phone, device_id_t device_id, int irq, int io) +{ + fibril_rwlock_write_lock(&netif_globals.lock); + int result = netif_probe_message(device_id, irq, io); + fibril_rwlock_write_unlock(&netif_globals.lock); + + return result; +} + +/** Send the packet queue. + * + * @param[in] netif_phone The network interface phone. + * @param[in] device_id The device identifier. + * @param[in] packet The packet queue. + * @param[in] sender The sending module service. + * + * @return EOK on success. + * @return Other error codes as defined for the generic_send_msg() function. + * + */ +int netif_send_msg_local(int netif_phone, device_id_t device_id, + packet_t packet, services_t sender) +{ + fibril_rwlock_write_lock(&netif_globals.lock); + int result = netif_send_message(device_id, packet, sender); + fibril_rwlock_write_unlock(&netif_globals.lock); + + return result; +} + +/** Start the device. + * + * @param[in] netif_phone The network interface phone. + * @param[in] device_id The device identifier. + * + * @return EOK on success. + * @return Other error codes as defined for the find_device() function. + * @return Other error codes as defined for the netif_start_message() function. + * + */ +int netif_start_req_local(int netif_phone, device_id_t device_id) +{ + ERROR_DECLARE; + + fibril_rwlock_write_lock(&netif_globals.lock); + + netif_device_t *device; + if (ERROR_OCCURRED(find_device(device_id, &device))) { + fibril_rwlock_write_unlock(&netif_globals.lock); + return ERROR_CODE; + } + + int result = netif_start_message(device); + if (result > NETIF_NULL) { + int phone = device->nil_phone; + fibril_rwlock_write_unlock(&netif_globals.lock); + nil_device_state_msg(phone, device_id, result); + return EOK; + } + + fibril_rwlock_write_unlock(&netif_globals.lock); + + return result; +} + +/** Stop the device. + * + * @param[in] netif_phone The network interface phone. + * @param[in] device_id The device identifier. + * + * @return EOK on success. + * @return Other error codes as defined for the find_device() function. + * @return Other error codes as defined for the netif_stop_message() function. + * + */ +int netif_stop_req_local(int netif_phone, device_id_t device_id) +{ + ERROR_DECLARE; + + fibril_rwlock_write_lock(&netif_globals.lock); + + netif_device_t *device; + if (ERROR_OCCURRED(find_device(device_id, &device))) { + fibril_rwlock_write_unlock(&netif_globals.lock); + return ERROR_CODE; + } + + int result = netif_stop_message(device); + if (result > NETIF_NULL) { + int phone = device->nil_phone; + fibril_rwlock_write_unlock(&netif_globals.lock); + nil_device_state_msg(phone, device_id, result); + return EOK; + } + + fibril_rwlock_write_unlock(&netif_globals.lock); + + return result; +} + +/** Return the device usage statistics. + * + * @param[in] netif_phone The network interface phone. + * @param[in] device_id The device identifier. + * @param[out] stats The device usage statistics. + * + * @return EOK on success. + * + */ +int netif_stats_req_local(int netif_phone, device_id_t device_id, + device_stats_ref stats) +{ + fibril_rwlock_read_lock(&netif_globals.lock); + int res = netif_get_device_stats(device_id, stats); + fibril_rwlock_read_unlock(&netif_globals.lock); + + return res; +} + +/** Return the device local hardware address. + * + * @param[in] netif_phone The network interface phone. + * @param[in] device_id The device identifier. + * @param[out] address The device local hardware address. + * @param[out] data The address data. + * + * @return EOK on success. + * @return EBADMEM if the address parameter is NULL. + * @return ENOENT if there no such device. + * @return Other error codes as defined for the netif_get_addr_message() + * function. + * + */ +int netif_get_addr_req_local(int netif_phone, device_id_t device_id, + measured_string_ref *address, char **data) +{ + ERROR_DECLARE; + + if ((!address) || (!data)) + return EBADMEM; + + fibril_rwlock_read_lock(&netif_globals.lock); + + measured_string_t translation; + if (!ERROR_OCCURRED(netif_get_addr_message(device_id, &translation))) { + *address = measured_string_copy(&translation); + ERROR_CODE = (*address) ? EOK : ENOMEM; + } + + fibril_rwlock_read_unlock(&netif_globals.lock); + + *data = (**address).value; + + return ERROR_CODE; +} + +/** Create bidirectional connection with the network interface module and registers 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. + * + * @return The phone of the needed service. + * @return EOK on success. + * @return Other error codes as defined for the bind_service() function. + * + */ +int netif_bind_service_local(services_t service, device_id_t device_id, + services_t me, async_client_conn_t receiver) +{ + return EOK; +} + +/** Find the device specific data. + * + * @param[in] device_id The device identifier. + * @param[out] device The device specific data. + * + * @return EOK on success. + * @return ENOENT if device is not found. + * @return EPERM if the device is not initialized. + * + */ +int find_device(device_id_t device_id, netif_device_t **device) +{ + if (!device) + return EBADMEM; + + *device = netif_device_map_find(&netif_globals.device_map, device_id); + if (*device == NULL) + return ENOENT; + + if ((*device)->state == NETIF_NULL) + return EPERM; + + return EOK; +} + +/** Clear the usage statistics. + * + * @param[in] stats The usage statistics. + * + */ +void null_device_stats(device_stats_ref stats) +{ + bzero(stats, sizeof(device_stats_t)); +} + +/** Initialize the netif module. + * + * @param[in] client_connection The client connection functio to be + * registered. + * + * @return EOK on success. + * @return Other error codes as defined for each specific module + * message function. + * + */ +int netif_init_module(async_client_conn_t client_connection) +{ + ERROR_DECLARE; + + async_set_client_connection(client_connection); + + netif_globals.net_phone = connect_to_service(SERVICE_NETWORKING); + netif_device_map_initialize(&netif_globals.device_map); + + ERROR_PROPAGATE(pm_init()); + + fibril_rwlock_initialize(&netif_globals.lock); + if (ERROR_OCCURRED(netif_initialize())) { + pm_destroy(); + return ERROR_CODE; + } + + return EOK; +} + +/** Release the given packet. + * + * Prepared for future optimization. + * + * @param[in] packet_id The packet identifier. + * + */ +void netif_pq_release(packet_id_t packet_id) +{ + pq_release_remote(netif_globals.net_phone, packet_id); +} + +/** Allocate new packet to handle the given content size. + * + * @param[in] content The minimum content size. + * + * @return The allocated packet. + * @return NULL if there is an error. + * + */ +packet_t netif_packet_get_1(size_t content) +{ + return packet_get_1_remote(netif_globals.net_phone, content); +} + +/** Register the device notification receiver, the network interface layer module. + * + * @param[in] name Module name. + * @param[in] device_id The device identifier. + * @param[in] phone The 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(const char *name, device_id_t device_id, int phone) +{ + ERROR_DECLARE; + + netif_device_t *device; + ERROR_PROPAGATE(find_device(device_id, &device)); + if(device->nil_phone > 0) + return ELIMIT; + + device->nil_phone = phone; + printf("%s: Receiver of device %d registered (phone: %d)\n", + name, device->device_id, device->nil_phone); + return EOK; +} + +/** Process the netif module messages. + * + * @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. + * + * @see IS_NET_NETIF_MESSAGE() + * + */ +int netif_module_message_standalone(const char *name, ipc_callid_t callid, + ipc_call_t *call, ipc_call_t *answer, int *answer_count) +{ + ERROR_DECLARE; + + size_t length; + device_stats_t stats; + packet_t packet; + measured_string_t address; + + *answer_count = 0; + switch (IPC_GET_METHOD(*call)) { + case IPC_M_PHONE_HUNGUP: + return EOK; + case NET_NETIF_PROBE: + return netif_probe_req_local(0, 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); + ERROR_CODE = register_message(name, IPC_GET_DEVICE(call), + IPC_GET_PHONE(call)); + fibril_rwlock_write_unlock(&netif_globals.lock); + return ERROR_CODE; + case NET_NETIF_SEND: + ERROR_PROPAGATE(packet_translate_remote(netif_globals.net_phone, + &packet, IPC_GET_PACKET(call))); + return netif_send_msg_local(0, IPC_GET_DEVICE(call), packet, + IPC_GET_SENDER(call)); + case NET_NETIF_START: + return netif_start_req_local(0, IPC_GET_DEVICE(call)); + case NET_NETIF_STATS: + fibril_rwlock_read_lock(&netif_globals.lock); + if (!ERROR_OCCURRED(async_data_read_receive(&callid, &length))) { + if (length < sizeof(device_stats_t)) + ERROR_CODE = EOVERFLOW; + else { + if (!ERROR_OCCURRED(netif_get_device_stats( + IPC_GET_DEVICE(call), &stats))) + ERROR_CODE = async_data_read_finalize(callid, &stats, + sizeof(device_stats_t)); + } + } + fibril_rwlock_read_unlock(&netif_globals.lock); + return ERROR_CODE; + case NET_NETIF_STOP: + return netif_stop_req_local(0, IPC_GET_DEVICE(call)); + case NET_NETIF_GET_ADDR: + fibril_rwlock_read_lock(&netif_globals.lock); + if (!ERROR_OCCURRED(netif_get_addr_message(IPC_GET_DEVICE(call), + &address))) + ERROR_CODE = measured_strings_reply(&address, 1); + fibril_rwlock_read_unlock(&netif_globals.lock); + return ERROR_CODE; + } + + return netif_specific_message(callid, call, answer, answer_count); +} + +/** Start the network interface module. + * + * Initialize the client connection serving function, initialize + * the module, registers 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_module_start_standalone(async_client_conn_t client_connection) +{ + ERROR_DECLARE; + + ERROR_PROPAGATE(netif_init_module(client_connection)); + + async_manager(); + + pm_destroy(); + return EOK; +} + +/** @} + */ Index: uspace/lib/net/netif/netif_nil_bundle.c =================================================================== --- uspace/lib/net/netif/netif_nil_bundle.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/netif/netif_nil_bundle.c (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -41,7 +41,7 @@ #include #include -#include #include -#include +#include +#include /** Distribute the messages between the module parts. @@ -62,26 +62,42 @@ ipc_call_t *call, ipc_call_t *answer, int *answer_count) { - if (IS_NET_NIL_MESSAGE(call) + if ((IS_NET_NIL_MESSAGE(call)) || (IPC_GET_METHOD(*call) == IPC_M_CONNECT_TO_ME)) - return nil_message(name, callid, call, answer, answer_count); + return nil_message_standalone(name, callid, call, answer, + answer_count); else - return netif_message(name, callid, call, answer, answer_count); + return netif_module_message_standalone(name, callid, call, answer, + answer_count); } -/** Starts the bundle network interface module. - * Initializes the client connection serving function, initializes both module parts, registers the module service and starts 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. - * @returns EOK on success. - * @returns Other error codes as defined for each specific module message function. +/** 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){ +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))){ + if (ERROR_OCCURRED(nil_initialize(netif_globals.net_phone))) { pm_destroy(); return ERROR_CODE; } - return netif_run_module(); + + async_manager(); + + pm_destroy(); + return EOK; } Index: uspace/lib/net/netif/netif_remote.c =================================================================== --- uspace/lib/net/netif/netif_remote.c (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) +++ uspace/lib/net/netif/netif_remote.c (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -0,0 +1,99 @@ +/* + * 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 + * Network interface module interface implementation for remote modules. + */ + +#include + +#include +#include +#include +#include +#include +#include +#include + +int netif_get_addr_req_remote(int netif_phone, device_id_t device_id, + measured_string_ref *address, char **data) +{ + return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id, + address, data); +} + +int netif_probe_req_remote(int netif_phone, device_id_t device_id, int irq, int io) +{ + return async_req_3_0(netif_phone, NET_NETIF_PROBE, device_id, irq, io); +} + +int netif_send_msg_remote(int netif_phone, device_id_t device_id, packet_t packet, + services_t sender) +{ + return generic_send_msg_remote(netif_phone, NET_NETIF_SEND, device_id, + packet_get_id(packet), sender, 0); +} + +int netif_start_req_remote(int netif_phone, device_id_t device_id) +{ + return async_req_1_0(netif_phone, NET_NETIF_START, device_id); +} + +int netif_stop_req_remote(int netif_phone, device_id_t device_id) +{ + return async_req_1_0(netif_phone, NET_NETIF_STOP, device_id); +} + +int netif_stats_req_remote(int netif_phone, device_id_t device_id, + device_stats_ref stats) +{ + if (!stats) + return EBADMEM; + + aid_t message_id = async_send_1(netif_phone, NET_NETIF_STATS, + (ipcarg_t) device_id, NULL); + async_data_read_start(netif_phone, stats, sizeof(*stats)); + + ipcarg_t result; + async_wait_for(message_id, &result); + + return (int) result; +} + +int netif_bind_service_remote(services_t service, device_id_t device_id, services_t me, + async_client_conn_t receiver) +{ + return bind_service(service, device_id, me, 0, receiver); +} + +/** @} + */ Index: uspace/lib/net/netif/netif_standalone.c =================================================================== --- uspace/lib/net/netif/netif_standalone.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,77 +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 standalone network interface module. - */ - -#include -#include - -#include -#include - -/** Delegate the messages to the netif_message() function. - * - * @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_module_message(const char *name, ipc_callid_t callid, - ipc_call_t *call, ipc_call_t *answer, int *answer_count) -{ - return netif_message(name, callid, call, answer, answer_count); -} - -/** Starts the network interface module. - * Initializes the client connection serving function, initializes the module, registers the module service and starts 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. - * @returns EOK on success. - * @returns Other error codes as defined for each specific module message function. - */ -int netif_module_start(async_client_conn_t client_connection){ - ERROR_DECLARE; - - ERROR_PROPAGATE(netif_init_module(client_connection)); - return netif_run_module(); -} - -/** @} - */ Index: uspace/lib/net/nil/nil_remote.c =================================================================== --- uspace/lib/net/nil/nil_remote.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/nil/nil_remote.c (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -28,10 +28,10 @@ /** @addtogroup net_nil - * @{ + * @{ */ /** @file - * Network interface layer interface implementation for standalone remote modules. - * @see nil_interface.h + * Network interface layer interface implementation for remote modules. + * @see nil_interface.h */ @@ -42,11 +42,43 @@ #include #include +#include -int nil_device_state_msg(int nil_phone, device_id_t device_id, int state){ - return generic_device_state_msg(nil_phone, NET_NIL_DEVICE_STATE, device_id, state, 0); +/** Notify the network interface layer about the device state change. + * + * @param[in] nil_phone The network interface layer phone. + * @param[in] device_id The device identifier. + * @param[in] state The new device state. + * + * @return EOK on success. + * @return Other error codes as defined for each specific module device + * state function. + * + */ +int nil_device_state_msg_remote(int nil_phone, device_id_t device_id, int state) +{ + return generic_device_state_msg_remote(nil_phone, NET_NIL_DEVICE_STATE, + device_id, state, 0); } -int nil_received_msg(int nil_phone, device_id_t device_id, packet_t packet, services_t target){ - return generic_received_msg(nil_phone, NET_NIL_RECEIVED, device_id, packet_get_id(packet), target, 0); +/** Pass the packet queue to the network interface layer. + * + * Process and redistribute the received packet queue to the registered + * upper layers. + * + * @param[in] nil_phone The network interface layer phone. + * @param[in] device_id The source device identifier. + * @param[in] packet The received packet or the received packet queue. + * @param target The target service. Ignored parameter. + * + * @return EOK on success. + * @return Other error codes as defined for each specific module + * received function. + * + */ +int nil_received_msg_remote(int nil_phone, device_id_t device_id, + packet_t packet, services_t target) +{ + return generic_received_msg_remote(nil_phone, NET_NIL_RECEIVED, device_id, + packet_get_id(packet), target, 0); } Index: uspace/lib/net/tl/icmp_remote.c =================================================================== --- uspace/lib/net/tl/icmp_remote.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/tl/icmp_remote.c (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -32,5 +32,5 @@ /** @file - * ICMP interface implementation for standalone remote modules. + * ICMP interface implementation for remote modules. * @see icmp_interface.h */ Index: uspace/lib/net/tl/tl_common.c =================================================================== --- uspace/lib/net/tl/tl_common.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/lib/net/tl/tl_common.c (revision 14f1db0aaed5208d5e8340c816ca6e555f81f67e) @@ -42,4 +42,5 @@ #include #include +#include #include #include @@ -47,7 +48,10 @@ #include #include -#include +#include +#include #include #include +#include +#include #include @@ -82,28 +86,51 @@ } -int tl_get_ip_packet_dimension(int ip_phone, packet_dimensions_ref packet_dimensions, device_id_t device_id, packet_dimension_ref * packet_dimension){ +/** Get IP packet dimensions. + * + * Try to search a cache and query the IP module if not found. + * 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, + packet_dimensions_ref packet_dimensions, device_id_t device_id, + packet_dimension_ref *packet_dimension) +{ ERROR_DECLARE; - - if(! packet_dimension){ + + if (!packet_dimension) return EBADMEM; - } - + *packet_dimension = packet_dimensions_find(packet_dimensions, device_id); - if(! * packet_dimension){ - // ask for and remember them if not found - *packet_dimension = malloc(sizeof(** packet_dimension)); - if(! * packet_dimension){ + if (!*packet_dimension) { + /* Ask for and remember them if not found */ + *packet_dimension = malloc(sizeof(**packet_dimension)); + if(!*packet_dimension) return ENOMEM; - } - if(ERROR_OCCURRED(ip_packet_size_req(ip_phone, device_id, * packet_dimension))){ + + if (ERROR_OCCURRED(ip_packet_size_req(ip_phone, device_id, + *packet_dimension))) { free(*packet_dimension); return ERROR_CODE; } - ERROR_CODE = packet_dimensions_add(packet_dimensions, device_id, * packet_dimension); - if(ERROR_CODE < 0){ + + ERROR_CODE = packet_dimensions_add(packet_dimensions, device_id, + *packet_dimension); + if (ERROR_CODE < 0) { free(*packet_dimension); return ERROR_CODE; } } + return EOK; } @@ -169,7 +196,7 @@ // detach the first packet and release the others next = pq_detach(packet); - if(next){ - pq_release(packet_phone, packet_get_id(next)); - } + if (next) + pq_release_remote(packet_phone, packet_get_id(next)); + length = packet_get_addr(packet, &src, NULL); if((length > 0) @@ -180,5 +207,5 @@ return EOK; }else{ - pq_release(packet_phone, packet_get_id(packet)); + pq_release_remote(packet_phone, packet_get_id(packet)); } return ENOENT; @@ -200,5 +227,5 @@ } // get a new packet - *packet = packet_get_4(packet_phone, length, dimension->addr_len, prefix + dimension->prefix, dimension->suffix); + *packet = packet_get_4_remote(packet_phone, length, dimension->addr_len, prefix + dimension->prefix, dimension->suffix); if(! packet){ return ENOMEM; @@ -207,5 +234,5 @@ data = packet_suffix(*packet, length); if(! data){ - pq_release(packet_phone, packet_get_id(*packet)); + pq_release_remote(packet_phone, packet_get_id(*packet)); return ENOMEM; } @@ -214,5 +241,5 @@ // set the packet destination address || ERROR_OCCURRED(packet_set_addr(*packet, NULL, (uint8_t *) addr, addrlen))){ - pq_release(packet_phone, packet_get_id(*packet)); + pq_release_remote(packet_phone, packet_get_id(*packet)); return ERROR_CODE; }