Index: uspace/srv/hw/netif/dp8390/Makefile =================================================================== --- uspace/srv/hw/netif/dp8390/Makefile (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/hw/netif/dp8390/Makefile (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -39,11 +39,9 @@ -include $(CONFIG_MAKEFILE) -ifeq ($(CONFIG_NETWORKING),modular) - BINARY = dp8390 +ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y) + LIBS += $(USPACE_PREFIX)/srv/net/nil/eth/libeth.a endif -ifeq ($(CONFIG_NETWORKING),module) - LIBRARY = libdp8390 -endif +BINARY = dp8390 SOURCES = \ Index: uspace/srv/hw/netif/dp8390/dp8390.c =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/hw/netif/dp8390/dp8390.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -37,9 +37,7 @@ #include - +#include #include #include - -#include #include "dp8390_drv.h" Index: uspace/srv/hw/netif/dp8390/dp8390_module.c =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390_module.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/hw/netif/dp8390/dp8390_module.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -50,6 +50,6 @@ #include #include -#include -#include +#include +#include #include "dp8390.h" @@ -95,8 +95,4 @@ }; -/** Network interface module global data. - */ -netif_globals_t netif_globals; - /** Handles the interrupt messages. * This is the interrupt handler callback function. @@ -104,61 +100,7 @@ * @param[in] call The interrupt message. */ -void irq_handler(ipc_callid_t iid, ipc_call_t * call); - -/** Changes the network interface state. - * @param[in,out] device The network interface. - * @param[in] state The new state. - * @returns The new state. - */ -int change_state(device_ref device, device_state_t state); - -int netif_specific_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ - return ENOTSUP; -} - -int netif_get_device_stats(device_id_t device_id, device_stats_ref stats){ - ERROR_DECLARE; - - device_ref device; - eth_stat_t * de_stat; - - if(! stats){ - return EBADMEM; - } - ERROR_PROPAGATE(find_device(device_id, &device)); - de_stat = &((dpeth_t *) device->specific)->de_stat; - null_device_stats(stats); - stats->receive_errors = de_stat->ets_recvErr; - stats->send_errors = de_stat->ets_sendErr; - stats->receive_crc_errors = de_stat->ets_CRCerr; - stats->receive_frame_errors = de_stat->ets_frameAll; - stats->receive_missed_errors = de_stat->ets_missedP; - stats->receive_packets = de_stat->ets_packetR; - stats->send_packets = de_stat->ets_packetT; - stats->collisions = de_stat->ets_collision; - stats->send_aborted_errors = de_stat->ets_transAb; - stats->send_carrier_errors = de_stat->ets_carrSense; - stats->send_heartbeat_errors = de_stat->ets_CDheartbeat; - stats->send_window_errors = de_stat->ets_OWC; - return EOK; -} - -int netif_get_addr_message(device_id_t device_id, measured_string_ref address){ - ERROR_DECLARE; - - device_ref device; - - if(! address){ - return EBADMEM; - } - ERROR_PROPAGATE(find_device(device_id, &device)); - address->value = (char *) (&((dpeth_t *) device->specific)->de_address); - address->length = CONVERT_SIZE(ether_addr_t, char, 1); - return EOK; -} - -void irq_handler(ipc_callid_t iid, ipc_call_t * call) +static void irq_handler(ipc_callid_t iid, ipc_call_t * call) { - device_ref device; + netif_device_t * device; dpeth_t * dep; packet_t received; @@ -203,11 +145,77 @@ } +/** Changes the network interface state. + * @param[in,out] device The network interface. + * @param[in] state The new state. + * @returns The new state. + */ +static int change_state(netif_device_t * device, device_state_t state) +{ + if (device->state != state) { + device->state = state; + + printf("%s: State changed to %s\n", NAME, + (state == NETIF_ACTIVE) ? "active" : "stopped"); + + return state; + } + + return EOK; +} + +int netif_specific_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ + return ENOTSUP; +} + +int netif_get_device_stats(device_id_t device_id, device_stats_ref stats){ + ERROR_DECLARE; + + netif_device_t * device; + eth_stat_t * de_stat; + + if(! stats){ + return EBADMEM; + } + ERROR_PROPAGATE(find_device(device_id, &device)); + de_stat = &((dpeth_t *) device->specific)->de_stat; + null_device_stats(stats); + stats->receive_errors = de_stat->ets_recvErr; + stats->send_errors = de_stat->ets_sendErr; + stats->receive_crc_errors = de_stat->ets_CRCerr; + stats->receive_frame_errors = de_stat->ets_frameAll; + stats->receive_missed_errors = de_stat->ets_missedP; + stats->receive_packets = de_stat->ets_packetR; + stats->send_packets = de_stat->ets_packetT; + stats->collisions = de_stat->ets_collision; + stats->send_aborted_errors = de_stat->ets_transAb; + stats->send_carrier_errors = de_stat->ets_carrSense; + stats->send_heartbeat_errors = de_stat->ets_CDheartbeat; + stats->send_window_errors = de_stat->ets_OWC; + return EOK; +} + +int netif_get_addr_message(device_id_t device_id, measured_string_ref address){ + ERROR_DECLARE; + + netif_device_t * device; + + if(! address){ + return EBADMEM; + } + ERROR_PROPAGATE(find_device(device_id, &device)); + address->value = (char *) (&((dpeth_t *) device->specific)->de_address); + address->length = CONVERT_SIZE(ether_addr_t, char, 1); + return EOK; +} + + + int netif_probe_message(device_id_t device_id, int irq, uintptr_t io){ ERROR_DECLARE; - device_ref device; - dpeth_t * dep; - - device = (device_ref) malloc(sizeof(device_t)); + netif_device_t * device; + dpeth_t * dep; + + device = (netif_device_t *) malloc(sizeof(netif_device_t)); if(! device){ return ENOMEM; @@ -218,5 +226,5 @@ return ENOMEM; } - bzero(device, sizeof(device_t)); + bzero(device, sizeof(netif_device_t)); bzero(dep, sizeof(dpeth_t)); device->device_id = device_id; @@ -233,5 +241,5 @@ return ERROR_CODE; } - if(ERROR_OCCURRED(device_map_add(&netif_globals.device_map, device->device_id, device))){ + if(ERROR_OCCURRED(netif_device_map_add(&netif_globals.device_map, device->device_id, device))){ free(dep); free(device); @@ -244,5 +252,5 @@ ERROR_DECLARE; - device_ref device; + netif_device_t * device; dpeth_t * dep; packet_t next; @@ -271,5 +279,5 @@ } -int netif_start_message(device_ref device){ +int netif_start_message(netif_device_t * device){ ERROR_DECLARE; @@ -290,5 +298,5 @@ } -int netif_stop_message(device_ref device){ +int netif_stop_message(netif_device_t * device){ dpeth_t * dep; @@ -302,18 +310,4 @@ } -int change_state(device_ref device, device_state_t state) -{ - if (device->state != state) { - device->state = state; - - printf("%s: State changed to %s\n", NAME, - (state == NETIF_ACTIVE) ? "active" : "stopped"); - - return state; - } - - return EOK; -} - int netif_initialize(void){ ipcarg_t phonehash; @@ -323,8 +317,4 @@ return REGISTER_ME(SERVICE_DP8390, &phonehash); } - -#ifdef CONFIG_NETWORKING_modular - -#include /** Default thread for new connections. @@ -386,7 +376,4 @@ } -#endif /* CONFIG_NETWORKING_modular */ - - /** @} */ Index: uspace/srv/net/cfg/Makefile =================================================================== --- uspace/srv/net/cfg/Makefile (revision ddfcfeb22fe529fef60132084a109a424354cd72) +++ uspace/srv/net/cfg/Makefile (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -0,0 +1,60 @@ +# +# 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. +# + +USPACE_PREFIX = ../../.. +ROOT_PATH = $(USPACE_PREFIX)/.. + +COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common +CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config + +-include $(COMMON_MAKEFILE) +-include $(CONFIG_MAKEFILE) + +ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y) + LO_SOURCE = lo.netif_nil_bundle + NE2K_SOURCE = ne2k.netif_nil_bundle +else + LO_SOURCE = lo.netif_standalone + NE2K_SOURCE = ne2k.netif_standalone +endif + +LO_TARGET = lo +NE2K_TARGET = ne2k + +.PHONY: all clean + +all: $(LO_TARGET) $(NE2K_TARGET) + +clean: + rm -f $(LO_TARGET) $(NE2K_TARGET) + +$(LO_TARGET): $(LO_SOURCE) + cp $< $@ + +$(NE2K_TARGET): $(NE2K_SOURCE) + cp $< $@ Index: uspace/srv/net/cfg/general =================================================================== --- uspace/srv/net/cfg/general (revision ddfcfeb22fe529fef60132084a109a424354cd72) +++ uspace/srv/net/cfg/general (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -0,0 +1,12 @@ +# general configuration + +IPV=4 +IP_ROUTING=no + +MTU=1500 + +ICMP_ERROR_REPORTING=yes +ICMP_ECHO_REPLYING=yes + +UDP_CHECKSUM_COMPUTING=yes +UDP_AUTOBINDING=yes Index: uspace/srv/net/cfg/lo.netif_nil_bundle =================================================================== --- uspace/srv/net/cfg/lo.netif_nil_bundle (revision ddfcfeb22fe529fef60132084a109a424354cd72) +++ uspace/srv/net/cfg/lo.netif_nil_bundle (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -0,0 +1,13 @@ +# loopback configuration + +NAME=lo + +NETIF=lo +NIL=lo +IL=ip + +IP_CONFIG=static +IP_ADDR=127.0.0.1 +IP_NETMASK=255.0.0.0 + +MTU=15535 Index: uspace/srv/net/cfg/lo.netif_standalone =================================================================== --- uspace/srv/net/cfg/lo.netif_standalone (revision ddfcfeb22fe529fef60132084a109a424354cd72) +++ uspace/srv/net/cfg/lo.netif_standalone (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -0,0 +1,13 @@ +# loopback configuration + +NAME=lo + +NETIF=lo +NIL=nildummy +IL=ip + +IP_CONFIG=static +IP_ADDR=127.0.0.1 +IP_NETMASK=255.0.0.0 + +MTU=15535 Index: uspace/srv/net/cfg/modular/general =================================================================== --- uspace/srv/net/cfg/modular/general (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,12 +1,0 @@ -# general configuration - -IPV=4 -IP_ROUTING=no - -MTU=1500 - -ICMP_ERROR_REPORTING=yes -ICMP_ECHO_REPLYING=yes - -UDP_CHECKSUM_COMPUTING=yes -UDP_AUTOBINDING=yes Index: uspace/srv/net/cfg/modular/lo =================================================================== --- uspace/srv/net/cfg/modular/lo (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,13 +1,0 @@ -# loopback configuration - -NAME=lo - -NETIF=lo -NIL=nildummy -IL=ip - -IP_CONFIG=static -IP_ADDR=127.0.0.1 -IP_NETMASK=255.0.0.0 - -MTU=15535 Index: uspace/srv/net/cfg/modular/ne2k =================================================================== --- uspace/srv/net/cfg/modular/ne2k (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,25 +1,0 @@ -# DP8390 (NE2k) configuration - -NAME=ne2k - -NETIF=dp8390 -NIL=eth -IL=ip - -# sysinfo_value("netif.dp8390.inr") -IRQ=9 -IO=300 - -# 8023_2_LSAP, 8023_2_SNAP -ETH_MODE=DIX -ETH_DUMMY=no - -IP_CONFIG=static -IP_ADDR=10.0.2.15 -IP_ROUTING=yes -IP_NETMASK=255.255.255.240 -IP_BROADCAST=10.0.2.255 -IP_GATEWAY=10.0.2.2 -ARP=arp - -MTU=1492 Index: uspace/srv/net/cfg/module/general =================================================================== --- uspace/srv/net/cfg/module/general (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,12 +1,0 @@ -# general configuration - -IPV=4 -IP_ROUTING=no - -MTU=1500 - -ICMP_ERROR_REPORTING=yes -ICMP_ECHO_REPLYING=yes - -UDP_CHECKSUM_COMPUTING=yes -UDP_AUTOBINDING=yes Index: uspace/srv/net/cfg/module/lo =================================================================== --- uspace/srv/net/cfg/module/lo (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,13 +1,0 @@ -# loopback configuration - -NAME=lo - -NETIF=lo -NIL=lo -IL=ip - -IP_CONFIG=static -IP_ADDR=127.0.0.1 -IP_NETMASK=255.0.0.0 - -MTU=15535 Index: uspace/srv/net/cfg/module/ne2k =================================================================== --- uspace/srv/net/cfg/module/ne2k (revision 24ab58b348754b301fea741628d74d49704735d6) +++ (revision ) @@ -1,25 +1,0 @@ -# DP8390 (NE2k) configuration - -NAME=ne2k - -NETIF=dp8390 -NIL=dp8390 -IL=ip - -# sysinfo_value("netif.dp8390.inr") -IRQ=9 -IO=300 - -# 8023_2_LSAP, 8023_2_SNAP -ETH_MODE=DIX -ETH_DUMMY=no - -IP_CONFIG=static -IP_ADDR=10.0.2.15 -IP_ROUTING=yes -IP_NETMASK=255.255.255.240 -IP_BROADCAST=10.0.2.255 -IP_GATEWAY=10.0.2.2 -ARP=arp - -MTU=1492 Index: uspace/srv/net/cfg/ne2k.netif_nil_bundle =================================================================== --- uspace/srv/net/cfg/ne2k.netif_nil_bundle (revision ddfcfeb22fe529fef60132084a109a424354cd72) +++ uspace/srv/net/cfg/ne2k.netif_nil_bundle (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -0,0 +1,25 @@ +# DP8390 (NE2k) configuration + +NAME=ne2k + +NETIF=dp8390 +NIL=dp8390 +IL=ip + +# sysinfo_value("netif.dp8390.inr") +IRQ=9 +IO=300 + +# 8023_2_LSAP, 8023_2_SNAP +ETH_MODE=DIX +ETH_DUMMY=no + +IP_CONFIG=static +IP_ADDR=10.0.2.15 +IP_ROUTING=yes +IP_NETMASK=255.255.255.240 +IP_BROADCAST=10.0.2.255 +IP_GATEWAY=10.0.2.2 +ARP=arp + +MTU=1492 Index: uspace/srv/net/cfg/ne2k.netif_standalone =================================================================== --- uspace/srv/net/cfg/ne2k.netif_standalone (revision ddfcfeb22fe529fef60132084a109a424354cd72) +++ uspace/srv/net/cfg/ne2k.netif_standalone (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -0,0 +1,25 @@ +# DP8390 (NE2k) configuration + +NAME=ne2k + +NETIF=dp8390 +NIL=eth +IL=ip + +# sysinfo_value("netif.dp8390.inr") +IRQ=9 +IO=300 + +# 8023_2_LSAP, 8023_2_SNAP +ETH_MODE=DIX +ETH_DUMMY=no + +IP_CONFIG=static +IP_ADDR=10.0.2.15 +IP_ROUTING=yes +IP_NETMASK=255.255.255.240 +IP_BROADCAST=10.0.2.255 +IP_GATEWAY=10.0.2.2 +ARP=arp + +MTU=1492 Index: uspace/srv/net/il/arp/arp.c =================================================================== --- uspace/srv/net/il/arp/arp.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/il/arp/arp.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -57,5 +57,8 @@ #include #include +#include #include +#include +#include #include @@ -370,7 +373,9 @@ } -int arp_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ +int arp_message_standalone(ipc_callid_t callid, ipc_call_t *call, + ipc_call_t *answer, int *answer_count) +{ ERROR_DECLARE; - + measured_string_ref address; measured_string_ref translation; @@ -378,8 +383,7 @@ packet_t packet; packet_t next; - -// printf("message %d - %d\n", IPC_GET_METHOD(*call), NET_ARP_FIRST); + *answer_count = 0; - switch(IPC_GET_METHOD(*call)){ + switch (IPC_GET_METHOD(*call)) { case IPC_M_PHONE_HUNGUP: return EOK; @@ -418,5 +422,5 @@ return EOK; case NET_IL_RECEIVED: - if(! ERROR_OCCURRED(packet_translate(arp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ + if(! ERROR_OCCURRED(packet_translate_remote(arp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ fibril_rwlock_read_lock(&arp_globals.lock); do{ @@ -424,5 +428,5 @@ ERROR_CODE = arp_receive_message(IPC_GET_DEVICE(call), packet); if(ERROR_CODE != 1){ - pq_release(arp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(arp_globals.net_phone, packet_get_id(packet)); } packet = next; @@ -434,4 +438,5 @@ return arp_mtu_changed_message(IPC_GET_DEVICE(call), IPC_GET_MTU(call)); } + return ENOTSUP; } @@ -570,5 +575,5 @@ return NULL; } - packet = packet_get_4(arp_globals.net_phone, device->packet_dimension.addr_len, device->packet_dimension.prefix, length, device->packet_dimension.suffix); + packet = packet_get_4_remote(arp_globals.net_phone, device->packet_dimension.addr_len, device->packet_dimension.prefix, length, device->packet_dimension.suffix); if(! packet){ return NULL; @@ -576,5 +581,5 @@ header = (arp_header_ref) packet_suffix(packet, length); if(! header){ - pq_release(arp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(arp_globals.net_phone, packet_get_id(packet)); return NULL; } @@ -593,5 +598,5 @@ memcpy(((uint8_t *) header) + length, target->value, target->length); if(packet_set_addr(packet, (uint8_t *) device->addr->value, (uint8_t *) device->broadcast_addr->value, CONVERT_SIZE(char, uint8_t, device->addr->length)) != EOK){ - pq_release(arp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(arp_globals.net_phone, packet_get_id(packet)); return NULL; } @@ -619,8 +624,4 @@ } } - -#ifdef CONFIG_NETWORKING_modular - -#include /** Default thread for new connections. @@ -650,5 +651,6 @@ /* Process the message */ - int res = il_module_message(callid, &call, &answer, &answer_count); + int res = il_module_message_standalone(callid, &call, &answer, + &answer_count); /* End if said to either by the message or the processing result */ @@ -675,5 +677,5 @@ /* Start the module */ - if (ERROR_OCCURRED(il_module_start(il_client_connection))) + if (ERROR_OCCURRED(il_module_start_standalone(il_client_connection))) return ERROR_CODE; @@ -681,6 +683,4 @@ } -#endif /* CONFIG_NETWORKING_modular */ - /** @} */ Index: uspace/srv/net/il/arp/arp_module.c =================================================================== --- uspace/srv/net/il/arp/arp_module.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/il/arp/arp_module.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -48,5 +48,5 @@ #include #include -#include +#include #include "arp.h" @@ -65,6 +65,6 @@ * @returns Other error codes as defined for the arp_message() function. */ -int il_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ - return arp_message(callid, call, answer, answer_count); +int il_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ + return arp_message_standalone(callid, call, answer, answer_count); } @@ -76,20 +76,20 @@ * @returns Other error codes as defined for the REGISTER_ME() macro function. */ -int il_module_start(async_client_conn_t client_connection){ +int il_module_start_standalone(async_client_conn_t client_connection){ ERROR_DECLARE; - - ipcarg_t phonehash; - + async_set_client_connection(client_connection); arp_globals.net_phone = net_connect_module(SERVICE_NETWORKING); ERROR_PROPAGATE(pm_init()); - if(ERROR_OCCURRED(arp_initialize(client_connection)) - || ERROR_OCCURRED(REGISTER_ME(SERVICE_ARP, &phonehash))){ + + ipcarg_t phonehash; + if (ERROR_OCCURRED(arp_initialize(client_connection)) + || ERROR_OCCURRED(REGISTER_ME(SERVICE_ARP, &phonehash))) { pm_destroy(); return ERROR_CODE; } - + async_manager(); - + pm_destroy(); return EOK; Index: uspace/srv/net/il/arp/arp_module.h =================================================================== --- uspace/srv/net/il/arp/arp_module.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/il/arp/arp_module.h (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -58,5 +58,5 @@ * @see IS_NET_ARP_MESSAGE() */ -int arp_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count); +int arp_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count); #endif Index: uspace/srv/net/il/ip/ip.c =================================================================== --- uspace/srv/net/il/ip/ip.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/il/ip/ip.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -69,6 +69,9 @@ #include #include +#include #include #include +#include +#include #include "ip.h" @@ -424,5 +427,5 @@ } -int ip_device_req(int il_phone, device_id_t device_id, services_t netif){ +int ip_device_req_local(int il_phone, device_id_t device_id, services_t netif){ ERROR_DECLARE; @@ -656,5 +659,5 @@ } -int ip_send_msg(int il_phone, device_id_t device_id, packet_t packet, services_t sender, services_t error){ +int ip_send_msg_local(int il_phone, device_id_t device_id, packet_t packet, services_t sender, services_t error){ ERROR_DECLARE; @@ -782,5 +785,5 @@ // sleep(1); // ERROR_PROPAGATE(arp_translate_req(netif->arp->phone, netif->device_id, SERVICE_IP, &destination, &translation, &data)); - pq_release(ip_globals.net_phone, packet_get_id(packet)); + pq_release_remote(ip_globals.net_phone, packet_get_id(packet)); return ERROR_CODE; } @@ -799,5 +802,5 @@ }else translation = NULL; if(ERROR_OCCURRED(ip_prepare_packet(src, dest, packet, translation))){ - pq_release(ip_globals.net_phone, packet_get_id(packet)); + pq_release_remote(ip_globals.net_phone, packet_get_id(packet)); }else{ packet = ip_split_packet(packet, netif->packet_dimension.prefix, netif->packet_dimension.content, netif->packet_dimension.suffix, netif->packet_dimension.addr_len, error); @@ -891,54 +894,69 @@ } -int ip_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ +int ip_message_standalone(ipc_callid_t callid, ipc_call_t *call, + ipc_call_t *answer, int * answer_count) +{ ERROR_DECLARE; - + packet_t packet; - struct sockaddr * addr; + struct sockaddr *addr; size_t addrlen; size_t prefix; size_t suffix; size_t content; - ip_pseudo_header_ref header; + void *header; size_t headerlen; device_id_t device_id; - + *answer_count = 0; - switch(IPC_GET_METHOD(*call)){ + switch (IPC_GET_METHOD(*call)) { case IPC_M_PHONE_HUNGUP: return EOK; case NET_IL_DEVICE: - return ip_device_req(0, IPC_GET_DEVICE(call), IPC_GET_SERVICE(call)); + return ip_device_req_local(0, IPC_GET_DEVICE(call), + IPC_GET_SERVICE(call)); case IPC_M_CONNECT_TO_ME: - return ip_register(IL_GET_PROTO(call), IL_GET_SERVICE(call), IPC_GET_PHONE(call), NULL); + return ip_register(IL_GET_PROTO(call), IL_GET_SERVICE(call), + IPC_GET_PHONE(call), NULL); case NET_IL_SEND: - ERROR_PROPAGATE(packet_translate(ip_globals.net_phone, &packet, IPC_GET_PACKET(call))); - return ip_send_msg(0, IPC_GET_DEVICE(call), packet, 0, IPC_GET_ERROR(call)); + ERROR_PROPAGATE(packet_translate_remote(ip_globals.net_phone, &packet, + IPC_GET_PACKET(call))); + return ip_send_msg_local(0, IPC_GET_DEVICE(call), packet, 0, + IPC_GET_ERROR(call)); case NET_IL_DEVICE_STATE: - return ip_device_state_message(IPC_GET_DEVICE(call), IPC_GET_STATE(call)); + return ip_device_state_message(IPC_GET_DEVICE(call), + IPC_GET_STATE(call)); case NET_IL_RECEIVED: - ERROR_PROPAGATE(packet_translate(ip_globals.net_phone, &packet, IPC_GET_PACKET(call))); + ERROR_PROPAGATE(packet_translate_remote(ip_globals.net_phone, &packet, + IPC_GET_PACKET(call))); return ip_receive_message(IPC_GET_DEVICE(call), packet); case NET_IP_RECEIVED_ERROR: - ERROR_PROPAGATE(packet_translate(ip_globals.net_phone, &packet, IPC_GET_PACKET(call))); - return ip_received_error_msg(0, IPC_GET_DEVICE(call), packet, IPC_GET_TARGET(call), IPC_GET_ERROR(call)); + ERROR_PROPAGATE(packet_translate_remote(ip_globals.net_phone, &packet, + IPC_GET_PACKET(call))); + return ip_received_error_msg_local(0, IPC_GET_DEVICE(call), packet, + IPC_GET_TARGET(call), IPC_GET_ERROR(call)); case NET_IP_ADD_ROUTE: - return ip_add_route_req(0, IPC_GET_DEVICE(call), IP_GET_ADDRESS(call), IP_GET_NETMASK(call), IP_GET_GATEWAY(call)); + return ip_add_route_req_local(0, IPC_GET_DEVICE(call), + IP_GET_ADDRESS(call), IP_GET_NETMASK(call), IP_GET_GATEWAY(call)); case NET_IP_SET_GATEWAY: - return ip_set_gateway_req(0, IPC_GET_DEVICE(call), IP_GET_GATEWAY(call)); + return ip_set_gateway_req_local(0, IPC_GET_DEVICE(call), + IP_GET_GATEWAY(call)); case NET_IP_GET_ROUTE: ERROR_PROPAGATE(data_receive((void **) &addr, &addrlen)); - ERROR_PROPAGATE(ip_get_route_req(0, IP_GET_PROTOCOL(call), addr, (socklen_t) addrlen, - &device_id, &header, &headerlen)); + ERROR_PROPAGATE(ip_get_route_req_local(0, IP_GET_PROTOCOL(call), + addr, (socklen_t) addrlen, &device_id, &header, &headerlen)); IPC_SET_DEVICE(answer, device_id); IP_SET_HEADERLEN(answer, headerlen); + *answer_count = 2; - if(! ERROR_OCCURRED(data_reply(&headerlen, sizeof(headerlen)))){ + + if (!ERROR_OCCURRED(data_reply(&headerlen, sizeof(headerlen)))) ERROR_CODE = data_reply(header, headerlen); - } + free(header); return ERROR_CODE; case NET_IL_PACKET_SPACE: - ERROR_PROPAGATE(ip_packet_size_message(IPC_GET_DEVICE(call), &addrlen, &prefix, &content, &suffix)); + ERROR_PROPAGATE(ip_packet_size_message(IPC_GET_DEVICE(call), + &addrlen, &prefix, &content, &suffix)); IPC_SET_ADDR(answer, addrlen); IPC_SET_PREFIX(answer, prefix); @@ -948,14 +966,20 @@ return EOK; case NET_IL_MTU_CHANGED: - return ip_mtu_changed_message(IPC_GET_DEVICE(call), IPC_GET_MTU(call)); - } + return ip_mtu_changed_message(IPC_GET_DEVICE(call), + IPC_GET_MTU(call)); + } + return ENOTSUP; } -int ip_packet_size_req(int ip_phone, device_id_t device_id, packet_dimension_ref packet_dimension){ - if(! packet_dimension){ +int ip_packet_size_req_local(int ip_phone, device_id_t device_id, + packet_dimension_ref packet_dimension) +{ + if (!packet_dimension) return EBADMEM; - } - return ip_packet_size_message(device_id, &packet_dimension->addr_len, &packet_dimension->prefix, &packet_dimension->content, &packet_dimension->suffix); + + return ip_packet_size_message(device_id, &packet_dimension->addr_len, + &packet_dimension->prefix, &packet_dimension->content, + &packet_dimension->suffix); } @@ -1003,5 +1027,5 @@ } -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){ +int ip_add_route_req_local(int ip_phone, device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway){ ip_route_ref route; ip_netif_ref netif; @@ -1067,5 +1091,6 @@ } -int ip_set_gateway_req(int ip_phone, device_id_t device_id, in_addr_t gateway){ +int ip_set_gateway_req_local(int ip_phone, device_id_t device_id, in_addr_t gateway) +{ ip_netif_ref netif; @@ -1112,5 +1137,5 @@ } }else{ - pq_release(ip_globals.net_phone, packet_get_id(next)); + pq_release_remote(ip_globals.net_phone, packet_get_id(next)); } next = new_packet; @@ -1153,5 +1178,5 @@ } // create the last fragment - new_packet = packet_get_4(ip_globals.net_phone, prefix, length, suffix, ((addrlen > addr_len) ? addrlen : addr_len)); + new_packet = packet_get_4_remote(ip_globals.net_phone, prefix, length, suffix, ((addrlen > addr_len) ? addrlen : addr_len)); if(! new_packet){ return ENOMEM; @@ -1177,5 +1202,5 @@ // create middle framgents while(IP_TOTAL_LENGTH(header) > length){ - new_packet = packet_get_4(ip_globals.net_phone, prefix, length, suffix, ((addrlen >= addr_len) ? addrlen : addr_len)); + new_packet = packet_get_4_remote(ip_globals.net_phone, prefix, length, suffix, ((addrlen >= addr_len) ? addrlen : addr_len)); if(! new_packet){ return ENOMEM; @@ -1357,5 +1382,18 @@ } -int ip_received_error_msg(int ip_phone, device_id_t device_id, packet_t packet, services_t target, services_t error){ +/** 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_local(int ip_phone, device_id_t device_id, packet_t packet, services_t target, services_t error){ uint8_t * data; int offset; @@ -1492,5 +1530,5 @@ next = pq_detach(packet); if(next){ - pq_release(ip_globals.net_phone, packet_get_id(next)); + pq_release_remote(ip_globals.net_phone, packet_get_id(next)); } if(! header){ @@ -1556,9 +1594,9 @@ int ip_release_and_return(packet_t packet, int result){ - pq_release(ip_globals.net_phone, packet_get_id(packet)); + pq_release_remote(ip_globals.net_phone, packet_get_id(packet)); return result; } -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){ +int ip_get_route_req_local(int ip_phone, ip_protocol_t protocol, const struct sockaddr * destination, socklen_t addrlen, device_id_t * device_id, void **header, size_t * headerlen){ struct sockaddr_in * address_in; // struct sockaddr_in6 * address_in6; @@ -1624,11 +1662,7 @@ header_in->protocol = protocol; header_in->data_length = 0; - *header = (ip_pseudo_header_ref) header_in; + *header = header_in; return EOK; } - -#ifdef CONFIG_NETWORKING_modular - -#include /** Default thread for new connections. @@ -1658,5 +1692,6 @@ /* Process the message */ - int res = il_module_message(callid, &call, &answer, &answer_count); + int res = il_module_message_standalone(callid, &call, &answer, + &answer_count); /* End if said to either by the message or the processing result */ @@ -1683,5 +1718,5 @@ /* Start the module */ - if (ERROR_OCCURRED(il_module_start(il_client_connection))) + if (ERROR_OCCURRED(il_module_start_standalone(il_client_connection))) return ERROR_CODE; @@ -1689,6 +1724,4 @@ } -#endif /* CONFIG_NETWORKING_modular */ - /** @} */ Index: uspace/srv/net/il/ip/ip_module.c =================================================================== --- uspace/srv/net/il/ip/ip_module.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/il/ip/ip_module.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -47,5 +47,5 @@ #include #include -#include +#include #include "ip.h" @@ -54,5 +54,5 @@ /** IP module global data. */ -extern ip_globals_t ip_globals; +extern ip_globals_t ip_globals; /** Processes the IP message. @@ -64,6 +64,6 @@ * @returns Other error codes as defined for the ip_message() function. */ -int il_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ - return ip_message(callid, call, answer, answer_count); +int il_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ + return ip_message_standalone(callid, call, answer, answer_count); } @@ -75,20 +75,20 @@ * @returns Other error codes as defined for the REGISTER_ME() macro function. */ -int il_module_start(async_client_conn_t client_connection){ +int il_module_start_standalone(async_client_conn_t client_connection){ ERROR_DECLARE; - - ipcarg_t phonehash; - + async_set_client_connection(client_connection); ip_globals.net_phone = net_connect_module(SERVICE_NETWORKING); ERROR_PROPAGATE(pm_init()); - if(ERROR_OCCURRED(ip_initialize(client_connection)) - || ERROR_OCCURRED(REGISTER_ME(SERVICE_IP, &phonehash))){ + + ipcarg_t phonehash; + if (ERROR_OCCURRED(ip_initialize(client_connection)) + || ERROR_OCCURRED(REGISTER_ME(SERVICE_IP, &phonehash))) { pm_destroy(); return ERROR_CODE; } - + async_manager(); - + pm_destroy(); return EOK; Index: uspace/srv/net/il/ip/ip_module.h =================================================================== --- uspace/srv/net/il/ip/ip_module.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/il/ip/ip_module.h (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -59,5 +59,5 @@ * @see IS_NET_IP_MESSAGE() */ -int ip_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count); +int ip_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count); #endif Index: uspace/srv/net/net/Makefile =================================================================== --- uspace/srv/net/net/Makefile (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/net/Makefile (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -30,6 +30,6 @@ USPACE_PREFIX = ../../.. ROOT_PATH = $(USPACE_PREFIX)/.. -LIBS = $(LIBNETIF_PREFIX)/libnetif.a $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a -EXTRA_CFLAGS = -I$(LIBNETIF_PREFIX)/include -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include +LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a +EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common Index: uspace/srv/net/net/net.c =================================================================== --- uspace/srv/net/net/net.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/net/net.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -56,6 +56,6 @@ #include #include +#include #include -#include #include #include @@ -461,5 +461,5 @@ int io = setting ? strtol(setting->value, NULL, 16) : 0; - ERROR_PROPAGATE(netif_probe_req(netif->driver->phone, netif->id, irq, io)); + ERROR_PROPAGATE(netif_probe_req_remote(netif->driver->phone, netif->id, irq, io)); /* Network interface layer startup */ @@ -490,5 +490,5 @@ } - ERROR_PROPAGATE(netif_start_req(netif->driver->phone, netif->id)); + ERROR_PROPAGATE(netif_start_req_remote(netif->driver->phone, netif->id)); return EOK; } Index: uspace/srv/net/net/net_standalone.c =================================================================== --- uspace/srv/net/net/net_standalone.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/net/net_standalone.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -49,49 +49,60 @@ /** Networking module global data. */ -extern net_globals_t net_globals; +extern net_globals_t net_globals; -/** Initializes the networking module for the chosen subsystem build type. - * @param[in] client_connection The client connection processing function. The module skeleton propagates its own one. - * @returns EOK on success. - * @returns ENOMEM if there is not enough memory left. +/** Initialize the networking module for the chosen subsystem build type. + * + * @param[in] client_connection The client connection processing function. + * The module skeleton propagates its own one. + * + * @return EOK on success. + * @return ENOMEM if there is not enough memory left. + * */ int net_initialize_build(async_client_conn_t client_connection){ ERROR_DECLARE; - - task_id_t task_id; - - task_id = spawn("/srv/ip"); - if(! task_id){ + + task_id_t task_id = spawn("/srv/ip"); + if (!task_id) return EINVAL; - } - ERROR_PROPAGATE(add_module(NULL, &net_globals.modules, IP_NAME, IP_FILENAME, SERVICE_IP, task_id, ip_connect_module)); - if(! spawn("/srv/icmp")){ + + ERROR_PROPAGATE(add_module(NULL, &net_globals.modules, IP_NAME, + IP_FILENAME, SERVICE_IP, task_id, ip_connect_module)); + + if (!spawn("/srv/icmp")) return EINVAL; - } - if(! spawn("/srv/udp")){ + + if (!spawn("/srv/udp")) return EINVAL; - } - if(! spawn("/srv/tcp")){ + + if (!spawn("/srv/tcp")) return EINVAL; - } + return EOK; } -/** Processes the module message. - * Distributes the message to the right bundled module. - * @param[in] callid The message identifier. - * @param[in] call The message parameters. - * @param[out] answer The message answer parameters. - * @param[out] answer_count The last parameter for the actual answer in the answer parameter. - * @returns EOK on success. - * @returns ENOTSUP if the message is not known. - * @returns Other error codes as defined for each bundled module message function. +/** Process the module message. + * + * Distribute the message to the right module. + * + * @param[in] callid The message identifier. + * @param[in] call The message parameters. + * @param[out] answer The message answer parameters. + * @param[out] answer_count The last parameter for the actual answer in + * the answer parameter. + * + * @return EOK on success. + * @return ENOTSUP if the message is not known. + * @return Other error codes as defined for each bundled module + * message function. + * */ -int net_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ - if(IS_NET_PACKET_MESSAGE(call)){ +int net_module_message(ipc_callid_t callid, ipc_call_t *call, + ipc_call_t *answer, int *answer_count) +{ + if (IS_NET_PACKET_MESSAGE(call)) return packet_server_message(callid, call, answer, answer_count); - }else{ - return net_message(callid, call, answer, answer_count); - } + + return net_message(callid, call, answer, answer_count); } Index: uspace/srv/net/netif/lo/Makefile =================================================================== --- uspace/srv/net/netif/lo/Makefile (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/netif/lo/Makefile (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -39,11 +39,9 @@ -include $(CONFIG_MAKEFILE) -ifeq ($(CONFIG_NETWORKING),modular) - BINARY = lo +ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y) + LIBS += $(USPACE_PREFIX)/srv/net/nil/nildummy/libnildummy.a endif -ifeq ($(CONFIG_NETWORKING),module) - LIBRARY = liblo -endif +BINARY = lo SOURCES = \ Index: uspace/srv/net/netif/lo/lo.c =================================================================== --- uspace/srv/net/netif/lo/lo.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/netif/lo/lo.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -51,6 +51,6 @@ #include #include -#include -#include +#include +#include /** Default hardware address. @@ -76,5 +76,5 @@ * @returns EOK otherwise. */ -int change_state_message(device_ref device, device_state_t state); +int change_state_message(netif_device_t * device, device_state_t state); /** Creates and returns the loopback network interface structure. @@ -85,5 +85,5 @@ * @returns ENOMEM if there is not enough memory left. */ -int create(device_id_t device_id, device_ref * device); +int create(device_id_t device_id, netif_device_t * * device); int netif_specific_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ @@ -103,5 +103,5 @@ ERROR_DECLARE; - device_ref device; + netif_device_t * device; if(! stats){ @@ -113,5 +113,5 @@ } -int change_state_message(device_ref device, device_state_t state) +int change_state_message(netif_device_t * device, device_state_t state) { if (device->state != state) { @@ -127,11 +127,11 @@ } -int create(device_id_t device_id, device_ref * device){ +int create(device_id_t device_id, netif_device_t * * device){ int index; - if(device_map_count(&netif_globals.device_map) > 0){ + if(netif_device_map_count(&netif_globals.device_map) > 0){ return EXDEV; }else{ - *device = (device_ref) malloc(sizeof(device_t)); + *device = (netif_device_t *) malloc(sizeof(netif_device_t)); if(!(*device)){ return ENOMEM; @@ -146,5 +146,5 @@ (** device).nil_phone = -1; (** device).state = NETIF_STOPPED; - index = device_map_add(&netif_globals.device_map, (** device).device_id, * device); + index = netif_device_map_add(&netif_globals.device_map, (** device).device_id, * device); if(index < 0){ free(*device); @@ -166,5 +166,5 @@ ERROR_DECLARE; - device_ref device; + netif_device_t * device; // create a new device @@ -178,5 +178,5 @@ ERROR_DECLARE; - device_ref device; + netif_device_t * device; size_t length; packet_t next; @@ -204,23 +204,19 @@ } -int netif_start_message(device_ref device){ +int netif_start_message(netif_device_t * device){ return change_state_message(device, NETIF_ACTIVE); } -int netif_stop_message(device_ref device){ +int netif_stop_message(netif_device_t * device){ return change_state_message(device, NETIF_STOPPED); } -#ifdef CONFIG_NETWORKING_modular - -#include - /** Default thread for new connections. * - * @param[in] iid The initial message identifier. - * @param[in] icall The initial message call structure. - * - */ -static void netif_client_connection(ipc_callid_t iid, ipc_call_t * icall) + * @param[in] iid The initial message identifier. + * @param[in] icall The initial message call structure. + * + */ +static void netif_client_connection(ipc_callid_t iid, ipc_call_t *icall) { /* @@ -254,13 +250,4 @@ } -/** Starts the module. - * - * @param argc The count of the command line arguments. Ignored parameter. - * @param argv The command line parameters. Ignored parameter. - * - * @returns EOK on success. - * @returns Other error codes as defined for each specific module start function. - * - */ int main(int argc, char *argv[]) { @@ -274,6 +261,4 @@ } -#endif /* CONFIG_NETWORKING_modular */ - /** @} */ Index: uspace/srv/net/nil/eth/Makefile =================================================================== --- uspace/srv/net/nil/eth/Makefile (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/nil/eth/Makefile (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -29,7 +29,19 @@ USPACE_PREFIX = ../../../.. -LIBS = $(LIBNETIF_PREFIX)/libnetif.a $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a -EXTRA_CFLAGS = -I$(LIBNETIF_PREFIX)/include -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include -BINARY = eth +ROOT_PATH = $(USPACE_PREFIX)/.. +LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a +EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include + +COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common +CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config + +-include $(COMMON_MAKEFILE) +-include $(CONFIG_MAKEFILE) + +ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y) + LIBRARY = libeth +else + BINARY = eth +endif SOURCES = \ Index: uspace/srv/net/nil/eth/eth.c =================================================================== --- uspace/srv/net/nil/eth/eth.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/nil/eth/eth.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -60,5 +60,6 @@ #include #include -#include +#include +#include #include "eth.h" @@ -271,5 +272,5 @@ INT_MAP_IMPLEMENT(eth_protos, eth_proto_t) -int nil_device_state_msg(int nil_phone, device_id_t device_id, int state){ +int nil_device_state_msg_local(int nil_phone, device_id_t device_id, int state){ int index; eth_proto_ref proto; @@ -475,5 +476,5 @@ } -int nil_received_msg(int nil_phone, device_id_t device_id, packet_t packet, services_t target){ +int nil_received_msg_local(int nil_phone, device_id_t device_id, packet_t packet, services_t target){ eth_proto_ref proto; packet_t next; @@ -497,5 +498,5 @@ }else{ // drop invalid/unknown - pq_release(eth_globals.net_phone, packet_get_id(packet)); + pq_release_remote(eth_globals.net_phone, packet_get_id(packet)); } packet = next; @@ -681,5 +682,5 @@ ethertype = htons(protocol_map(SERVICE_ETHERNET, sender)); if(! ethertype){ - pq_release(eth_globals.net_phone, packet_get_id(packet)); + pq_release_remote(eth_globals.net_phone, packet_get_id(packet)); return EINVAL; } @@ -699,5 +700,5 @@ packet = tmp; } - pq_release(eth_globals.net_phone, packet_get_id(next)); + pq_release_remote(eth_globals.net_phone, packet_get_id(next)); next = tmp; }else{ @@ -713,5 +714,5 @@ } -int nil_message(const char *name, ipc_callid_t callid, ipc_call_t *call, +int nil_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, int *answer_count) { @@ -733,5 +734,5 @@ IPC_GET_SERVICE(call), IPC_GET_MTU(call)); case NET_NIL_SEND: - ERROR_PROPAGATE(packet_translate(eth_globals.net_phone, &packet, + ERROR_PROPAGATE(packet_translate_remote(eth_globals.net_phone, &packet, IPC_GET_PACKET(call))); return eth_send_message(IPC_GET_DEVICE(call), packet, @@ -771,10 +772,10 @@ switch(IPC_GET_METHOD(*icall)){ case NET_NIL_DEVICE_STATE: - nil_device_state_msg(0, IPC_GET_DEVICE(icall), IPC_GET_STATE(icall)); + nil_device_state_msg_local(0, IPC_GET_DEVICE(icall), IPC_GET_STATE(icall)); ipc_answer_0(iid, EOK); break; case NET_NIL_RECEIVED: - if(! ERROR_OCCURRED(packet_translate(eth_globals.net_phone, &packet, IPC_GET_PACKET(icall)))){ - ERROR_CODE = nil_received_msg(0, IPC_GET_DEVICE(icall), packet, 0); + if(! ERROR_OCCURRED(packet_translate_remote(eth_globals.net_phone, &packet, IPC_GET_PACKET(icall)))){ + ERROR_CODE = nil_received_msg_local(0, IPC_GET_DEVICE(icall), packet, 0); } ipc_answer_0(iid, (ipcarg_t) ERROR_CODE); @@ -787,15 +788,13 @@ } -#ifdef CONFIG_NETWORKING_modular - -#include +#ifndef CONFIG_NETIF_NIL_BUNDLE /** Default thread for new connections. * - * @param[in] iid The initial message identifier. - * @param[in] icall The initial message call structure. + * @param[in] iid The initial message identifier. + * @param[in] icall The initial message call structure. * */ -static void nil_client_connection(ipc_callid_t iid, ipc_call_t * icall) +static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall) { /* @@ -817,5 +816,5 @@ /* Process the message */ - int res = nil_module_message(NAME, callid, &call, &answer, + int res = nil_module_message_standalone(NAME, callid, &call, &answer, &answer_count); @@ -829,13 +828,4 @@ } -/** Starts the module. - * - * @param argc The count of the command line arguments. Ignored parameter. - * @param argv The command line parameters. Ignored parameter. - * - * @returns EOK on success. - * @returns Other error codes as defined for each specific module start function. - * - */ int main(int argc, char *argv[]) { @@ -843,5 +833,5 @@ /* Start the module */ - if (ERROR_OCCURRED(nil_module_start(nil_client_connection))) + if (ERROR_OCCURRED(nil_module_start_standalone(nil_client_connection))) return ERROR_CODE; @@ -849,5 +839,5 @@ } -#endif /* CONFIG_NETWORKING_modular */ +#endif /* CONFIG_NETIF_NIL_BUNDLE */ /** @} Index: uspace/srv/net/nil/eth/eth_module.c =================================================================== --- uspace/srv/net/nil/eth/eth_module.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/nil/eth/eth_module.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -46,6 +46,5 @@ #include #include -#include -#include +#include #include "eth.h" @@ -59,21 +58,21 @@ * @returns Other error codes as defined for the REGISTER_ME() macro function. */ -int nil_module_start(async_client_conn_t client_connection){ +int nil_module_start_standalone(async_client_conn_t client_connection) +{ ERROR_DECLARE; - + + async_set_client_connection(client_connection); + int net_phone = net_connect_module(SERVICE_NETWORKING); + ERROR_PROPAGATE(pm_init()); + ipcarg_t phonehash; - int net_phone; - - async_set_client_connection(client_connection); - net_phone = net_connect_module(SERVICE_NETWORKING); - ERROR_PROPAGATE(pm_init()); - if(ERROR_OCCURRED(nil_initialize(net_phone)) - || ERROR_OCCURRED(REGISTER_ME(SERVICE_ETHERNET, &phonehash))){ + if (ERROR_OCCURRED(nil_initialize(net_phone)) + || ERROR_OCCURRED(REGISTER_ME(SERVICE_ETHERNET, &phonehash))) { pm_destroy(); return ERROR_CODE; } - + async_manager(); - + pm_destroy(); return EOK; @@ -95,8 +94,8 @@ * */ -int nil_module_message(const char *name, ipc_callid_t callid, ipc_call_t *call, +int nil_module_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, int *answer_count) { - return nil_message(name, callid, call, answer, answer_count); + return nil_message_standalone(name, callid, call, answer, answer_count); } Index: uspace/srv/net/nil/nildummy/Makefile =================================================================== --- uspace/srv/net/nil/nildummy/Makefile (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/nil/nildummy/Makefile (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -29,7 +29,19 @@ USPACE_PREFIX = ../../../.. -LIBS = $(LIBNETIF_PREFIX)/libnetif.a $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a -EXTRA_CFLAGS = -I$(LIBNETIF_PREFIX)/include -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include -BINARY = nildummy +ROOT_PATH = $(USPACE_PREFIX)/.. +LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a +EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include + +COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common +CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config + +-include $(COMMON_MAKEFILE) +-include $(CONFIG_MAKEFILE) + +ifeq ($(CONFIG_NETIF_NIL_BUNDLE),y) + LIBRARY = libnildummy +else + BINARY = nildummy +endif SOURCES = \ Index: uspace/srv/net/nil/nildummy/nildummy.c =================================================================== --- uspace/srv/net/nil/nildummy/nildummy.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/nil/nildummy/nildummy.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -28,10 +28,10 @@ /** @addtogroup nildummy - * @{ + * @{ */ /** @file - * Dummy network interface layer module implementation. - * @see nildummy.h + * Dummy network interface layer module implementation. + * @see nildummy.h */ @@ -41,5 +41,4 @@ #include #include - #include #include @@ -54,113 +53,106 @@ #include #include -#include +#include +#include #include "nildummy.h" /** The module name. + * */ #define NAME "nildummy" /** Default maximum transmission unit. - */ -#define NET_DEFAULT_MTU 1500 + * + */ +#define NET_DEFAULT_MTU 1500 /** Network interface layer module global data. - */ -nildummy_globals_t nildummy_globals; - -/** @name Message processing functions - */ -/*@{*/ - -/** Processes IPC messages from the registered device driver modules in an infinite loop. - * @param[in] iid The message identifier. - * @param[in,out] icall The message parameters. - */ -void nildummy_receiver(ipc_callid_t iid, ipc_call_t * icall); - -/** Registers new device or updates the MTU of an existing one. - * Determines the device local hardware address. - * @param[in] device_id The new device identifier. - * @param[in] service The device driver service. - * @param[in] mtu The device maximum transmission unit. - * @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 netif_bind_service() function. - * @returns Other error codes as defined for the netif_get_addr_req() function. - */ -int nildummy_device_message(device_id_t device_id, services_t service, size_t mtu); - -/** Returns the device packet dimensions for sending. - * @param[in] device_id The device identifier. - * @param[out] addr_len The minimum reserved address length. - * @param[out] prefix The minimum reserved prefix size. - * @param[out] content The maximum content size. - * @param[out] suffix The minimum reserved suffix size. - * @returns EOK on success. - * @returns EBADMEM if either one of the parameters is NULL. - * @returns ENOENT if there is no such device. - */ -int nildummy_packet_space_message(device_id_t device_id, size_t * addr_len, size_t * prefix, size_t * content, size_t * suffix); - -/** Registers receiving module service. - * Passes received packets for this service. - * @param[in] service The module service. - * @param[in] phone The service phone. - * @returns EOK on success. - * @returns ENOENT if the service is not known. - * @returns ENOMEM if there is not enough memory left. - */ -int nildummy_register_message(services_t service, int phone); - -/** 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 ENOENT if there no such device. - * @returns EINVAL if the service parameter is not known. - */ -int nildummy_send_message(device_id_t device_id, packet_t packet, services_t sender); - -/** Returns the device hardware address. - * @param[in] device_id The device identifier. - * @param[out] address The device hardware address. - * @returns EOK on success. - * @returns EBADMEM if the address parameter is NULL. - * @returns ENOENT if there no such device. - */ -int nildummy_addr_message(device_id_t device_id, measured_string_ref * address); - -/*@}*/ - -DEVICE_MAP_IMPLEMENT(nildummy_devices, nildummy_device_t) - -int nil_device_state_msg(int nil_phone, device_id_t device_id, int state){ + * + */ +nildummy_globals_t nildummy_globals; + +DEVICE_MAP_IMPLEMENT(nildummy_devices, nildummy_device_t); + +int nil_device_state_msg_local(int nil_phone, device_id_t device_id, int state) +{ fibril_rwlock_read_lock(&nildummy_globals.protos_lock); - if(nildummy_globals.proto.phone){ - il_device_state_msg(nildummy_globals.proto.phone, device_id, state, nildummy_globals.proto.service); - } + + if (nildummy_globals.proto.phone) + il_device_state_msg(nildummy_globals.proto.phone, device_id, state, + nildummy_globals.proto.service); + fibril_rwlock_read_unlock(&nildummy_globals.protos_lock); - return EOK; -} - -int nil_initialize(int net_phone){ + + return EOK; +} + +int nil_initialize(int net_phone) +{ ERROR_DECLARE; - + fibril_rwlock_initialize(&nildummy_globals.devices_lock); fibril_rwlock_initialize(&nildummy_globals.protos_lock); fibril_rwlock_write_lock(&nildummy_globals.devices_lock); fibril_rwlock_write_lock(&nildummy_globals.protos_lock); + nildummy_globals.net_phone = net_phone; nildummy_globals.proto.phone = 0; ERROR_PROPAGATE(nildummy_devices_initialize(&nildummy_globals.devices)); + fibril_rwlock_write_unlock(&nildummy_globals.protos_lock); fibril_rwlock_write_unlock(&nildummy_globals.devices_lock); - return EOK; -} - -int nildummy_device_message(device_id_t device_id, services_t service, size_t mtu){ + + return EOK; +} + +/** Process IPC messages from the registered device driver modules in an infinite loop. + * + * @param[in] iid The message identifier. + * @param[in,out] icall The message parameters. + * + */ +static void nildummy_receiver(ipc_callid_t iid, ipc_call_t * icall){ + ERROR_DECLARE; + + packet_t packet; + + while(true){ + switch(IPC_GET_METHOD(*icall)){ + case NET_NIL_DEVICE_STATE: + ERROR_CODE = nil_device_state_msg_local(0, IPC_GET_DEVICE(icall), IPC_GET_STATE(icall)); + ipc_answer_0(iid, (ipcarg_t) ERROR_CODE); + break; + case NET_NIL_RECEIVED: + if(! ERROR_OCCURRED(packet_translate_remote(nildummy_globals.net_phone, &packet, IPC_GET_PACKET(icall)))){ + ERROR_CODE = nil_received_msg_local(0, IPC_GET_DEVICE(icall), packet, 0); + } + ipc_answer_0(iid, (ipcarg_t) ERROR_CODE); + break; + default: + ipc_answer_0(iid, (ipcarg_t) ENOTSUP); + } + iid = async_get_call(icall); + } +} + +/** Register new device or updates the MTU of an existing one. + * + * Determine the device local hardware address. + * + * @param[in] device_id The new device identifier. + * @param[in] service The device driver service. + * @param[in] mtu The device maximum transmission unit. + * + * @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 netif_bind_service() function. + * @returns Other error codes as defined for the netif_get_addr_req() function. + * + */ +static int nildummy_device_message(device_id_t device_id, services_t service, + size_t mtu) +{ ERROR_DECLARE; @@ -235,5 +227,17 @@ } -int nildummy_addr_message(device_id_t device_id, measured_string_ref * address){ +/** Return the device hardware address. + * + * @param[in] device_id The device identifier. + * @param[out] address The device hardware address. + * + * @return EOK on success. + * @return EBADMEM if the address parameter is NULL. + * @return ENOENT if there no such device. + * + */ +static int nildummy_addr_message(device_id_t device_id, + measured_string_ref *address) +{ nildummy_device_ref device; @@ -252,5 +256,20 @@ } -int nildummy_packet_space_message(device_id_t device_id, size_t * addr_len, size_t * prefix, size_t * content, size_t * suffix){ +/** Return the device packet dimensions for sending. + * + * @param[in] device_id The device identifier. + * @param[out] addr_len The minimum reserved address length. + * @param[out] prefix The minimum reserved prefix size. + * @param[out] content The maximum content size. + * @param[out] suffix The minimum reserved suffix size. + * + * @return EOK on success. + * @return EBADMEM if either one of the parameters is NULL. + * @return ENOENT if there is no such device. + * + */ +static int nildummy_packet_space_message(device_id_t device_id, + size_t *addr_len, size_t *prefix, size_t *content, size_t *suffix) +{ nildummy_device_ref device; @@ -272,5 +291,5 @@ } -int nil_received_msg(int nil_phone, device_id_t device_id, packet_t packet, services_t target){ +int nil_received_msg_local(int nil_phone, device_id_t device_id, packet_t packet, services_t target){ packet_t next; @@ -287,5 +306,18 @@ } -int nildummy_register_message(services_t service, int phone){ +/** Register receiving module service. + * + * Pass received packets for this service. + * + * @param[in] service The module service. + * @param[in] phone The service phone. + * + * @return EOK on success. + * @return ENOENT if the service is not known. + * @return ENOMEM if there is not enough memory left. + * + */ +static int nildummy_register_message(services_t service, int phone) +{ fibril_rwlock_write_lock(&nildummy_globals.protos_lock); nildummy_globals.proto.service = service; @@ -299,5 +331,18 @@ } -int nildummy_send_message(device_id_t device_id, packet_t packet, services_t sender){ +/** Send the packet queue. + * + * @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 ENOENT if there no such device. + * @return EINVAL if the service parameter is not known. + * + */ +static int nildummy_send_message(device_id_t device_id, packet_t packet, + services_t sender) +{ nildummy_device_ref device; @@ -316,5 +361,5 @@ } -int nil_message(const char *name, ipc_callid_t callid, ipc_call_t *call, +int nil_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, int *answer_count) { @@ -336,5 +381,5 @@ IPC_GET_SERVICE(call), IPC_GET_MTU(call)); case NET_NIL_SEND: - ERROR_PROPAGATE(packet_translate(nildummy_globals.net_phone, + ERROR_PROPAGATE(packet_translate_remote(nildummy_globals.net_phone, &packet, IPC_GET_PACKET(call))); return nildummy_send_message(IPC_GET_DEVICE(call), packet, @@ -353,4 +398,8 @@ &address)); return measured_strings_reply(address, 1); + case NET_NIL_BROADCAST_ADDR: + ERROR_PROPAGATE(nildummy_addr_message(IPC_GET_DEVICE(call), + &address)); + return measured_strings_reply(address, 1); case IPC_M_CONNECT_TO_ME: return nildummy_register_message(NIL_GET_PROTO(call), @@ -361,40 +410,13 @@ } -void nildummy_receiver(ipc_callid_t iid, ipc_call_t * icall){ - ERROR_DECLARE; - - packet_t packet; - - while(true){ -// printf("message %d - %d\n", IPC_GET_METHOD(*icall), NET_NIL_FIRST); - switch(IPC_GET_METHOD(*icall)){ - case NET_NIL_DEVICE_STATE: - ERROR_CODE = nil_device_state_msg(0, IPC_GET_DEVICE(icall), IPC_GET_STATE(icall)); - ipc_answer_0(iid, (ipcarg_t) ERROR_CODE); - break; - case NET_NIL_RECEIVED: - if(! ERROR_OCCURRED(packet_translate(nildummy_globals.net_phone, &packet, IPC_GET_PACKET(icall)))){ - ERROR_CODE = nil_received_msg(0, IPC_GET_DEVICE(icall), packet, 0); - } - ipc_answer_0(iid, (ipcarg_t) ERROR_CODE); - break; - default: - ipc_answer_0(iid, (ipcarg_t) ENOTSUP); - } - iid = async_get_call(icall); - } -} - -#ifdef CONFIG_NETWORKING_modular - -#include +#ifndef CONFIG_NETIF_NIL_BUNDLE /** Default thread for new connections. * - * @param[in] iid The initial message identifier. - * @param[in] icall The initial message call structure. - * - */ -static void nil_client_connection(ipc_callid_t iid, ipc_call_t * icall) + * @param[in] iid The initial message identifier. + * @param[in] icall The initial message call structure. + * + */ +static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall) { /* @@ -416,5 +438,5 @@ /* Process the message */ - int res = nil_module_message(NAME, callid, &call, &answer, + int res = nil_module_message_standalone(NAME, callid, &call, &answer, &answer_count); @@ -428,13 +450,4 @@ } -/** Starts the module. - * - * @param argc The count of the command line arguments. Ignored parameter. - * @param argv The command line parameters. Ignored parameter. - * - * @returns EOK on success. - * @returns Other error codes as defined for each specific module start function. - * - */ int main(int argc, char *argv[]) { @@ -442,5 +455,5 @@ /* Start the module */ - if (ERROR_OCCURRED(nil_module_start(nil_client_connection))) + if (ERROR_OCCURRED(nil_module_start_standalone(nil_client_connection))) return ERROR_CODE; @@ -448,5 +461,5 @@ } -#endif /* CONFIG_NETWORKING_modular */ +#endif /* CONFIG_NETIF_NIL_BUNDLE */ /** @} Index: uspace/srv/net/nil/nildummy/nildummy_module.c =================================================================== --- uspace/srv/net/nil/nildummy/nildummy_module.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/nil/nildummy/nildummy_module.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -46,6 +46,5 @@ #include #include -#include -#include +#include #include "nildummy.h" @@ -67,5 +66,5 @@ * */ -int nil_module_start(async_client_conn_t client_connection) +int nil_module_start_standalone(async_client_conn_t client_connection) { ERROR_DECLARE; @@ -103,8 +102,8 @@ * */ -int nil_module_message(const char *name, ipc_callid_t callid, +int nil_module_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, int *answer_count) { - return nil_message(name, callid, call, answer, answer_count); + return nil_message_standalone(name, callid, call, answer, answer_count); } Index: uspace/srv/net/tl/icmp/icmp.c =================================================================== --- uspace/srv/net/tl/icmp/icmp.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/tl/icmp/icmp.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -51,4 +51,5 @@ #include #include +#include #include #include @@ -67,4 +68,6 @@ #include #include +#include +#include #include #include @@ -288,5 +291,5 @@ // TODO do not ask all the time ERROR_PROPAGATE(ip_packet_size_req(icmp_globals.ip_phone, -1, &icmp_globals.packet_dimension)); - packet = packet_get_4(icmp_globals.net_phone, size, icmp_globals.packet_dimension.addr_len, ICMP_HEADER_SIZE + icmp_globals.packet_dimension.prefix, icmp_globals.packet_dimension.suffix); + packet = packet_get_4_remote(icmp_globals.net_phone, size, icmp_globals.packet_dimension.addr_len, ICMP_HEADER_SIZE + icmp_globals.packet_dimension.prefix, icmp_globals.packet_dimension.suffix); if(! packet){ return ENOMEM; @@ -626,5 +629,5 @@ // compute the reply key reply_key = ICMP_GET_REPLY_KEY(header->un.echo.identifier, header->un.echo.sequence_number); - pq_release(icmp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(icmp_globals.net_phone, packet_get_id(packet)); // lock the globals fibril_rwlock_write_lock(&icmp_globals.lock); @@ -641,5 +644,5 @@ } -int icmp_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ +int icmp_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ ERROR_DECLARE; @@ -649,5 +652,5 @@ switch(IPC_GET_METHOD(*call)){ case NET_TL_RECEIVED: - if(! ERROR_OCCURRED(packet_translate(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ + if(! ERROR_OCCURRED(packet_translate_remote(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ ERROR_CODE = icmp_received_msg(IPC_GET_DEVICE(call), packet, SERVICE_ICMP, IPC_GET_ERROR(call)); } @@ -759,20 +762,20 @@ switch(IPC_GET_METHOD(*call)){ case NET_ICMP_DEST_UNREACH: - if(! ERROR_OCCURRED(packet_translate(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ + if(! ERROR_OCCURRED(packet_translate_remote(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ ERROR_CODE = icmp_destination_unreachable_msg(0, ICMP_GET_CODE(call), ICMP_GET_MTU(call), packet); } return ERROR_CODE; case NET_ICMP_SOURCE_QUENCH: - if(! ERROR_OCCURRED(packet_translate(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ + if(! ERROR_OCCURRED(packet_translate_remote(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ ERROR_CODE = icmp_source_quench_msg(0, packet); } return ERROR_CODE; case NET_ICMP_TIME_EXCEEDED: - if(! ERROR_OCCURRED(packet_translate(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ + if(! ERROR_OCCURRED(packet_translate_remote(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ ERROR_CODE = icmp_time_exceeded_msg(0, ICMP_GET_CODE(call), packet); } return ERROR_CODE; case NET_ICMP_PARAMETERPROB: - if(! ERROR_OCCURRED(packet_translate(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ + if(! ERROR_OCCURRED(packet_translate_remote(icmp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ ERROR_CODE = icmp_parameter_problem_msg(0, ICMP_GET_CODE(call), ICMP_GET_POINTER(call), packet); } @@ -784,5 +787,5 @@ int icmp_release_and_return(packet_t packet, int result){ - pq_release(icmp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(icmp_globals.net_phone, packet_get_id(packet)); return result; } @@ -819,8 +822,4 @@ } -#ifdef CONFIG_NETWORKING_modular - -#include - /** Default thread for new connections. * @@ -849,5 +848,6 @@ /* Process the message */ - int res = tl_module_message(callid, &call, &answer, &answer_count); + int res = tl_module_message_standalone(callid, &call, &answer, + &answer_count); /* End if said to either by the message or the processing result */ @@ -874,5 +874,5 @@ /* Start the module */ - if (ERROR_OCCURRED(tl_module_start(tl_client_connection))) + if (ERROR_OCCURRED(tl_module_start_standalone(tl_client_connection))) return ERROR_CODE; @@ -880,6 +880,4 @@ } -#endif /* CONFIG_NETWORKING_modular */ - /** @} */ Index: uspace/srv/net/tl/icmp/icmp_module.c =================================================================== --- uspace/srv/net/tl/icmp/icmp_module.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/tl/icmp/icmp_module.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -47,5 +47,5 @@ #include #include -#include +#include #include "icmp.h" @@ -63,5 +63,5 @@ * @returns Other error codes as defined for the REGISTER_ME() macro function. */ -int tl_module_start(async_client_conn_t client_connection){ +int tl_module_start_standalone(async_client_conn_t client_connection){ ERROR_DECLARE; @@ -94,6 +94,6 @@ * @returns Other error codes as defined for the icmp_message() function. */ -int tl_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ - return icmp_message(callid, call, answer, answer_count); +int tl_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ + return icmp_message_standalone(callid, call, answer, answer_count); } Index: uspace/srv/net/tl/icmp/icmp_module.h =================================================================== --- uspace/srv/net/tl/icmp/icmp_module.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/tl/icmp/icmp_module.h (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -59,5 +59,5 @@ * @see IS_NET_ICMP_MESSAGE() */ -int icmp_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count); +int icmp_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count); #endif Index: uspace/srv/net/tl/tcp/tcp.c =================================================================== --- uspace/srv/net/tl/tcp/tcp.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/tl/tcp/tcp.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -51,4 +51,5 @@ #include #include +#include #include #include @@ -68,4 +69,6 @@ #include #include +#include +#include #include "tcp.h" @@ -421,5 +424,5 @@ break; default: - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); } @@ -473,5 +476,5 @@ // release the acknowledged packets next_packet = pq_next(packet); - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); packet = next_packet; offset -= length; @@ -517,5 +520,5 @@ next_packet = pq_next(next_packet); pq_insert_after(tmp_packet, next_packet); - pq_release(tcp_globals.net_phone, packet_get_id(tmp_packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(tmp_packet)); } assert(new_sequence_number + total_length == socket_data->next_incoming + socket_data->window); @@ -548,5 +551,5 @@ socket_data->incoming = next_packet; } - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); packet = next_packet; continue; @@ -568,5 +571,5 @@ if(length <= 0){ // remove the empty packet - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); packet = next_packet; continue; @@ -595,5 +598,5 @@ } // remove the duplicit or corrupted packet - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); packet = next_packet; continue; @@ -617,6 +620,6 @@ if(ERROR_OCCURRED(pq_add(&socket_data->incoming, packet, new_sequence_number, length))){ // remove the corrupted packets - pq_release(tcp_globals.net_phone, packet_get_id(packet)); - pq_release(tcp_globals.net_phone, packet_get_id(next_packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(next_packet)); }else{ while(next_packet){ @@ -626,5 +629,5 @@ if(ERROR_OCCURRED(pq_set_order(next_packet, new_sequence_number, length)) || ERROR_OCCURRED(pq_insert_after(packet, next_packet))){ - pq_release(tcp_globals.net_phone, packet_get_id(next_packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(next_packet)); } next_packet = tmp_packet; @@ -634,5 +637,5 @@ printf("unexpected\n"); // release duplicite or restricted - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); } @@ -679,5 +682,5 @@ // queue the received packet if(ERROR_OCCURRED(dyn_fifo_push(&socket->received, packet_get_id(packet), SOCKET_MAX_RECEIVED_SIZE)) - || ERROR_OCCURRED(tl_get_ip_packet_dimension(tcp_globals.ip_phone, &tcp_globals.dimensions, socket_data->device_id, &packet_dimension))){ + || ERROR_OCCURRED(tl_get_ip_packet_dimension(tcp_globals.ip_phone, &tcp_globals.dimensions, socket_data->device_id, &packet_dimension))){ return tcp_release_and_return(packet, ERROR_CODE); } @@ -710,5 +713,5 @@ next_packet = pq_detach(packet); if(next_packet){ - pq_release(tcp_globals.net_phone, packet_get_id(next_packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(next_packet)); } // trim if longer than the header @@ -780,5 +783,5 @@ free(socket_data->addr); free(socket_data); - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); return ERROR_CODE; } @@ -846,5 +849,5 @@ next_packet = pq_detach(packet); if(next_packet){ - pq_release(tcp_globals.net_phone, packet_get_id(next_packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(next_packet)); } // trim if longer than the header @@ -895,5 +898,5 @@ socket_data->next_incoming = ntohl(header->sequence_number);// + 1; - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); socket_data->state = TCP_SOCKET_ESTABLISHED; listening_socket = socket_cores_find(socket_data->local_sockets, socket_data->listening_socket_id); @@ -981,5 +984,5 @@ // add to acknowledged or release if(pq_add(&acknowledged, packet, 0, 0) != EOK){ - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); } packet = next; @@ -990,5 +993,5 @@ // release acknowledged if(acknowledged){ - pq_release(tcp_globals.net_phone, packet_get_id(acknowledged)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(acknowledged)); } return; @@ -1006,5 +1009,5 @@ } -int tcp_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ +int tcp_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ ERROR_DECLARE; @@ -1019,5 +1022,5 @@ case NET_TL_RECEIVED: //fibril_rwlock_read_lock(&tcp_globals.lock); - if(! ERROR_OCCURRED(packet_translate(tcp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ + if(! ERROR_OCCURRED(packet_translate_remote(tcp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ ERROR_CODE = tcp_received_msg(IPC_GET_DEVICE(call), packet, SERVICE_TCP, IPC_GET_ERROR(call)); } @@ -1111,5 +1114,5 @@ fibril_rwlock_write_unlock(&lock); if(res == EOK){ - if(tl_get_ip_packet_dimension(tcp_globals.ip_phone, &tcp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){ + if (tl_get_ip_packet_dimension(tcp_globals.ip_phone, &tcp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){ SOCKET_SET_DATA_FRAGMENT_SIZE(answer, ((packet_dimension->content < socket_data->data_fragment_size) ? packet_dimension->content : socket_data->data_fragment_size)); } @@ -1565,5 +1568,5 @@ }else{ if(ERROR_OCCURRED(pq_insert_after(previous, copy))){ - pq_release(tcp_globals.net_phone, packet_get_id(copy)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(copy)); return sending; } @@ -1597,5 +1600,5 @@ // adjust the pseudo header if(ERROR_OCCURRED(ip_client_set_pseudo_header_data_length(socket_data->pseudo_header, socket_data->headerlen, packet_get_data_length(packet)))){ - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); return NULL; } @@ -1604,5 +1607,5 @@ header = (tcp_header_ref) packet_get_data(packet); if(! header){ - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); return NULL; } @@ -1625,5 +1628,5 @@ // prepare the timeout || ERROR_OCCURRED(tcp_prepare_timeout(tcp_timeout, socket, socket_data, sequence_number, socket_data->state, socket_data->timeout, true))){ - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); return NULL; } @@ -1750,5 +1753,5 @@ return NO_DATA; } - ERROR_PROPAGATE(packet_translate(tcp_globals.net_phone, &packet, packet_id)); + ERROR_PROPAGATE(packet_translate_remote(tcp_globals.net_phone, &packet, packet_id)); // reply the packets @@ -1757,5 +1760,5 @@ // release the packet dyn_fifo_pop(&socket->received); - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); // return the total length return (int) length; @@ -1889,5 +1892,5 @@ ERROR_PROPAGATE(tl_get_ip_packet_dimension(tcp_globals.ip_phone, &tcp_globals.dimensions, socket_data->device_id, &packet_dimension)); // get a new packet - *packet = packet_get_4(tcp_globals.net_phone, TCP_HEADER_SIZE, packet_dimension->addr_len, packet_dimension->prefix, packet_dimension->suffix); + *packet = packet_get_4_remote(tcp_globals.net_phone, TCP_HEADER_SIZE, packet_dimension->addr_len, packet_dimension->prefix, packet_dimension->suffix); if(! * packet){ return ENOMEM; @@ -1993,11 +1996,7 @@ int tcp_release_and_return(packet_t packet, int result){ - pq_release(tcp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(tcp_globals.net_phone, packet_get_id(packet)); return result; } - -#ifdef CONFIG_NETWORKING_modular - -#include /** Default thread for new connections. @@ -2027,5 +2026,6 @@ /* Process the message */ - int res = tl_module_message(callid, &call, &answer, &answer_count); + int res = tl_module_message_standalone(callid, &call, &answer, + &answer_count); /* End if said to either by the message or the processing result */ @@ -2052,5 +2052,5 @@ /* Start the module */ - if (ERROR_OCCURRED(tl_module_start(tl_client_connection))) + if (ERROR_OCCURRED(tl_module_start_standalone(tl_client_connection))) return ERROR_CODE; @@ -2058,6 +2058,4 @@ } -#endif /* CONFIG_NETWORKING_modular */ - /** @} */ Index: uspace/srv/net/tl/tcp/tcp.h =================================================================== --- uspace/srv/net/tl/tcp/tcp.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/tl/tcp/tcp.h (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -232,5 +232,5 @@ /** IP pseudo header. */ - ip_pseudo_header_ref pseudo_header; + void *pseudo_header; /** IP pseudo header length. */ Index: uspace/srv/net/tl/tcp/tcp_module.c =================================================================== --- uspace/srv/net/tl/tcp/tcp_module.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/tl/tcp/tcp_module.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -49,5 +49,5 @@ #include #include -#include +#include #include "tcp.h" @@ -65,20 +65,21 @@ * @returns Other error codes as defined for the REGISTER_ME() macro function. */ -int tl_module_start(async_client_conn_t client_connection){ +int tl_module_start_standalone(async_client_conn_t client_connection) +{ ERROR_DECLARE; - - ipcarg_t phonehash; - + async_set_client_connection(client_connection); tcp_globals.net_phone = net_connect_module(SERVICE_NETWORKING); ERROR_PROPAGATE(pm_init()); - if(ERROR_OCCURRED(tcp_initialize(client_connection)) - || ERROR_OCCURRED(REGISTER_ME(SERVICE_TCP, &phonehash))){ + + ipcarg_t phonehash; + if (ERROR_OCCURRED(tcp_initialize(client_connection)) + || ERROR_OCCURRED(REGISTER_ME(SERVICE_TCP, &phonehash))) { pm_destroy(); return ERROR_CODE; } - + async_manager(); - + pm_destroy(); return EOK; @@ -93,6 +94,6 @@ * @returns Other error codes as defined for the tcp_message() function. */ -int tl_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ - return tcp_message(callid, call, answer, answer_count); +int tl_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ + return tcp_message_standalone(callid, call, answer, answer_count); } Index: uspace/srv/net/tl/tcp/tcp_module.h =================================================================== --- uspace/srv/net/tl/tcp/tcp_module.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/tl/tcp/tcp_module.h (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -59,5 +59,5 @@ * @see IS_NET_TCP_MESSAGE() */ -extern int tcp_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count); +extern int tcp_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count); #endif Index: uspace/srv/net/tl/udp/udp.c =================================================================== --- uspace/srv/net/tl/udp/udp.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/tl/udp/udp.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -48,4 +48,5 @@ #include #include +#include #include #include @@ -63,4 +64,6 @@ #include #include +#include +#include #include @@ -258,5 +261,5 @@ icmp_type_t type; icmp_code_t code; - ip_pseudo_header_ref ip_header; + void *ip_header; struct sockaddr * src; struct sockaddr * dest; @@ -356,5 +359,5 @@ while(tmp_packet){ next_packet = pq_detach(tmp_packet); - pq_release(udp_globals.net_phone, packet_get_id(tmp_packet)); + pq_release_remote(udp_globals.net_phone, packet_get_id(tmp_packet)); tmp_packet = next_packet; } @@ -382,5 +385,5 @@ // queue the received packet if(ERROR_OCCURRED(dyn_fifo_push(&socket->received, packet_get_id(packet), SOCKET_MAX_RECEIVED_SIZE)) - || ERROR_OCCURRED(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, device_id, &packet_dimension))){ + || ERROR_OCCURRED(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, device_id, &packet_dimension))){ return udp_release_and_return(packet, ERROR_CODE); } @@ -392,5 +395,5 @@ } -int udp_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ +int udp_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ ERROR_DECLARE; @@ -400,5 +403,5 @@ switch(IPC_GET_METHOD(*call)){ case NET_TL_RECEIVED: - if(! ERROR_OCCURRED(packet_translate(udp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ + if(! ERROR_OCCURRED(packet_translate_remote(udp_globals.net_phone, &packet, IPC_GET_PACKET(call)))){ ERROR_CODE = udp_received_msg(IPC_GET_DEVICE(call), packet, SERVICE_UDP, IPC_GET_ERROR(call)); } @@ -457,5 +460,5 @@ if(res == EOK){ - if(tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){ + if (tl_get_ip_packet_dimension(udp_globals.ip_phone, &udp_globals.dimensions, DEVICE_INVALID_ID, &packet_dimension) == EOK){ SOCKET_SET_DATA_FRAGMENT_SIZE(answer, packet_dimension->content); } @@ -533,5 +536,5 @@ uint16_t dest_port; uint32_t checksum; - ip_pseudo_header_ref ip_header; + void *ip_header; size_t headerlen; device_id_t device_id; @@ -662,9 +665,9 @@ return NO_DATA; } - ERROR_PROPAGATE(packet_translate(udp_globals.net_phone, &packet, packet_id)); + ERROR_PROPAGATE(packet_translate_remote(udp_globals.net_phone, &packet, packet_id)); // get udp header data = packet_get_data(packet); if(! data){ - pq_release(udp_globals.net_phone, packet_id); + pq_release_remote(udp_globals.net_phone, packet_id); return NO_DATA; } @@ -674,5 +677,5 @@ result = packet_get_addr(packet, (uint8_t **) &addr, NULL); if(ERROR_OCCURRED(tl_set_address_port(addr, result, ntohs(header->source_port)))){ - pq_release(udp_globals.net_phone, packet_id); + pq_release_remote(udp_globals.net_phone, packet_id); return ERROR_CODE; } @@ -689,5 +692,5 @@ // release the packet dyn_fifo_pop(&socket->received); - pq_release(udp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(udp_globals.net_phone, packet_get_id(packet)); // return the total length return (int) length; @@ -695,11 +698,7 @@ int udp_release_and_return(packet_t packet, int result){ - pq_release(udp_globals.net_phone, packet_get_id(packet)); + pq_release_remote(udp_globals.net_phone, packet_get_id(packet)); return result; } - -#ifdef CONFIG_NETWORKING_modular - -#include /** Default thread for new connections. @@ -729,5 +728,6 @@ /* Process the message */ - int res = tl_module_message(callid, &call, &answer, &answer_count); + int res = tl_module_message_standalone(callid, &call, &answer, + &answer_count); /* End if said to either by the message or the processing result */ @@ -754,5 +754,5 @@ /* Start the module */ - if (ERROR_OCCURRED(tl_module_start(tl_client_connection))) + if (ERROR_OCCURRED(tl_module_start_standalone(tl_client_connection))) return ERROR_CODE; @@ -760,6 +760,4 @@ } -#endif /* CONFIG_NETWORKING_modular */ - /** @} */ Index: uspace/srv/net/tl/udp/udp_module.c =================================================================== --- uspace/srv/net/tl/udp/udp_module.c (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/tl/udp/udp_module.c (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -47,5 +47,5 @@ #include #include -#include +#include #include "udp.h" @@ -63,5 +63,5 @@ * @returns Other error codes as defined for the REGISTER_ME() macro function. */ -int tl_module_start(async_client_conn_t client_connection){ +int tl_module_start_standalone(async_client_conn_t client_connection){ ERROR_DECLARE; @@ -94,6 +94,6 @@ * @returns Other error codes as defined for the udp_message() function. */ -int tl_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ - return udp_message(callid, call, answer, answer_count); +int tl_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ + return udp_message_standalone(callid, call, answer, answer_count); } Index: uspace/srv/net/tl/udp/udp_module.h =================================================================== --- uspace/srv/net/tl/udp/udp_module.h (revision 24ab58b348754b301fea741628d74d49704735d6) +++ uspace/srv/net/tl/udp/udp_module.h (revision ddfcfeb22fe529fef60132084a109a424354cd72) @@ -59,5 +59,5 @@ * @see IS_NET_UDP_MESSAGE() */ -extern int udp_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count); +extern int udp_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count); #endif