Changeset 3aae4e8 in mainline for uspace/lib/net/include/ip_interface.h

Timestamp:

2010-04-04T22:07:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

23de644

Parents:

9f10660f (diff), 73060801 (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:

• uspace/lib/net/include/ip_interface.h (moved) (moved from uspace/srv/net/include/ip_interface.h ) (10 diffs)

uspace/lib/net/include/ip_interface.h

@@ -42 +42 @@
 
 #include <async.h>
-
 #include <ipc/services.h>
 
-#include "../include/device.h"
+#include <net_device.h>
+#include <packet/packet.h>
 
-#include "../structures/packet/packet.h"
-
-#include "in.h"
-#include "ip_codes.h"
-#include "socket_codes.h"
+#include <in.h>
+#include <ip_codes.h>
+#include <socket_codes.h>
 
 /** @name IP module interface
@@ -82 +80 @@
  *  @returns Other error codes as defined for the bind_service() function.
  */
-int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver, tl_received_msg_t tl_received_msg);
+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);
 
 /** Registers the new device.
@@ -98 +96 @@
  *  @returns Other error codes as defined for the arp_device_req() function.
  */
-int ip_device_req(int ip_phone, device_id_t device_id, services_t netif);
+extern int ip_device_req(int ip_phone, device_id_t device_id, services_t netif);
 
 /** Sends the packet queue.
@@ -110 +108 @@
  *  @returns Other error codes as defined for the generic_send_msg() function.
  */
-int ip_send_msg(int ip_phone, device_id_t device_id, packet_t packet, services_t sender, services_t error);
+extern int ip_send_msg(int ip_phone, device_id_t device_id, packet_t packet, services_t sender, services_t error);
 
 /** Connects to the IP module.
@@ -117 +115 @@
  *  @returns 0 if called by the bundle module.
  */
-int ip_connect_module(services_t service);
+extern int ip_connect_module(services_t service);
 
 /** Adds a route to the device routing table.
@@ -127 +125 @@
  *  @param[in] gateway The target network gateway. Not used if zero.
  */
-int ip_add_route_req(int ip_phone, device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway);
+extern int ip_add_route_req(int ip_phone, device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway);
 
 /** Sets the default gateway.
@@ -135 +133 @@
  *  @param[in] gateway The default gateway.
  */
-int ip_set_gateway_req(int ip_phone, device_id_t device_id, in_addr_t gateway);
+extern int ip_set_gateway_req(int ip_phone, device_id_t device_id, in_addr_t gateway);
 
 /** Returns the device packet dimension for sending.
@@ -145 +143 @@
  *  @returns Other error codes as defined for the generic_packet_size_req() function.
  */
-int ip_packet_size_req(int ip_phone, device_id_t device_id, packet_dimension_ref packet_dimension);
+extern int ip_packet_size_req(int ip_phone, device_id_t device_id, packet_dimension_ref packet_dimension);
 
 /** Notifies the IP module about the received error notification packet.
@@ -155 +153 @@
  *  @returns EOK on success.
  */
-int ip_received_error_msg(int ip_phone, device_id_t device_id, packet_t packet, services_t target, services_t error);
+extern int ip_received_error_msg(int ip_phone, device_id_t device_id, packet_t packet, services_t target, services_t error);
 
 /** Returns the device identifier and the IP pseudo header based on the destination address.
@@ -166 +164 @@
  *  @param[out] headerlen The IP pseudo header length.
  */
-int ip_get_route_req(int ip_phone, ip_protocol_t protocol, const struct sockaddr * destination, socklen_t addrlen, device_id_t * device_id, ip_pseudo_header_ref * header, size_t * headerlen);
+extern int ip_get_route_req(int ip_phone, ip_protocol_t protocol, const struct sockaddr * destination, socklen_t addrlen, device_id_t * device_id, ip_pseudo_header_ref * header, size_t * headerlen);
 
 /*@}*/