Index: uspace/lib/net/include/icmp_header.h =================================================================== --- uspace/lib/net/include/icmp_header.h (revision 626182dd7b78da91aab98265b7dfb7a86dfa801f) +++ uspace/lib/net/include/icmp_header.h (revision a26b9e3b11586f3f29f265e2fe1e6ef9a078d6bb) @@ -27,15 +27,15 @@ */ -/** @addtogroup icmp +/** @addtogroup libnet * @{ */ /** @file - * ICMP header definition. - * Based on the RFC~792. + * ICMP header definition. + * Based on the RFC 792. */ -#ifndef __NET_ICMP_HEADER_H__ -#define __NET_ICMP_HEADER_H__ +#ifndef LIBNET_ICMP_HEADER_H_ +#define LIBNET_ICMP_HEADER_H_ #include @@ -44,83 +44,74 @@ #include -/** ICMP header size in bytes. - */ -#define ICMP_HEADER_SIZE sizeof(icmp_header_t) +/** ICMP header size in bytes. */ +#define ICMP_HEADER_SIZE sizeof(icmp_header_t) /** Type definition of the echo specific data. - * @see icmp_echo + * @see icmp_echo */ -typedef struct icmp_echo icmp_echo_t; +typedef struct icmp_echo icmp_echo_t; /** Type definition of the echo specific data pointer. - * @see icmp_echo + * @see icmp_echo */ -typedef icmp_echo_t * icmp_echo_ref; +typedef icmp_echo_t *icmp_echo_ref; -/** Echo specific data. - */ -struct icmp_echo{ - /** Message idintifier. - */ +/** Echo specific data. */ +struct icmp_echo { + /** Message idintifier. */ icmp_param_t identifier; - /** Message sequence number. - */ + /** Message sequence number. */ icmp_param_t sequence_number; } __attribute__ ((packed)); /** Type definition of the internet control message header. - * @see icmp_header + * @see icmp_header */ -typedef struct icmp_header icmp_header_t; +typedef struct icmp_header icmp_header_t; /** Type definition of the internet control message header pointer. - * @see icmp_header + * @see icmp_header */ -typedef icmp_header_t * icmp_header_ref; +typedef icmp_header_t *icmp_header_ref; -/** Internet control message header. - */ -struct icmp_header{ - /** The type of the message. - */ +/** Internet control message header. */ +struct icmp_header { + /** The type of the message. */ uint8_t type; - /** The error code for the datagram reported by the ICMP message. - * The interpretation is dependent on the message type. + + /** + * The error code for the datagram reported by the ICMP message. + * The interpretation is dependent on the message type. */ uint8_t code; - /** The checksum is the 16-bit ones's complement of the one's complement sum of the ICMP message starting with the ICMP Type. - * For computing the checksum, the checksum field should be zero. - * If the checksum does not match the contents, the datagram is discarded. + + /** + * The checksum is the 16-bit ones's complement of the one's complement + * sum of the ICMP message starting with the ICMP Type. For computing + * the checksum, the checksum field should be zero. If the checksum does + * not match the contents, the datagram is discarded. */ uint16_t checksum; - /** Message specific data. - */ - union{ - /** Echo specific data. - */ + + /** Message specific data. */ + union { + /** Echo specific data. */ icmp_echo_t echo; - /** Proposed gateway value. - */ + /** Proposed gateway value. */ in_addr_t gateway; - /** Fragmentation needed specific data. - */ - struct{ - /** Reserved field. - * Must be zero. - */ + + /** Fragmentation needed specific data. */ + struct { + /** Reserved field. Must be zero. */ icmp_param_t reserved; - /** Proposed MTU. - */ + /** Proposed MTU. */ icmp_param_t mtu; } frag; - /** Parameter problem specific data. - */ - struct{ - /** Problem pointer. - */ + + /** Parameter problem specific data. */ + struct { + /** Problem pointer. */ icmp_param_t pointer; - /** Reserved field. - * Must be zero. - */ + /** Reserved field. Must be zero. */ icmp_param_t reserved; } param; Index: uspace/lib/net/include/icmp_interface.h =================================================================== --- uspace/lib/net/include/icmp_interface.h (revision 626182dd7b78da91aab98265b7dfb7a86dfa801f) +++ uspace/lib/net/include/icmp_interface.h (revision a26b9e3b11586f3f29f265e2fe1e6ef9a078d6bb) @@ -27,10 +27,10 @@ */ -/** @addtogroup icmp +/** @addtogroup libnet * @{ */ -#ifndef __NET_ICMP_INTERFACE_H__ -#define __NET_ICMP_INTERFACE_H__ +#ifndef LIBNET_ICMP_INTERFACE_H_ +#define LIBNET_ICMP_INTERFACE_H_ #include @@ -46,56 +46,13 @@ /** @name ICMP module interface - * This interface is used by other modules. + * This interface is used by other modules. */ /*@{*/ -/** Sends the Destination Unreachable error notification packet. - * Beginning of the packet is sent as the notification packet data. - * The source and the destination addresses should be set in the original packet. - * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. - * @param[in] code The error specific code. - * @param[in] mtu The error MTU value. - * @param[in] packet The original packet. - * @returns EOK on success. - * @returns EPERM if the ICMP error notifications are disabled. - * @returns ENOMEM if there is not enough memory left. - */ -extern int icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code, icmp_param_t mtu, packet_t packet); - -/** Sends the Source Quench error notification packet. - * Beginning of the packet is sent as the notification packet data. - * The source and the destination addresses should be set in the original packet. - * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. - * @param[in] packet The original packet. - * @returns EOK on success. - * @returns EPERM if the ICMP error notifications are disabled. - * @returns ENOMEM if there is not enough memory left. - */ -extern int icmp_source_quench_msg(int icmp_phone, packet_t packet); - -/** Sends the Time Exceeded error notification packet. - * Beginning of the packet is sent as the notification packet data. - * The source and the destination addresses should be set in the original packet. - * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. - * @param[in] code The error specific code. - * @param[in] packet The original packet. - * @returns EOK on success. - * @returns EPERM if the ICMP error notifications are disabled. - * @returns ENOMEM if there is not enough memory left. - */ -extern int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t packet); - -/** Sends the Parameter Problem error notification packet. - * Beginning of the packet is sent as the notification packet data. - * The source and the destination addresses should be set in the original packet. - * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. - * @param[in] code The error specific code. - * @param[in] pointer The problematic parameter offset. - * @param[in] packet The original packet. - * @returns EOK on success. - * @returns EPERM if the ICMP error notifications are disabled. - * @returns ENOMEM if there is not enough memory left. - */ -extern int icmp_parameter_problem_msg(int icmp_phone, icmp_code_t code, icmp_param_t pointer, packet_t packet); +extern int icmp_destination_unreachable_msg(int, icmp_code_t, icmp_param_t, + packet_t); +extern int icmp_source_quench_msg(int, packet_t); +extern int icmp_time_exceeded_msg(int, icmp_code_t, packet_t); +extern int icmp_parameter_problem_msg(int, icmp_code_t, icmp_param_t, packet_t); /*@}*/ Index: uspace/lib/net/tl/icmp_remote.c =================================================================== --- uspace/lib/net/tl/icmp_remote.c (revision 626182dd7b78da91aab98265b7dfb7a86dfa801f) +++ uspace/lib/net/tl/icmp_remote.c (revision a26b9e3b11586f3f29f265e2fe1e6ef9a078d6bb) @@ -27,12 +27,16 @@ */ -/** @addtogroup icmp +/** @addtogroup libnet * @{ */ /** @file - * ICMP interface implementation for remote modules. - * @see icmp_interface.h + * ICMP interface implementation for remote modules. + * @see icmp_interface.h */ + +#include +#include +#include #include @@ -43,25 +47,85 @@ #include -#include -#include -#include - -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); +/** Sends the Destination Unreachable error notification packet. + * + * Beginning of the packet is sent as the notification packet data. + * The source and the destination addresses should be set in the original + * packet. + * + * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. + * @param[in] code The error specific code. + * @param[in] mtu The error MTU value. + * @param[in] packet The original packet. + * @returns EOK on success. + * @returns EPERM if the ICMP error notifications are disabled. + * @returns ENOMEM if there is not enough memory left. + */ +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)); +/** Sends the Source Quench error notification packet. + * + * Beginning of the packet is sent as the notification packet data. + * The source and the destination addresses should be set in the original + * packet. + * + * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. + * @param[in] packet The original packet. + * @returns EOK on success. + * @returns EPERM if the ICMP error notifications are disabled. + * @returns ENOMEM if there is not enough memory left. + */ +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)); +/** Sends the Time Exceeded error notification packet. + * + * Beginning of the packet is sent as the notification packet data. + * The source and the destination addresses should be set in the original + * packet. + * + * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. + * @param[in] code The error specific code. + * @param[in] packet The original packet. + * @returns EOK on success. + * @returns EPERM if the ICMP error notifications are disabled. + * @returns ENOMEM if there is not enough memory left. + */ +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); +/** Sends the Parameter Problem error notification packet. + * + * Beginning of the packet is sent as the notification packet data. + * The source and the destination addresses should be set in the original + * packet. + * + * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls. + * @param[in] code The error specific code. + * @param[in] pointer The problematic parameter offset. + * @param[in] packet The original packet. + * @returns EOK on success. + * @returns EPERM if the ICMP error notifications are disabled. + * @returns ENOMEM if there is not enough memory left. + */ +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; } @@ -69,2 +133,3 @@ /** @} */ +