Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 25171e5 in mainline


Ignore:
Timestamp:
2010-10-17T21:52:12Z (10 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
master
Children:
84c20da
Parents:
3a609e0
Message:

Cleanup icmp_client.[ch].

Location:
uspace/lib
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/include/net/icmp_codes.h

    r3a609e0 r25171e5  
    4242#define LIBC_ICMP_CODES_H_
    4343
     44#include <sys/types.h>
     45
    4446/** ICMP type type definition. */
    4547typedef uint8_t icmp_type_t;
  • uspace/lib/net/include/icmp_client.h

    r3a609e0 r25171e5  
    2727 */
    2828
    29 /** @addtogroup icmp
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  ICMP client interface.
     34 * ICMP client interface.
    3535 */
    3636
    37 #ifndef __NET_ICMP_CLIENT_H__
    38 #define __NET_ICMP_CLIENT_H__
     37#ifndef LIBNET_ICMP_CLIENT_H_
     38#define LIBNET_ICMP_CLIENT_H_
    3939
    4040#include <net/icmp_codes.h>
    4141#include <net/packet.h>
    4242
    43 /** Processes the received packet prefixed with an ICMP header.
    44  *  @param[in] packet The received packet.
    45  *  @param[out] type The ICMP header type.
    46  *  @param[out] code The ICMP header code.
    47  *  @param[out] pointer The ICMP header pointer.
    48  *  @param[out] mtu The ICMP header MTU.
    49  *  @returns The ICMP header length.
    50  *  @returns Zero (0) if the packet contains no data.
    51  */
    52 extern int icmp_client_process_packet(packet_t packet, icmp_type_t * type, icmp_code_t * code, icmp_param_t * pointer, icmp_param_t * mtu);
    53 
    54 /** Returns the ICMP header length.
    55  *  @param[in] packet The packet.
    56  *  @returns The ICMP header length in bytes.
    57  */
    58 extern size_t icmp_client_header_length(packet_t packet);
     43extern int icmp_client_process_packet(packet_t, icmp_type_t *, icmp_code_t *,
     44    icmp_param_t *, icmp_param_t *);
     45extern size_t icmp_client_header_length(packet_t);
    5946
    6047#endif
  • uspace/lib/net/tl/icmp_client.c

    r3a609e0 r25171e5  
    2727 */
    2828
    29 /** @addtogroup icmp
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    3333/** @file
    34  *  ICMP client interface implementation.
    35  *  @see icmp_client.h
     34 * ICMP client interface implementation.
     35 * @see icmp_client.h
    3636 */
    3737
     38#include <icmp_client.h>
     39#include <icmp_header.h>
     40#include <packet_client.h>
     41
    3842#ifdef CONFIG_DEBUG
    39         #include <stdio.h>
     43#include <stdio.h>
    4044#endif
    4145
     
    4448
    4549#include <net/icmp_codes.h>
    46 #include <icmp_client.h>
    4750#include <net/packet.h>
    48 #include <packet_client.h>
    49 #include <icmp_header.h>
    5051
    51 int icmp_client_process_packet(packet_t packet, icmp_type_t * type, icmp_code_t * code, icmp_param_t * pointer, icmp_param_t * mtu){
     52/** Processes the received packet prefixed with an ICMP header.
     53 *
     54 * @param[in] packet    The received packet.
     55 * @param[out] type     The ICMP header type.
     56 * @param[out] code     The ICMP header code.
     57 * @param[out] pointer  The ICMP header pointer.
     58 * @param[out] mtu      The ICMP header MTU.
     59 * @returns             The ICMP header length.
     60 * @returns             Zero if the packet contains no data.
     61 */
     62int
     63icmp_client_process_packet(packet_t packet, icmp_type_t *type,
     64    icmp_code_t *code, icmp_param_t *pointer, icmp_param_t *mtu)
     65{
    5266        icmp_header_ref header;
    5367
    5468        header = (icmp_header_ref) packet_get_data(packet);
    55         if((! header)
    56                 || (packet_get_data_length(packet) < sizeof(icmp_header_t))){
     69        if (!header ||
     70            (packet_get_data_length(packet) < sizeof(icmp_header_t))) {
    5771                return 0;
    5872        }
    59         if(type){
     73
     74        if (type)
    6075                *type = header->type;
    61         }
    62         if(code){
     76        if (code)
    6377                *code = header->code;
    64         }
    65         if(pointer){
     78        if (pointer)
    6679                *pointer = header->un.param.pointer;
    67         }
    68         if(mtu){
     80        if (mtu)
    6981                *mtu = header->un.frag.mtu;
    70         }
     82
    7183        // remove debug dump
    7284#ifdef CONFIG_DEBUG
    73         printf("ICMP error %d (%d) in packet %d\n", header->type, header->code, packet_get_id(packet));
     85        printf("ICMP error %d (%d) in packet %d\n", header->type, header->code,
     86            packet_get_id(packet));
    7487#endif
    7588        return sizeof(icmp_header_t);
    7689}
    7790
    78 size_t icmp_client_header_length(packet_t packet){
    79         if(packet_get_data_length(packet) < sizeof(icmp_header_t)){
     91/** Returns the ICMP header length.
     92 *
     93 * @param[in] packet    The packet.
     94 * @returns             The ICMP header length in bytes.
     95 */
     96size_t icmp_client_header_length(packet_t packet)
     97{
     98        if (packet_get_data_length(packet) < sizeof(icmp_header_t))
    8099                return 0;
    81         }
     100
    82101        return sizeof(icmp_header_t);
    83102}
Note: See TracChangeset for help on using the changeset viewer.