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 41963042778157d86a3ab7cffe9897ece175627a) @@ -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 41963042778157d86a3ab7cffe9897ece175627a) @@ -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 41963042778157d86a3ab7cffe9897ece175627a) @@ -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 41963042778157d86a3ab7cffe9897ece175627a) @@ -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 41963042778157d86a3ab7cffe9897ece175627a) @@ -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 41963042778157d86a3ab7cffe9897ece175627a) @@ -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