WebSVN – HelenOS – Path Comparison – / – /branches/network/uspace/srv/net/il/ Rev 4706 and /branches/network/uspace/srv/net/il/ Rev 4707

Ignore whitespace Rev 4706 → Rev 4707

 /branches/network/uspace/srv/net/il/icmp/icmp_module.h
 ,0 → 1,66
+/*
+ * Copyright (c) 2008 Lukas Mejdrech
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup icmp
+ *  @{
+ */
+/** @file
+ *  ICMP module functions.
+ *  The functions are used as ICMP module entry points.
+ */
+#ifndef __NET_ICMP_MODULE_H__
+#define __NET_ICMP_MODULE_H__
+#include <async.h>
+#include <ipc/ipc.h>
+/** Initializes the ICMP module.
+ *  @param client_connection The client connection processing function. The module skeleton propagates its own one. Input parameter.
+ *  @returns EOK on success.
+ *  @returns ENOMEM if there is not enough memory left.
+ */
+int icmp_initialize( async_client_conn_t client_connection );
+/** Processes the ICMP message.
+ *  @param callid The message identifier. Input parameter.
+ *  @param call The message parameters. Input parameter.
+ *  @param answer The message answer parameters. Output parameter.
+ *  @param answer_count The last parameter for the actual answer in the answer parameter. Output parameter.
+ *  @returns EOK on success.
+ *  @returns ENOTSUP if the message is not known.
+ *  @see icmp_interface.h
+ *  @see IS_NET_ICMP_MESSAGE()
+ */
+int icmp_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count );
+#endif
+/** @}
+ */
 Property changes:
 Added: svn:eol-style
 +native
 \ No newline at end of property

 /branches/network/uspace/srv/net/il/icmp/icmp_remote.c
 ,0 → 1,83
+/*
+ * Copyright (c) 2009 Lukas Mejdrech
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup icmp
+ *  @{
+ */
+/** @file
+ *  ICMP interface implementation for standalone remote modules.
+ *  @see icmp_interface.h
+ */
+#include <async.h>
+#include <errno.h>
+#include <ipc/ipc.h>
+#include <ipc/services.h>
+#include "../../messages.h"
+#include "../../modules.h"
+#include "../../include/icmp_interface.h"
+#include "../../structures/packet/packet_client.h"
+#include "icmp_messages.h"
+int icmp_echo_msg( int icmp_phone, icmp_param_t identifier, icmp_param_t sequence_number, const void * data, size_t length ){
+    // TODO ICMP echo
+    return ENOTSUP;
+}
+int icmp_destination_unreachable_msg( int icmp_phone, icmp_code_t code, icmp_param_t mtu, packet_t packet ){
+    async_msg_3( icmp_phone, NET_ICMP_DEST_UNREACH, ( ipcarg_t ) code, ( ipcarg_t ) packet_get_id( packet ), ( ipcarg_t ) mtu );
+    return EOK;
+}
+int icmp_source_quench_msg( int icmp_phone, packet_t packet ){
+    async_msg_2( icmp_phone, NET_ICMP_SOURCE_QUENCH, 0, ( ipcarg_t ) packet_get_id( packet ));
+    return EOK;
+}
+int icmp_time_exceeded_msg( int icmp_phone, icmp_code_t code, packet_t packet ){
+    async_msg_2( icmp_phone, NET_ICMP_TIME_EXCEEDED, ( ipcarg_t ) code, ( ipcarg_t ) packet_get_id( packet ));
+    return EOK;
+}
+int icmp_parameter_problem_msg( int icmp_phone, icmp_code_t code, icmp_param_t pointer, packet_t packet ){
+    async_msg_3( icmp_phone, NET_ICMP_PARAMETERPROB, ( ipcarg_t ) code, ( ipcarg_t ) packet_get_id( packet ), ( ipcarg_t ) pointer );
+    return EOK;
+}
+int icmp_connect_module( services_t service ){
+    return connect_to_service( SERVICE_ICMP );
+}
+/** @}
+ */
 Property changes:
 Added: svn:eol-style
 +native
 \ No newline at end of property

 /branches/network/uspace/srv/net/il/icmp/icmp_messages.h
 ,0 → 1,108
+/*
+ * Copyright (c) 2009 Lukas Mejdrech
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup icmp
+ *  @{
+ */
+/** @file
+ *  ICMP module messages.
+ *  @see icmp_interface.h
+ */
+#ifndef __NET_ICMP_MESSAGES__
+#define __NET_ICMP_MESSAGES__
+#include <ipc/ipc.h>
+#include "../../messages.h"
+/** ICMP module messages.
+ */
+typedef enum{
+    /** Sends echo request.
+     *  @see icmp_echo()
+     */
+    NET_ICMP_ECHO = NET_ICMP_FIRST,
+    /** Sends destination unreachable error message.
+     *  @see icmp_destination_unreachable_msg()
+     */
+    NET_ICMP_DEST_UNREACH,
+    /** Sends source quench error message.
+     *  @see icmp_source_quench_msg()
+     */
+    NET_ICMP_SOURCE_QUENCH,
+    /** Sends redirect error message.
+     *  @see icmp_redirect_msg()
+     */
+    NET_ICMP_REDIRECT,
+    /** Sends time exceeded error message.
+     *  @see icmp_time_exceeded_msg()
+     */
+    NET_ICMP_TIME_EXCEEDED,
+    /** Sends parameter problem error message.
+     *  @see icmp_parameter_problem_msg()
+     */
+    NET_ICMP_PARAMETERPROB,
+} icmp_messages;
+/** @name ICMP specific message parameters definitions
+ */
+/*@{*/
+/** Returns the ICMP code message parameter.
+ *  @param call The message call structure. Input parameter.
+ */
+#define ICMP_GET_CODE( call )       ( uint8_t ) IPC_GET_ARG1( * call )
+/** Returns the echo identifier message parameter.
+ *  @param call The message call structure. Input parameter.
+ */
+#define ICMP_GET_IDENTIFIER( call )     ( uint8_t ) IPC_GET_ARG1( * call )
+/** Returns the echo sequence number message parameter.
+ *  @param call The message call structure. Input parameter.
+ */
+#define ICMP_GET_SEQUENCE( call )       ( uint8_t ) IPC_GET_ARG2( * call )
+/** Returns the ICMP link MTU message parameter.
+ *  @param call The message call structure. Input parameter.
+ */
+#define ICMP_GET_MTU( call )        ( uint16_t ) IPC_GET_ARG3( * call )
+/** Returns the pointer message parameter.
+ *  @param call The message call structure. Input parameter.
+ */
+#define ICMP_GET_POINTER( call )        ( uint16_t ) IPC_GET_ARG3( * call )
+/*@}*/
+#endif
+/** @}
+ */
 Property changes:
 Added: svn:eol-style
 +native
 \ No newline at end of property

 /branches/network/uspace/srv/net/il/icmp/icmp_header.h
 ,0 → 1,92
+/*
+ * Copyright (c) 2009 Lukas Mejdrech
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup icmp
+ *  @{
+ */
+/** @file
+ *  ICMP header definition.
+ *  Names according to the linux src/include/linux/icmp.h header file.
+ */
+#ifndef __NET_ICMP_HEADER_H__
+#define __NET_ICMP_HEADER_H__
+#include <sys/types.h>
+#include "../../include/in.h"
+#include "../../include/icmp_codes.h"
+/** Type definition of the user datagram header.
+ *  @see icmp_header
+ */
+typedef struct icmp_header  icmp_header_t;
+/** Type definition of the user datagram header pointer.
+ *  @see icmp_header
+ */
+typedef icmp_header_t *     icmp_header_ref;
+/** User datagram header.
+ */
+struct icmp_header{
+    /** Specifies the type of the message.
+     */
+    uint8_t type;
+    /** Contains the error code for the datagram reported by this ICMP message.
+     *  The interpretation is dependent on the message type.
+     */
+    uint8_t code;
+    /** Contains the checksum for the ICMP message starting with the ICMP Type field.
+     *  If the checksum does not match the contents, the datagram is discarded.
+     */
+    uint16_t    checksum;
+    /** \todo
+     */
+    union{
+        struct{
+            icmp_param_t    id;
+            icmp_param_t    sequence;
+        } echo;
+        in_addr_t           gateway;
+        struct{
+            icmp_param_t    unused;
+            icmp_param_t    mtu;
+        } frag;
+        struct{
+            icmp_param_t    pointer;
+            icmp_param_t    unused;
+        } param;
+    } un;
+} __attribute__ ((packed));
+#endif
+/** @}
+ */
 Property changes:
 Added: svn:eol-style
 +native
 \ No newline at end of property

 /branches/network/uspace/srv/net/il/icmp/icmp_client.c
 ,0 → 1,67
+/*
+ * Copyright (c) 2009 Lukas Mejdrech
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup icmp
+ *  @{
+ */
+/** @file
+ *  ICMP client interface implementation.
+ *  @see icmp_client.h
+ */
+#include <errno.h>
+#include <sys/types.h>
+#include "../../include/icmp_codes.h"
+#include "../../include/icmp_client.h"
+#include "../../structures/packet/packet.h"
+#include "../../structures/packet/packet_client.h"
+#include "icmp_header.h"
+int icmp_client_process_packet( packet_t packet, icmp_type_t * type, icmp_code_t * code, icmp_param_t * pointer, icmp_param_t * mtu ){
+    icmp_header_ref header;
+    header = ( icmp_header_ref ) packet_get_data( packet );
+    if( ! header ) return ENOMEM;
+    if( type ) * type = header->type;
+    if( code ) * code = header->code;
+    if( pointer ) * pointer = header->un.param.pointer;
+    if( mtu ) * mtu = header->un.frag.mtu;
+    return sizeof( icmp_header_t );
+}
+int icmp_client_header_length( packet_t packet ){
+    return sizeof( icmp_header_t );
+}
+/** @}
+ */
 Property changes:
 Added: svn:eol-style
 +native
 \ No newline at end of property

 /branches/network/uspace/srv/net/il/icmp/icmp.c
 ,0 → 1,273
+/*
+ * Copyright (c) 2008 Lukas Mejdrech
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup icmp
+ *  @{
+ */
+/** @file
+ *  ICMP module implementation.
+ *  @see icmp.h
+ */
+#include <async.h>
+#include <fibril_sync.h>
+#include <ipc/ipc.h>
+#include <ipc/services.h>
+#include "../../err.h"
+#include "../../messages.h"
+#include "../../modules.h"
+#include "../../structures/packet/packet_client.h"
+#include "../../include/crc.h"
+#include "../../include/icmp_codes.h"
+#include "../../include/icmp_client.h"
+#include "../../include/icmp_interface.h"
+#include "../../include/ip_client.h"
+#include "../../include/ip_interface.h"
+#include "../../include/il_interface.h"
+#include "../../include/ip_protocols.h"
+#include "../../tl/tl_messages.h"
+#include "icmp.h"
+#include "icmp_header.h"
+#include "icmp_messages.h"
+#include "icmp_module.h"
+#define ICMP_KEEP_LENGTH    8
+#define ICMP_HEADER_CHECKSUM( header )      compact_checksum(compute_checksum( 0, ( uint8_t * ) header, sizeof( icmp_header_t )))
+/** Processes the received ICMP packet.
+ *  Is used as an entry point from the underlying IP module.
+ *  Releases the packet on error.
+ *  @param device_id The device identifier. Ignored parameter.
+ *  @param packet The received packet. Input/output parameter.
+ *  @param receiver The target service. Ignored parameter.
+ *  @param error The packet error reporting service. Prefixes the received packet. Input parameter.
+ *  @returns EOK on success.
+ *  @returns Other error codes as defined for the icmp_process_packet() function.
+ */
+int icmp_received_msg( device_id_t device_id, packet_t packet, services_t receiver, services_t error );
+/** Processes the received ICMP packet.
+ *  Notifies the destination socket application.
+ *  @param packet The received packet. Input/output parameter.
+ *  @returns EOK on success.
+ *  @returns EINVAL if the packet is not valid.
+ *  @returns EINVAL if the stored packet address is not the an_addr_t.
+ *  @returns EINVAL if the packet does not contain any data.
+ *  @returns NO_DATA if the packet content is shorter than the user datagram header.
+ *  @returns ENOMEM if there is not enough memory left.
+ *  @returns EADDRNOTAVAIL if the destination socket does not exist.
+ *  @returns Other error codes as defined for the ip_client_process_packet() function.
+ */
+int icmp_process_packet( packet_t packet );
+icmp_header_ref icmp_prepare_packet( packet_t packet );
+int icmp_send_packet( icmp_type_t type, icmp_code_t code, packet_t packet, icmp_header_ref header );
+/** ICMP global data.
+ */
+icmp_globals_t  icmp_globals;
+int icmp_echo_msg( int icmp_phone, icmp_param_t identifier, icmp_param_t sequence_number, const void * data, size_t length ){
+    // TODO echo - with timeout
+    // waits for the reply up to the timeout
+    return ENOTSUP;
+}
+int icmp_destination_unreachable_msg( int icmp_phone, icmp_code_t code, icmp_param_t mtu, packet_t packet ){
+    icmp_header_ref header;
+    header = icmp_prepare_packet( packet );
+    if( ! header ) return ENOMEM;
+    if( mtu ){
+        header->un.frag.mtu = mtu;
+    }
+    return icmp_send_packet( ICMP_DEST_UNREACH, code, packet, header );
+}
+int icmp_source_quench_msg( int icmp_phone, packet_t packet ){
+    icmp_header_ref header;
+    header = icmp_prepare_packet( packet );
+    if( ! header ) return ENOMEM;
+    return icmp_send_packet( ICMP_SOURCE_QUENCH, ICMP_SOURCE_QUENCH, packet, header );
+}
+int icmp_time_exceeded_msg( int icmp_phone, icmp_code_t code, packet_t packet ){
+    icmp_header_ref header;
+    header = icmp_prepare_packet( packet );
+    if( ! header ) return ENOMEM;
+    return icmp_send_packet( ICMP_TIME_EXCEEDED, code, packet, header );
+}
+int icmp_parameter_problem_msg( int icmp_phone, icmp_code_t code, icmp_param_t pointer, packet_t packet ){
+    icmp_header_ref header;
+    header = icmp_prepare_packet( packet );
+    if( ! header ) return ENOMEM;
+    header->un.param.pointer = pointer;
+    return icmp_send_packet( ICMP_PARAMETERPROB, code, packet, header );
+}
+icmp_header_ref icmp_prepare_packet( packet_t packet ){
+    icmp_header_ref header;
+    int             header_length;
+    size_t          total_length;
+    total_length = packet_get_data_length( packet );
+    if( total_length <= 0 ) return NULL;
+    header_length = ip_client_header_length( packet );
+    if( header_length <= 0 ) return NULL;
+    // truncate if longer than 64 bits (without the IP header)
+    if( total_length - header_length > ICMP_KEEP_LENGTH ){
+        if( packet_trim( packet, 0, total_length - header_length - ICMP_KEEP_LENGTH ) != EOK ) return NULL;
+    }
+    header = PACKET_PREFIX( packet, icmp_header_t );
+    if( ! header ){
+        pq_release( icmp_globals.net_phone, packet_get_id( packet ));
+        return NULL;
+    }
+    bzero( header, sizeof( * header ));
+    return header;
+}
+int icmp_send_packet( icmp_type_t type, icmp_code_t code, packet_t packet, icmp_header_ref header ){
+    ERROR_DECLARE;
+    header->type = type;
+    header->code = code;
+    header->checksum = 0;
+    header->checksum = ICMP_HEADER_CHECKSUM( header );
+    if( ERROR_OCCURRED( ip_client_prepare_packet( packet, IPPROTO_ICMP, 0, 0, 0, 0 ))){
+        pq_release( icmp_globals.net_phone, packet_get_id( packet ));
+        return ERROR_CODE;
+    }
+    return ip_send_msg( icmp_globals.ip_phone, -1, packet, SERVICE_ICMP, SERVICE_ICMP );
+}
+int icmp_connect_module( services_t service ){
+    return EOK;
+}
+int icmp_initialize( async_client_conn_t client_connection ){
+    ERROR_DECLARE;
+    fibril_rwlock_initialize( & icmp_globals.lock );
+    fibril_rwlock_write_lock( & icmp_globals.lock );
+    icmp_globals.ip_phone = ip_bind_service( SERVICE_IP, IPPROTO_ICMP, SERVICE_ICMP, client_connection, icmp_received_msg );
+    if( icmp_globals.ip_phone < 0 ){
+        return icmp_globals.ip_phone;
+    }
+    ERROR_PROPAGATE( ip_packet_size_req( icmp_globals.ip_phone, -1, & icmp_globals.addr_len, & icmp_globals.prefix, & icmp_globals.content, & icmp_globals.suffix ));
+    icmp_globals.prefix += sizeof( icmp_header_t );
+    icmp_globals.content -= sizeof( icmp_header_t );
+    fibril_rwlock_write_unlock( & icmp_globals.lock );
+    return EOK;
+}
+int icmp_received_msg( device_id_t device_id, packet_t packet, services_t receiver, services_t error ){
+    ERROR_DECLARE;
+    if( error ){
+        pq_release( icmp_globals.net_phone, packet_get_id( packet ));
+        return EINVAL;
+    }
+    if( ERROR_OCCURRED( icmp_process_packet( packet ))){
+        pq_release( icmp_globals.net_phone, packet_get_id( packet ));
+        return ERROR_CODE;
+    }
+    return EOK;
+}
+int icmp_process_packet( packet_t packet ){
+    int             length;
+    void *          data;
+    icmp_header_ref header;
+    // get rid of the ip header
+    length = ip_client_process_packet( packet, NULL, NULL, NULL, NULL, NULL );
+    if( length < 0 ) return length;
+    packet_trim( packet, length, 0 );
+    length = packet_get_data_length( packet );
+    if( length <= 0 ) return EINVAL;
+    if( length < sizeof( icmp_header_t )) return EINVAL;
+    data = packet_get_data( packet );
+    if( ! data ) return EINVAL;
+    // get icmp header
+    header = ( icmp_header_ref ) data;
+    // checksum
+    if(( header->checksum ) && ( ICMP_HEADER_CHECKSUM( header ))){
+        return EINVAL;
+    }
+    // TODO process requests and replies
+    ip_received_error_msg( icmp_globals.ip_phone, -1, packet, SERVICE_IP, SERVICE_ICMP );
+    return EOK;
+}
+int icmp_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count ){
+    ERROR_DECLARE;
+    packet_t    packet;
+    * answer_count = 0;
+    switch( IPC_GET_METHOD( * call )){
+        case NET_TL_RECEIVED:
+            fibril_rwlock_read_lock( & icmp_globals.lock );
+            if( ! ERROR_OCCURRED( packet_translate( 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 ));
+            }
+            fibril_rwlock_read_unlock( & icmp_globals.lock );
+            return ERROR_CODE;
+        case NET_ICMP_DEST_UNREACH:
+            ERROR_PROPAGATE( packet_translate( icmp_globals.net_phone, & packet, IPC_GET_PACKET( call )));
+            return icmp_destination_unreachable_msg( 0, ICMP_GET_CODE( call ), ICMP_GET_MTU( call ), packet );
+        case NET_ICMP_SOURCE_QUENCH:
+            ERROR_PROPAGATE( packet_translate( icmp_globals.net_phone, & packet, IPC_GET_PACKET( call )));
+            return icmp_source_quench_msg( 0, packet );
+        case NET_ICMP_TIME_EXCEEDED:
+            ERROR_PROPAGATE( packet_translate( icmp_globals.net_phone, & packet, IPC_GET_PACKET( call )));
+            return icmp_time_exceeded_msg( 0, ICMP_GET_CODE( call ), packet );
+        case NET_ICMP_PARAMETERPROB:
+            ERROR_PROPAGATE( packet_translate( icmp_globals.net_phone, & packet, IPC_GET_PACKET( call )));
+            return icmp_parameter_problem_msg( 0, ICMP_GET_CODE( call ), ICMP_GET_POINTER( call ), packet );
+    }
+    return ENOTSUP;
+}
+/** @}
+ */
 Property changes:
 Added: svn:eol-style
 +native
 \ No newline at end of property

 /branches/network/uspace/srv/net/il/icmp/Makefile
 ,0 → 1,52
+#
+# Copyright (c) 2009 Lukas Mejdrech
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+NAME = icmp
+NET_BASE = ../../
+STRUCTURES = $(NET_BASE)structures/
+## Sources
+#
+OUTPUT = $(NAME)
+SOURCES = \
+    $(NAME)_module.c \
+    $(NAME).c \
+    $(NET_BASE)module.c \
+    $(NET_BASE)modules.c \
+    $(NET_BASE)crc.c \
+    $(STRUCTURES)packet/packet.c \
+    $(STRUCTURES)packet/packet_client.c \
+    $(STRUCTURES)packet/packet_remote.c \
+    $(STRUCTURES)measured_strings.c \
+    $(NET_BASE)il/ip/ip_client.c \
+    $(NET_BASE)il/ip/ip_remote.c \
+    $(NET_BASE)net/net_remote.c
+include $(NET_BASE)Makefile.module
 Property changes:
 Added: svn:eol-style
 +native
 \ No newline at end of property

 /branches/network/uspace/srv/net/il/icmp/icmp.h
 ,0 → 1,79
+/*
+ * Copyright (c) 2008 Lukas Mejdrech
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup icmp
+ *  @{
+ */
+/** @file
+ *  ICMP module.
+ */
+#ifndef __NET_ICMP_H__
+#define __NET_ICMP_H__
+#include <fibril_sync.h>
+#include "../../socket/socket_core.h"
+/** Type definition of the ICMP global data.
+ *  @see icmp_globals
+ */
+typedef struct icmp_globals icmp_globals_t;
+/** ICMP global data.
+ */
+struct  icmp_globals{
+    /** IP module phone.
+     */
+    int             ip_phone;
+    /** Reserved packet prefix length.
+     */
+    size_t          prefix;
+    /** Maximal packet content length.
+     */
+    size_t          content;
+    /** Reserved packet suffix length.
+     */
+    size_t          suffix;
+    /** Packet address length.
+     */
+    size_t          addr_len;
+    /** Networking module phone.
+     */
+    int             net_phone;
+    /** Safety lock.
+     */
+    fibril_rwlock_t lock;
+};
+#endif
+/** @}
+ */
 Property changes:
 Added: svn:eol-style
 +native
 \ No newline at end of property

 /branches/network/uspace/srv/net/il/icmp/icmp_module.c
 ,0 → 1,120
+/*
+ * Copyright (c) 2008 Lukas Mejdrech
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/** @addtogroup icmp
+ *  @{
+ */
+/** @file
+ *  ICMP standalone module implementation.
+ *  Contains skeleton module functions mapping.
+ *  The functions are used by the module skeleton as module specific entry points.
+ *  @see module.c
+ */
+#include <async.h>
+#include <stdio.h>
+#include <ipc/ipc.h>
+#include <ipc/services.h>
+#include "../../err.h"
+#include "../../modules.h"
+#include "../../structures/packet/packet.h"
+#include "../../include/net_interface.h"
+#include "icmp.h"
+#include "icmp_module.h"
+/** ICMP module name.
+ */
+#define NAME    "ICMP protocol"
+/** Prints the module name.
+ *  @see NAME
+ */
+void    module_print_name( void );
+/** Starts the ICMP module.
+ *  Initializes the client connection serving function, initializes the module, registers the module service and starts the async manager, processing IPC messages in an infinite loop.
+ *  @param client_connection The client connection processing function. The module skeleton propagates its own one. Input parameter.
+ *  @returns EOK on successful module termination.
+ *  @returns Other error codes as defined for the arp_initialize() function.
+ *  @returns Other error codes as defined for the REGISTER_ME() macro function.
+ */
+int module_start( async_client_conn_t client_connection );
+/** Processes the ICMP message.
+ *  @param callid The message identifier. Input parameter.
+ *  @param call The message parameters. Input parameter.
+ *  @param answer The message answer parameters. Output parameter.
+ *  @param answer_count The last parameter for the actual answer in the answer parameter. Output parameter.
+ *  @returns EOK on success.
+ *  @returns Other error codes as defined for the icmp_message() function.
+ */
+int module_message( ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count );
+/** ICMP module global data.
+ */
+extern icmp_globals_t   icmp_globals;
+void module_print_name( void ){
+    printf( "%s", NAME );
+}
+int module_start( async_client_conn_t client_connection ){
+    ERROR_DECLARE;
+    ipcarg_t    phonehash;
+    async_set_client_connection( client_connection );
+    icmp_globals.net_phone = net_connect_module( SERVICE_NETWORKING );
+    if( icmp_globals.net_phone < 0 ){
+        return icmp_globals.net_phone;
+    }
+    ERROR_PROPAGATE( pm_init());
+    if( ERROR_OCCURRED( icmp_initialize( client_connection ))
+    || ERROR_OCCURRED( REGISTER_ME( SERVICE_ICMP, & phonehash ))){
+        pm_destroy();
+        return ERROR_CODE;
+    }
+    async_manager();
+    pm_destroy();
+    return EOK;
+}
+int 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 );
+}
+/** @}
+ */
 Property changes:
 Added: svn:eol-style
 +native
 \ No newline at end of property

 /branches/network/uspace/srv/net/il/ip/ip_remote.c
 ,8 → 55,8
     return generic_device_req( ip_phone, NET_IL_DEVICE, device_id, 0, service );
 }
-int ip_send_msg( int ip_phone, device_id_t device_id, packet_t packet, services_t sender ){
-    return generic_send_msg( ip_phone, NET_IL_SEND, device_id, packet_get_id( packet ), sender );
+int ip_send_msg( int ip_phone, device_id_t device_id, packet_t packet, services_t sender, services_t error ){
+    return generic_send_msg( ip_phone, NET_IL_SEND, device_id, packet_get_id( packet ), sender, error );
 }
 int ip_connect_module( services_t service ){
 ,5 → 79,9
     return ( int ) bind_service( service, ( ipcarg_t ) protocol, me, service, receiver );
 }
+int ip_received_error_msg( int ip_phone, device_id_t device_id, packet_t packet, services_t target, services_t error ){
+    return generic_received_msg( ip_phone, NET_IP_RECEIVED_ERROR, device_id, packet_get_id( packet ), target, error );
+}
 /** @}
  */

 /branches/network/uspace/srv/net/il/ip/ip_messages.h
 ,7 → 50,11
     /** Sets the default gateway.
      *  @see ip_set_default_gateway()
      */
-    NET_IP_SET_GATEWAY
+    NET_IP_SET_GATEWAY,
+    /** Processes the received error notification.
+     *  @see ip_received_error_msg()
+     */
+    NET_IP_RECEIVED_ERROR
 } ip_messages;
 /** @name IP specific message parameters definitions

 /branches/network/uspace/srv/net/il/ip/ip_client.c
 ,11 → 79,19
     if( dont_fragment ) * dont_fragment = header->flags & IPFLAG_DONT_FRAGMENT;
     if( ipopt_length ){
         * ipopt_length = header->ihl * 4 - sizeof( ip_header_t );
-        return packet_trim( packet, sizeof( ip_header_t ), 0 );
+        return sizeof( ip_header_t );
     }else{
-        return packet_trim( packet, header->ihl * 4, 0 );
+        return header->ihl * 4;
     }
 }
+int ip_client_header_length( packet_t packet ){
+    ip_header_ref   header;
+    header = ( ip_header_ref ) packet_get_data( packet );
+    if( ! header ) return ENOMEM;
+    return header->ihl * 4;
+}
 /** @}
  */

 /branches/network/uspace/srv/net/il/ip/ip.c
 ,6 → 63,9
 #include "../../include/ip_client.h"
 #include "../../include/ip_interface.h"
 #include "../../include/tl_interface.h"
+#include "../../include/icmp_codes.h"
+#include "../../include/icmp_interface.h"
+#include "../../include/icmp_client.h"
 #include "../../structures/measured_strings.h"
 #include "../../structures/module_map.h"
 #include "../../structures/packet/packet_client.h"
 ,16 → 181,16
  */
 int ip_netif_initialize( ip_netif_ref ip_netif );
-int ip_send_route( packet_t packet, ip_netif_ref netif, ip_route_ref route, in_addr_t * src, in_addr_t dest );
+int ip_send_route( packet_t packet, ip_netif_ref netif, ip_route_ref route, in_addr_t * src, in_addr_t dest, services_t error );
 int ip_prepare_packet( in_addr_t * source, in_addr_t dest, packet_t packet, measured_string_ref destination );
-packet_t    ip_split_packet( packet_t packet, size_t prefix, size_t content, size_t suffix, size_t addr_len );
+packet_t    ip_split_packet( packet_t packet, size_t prefix, size_t content, size_t suffix, size_t addr_len, services_t error );
 int ip_fragment_packet( packet_t packet, size_t length, size_t prefix, size_t suffix, size_t addr_len );
 int ip_fragment_packet_data( packet_t packet, packet_t new_packet, ip_header_ref header, ip_header_ref new_header, size_t length, void * src, void * dest, size_t address_length );
 ip_header_ref   ip_create_middle_header( packet_t packet, ip_header_ref last );
 void ip_create_last_header( ip_header_ref last, ip_header_ref first );
-in_addr_t * ip_netif_addr( ip_netif_ref netif );
+in_addr_t * ip_netif_address( ip_netif_ref netif );
 ip_route_ref    ip_find_route( in_addr_t destination );
 ip_route_ref    ip_netif_find_route( ip_netif_ref netif, in_addr_t destination );
 ,7 → 208,7
 int ip_process_packet( device_id_t device_id, packet_t packet );
 in_addr_t   ip_get_destination( ip_header_ref header );
-int ip_deliver_local( device_id_t device_id, packet_t packet, ip_header_ref header );
+int ip_deliver_local( device_id_t device_id, packet_t packet, ip_header_ref header, services_t error );
 /** Computes the ip header checksum.
  *  To compute the checksum of a new packet, the checksum header field must be zero.
 ,6 → 221,12
  */
 uint16_t ip_checksum( uint8_t * data, size_t length );
+int ip_prepare_icmp_and_get_phone( services_t error, packet_t packet, ip_header_ref header );
+int ip_get_icmp_phone( void );
+int ip_prepare_icmp( packet_t packet, ip_header_ref header );
+static int  release_and_return( packet_t packet, int result );
 uint16_t ip_checksum( uint8_t * data, size_t length ){
     uint16_t    checksum;
 ,7 → 527,7
     return EOK;
 }
-int ip_send_msg( int il_phone, device_id_t device_id, packet_t packet, services_t sender ){
+int ip_send_msg( int il_phone, device_id_t device_id, packet_t packet, services_t sender, services_t error ){
     ERROR_DECLARE;
     int                 length;
 ,22 → 535,20
     ip_route_ref        route;
     in_addr_t *         dest;
     in_addr_t *         src;
+    int                 phone;
     // addresses in the host byte order
     // should be the next hop address or the target destination address
     length = packet_get_addr( packet, NULL, ( uint8_t ** ) & dest );
     if( length < 0 ){
-        pq_release( ip_globals.net_phone, packet_get_id( packet ));
-        return length;
+        return release_and_return( packet, length );
     }
     // TODO IPv6
     if( length != IP_ADDR ){
-        pq_release( ip_globals.net_phone, packet_get_id( packet ));
-        return EINVAL;
+        return release_and_return( packet, EINVAL );
     }
     fibril_rwlock_read_lock( & ip_globals.netifs_lock );
     // device specified?
-//  dest.s_addr = ntohl( dest.s_addr );
     if( device_id > 0 ){
         netif = ip_netifs_find( & ip_globals.netifs, device_id );
         route = ip_netif_find_route( netif, * dest );
 ,23 → 559,35
     }
     if( !( netif && route )){
         fibril_rwlock_read_unlock( & ip_globals.netifs_lock );
-        pq_release( ip_globals.net_phone, packet_get_id( packet ));
+        phone = ip_prepare_icmp_and_get_phone( error, packet, NULL );
+        if( phone >= 0 ){
+            // unreachable ICMP if no routing
+            icmp_destination_unreachable_msg( phone, ICMP_HOST_UNREACH, 0, packet );
+        }
         return ENOENT;
     }
+    if( error ){
+        // do not send for broadcast, anycast packets or network broadcast
+        if(( ! dest->s_addr )
+        || ( !( ~ dest->s_addr ))
+        || ( !( ~(( dest->s_addr & ( ~ route->netmask.s_addr )) | route->netmask.s_addr )))
+        || ( !( dest->s_addr & ( ~ route->netmask.s_addr )))){
+            return release_and_return( packet, EINVAL );
+        }
+    }
     // to me?
     if( route->address.s_addr == dest->s_addr ){
         // TODO loopback deliver
         fibril_rwlock_read_unlock( & ip_globals.netifs_lock );
-        return ip_deliver_local( -1, packet, ( ip_header_ref ) packet_get_data( packet ));
+        return ip_deliver_local( -1, packet, ( ip_header_ref ) packet_get_data( packet ), error );
     }
-    src = ip_netif_addr( netif );
+    src = ip_netif_address( netif );
     if( ! src ){
         fibril_rwlock_read_unlock( & ip_globals.netifs_lock );
-        pq_release( ip_globals.net_phone, packet_get_id( packet ));
-        return ENOENT;
+        return release_and_return( packet, ENOENT );
     }
-    if( ERROR_OCCURRED( ip_send_route( packet, netif, route, src, * dest ))){
+    if( ERROR_OCCURRED( ip_send_route( packet, netif, route, src, * dest, error ))){
         pq_release( ip_globals.net_phone, packet_get_id( packet ));
     }
     fibril_rwlock_read_unlock( & ip_globals.netifs_lock );
 ,7 → 594,7
     return ERROR_CODE;
 }
-in_addr_t * ip_netif_addr( ip_netif_ref netif ){
+in_addr_t * ip_netif_address( ip_netif_ref netif ){
     ip_route_ref    route;
     route = ip_routes_get_index( & netif->routes, 0 );
 ,12 → 601,13
     return route ? & route->address : NULL;
 }
-int ip_send_route( packet_t packet, ip_netif_ref netif, ip_route_ref route, in_addr_t * src, in_addr_t dest ){
+int ip_send_route( packet_t packet, ip_netif_ref netif, ip_route_ref route, in_addr_t * src, in_addr_t dest, services_t error ){
     ERROR_DECLARE;
     measured_string_t   destination;
     measured_string_ref translation;
     char *              data;
+    int                 phone;
     // get destination hardware address
     if( netif->arp ){
 ,12 → 617,16
             sleep( 1 );
             ERROR_PROPAGATE( arp_translate_req( netif->arp->phone, netif->device_id, SERVICE_IP, & destination, & translation, & data ));
         }
-        // TODO unreachable
-        if( ! translation ) return EINVAL;
-        if( ! translation->value ){
-            // TODO unreachable
-            free( translation );
-            free( data );
+        if( !( translation && translation->value )){
+            if( translation ){
+                free( translation );
+                free( data );
+            }
+            phone = ip_prepare_icmp_and_get_phone( error, packet, NULL );
+            if( phone >= 0 ){
+                // unreachable ICMP if no routing
+                icmp_destination_unreachable_msg( phone, ICMP_HOST_UNREACH, 0, packet );
+            }
             return EINVAL;
         }
     }else translation = NULL;
 ,7 → 633,7
     if( ERROR_OCCURRED( ip_prepare_packet( src, dest, packet, translation ))){
         pq_release( ip_globals.net_phone, packet_get_id( packet ));
     }else{
-        packet = ip_split_packet( packet, netif->prefix, netif->content, netif->suffix, netif->addr_len );
+        packet = ip_split_packet( packet, netif->prefix, netif->content, netif->suffix, netif->addr_len, error );
         if( packet ){
             nil_send_msg( netif->phone, netif->device_id, packet, SERVICE_IP );
         }
 ,12 → 723,15
             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 );
+            return ip_send_msg( 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 ));
         case NET_IL_RECEIVED:
             ERROR_PROPAGATE( packet_translate( 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 ));
         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 ));
         case NET_IP_SET_GATEWAY:
 ,10 → 858,12
     return EOK;
 }
-packet_t ip_split_packet( packet_t packet, size_t prefix, size_t content, size_t suffix, size_t addr_len ){
+packet_t ip_split_packet( packet_t packet, size_t prefix, size_t content, size_t suffix, size_t addr_len, services_t error ){
     size_t          length;
     packet_t        next;
     packet_t        new_packet;
+    int             result;
+    int             phone;
     next = packet;
     // check all packets
 ,12 → 871,23
         length = packet_get_data_length( next );
         // too long?
         if( length > content ){
-            if( ip_fragment_packet( next, content, prefix, suffix, addr_len ) != EOK ){
+            result = ip_fragment_packet( next, content, prefix, suffix, addr_len );
+            if( result != EOK ){
                 new_packet = pq_detach( next );
                 if( next == packet ){
+                    // the new first packet of the queue
                     packet = new_packet;
                 }
-                pq_release( ip_globals.net_phone, packet_get_id( next ));
+                // fragmentation needed?
+                if( result == EPERM ){
+                    phone = ip_prepare_icmp_and_get_phone( error, next, NULL );
+                    if( phone >= 0 ){
+                        // fragmentation necessary ICMP
+                        icmp_destination_unreachable_msg( phone, ICMP_FRAG_NEEDED, content, next );
+                    }
+                }else{
+                    pq_release( ip_globals.net_phone, packet_get_id( next ));
+                }
                 next = new_packet;
                 continue;
             }
 ,7 → 916,6
     if( ! header ) return EINVAL;
     // fragmentation forbidden?
     if( header->flags & IPFLAG_DONT_FRAGMENT ){
-        // TODO fragmentation necessary ICMP
         return EPERM;
     }
     // create the last fragment
 ,21 → 924,18
     // allocate as much as originally
     last_header = ( ip_header_ref ) packet_suffix( new_packet, IP_HEADER_LENGTH( header ));
     if( ! last_header ){
-        pq_release( ip_globals.net_phone, packet_get_id( new_packet ));
-        return ENOMEM;
+        return release_and_return( packet, ENOMEM );
     }
     ip_create_last_header( last_header, header );
     // trim the unused space
     if( ERROR_OCCURRED( packet_trim( new_packet, 0, IP_HEADER_LENGTH( header ) - IP_HEADER_LENGTH( last_header )))){
-        pq_release( ip_globals.net_phone, packet_get_id( new_packet ));
-        return ERROR_CODE;
+        return release_and_return( packet, ERROR_CODE );
     }
     // biggest multiple of 8 lower than content
     // TODO even fragmentation?
     length = length & ( ~ 0x7 );// ( content / 8 ) * 8
     if( ERROR_OCCURRED( ip_fragment_packet_data( packet, new_packet, header, last_header, (( IP_TOTAL_LENGTH( header ) - length ) % ( length - IP_HEADER_LENGTH( last_header ))), src, dest, address_length ))){
-        pq_release( ip_globals.net_phone, packet_get_id( new_packet ));
-        return ERROR_CODE;
+        return release_and_return( packet, ERROR_CODE );
     }
     // mark the first as fragmented
     header->flags |= IPFLAG_MORE_FRAGMENTS;
 ,17 → 945,14
         if( ! new_packet ) return ENOMEM;
         middle_header = ip_create_middle_header( new_packet, last_header );
         if( ! middle_header ){
-            pq_release( ip_globals.net_phone, packet_get_id( new_packet ));
-            return ENOMEM;
+            return release_and_return( packet, ENOMEM );
         }
         if( ERROR_OCCURRED( ip_fragment_packet_data( packet, new_packet, header, middle_header, length - IP_HEADER_LENGTH( middle_header ), src, dest, address_length ))){
-            pq_release( ip_globals.net_phone, packet_get_id( new_packet ));
-            return ERROR_CODE;
+            return release_and_return( packet, ERROR_CODE );
         }
     }
     // finish the first fragment
     header->header_checksum = IP_HEADER_CHECKSUM( header );
-    printf( "ok\n" );
     return EOK;
 }
 ,9 → 1023,7
     do{
         next = pq_detach( packet );
-        if( ip_process_packet( device_id, packet ) != EOK ){
-            pq_release( ip_globals.net_phone, packet_get_id( packet ));
-        }
+        ip_process_packet( device_id, packet );
         packet = next;
     }while( packet );
     return EOK;
 ,42 → 1035,102
     ip_header_ref   header;
     in_addr_t       dest;
     ip_route_ref    route;
+    int             phone;
     header = ( ip_header_ref ) packet_get_data( packet );
-    if( ! header ) return ENOMEM;
+    if( ! header ){
+        return release_and_return( packet, ENOMEM );
+    }
     // checksum
     if(( header->header_checksum ) && ( IP_HEADER_CHECKSUM( header ))){
         // TODO checksum error ICMP?
+        return release_and_return( packet, EINVAL );
+    }
+    if( header->ttl <= 1 ){
+        phone = ip_prepare_icmp_and_get_phone( 0, packet, header );
+        if( phone >= 0 ){
+            // ttl oxceeded ICMP
+            icmp_time_exceeded_msg( phone, ICMP_EXC_TTL, packet );
+        }
         return EINVAL;
     }
-    // TODO ttl oxceeded ICMP?
-    if( !( -- header->ttl )) return EINVAL;
     // process ipopt and get destination
     dest = ip_get_destination( header );
     ERROR_PROPAGATE( packet_set_addr( packet, NULL, ( uint8_t * ) & dest.s_addr, IP_ADDR ));
     route = ip_find_route( dest );
-    // TODO unreachable ICMP?
-    if( ! route ) return ENOENT;
+    if( ! route ){
+        phone = ip_prepare_icmp_and_get_phone( 0, packet, header );
+        if( phone >= 0 ){
+            // unreachable ICMP
+            icmp_destination_unreachable_msg( phone, ICMP_HOST_UNREACH, 0, packet );
+        }
+        return ENOENT;
+    }
     if( route->address.s_addr == dest.s_addr ){
         // local delivery
-        return ip_deliver_local( device_id, packet, header );
+        return ip_deliver_local( device_id, packet, header, 0 );
     }else{
         // only if routing enabled
         if( route->netif->routing ){
-            return ip_send_route( packet, route->netif, route, NULL, dest );
-        }
-        else
-        {
-            // TODO icmp unreachable?
+            -- header->ttl;
+            return ip_send_route( packet, route->netif, route, NULL, dest, 0 );
+        }else{
+            phone = ip_prepare_icmp_and_get_phone( 0, packet, header );
+            if( phone >= 0 ){
+                // unreachable ICMP if no routing
+                icmp_destination_unreachable_msg( phone, ICMP_HOST_UNREACH, 0, packet );
+            }
             return ENOENT;
         }
     }
 }
-int ip_deliver_local( device_id_t device_id, packet_t packet, ip_header_ref header ){
+int ip_received_error_msg( int ip_phone, device_id_t device_id, packet_t packet, services_t target, services_t error ){
+    uint8_t *           data;
+    int                 offset;
+    icmp_type_t         type;
+    icmp_code_t         code;
+    ip_netif_ref        netif;
+    measured_string_t   address;
+    ip_route_ref        route;
+    ip_header_ref       header;
+    switch( error ){
+        case SERVICE_ICMP:
+            offset = icmp_client_process_packet( packet, & type, & code, NULL, NULL );
+            if( offset < 0 ){
+                return release_and_return( packet, ENOMEM );
+            }
+            data = packet_get_data( packet );
+            header = ( ip_header_ref ) data + offset;
+            // destination host unreachable?
+            if(( type == ICMP_DEST_UNREACH ) && ( code == ICMP_HOST_UNREACH )){
+                fibril_rwlock_read_lock( & ip_globals.netifs_lock );
+                netif = ip_netifs_find( & ip_globals.netifs, device_id );
+                if( netif && netif->arp ){
+                    route = ip_routes_get_index( & netif->routes, 0 );
+                    // from the same network?
+                    if( route && (( route->address.s_addr & route->netmask.s_addr ) == ( header->destination_address & route->netmask.s_addr ))){
+                        // clear the ARP mapping if any
+                        address.value = ( char * ) & header->destination_address;
+                        address.length = CONVERT_SIZE( uint8_t, char, sizeof( header->destination_address ));
+                        arp_clear_address_req( netif->arp->phone, netif->device_id, SERVICE_IP, & address );
+                    }
+                }
+                fibril_rwlock_read_unlock( & ip_globals.netifs_lock );
+            }
+            break;
+        default:
+            return release_and_return( packet, ENOTSUP );
+    }
+    return ip_deliver_local( device_id, packet, header, error );
+}
+int ip_deliver_local( device_id_t device_id, packet_t packet, ip_header_ref header, services_t error ){
     ERROR_DECLARE;
     ip_proto_ref    proto;
+    int             phone;
     if(( header->flags & IPFLAG_MORE_FRAGMENTS ) || header->fragment_offset ){
         // TODO fragmented
 ,12 → 1141,17
         proto = ip_protos_find( & ip_globals.protos, header->protocol );
         if( ! proto ){
             fibril_rwlock_read_unlock( & ip_globals.protos_lock );
+            phone = ip_prepare_icmp_and_get_phone( error, packet, header );
+            if( phone >= 0 ){
+                // unreachable ICMP
+                icmp_destination_unreachable_msg( phone, ICMP_PROT_UNREACH, 0, packet );
+            }
             return ENOENT;
         }
         if( proto->received_msg ){
-            ERROR_CODE = proto->received_msg( device_id, packet, SERVICE_IP );
+            ERROR_CODE = proto->received_msg( device_id, packet, proto->service, error );
         }else{
-            ERROR_CODE = tl_received_msg( proto->phone, device_id, packet, proto->service );
+            ERROR_CODE = tl_received_msg( proto->phone, device_id, packet, proto->service, error );
         }
         fibril_rwlock_read_unlock( & ip_globals.protos_lock );
         return ERROR_CODE;
 ,9 → 1162,55
     in_addr_t   destination;
     // TODO search set ipopt route?
-    destination.s_addr = header->destination_address; //ntohl( header->destination_address );
+    destination.s_addr = header->destination_address;
     return destination;
 }
+int ip_prepare_icmp( packet_t packet, ip_header_ref header ){
+    packet_t    next;
+    // detach the first packet and release the others
+    next = pq_detach( packet );
+    if( next ){
+        pq_release( ip_globals.net_phone, packet_get_id( next ));
+    }
+    if( ! header ){
+        if( packet_get_data_length( packet ) <= sizeof( ip_header_t )) return ENOMEM;
+        // get header
+        header = ( ip_header_ref ) packet_get_data( packet );
+        if( ! header ) return EINVAL;
+    }
+    // only for the first fragment
+    if( header->fragment_offset ) return EINVAL;
+    // set the destination address
+    return packet_set_addr( packet, NULL, ( uint8_t * ) & header->source_address, sizeof( header->source_address ));
+}
+int ip_get_icmp_phone( void ){
+    ip_proto_ref    proto;
+    int             phone;
+    fibril_rwlock_read_lock( & ip_globals.protos_lock );
+    proto = ip_protos_find( & ip_globals.protos, IPPROTO_ICMP );
+    phone = proto ? proto->phone : ENOENT;
+    fibril_rwlock_read_unlock( & ip_globals.protos_lock );
+    return phone;
+}
+int ip_prepare_icmp_and_get_phone( services_t error, packet_t packet, ip_header_ref header ){
+    int phone;
+    phone = ip_get_icmp_phone();
+    if( error || ( phone < 0 ) || ip_prepare_icmp( packet, header )){
+        return release_and_return( packet, EINVAL );
+    }
+    return phone;
+}
+static int  release_and_return( packet_t packet, int result ){
+    pq_release( ip_globals.net_phone, packet_get_id( packet ));
+    return result;
+}
 /** @}
  */

 /branches/network/uspace/srv/net/il/ip/Makefile
 ,6 → 50,8
     $(NET_BASE)inet.c \
     $(STRUCTURES)/packet/packet_remote.c \
     $(NET_BASE)il/arp/arp_remote.c \
+    $(NET_BASE)il/icmp/icmp_remote.c \
+    $(NET_BASE)il/icmp/icmp_client.c \
     $(NET_BASE)nil/nil_remote.c \
     $(NET_BASE)net/net_remote.c

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4706 → Rev 4707