Changeset aaa3f33a in mainline for uspace/srv

Timestamp:

2010-11-19T21:26:08Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a7811f17, cc3c2a1c

Parents:

4eca056

Message:

Remove xxx_ref typedefs (part 5).

Location:

uspace/srv/net

Files:

• net/net.c (modified) (4 diffs)
• net/net.h (modified) (1 diff)
• tl/tcp/tcp.c (modified) (10 diffs)
• tl/tcp/tcp.h (modified) (1 diff)
• tl/udp/udp.c (modified) (2 diffs)

uspace/srv/net/net/net.c

@@ -88 +88 @@
  *
  */
-int add_configuration(measured_strings_ref configuration, const char *name,
+int add_configuration(measured_strings_t *configuration, const char *name,
     const char *value)
 {
@@ -117 +117 @@
 }
 
-static int parse_line(measured_strings_ref configuration, char *line)
+static int parse_line(measured_strings_t *configuration, char *line)
 {
         int rc;
@@ -179 +179 @@
 
 static int read_configuration_file(const char *directory, const char *filename,
-    measured_strings_ref configuration)
+    measured_strings_t *configuration)
 {
         printf("%s: Reading configuration file %s/%s\n", NAME, directory, filename);
@@ -356 +356 @@
  *
  */
-static int net_get_conf(measured_strings_ref netif_conf,
+static int net_get_conf(measured_strings_t *netif_conf,
     measured_string_t *configuration, size_t count, char **data)
 {

uspace/srv/net/net/net.h

@@ -133 +133 @@
 } net_globals_t;
 
-extern int add_configuration(measured_strings_ref, const char *, const char *);
+extern int add_configuration(measured_strings_t *, const char *, const char *);
 extern int net_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, int *);
 extern int net_initialize_build(async_client_conn_t);

uspace/srv/net/tl/tcp/tcp.c

@@ -139 +139 @@
 
         /** Local sockets. */
-        socket_cores_ref local_sockets;
+        socket_cores_t *local_sockets;
 
         /** Socket identifier. */
@@ -172 +172 @@
 
 static int tcp_process_packet(device_id_t, packet_t, services_t);
-static int tcp_connect_core(socket_core_t *, socket_cores_ref,
+static int tcp_connect_core(socket_core_t *, socket_cores_t *,
     struct sockaddr *, socklen_t);
 static int tcp_queue_prepare_packet(socket_core_t *, tcp_socket_data_t *,
@@ -209 +209 @@
 static int tcp_process_client_messages(ipc_callid_t, ipc_call_t);
 
-static int tcp_listen_message(socket_cores_ref, int, int);
-static int tcp_connect_message(socket_cores_ref, int, struct sockaddr *,
+static int tcp_listen_message(socket_cores_t *, int, int);
+static int tcp_connect_message(socket_cores_t *, int, struct sockaddr *,
     socklen_t);
-static int tcp_recvfrom_message(socket_cores_ref, int, int, size_t *);
-static int tcp_send_message(socket_cores_ref, int, int, size_t *, int);
-static int tcp_accept_message(socket_cores_ref, int, int, size_t *, size_t *);
-static int tcp_close_message(socket_cores_ref, int);
+static int tcp_recvfrom_message(socket_cores_t *, int, int, size_t *);
+static int tcp_send_message(socket_cores_t *, int, int, size_t *, int);
+static int tcp_accept_message(socket_cores_t *, int, int, size_t *, size_t *);
+static int tcp_close_message(socket_cores_t *, int);
 
 /** TCP global data. */
@@ -1678 +1678 @@
 }
 
-int tcp_listen_message(socket_cores_ref local_sockets, int socket_id,
+int tcp_listen_message(socket_cores_t *local_sockets, int socket_id,
     int backlog)
 {
@@ -1704 +1704 @@
 }
 
-int tcp_connect_message(socket_cores_ref local_sockets, int socket_id,
+int tcp_connect_message(socket_cores_t *local_sockets, int socket_id,
     struct sockaddr *addr, socklen_t addrlen)
 {
@@ -1732 +1732 @@
 }
 
-int tcp_connect_core(socket_core_t *socket, socket_cores_ref local_sockets,
+int tcp_connect_core(socket_core_t *socket, socket_cores_t *local_sockets,
     struct sockaddr *addr, socklen_t addrlen)
 {
@@ -2091 +2091 @@
 }
 
-int tcp_recvfrom_message(socket_cores_ref local_sockets, int socket_id,
+int tcp_recvfrom_message(socket_cores_t *local_sockets, int socket_id,
     int flags, size_t *addrlen)
 {
@@ -2149 +2149 @@
 }
 
-int tcp_send_message(socket_cores_ref local_sockets, int socket_id,
+int tcp_send_message(socket_cores_t *local_sockets, int socket_id,
     int fragments, size_t *data_fragment_size, int flags)
 {
@@ -2225 +2225 @@
 
 int
-tcp_close_message(socket_cores_ref local_sockets, int socket_id)
+tcp_close_message(socket_cores_t *local_sockets, int socket_id)
 {
         socket_core_t *socket;
@@ -2327 +2327 @@
 }
 
-int tcp_accept_message(socket_cores_ref local_sockets, int socket_id,
+int tcp_accept_message(socket_cores_t *local_sockets, int socket_id,
     int new_socket_id, size_t *data_fragment_size, size_t *addrlen)
 {

uspace/srv/net/tl/tcp/tcp.h

@@ -262 +262 @@
         uint16_t dest_port;
         /** Parent local sockets. */
-        socket_cores_ref local_sockets;
+        socket_cores_t *local_sockets;
         
         /** Local sockets safety lock.

uspace/srv/net/tl/udp/udp.c

@@ -453 +453 @@
  *                      function.
  */
-static int udp_sendto_message(socket_cores_ref local_sockets, int socket_id,
+static int udp_sendto_message(socket_cores_t *local_sockets, int socket_id,
     const struct sockaddr *addr, socklen_t addrlen, int fragments,
     size_t *data_fragment_size, int flags)
@@ -609 +609 @@
  *                      function.
  */
-static int udp_recvfrom_message(socket_cores_ref local_sockets, int socket_id,
+static int udp_recvfrom_message(socket_cores_t *local_sockets, int socket_id,
     int flags, size_t *addrlen)
 {