Changeset 59ecd4a in mainline for uspace/lib/net/include/tl_common.h

Timestamp:

2010-04-04T21:41:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5db9084

Parents:

36a75a2 (diff), ee7e82a9 (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/tl_common.h (moved) (moved from uspace/srv/net/tl/tl_common.h ) (7 diffs)

uspace/lib/net/include/tl_common.h

@@ -38 +38 @@
 #define __NET_TL_COMMON_H__
 
-#include "../structures/packet/packet.h"
-
-#include "../include/device.h"
-#include "../include/inet.h"
-#include "../include/socket_codes.h"
+#include <packet/packet.h>
+#include <net_device.h>
+#include <inet.h>
+#include <socket_codes.h>
 
 /** Device packet dimensions.
@@ -59 +58 @@
  *  @returns EAFNOSUPPORT if the address family is not supported.
  */
-int tl_get_address_port(const struct sockaddr * addr, int addrlen, uint16_t * port);
+extern int tl_get_address_port(const struct sockaddr * addr, int addrlen, uint16_t * port);
 
 /** Gets IP packet dimensions.
@@ -74 +73 @@
  *  @returns Other codes as defined for the ip_packet_size_req() function.
  */
-int tl_get_ip_packet_dimension(int ip_phone, packet_dimensions_ref packet_dimensions, device_id_t device_id, packet_dimension_ref * packet_dimension);
+extern int tl_get_ip_packet_dimension(int ip_phone, packet_dimensions_ref packet_dimensions, device_id_t device_id, packet_dimension_ref * packet_dimension);
 
 /** Updates IP device packet dimensions cache.
@@ -83 +82 @@
  *  @returns ENOENT if the packet dimension is not cached.
  */
-int tl_update_ip_packet_dimension(packet_dimensions_ref packet_dimensions, device_id_t device_id, size_t content);
+extern int tl_update_ip_packet_dimension(packet_dimensions_ref packet_dimensions, device_id_t device_id, size_t content);
 
 /** Sets the address port.
@@ -94 +93 @@
  *  @returns EAFNOSUPPORT if the address family is not supported.
  */
-int tl_set_address_port(struct sockaddr * addr, int addrlen, uint16_t port);
+extern int tl_set_address_port(struct sockaddr * addr, int addrlen, uint16_t port);
 
 /** Prepares the packet for ICMP error notification.
@@ -106 +105 @@
  *  @returns ENOENT if no packet may be sent.
  */
-int tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t packet, services_t error);
+extern int tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t packet, services_t error);
 
 /** Receives data from the socket into a packet.
@@ -120 +119 @@
  *  @returns Other error codes as defined for the async_data_read_finalize() function.
  */
-int tl_socket_read_packet_data(int packet_phone, packet_ref packet, size_t prefix, const packet_dimension_ref dimension, const struct sockaddr * addr, socklen_t addrlen);
+extern int tl_socket_read_packet_data(int packet_phone, packet_ref packet, size_t prefix, const packet_dimension_ref dimension, const struct sockaddr * addr, socklen_t addrlen);
 
 #endif