Changeset 7715994 in mainline for uspace/srv/net/socket/socket_core.h

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/srv/net/socket/socket_core.h (modified) (11 diffs)

uspace/srv/net/socket/socket_core.h

@@ -93 +93 @@
         /** Socket identifier.
          */
-        int                             socket_id;
+        int socket_id;
         /** Client application phone.
          */
-        int                             phone;
+        int phone;
         /** Bound port.
          */
-        int                             port;
+        int port;
         /** Received packets queue.
          */
-        dyn_fifo_t              received;
+        dyn_fifo_t received;
         /** Sockets for acceptance queue.
          */
-        dyn_fifo_t              accepted;
+        dyn_fifo_t accepted;
         /** Protocol specific data.
          */
-        void *                  specific_data;
+        void * specific_data;
         /** Socket ports map key.
          */
-        const char *    key;
+        const char * key;
         /** Length of the Socket ports map key.
          */
-        size_t                  key_length;
+        size_t key_length;
 };
 
@@ -120 +120 @@
  *  The key is the socket identifier.
  */
-INT_MAP_DECLARE( socket_cores, socket_core_t );
+INT_MAP_DECLARE(socket_cores, socket_core_t);
 
 /** Bount port sockets map.
  *  The listening socket has the SOCKET_MAP_KEY_LISTENING key identifier whereas the other use the remote addresses.
  */
-GENERIC_CHAR_MAP_DECLARE( socket_port_map, socket_core_ref );
+GENERIC_CHAR_MAP_DECLARE(socket_port_map, socket_core_ref);
 
 /** Ports map.
  *  The key is the port number.
  */
-INT_MAP_DECLARE( socket_ports, socket_port_t );
+INT_MAP_DECLARE(socket_ports, socket_port_t);
 
 /** Destroys local sockets.
@@ -139 +139 @@
  *  @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 ));
+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 +158 @@
  *  @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 );
+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 +171 @@
  *  @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 );
+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 +182 @@
  *  @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 );
+int socket_create(socket_cores_ref local_sockets, int app_phone, void * specific_data, int * socket_id);
 
 /** Destroys the socket.
@@ -195 +195 @@
  *  @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 ));
+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 +206 @@
  *  @returns Other error codes as defined for the data_reply() function.
  */
-int     socket_reply_packets( packet_t packet, size_t * length );
+int socket_reply_packets(packet_t packet, size_t * length);
 
 /** Finds the bound port socket.
@@ -216 +216 @@
  *  @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 );
+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 +224 @@
  *  @param[in] socket The socket to be unbound.
  */
-void    socket_port_release( socket_ports_ref global_sockets, socket_core_ref socket );
+void socket_port_release(socket_ports_ref global_sockets, socket_core_ref socket);
 
 /** Adds the socket to an already bound port.
@@ -236 +236 @@
  *  @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 );
+int socket_port_add(socket_ports_ref global_sockets, int port, socket_core_ref socket, const char * key, size_t key_length);
 
 #endif