Changeset 10056483 in mainline for uspace/lib/net/include


Ignore:
Timestamp:
2010-10-13T22:48:25Z (16 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ef689ef0
Parents:
b278b4e (diff), 753bca3 (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 from lp:~jakub/helenos/net.

Location:
uspace/lib/net/include
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/net/include/icmp_client.h

    rb278b4e r10056483  
    3838#define __NET_ICMP_CLIENT_H__
    3939
    40 #include <icmp_codes.h>
     40#include <net/icmp_codes.h>
    4141#include <net/packet.h>
    4242

  • uspace/lib/net/include/icmp_header.h

    rb278b4e r10056483  
    4242
    4343#include <net/in.h>
    44 #include <icmp_codes.h>
     44#include <net/icmp_codes.h>
    4545
    4646/** ICMP header size in bytes.

  • uspace/lib/net/include/icmp_interface.h

    rb278b4e r10056483  
    4141#include <net/packet.h>
    4242#include <net/inet.h>
    43 #include <ip_codes.h>
    44 #include <icmp_codes.h>
    45 #include <icmp_common.h>
     43#include <net/ip_codes.h>
     44#include <net/icmp_codes.h>
     45#include <net/icmp_common.h>
    4646
    4747/** @name ICMP module interface

  • uspace/lib/net/include/ip_client.h

    rb278b4e r10056483  
    4242
    4343#include <net/packet.h>
    44 #include <ip_codes.h>
     44#include <net/ip_codes.h>
    4545#include <ip_interface.h>
    4646

  • uspace/lib/net/include/ip_interface.h

    rb278b4e r10056483  
    4242
    4343#include <net/in.h>
    44 #include <ip_codes.h>
     44#include <net/ip_codes.h>
    4545
    4646#include <ip_remote.h>
    … …  
    7474 *  @param[in] me The requesting module service.
    7575 *  @param[in] receiver The message receiver. Used for remote connection.
    76  *  @param[in] tl_received_msg The message processing function. Used if bundled together.
    7776 *  @returns The phone of the needed service.
    7877 *  @returns EOK on success.
    7978 *  @returns Other error codes as defined for the bind_service() function.
    8079 */
    81 extern int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver, tl_received_msg_t tl_received_msg);
     80extern int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver);
    8281
    8382/** Connects to the IP module.

  • uspace/lib/net/include/ip_local.h

    rb278b4e r10056483  
    3737#include <ipc/services.h>
    3838
    39 #include <ip_codes.h>
     39#include <net/ip_codes.h>
    4040#include <net/inet.h>
    4141#include <net/in.h>

  • uspace/lib/net/include/ip_messages.h

    rb278b4e r10056483  
    4343
    4444#include <net/in.h>
    45 #include <ip_codes.h>
     45#include <net/ip_codes.h>
    4646
    4747/** IP module messages.

  • uspace/lib/net/include/ip_remote.h

    rb278b4e r10056483  
    3737#include <ipc/services.h>
    3838
    39 #include <ip_codes.h>
     39#include <net/ip_codes.h>
    4040#include <net/inet.h>
    4141#include <net/in.h>
Note: See TracChangeset for help on using the changeset viewer.