Changeset 3aae4e8 in mainline for uspace/lib/socket/include/socket_core.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/socket/include/socket_core.h (moved) (moved from uspace/srv/net/socket/socket_core.h ) (10 diffs)

uspace/lib/socket/include/socket_core.h

@@ -40 +40 @@
 #include <sys/types.h>
 
-#include "../include/in.h"
-#include "../include/device.h"
-
-#include "../structures/generic_char_map.h"
-#include "../structures/dynamic_fifo.h"
-#include "../structures/int_map.h"
-#include "../structures/packet/packet.h"
+#include <in.h>
+#include <net_device.h>
+#include <adt/generic_char_map.h>
+#include <adt/dynamic_fifo.h>
+#include <adt/int_map.h>
+#include <packet/packet.h>
 
 /** Initial size of the received packet queue.
@@ -139 +138 @@
  *  @param[in] socket_release The client release callback function.
  */
-void socket_cores_release(int packet_phone, socket_cores_ref local_sockets, socket_ports_ref global_sockets, void (*socket_release)(socket_core_ref socket));
+extern void socket_cores_release(int packet_phone, socket_cores_ref local_sockets, socket_ports_ref global_sockets, void (*socket_release)(socket_core_ref socket));
 
 /** Binds the socket to the port.
@@ -158 +157 @@
  *  @returns Other error codes as defined for the socket_bind_insert() function.
  */
-int socket_bind(socket_cores_ref local_sockets, socket_ports_ref global_sockets, int socket_id, void * addr, size_t addrlen, int free_ports_start, int free_ports_end, int last_used_port);
+extern int socket_bind(socket_cores_ref local_sockets, socket_ports_ref global_sockets, int socket_id, void * addr, size_t addrlen, int free_ports_start, int free_ports_end, int last_used_port);
 
 /** Binds the socket to a free port.
@@ -171 +170 @@
  *  @returns Other error codes as defined for the socket_bind_insert() function.
  */
-int socket_bind_free_port(socket_ports_ref global_sockets, socket_core_ref socket, int free_ports_start, int free_ports_end, int last_used_port);
+extern int socket_bind_free_port(socket_ports_ref global_sockets, socket_core_ref socket, int free_ports_start, int free_ports_end, int last_used_port);
 
 /** Creates a new socket.
@@ -182 +181 @@
  *  @returns ENOMEM if there is not enough memory left.
  */
-int socket_create(socket_cores_ref local_sockets, int app_phone, void * specific_data, int * socket_id);
+extern int socket_create(socket_cores_ref local_sockets, int app_phone, void * specific_data, int * socket_id);
 
 /** Destroys the socket.
@@ -195 +194 @@
  *  @returns ENOTSOCK if the socket is not found.
  */
-int socket_destroy(int packet_phone, int socket_id, socket_cores_ref local_sockets, socket_ports_ref global_sockets, void (*socket_release)(socket_core_ref socket));
+extern int socket_destroy(int packet_phone, int socket_id, socket_cores_ref local_sockets, socket_ports_ref global_sockets, void (*socket_release)(socket_core_ref socket));
 
 /** Replies the packet or the packet queue data to the application via the socket.
@@ -206 +205 @@
  *  @returns Other error codes as defined for the data_reply() function.
  */
-int socket_reply_packets(packet_t packet, size_t * length);
+extern int socket_reply_packets(packet_t packet, size_t * length);
 
 /** Finds the bound port socket.
@@ -216 +215 @@
  *  @returns NULL if no socket was found.
  */
-socket_core_ref socket_port_find(socket_ports_ref global_sockets, int port, const char * key, size_t key_length);
+extern socket_core_ref socket_port_find(socket_ports_ref global_sockets, int port, const char * key, size_t key_length);
 
 /** Releases the socket port.
@@ -224 +223 @@
  *  @param[in] socket The socket to be unbound.
  */
-void socket_port_release(socket_ports_ref global_sockets, socket_core_ref socket);
+extern void socket_port_release(socket_ports_ref global_sockets, socket_core_ref socket);
 
 /** Adds the socket to an already bound port.
@@ -236 +235 @@
  *  @returns Other error codes as defined for the socket_port_add_core() function.
  */
-int socket_port_add(socket_ports_ref global_sockets, int port, socket_core_ref socket, const char * key, size_t key_length);
+extern int socket_port_add(socket_ports_ref global_sockets, int port, socket_core_ref socket, const char * key, size_t key_length);
 
 #endif