Ignore:
Timestamp:
2010-11-02T18:29:01Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4f35b9ff
Parents:
76e1121f (diff), 28f4adb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/net/include/icmp_client.h

    r76e1121f r4687a26c  
    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
    40 #include <icmp_codes.h>
    41 #include <packet/packet.h>
     40#include <net/icmp_codes.h>
     41#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
Note: See TracChangeset for help on using the changeset viewer.