Changeset 88a1bb9 in mainline for uspace/srv

Timestamp:

2010-11-18T23:20:09Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4eca056

Parents:

f772bc55

Message:

Remove xxx_ref typedefs (part 3).

Location:

uspace/srv/net

Files:

• il/ip/ip.c (modified) (24 diffs)
• il/ip/ip.h (modified) (1 diff)
• net/net.h (modified) (1 diff)
• nil/eth/eth.c (modified) (1 diff)
• tl/icmp/icmp.c (modified) (13 diffs)
• tl/tcp/tcp.c (modified) (31 diffs)
• tl/udp/udp.c (modified) (3 diffs)

uspace/srv/net/il/ip/ip.c

@@ -170 +170 @@
  * @returns             Other error codes as defined for the packet_set_addr().
  */
-static int ip_prepare_icmp(packet_t packet, ip_header_ref header)
+static int ip_prepare_icmp(packet_t packet, ip_header_t *header)
 {
         packet_t next;
@@ -187 +187 @@
 
                 // get header
-                header = (ip_header_ref) packet_get_data(packet);
+                header = (ip_header_t *) packet_get_data(packet);
                 if (!header)
                         return EINVAL;
@@ -234 +234 @@
 static int
 ip_prepare_icmp_and_get_phone(services_t error, packet_t packet,
-    ip_header_ref header)
+    ip_header_t *header)
 {
         int phone;
@@ -542 +542 @@
  * @returns             NULL on error.
  */
-static ip_header_ref
-ip_create_middle_header(packet_t packet, ip_header_ref last)
-{
-        ip_header_ref middle;
-
-        middle = (ip_header_ref) packet_suffix(packet, IP_HEADER_LENGTH(last));
+static ip_header_t *
+ip_create_middle_header(packet_t packet, ip_header_t *last)
+{
+        ip_header_t *middle;
+
+        middle = (ip_header_t *) packet_suffix(packet, IP_HEADER_LENGTH(last));
         if (!middle)
                 return NULL;
@@ -562 +562 @@
  * @param[in] first     The original header to be copied.
  */
-static void ip_create_last_header(ip_header_ref last, ip_header_ref first)
-{
-        ip_option_ref option;
+static void ip_create_last_header(ip_header_t *last, ip_header_t *first)
+{
+        ip_option_t *option;
         size_t next;
         size_t length;
@@ -575 +575 @@
         // process all ip options
         while (next < first->header_length) {
-                option = (ip_option_ref) (((uint8_t *) first) + next);
+                option = (ip_option_t *) (((uint8_t *) first) + next);
                 // skip end or noop
                 if ((option->type == IPOPT_END) ||
@@ -626 +626 @@
 {
         size_t length;
-        ip_header_ref header;
-        ip_header_ref last_header;
-        ip_header_ref middle_header;
+        ip_header_t *header;
+        ip_header_t *last_header;
+        ip_header_t *middle_header;
         packet_t next;
         int rc;
@@ -636 +636 @@
                 return EINVAL;
 
-        header = (ip_header_ref) packet_get_data(packet);
+        header = (ip_header_t *) packet_get_data(packet);
         if (destination) {
                 rc = packet_set_addr(packet, NULL, (uint8_t *) destination->value,
@@ -660 +660 @@
 
         if (pq_next(packet)) {
-                last_header = (ip_header_ref) malloc(IP_HEADER_LENGTH(header));
+                last_header = (ip_header_t *) malloc(IP_HEADER_LENGTH(header));
                 if (!last_header)
                         return ENOMEM;
@@ -666 +666 @@
                 next = pq_next(packet);
                 while (pq_next(next)) {
-                        middle_header = (ip_header_ref) packet_prefix(next,
+                        middle_header = (ip_header_t *) packet_prefix(next,
                             IP_HEADER_LENGTH(last_header));
                         if (!middle_header) {
@@ -698 +698 @@
                 }
 
-                middle_header = (ip_header_ref) packet_prefix(next,
+                middle_header = (ip_header_t *) packet_prefix(next,
                     IP_HEADER_LENGTH(last_header));
                 if (!middle_header) {
@@ -755 +755 @@
 static int
 ip_fragment_packet_data(packet_t packet, packet_t new_packet,
-    ip_header_ref header, ip_header_ref new_header, size_t length,
+    ip_header_t *header, ip_header_t *new_header, size_t length,
     const struct sockaddr *src, const struct sockaddr *dest, socklen_t addrlen)
 {
@@ -820 +820 @@
 {
         packet_t new_packet;
-        ip_header_ref header;
-        ip_header_ref middle_header;
-        ip_header_ref last_header;
+        ip_header_t *header;
+        ip_header_t *middle_header;
+        ip_header_t *last_header;
         struct sockaddr *src;
         struct sockaddr *dest;
@@ -838 +838 @@
 
         // get header
-        header = (ip_header_ref) packet_get_data(packet);
+        header = (ip_header_t *) packet_get_data(packet);
         if (!header)
                 return EINVAL;
@@ -853 +853 @@
 
         // allocate as much as originally
-        last_header = (ip_header_ref) packet_suffix(new_packet,
+        last_header = (ip_header_t *) packet_suffix(new_packet,
             IP_HEADER_LENGTH(header));
         if (!last_header)
@@ -1065 +1065 @@
  * @returns             NULL if no route was found.
  */
-static ip_route_t
-*ip_netif_find_route(ip_netif_t *netif, in_addr_t destination)
+static ip_route_t *
+ip_netif_find_route(ip_netif_t *netif, in_addr_t destination)
 {
         int index;
@@ -1420 +1420 @@
  * @returns             The packet destination address.
  */
-static in_addr_t ip_get_destination(ip_header_ref header)
+static in_addr_t ip_get_destination(ip_header_t *header)
 {
         in_addr_t destination;
@@ -1451 +1451 @@
  */
 static int
-ip_deliver_local(device_id_t device_id, packet_t packet, ip_header_ref header,
+ip_deliver_local(device_id_t device_id, packet_t packet, ip_header_t *header,
     services_t error)
 {
@@ -1555 +1555 @@
 ip_process_packet(device_id_t device_id, packet_t packet)
 {
-        ip_header_ref header;
+        ip_header_t *header;
         in_addr_t dest;
         ip_route_t *route;
@@ -1564 +1564 @@
         int rc;
 
-        header = (ip_header_ref) packet_get_data(packet);
+        header = (ip_header_t *) packet_get_data(packet);
         if (!header)
                 return ip_release_and_return(packet, ENOMEM);
@@ -1724 +1724 @@
         measured_string_t address;
         ip_route_t *route;
-        ip_header_ref header;
+        ip_header_t *header;
 
         switch (error) {
@@ -1734 +1734 @@
 
                 data = packet_get_data(packet);
-                header = (ip_header_ref)(data + offset);
+                header = (ip_header_t *)(data + offset);
 
                 // destination host unreachable?
@@ -1783 +1783 @@
         in_addr_t *src;
         ip_route_t *route;
-        ipv4_pseudo_header_ref header_in;
+        ipv4_pseudo_header_t *header_in;
 
         if (!destination || (addrlen <= 0))
@@ -1829 +1829 @@
 
         *headerlen = sizeof(*header_in);
-        header_in = (ipv4_pseudo_header_ref) malloc(*headerlen);
+        header_in = (ipv4_pseudo_header_t *) malloc(*headerlen);
         if (!header_in)
                 return ENOMEM;

uspace/srv/net/il/ip/ip.h

@@ -89 +89 @@
 struct ip_netif {
         /** ARP module. Assigned if using ARP. */
-        module_ref arp;
+        module_t *arp;
         /** Broadcast address. */
         in_addr_t broadcast;

uspace/srv/net/net/net.h

@@ -103 +103 @@
         
         /** Serving network interface driver module index. */
-        module_ref driver;
+        module_t *driver;
         
-        device_id_t id;  /**< System-unique network interface identifier. */
-        module_ref il;   /**< Serving internet layer module index. */
-        char *name;      /**< System-unique network interface name. */
-        module_ref nil;  /**< Serving link layer module index. */
+        device_id_t id; /**< System-unique network interface identifier. */
+        module_t *il;   /**< Serving internet layer module index. */
+        char *name;     /**< System-unique network interface name. */
+        module_t *nil;  /**< Serving link layer module index. */
 } netif_t;
 

uspace/srv/net/nil/eth/eth.c

@@ -155 +155 @@
  */
 typedef enum eth_addr_type eth_addr_type_t;
-
-/** Type definition of the ethernet address type pointer.
- * @see eth_addr_type
- */
-typedef eth_addr_type_t *eth_addr_type_ref;
 
 /** Ethernet address type. */

uspace/srv/net/tl/icmp/icmp.c

@@ -156 +156 @@
  */
 static int icmp_send_packet(icmp_type_t type, icmp_code_t code, packet_t packet,
-    icmp_header_ref header, services_t error, ip_ttl_t ttl, ip_tos_t tos,
+    icmp_header_t *header, services_t error, ip_ttl_t ttl, ip_tos_t tos,
     int dont_fragment)
 {
@@ -189 +189 @@
  * @returns NULL on errors.
  */
-static icmp_header_ref icmp_prepare_packet(packet_t packet)
-{
-        icmp_header_ref header;
+static icmp_header_t *icmp_prepare_packet(packet_t packet)
+{
+        icmp_header_t *header;
         size_t header_length;
         size_t total_length;
@@ -247 +247 @@
     const struct sockaddr * addr, socklen_t addrlen)
 {
-        icmp_header_ref header;
+        icmp_header_t *header;
         packet_t packet;
         size_t length;
@@ -342 +342 @@
     icmp_code_t code, icmp_param_t mtu, packet_t packet)
 {
-        icmp_header_ref header;
+        icmp_header_t *header;
 
         header = icmp_prepare_packet(packet);
@@ -357 +357 @@
 static int icmp_source_quench_msg_local(int icmp_phone, packet_t packet)
 {
-        icmp_header_ref header;
+        icmp_header_t *header;
 
         header = icmp_prepare_packet(packet);
@@ -370 +370 @@
     packet_t packet)
 {
-        icmp_header_ref header;
+        icmp_header_t *header;
 
         header = icmp_prepare_packet(packet);
@@ -383 +383 @@
     icmp_param_t pointer, packet_t packet)
 {
-        icmp_header_ref header;
+        icmp_header_t *header;
 
         header = icmp_prepare_packet(packet);
@@ -479 +479 @@
  * @param[in] code      The received reply message code.
  */
-static void  icmp_process_echo_reply(packet_t packet, icmp_header_ref header,
+static void  icmp_process_echo_reply(packet_t packet, icmp_header_t *header,
     icmp_type_t type, icmp_code_t code)
 {
@@ -525 +525 @@
         int result;
         void *data;
-        icmp_header_ref header;
+        icmp_header_t *header;
         icmp_type_t type;
         icmp_code_t code;
@@ -567 +567 @@
 
         /* Get ICMP header */
-        header = (icmp_header_ref) data;
+        header = (icmp_header_t *) data;
 
         if (header->checksum) {
@@ -735 +735 @@
  * @returns             ENOTCONN if no free identifier have been found.
  */
-static int icmp_bind_free_id(icmp_echo_ref echo_data)
+static int icmp_bind_free_id(icmp_echo_t *echo_data)
 {
         icmp_param_t index;
@@ -791 +791 @@
         struct sockaddr *addr;
         ipc_callid_t data_callid;
-        icmp_echo_ref echo_data;
+        icmp_echo_t *echo_data;
         int rc = EOK;
 
@@ -800 +800 @@
         answer_count = 0;
 
-        echo_data = (icmp_echo_ref) malloc(sizeof(*echo_data));
+        echo_data = (icmp_echo_t *) malloc(sizeof(*echo_data));
         if (!echo_data)
                 return ENOMEM;

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

@@ -161 +161 @@
 
 static int tcp_release_and_return(packet_t, int);
-static void tcp_prepare_operation_header(socket_core_ref, tcp_socket_data_t *,
+static void tcp_prepare_operation_header(socket_core_t *, tcp_socket_data_t *,
     tcp_header_t *, int synchronize, int);
-static int tcp_prepare_timeout(int (*)(void *), socket_core_ref,
+static int tcp_prepare_timeout(int (*)(void *), socket_core_t *,
     tcp_socket_data_t *, size_t, tcp_socket_state_t, suseconds_t, int);
-static void tcp_free_socket_data(socket_core_ref);
+static void tcp_free_socket_data(socket_core_t *);
 
 static int tcp_timeout(void *);
@@ -172 +172 @@
 
 static int tcp_process_packet(device_id_t, packet_t, services_t);
-static int tcp_connect_core(socket_core_ref, socket_cores_ref,
+static int tcp_connect_core(socket_core_t *, socket_cores_ref,
     struct sockaddr *, socklen_t);
-static int tcp_queue_prepare_packet(socket_core_ref, tcp_socket_data_t *,
+static int tcp_queue_prepare_packet(socket_core_t *, tcp_socket_data_t *,
     packet_t, size_t);
-static int tcp_queue_packet(socket_core_ref, tcp_socket_data_t *, packet_t,
+static int tcp_queue_packet(socket_core_t *, tcp_socket_data_t *, packet_t,
     size_t);
-static packet_t tcp_get_packets_to_send(socket_core_ref, tcp_socket_data_t *);
+static packet_t tcp_get_packets_to_send(socket_core_t *, tcp_socket_data_t *);
 static void tcp_send_packets(device_id_t, packet_t);
 
-static void tcp_process_acknowledgement(socket_core_ref, tcp_socket_data_t *,
+static void tcp_process_acknowledgement(socket_core_t *, tcp_socket_data_t *,
     tcp_header_t *);
-static packet_t tcp_send_prepare_packet(socket_core_ref, tcp_socket_data_t *,
+static packet_t tcp_send_prepare_packet(socket_core_t *, tcp_socket_data_t *,
     packet_t, size_t, size_t);
-static packet_t tcp_prepare_copy(socket_core_ref, tcp_socket_data_t *, packet_t,
+static packet_t tcp_prepare_copy(socket_core_t *, tcp_socket_data_t *, packet_t,
     size_t, size_t);
-/* static */ void tcp_retransmit_packet(socket_core_ref, tcp_socket_data_t *,
+/* static */ void tcp_retransmit_packet(socket_core_t *, tcp_socket_data_t *,
     size_t);
-static int tcp_create_notification_packet(packet_t *, socket_core_ref,
+static int tcp_create_notification_packet(packet_t *, socket_core_t *,
     tcp_socket_data_t *, int, int);
 static void tcp_refresh_socket_data(tcp_socket_data_t *);
@@ -195 +195 @@
 static void tcp_initialize_socket_data(tcp_socket_data_t *);
 
-static int tcp_process_listen(socket_core_ref, tcp_socket_data_t *,
+static int tcp_process_listen(socket_core_t *, tcp_socket_data_t *,
     tcp_header_t *, packet_t, struct sockaddr *, struct sockaddr *, size_t);
-static int tcp_process_syn_sent(socket_core_ref, tcp_socket_data_t *,
+static int tcp_process_syn_sent(socket_core_t *, tcp_socket_data_t *,
     tcp_header_t *, packet_t);
-static int tcp_process_syn_received(socket_core_ref, tcp_socket_data_t *,
+static int tcp_process_syn_received(socket_core_t *, tcp_socket_data_t *,
     tcp_header_t *, packet_t);
-static int tcp_process_established(socket_core_ref, tcp_socket_data_t *,
+static int tcp_process_established(socket_core_t *, tcp_socket_data_t *,
     tcp_header_t *, packet_t, int, size_t);
-static int tcp_queue_received_packet(socket_core_ref, tcp_socket_data_t *,
+static int tcp_queue_received_packet(socket_core_t *, tcp_socket_data_t *,
     packet_t, int, size_t);
 
@@ -286 +286 @@
         int result;
         tcp_header_t *header;
-        socket_core_ref socket;
+        socket_core_t *socket;
         tcp_socket_data_t *socket_data;
         packet_t next_packet;
@@ -492 +492 @@
 }
 
-int tcp_process_established(socket_core_ref socket, tcp_socket_data_t *
+int tcp_process_established(socket_core_t *socket, tcp_socket_data_t *
     socket_data, tcp_header_t *header, packet_t packet, int fragments,
     size_t total_length)
@@ -800 +800 @@
 }
 
-int tcp_queue_received_packet(socket_core_ref socket,
+int tcp_queue_received_packet(socket_core_t *socket,
     tcp_socket_data_t *socket_data, packet_t packet, int fragments,
     size_t total_length)
@@ -837 +837 @@
 }
 
-int tcp_process_syn_sent(socket_core_ref socket, tcp_socket_data_t *
+int tcp_process_syn_sent(socket_core_t *socket, tcp_socket_data_t *
     socket_data, tcp_header_t *header, packet_t packet)
 {
@@ -895 +895 @@
 }
 
-int tcp_process_listen(socket_core_ref listening_socket,
+int tcp_process_listen(socket_core_t *listening_socket,
     tcp_socket_data_t *listening_socket_data, tcp_header_t *header,
     packet_t packet, struct sockaddr *src, struct sockaddr *dest,
@@ -901 +901 @@
 {
         packet_t next_packet;
-        socket_core_ref socket;
+        socket_core_t *socket;
         tcp_socket_data_t *socket_data;
         int socket_id;
@@ -1055 +1055 @@
 }
 
-int tcp_process_syn_received(socket_core_ref socket,
+int tcp_process_syn_received(socket_core_t *socket,
     tcp_socket_data_t *socket_data, tcp_header_t *header, packet_t packet)
 {
-        socket_core_ref listening_socket;
+        socket_core_t *listening_socket;
         tcp_socket_data_t *listening_socket_data;
         int rc;
@@ -1122 +1122 @@
 }
 
-void tcp_process_acknowledgement(socket_core_ref socket,
+void tcp_process_acknowledgement(socket_core_t *socket,
     tcp_socket_data_t *socket_data, tcp_header_t *header)
 {
@@ -1300 +1300 @@
         int answer_count;
         tcp_socket_data_t *socket_data;
-        socket_core_ref socket;
+        socket_core_t *socket;
         packet_dimension_t *packet_dimension;
 
@@ -1537 +1537 @@
         tcp_timeout_t *timeout = data;
         int keep_write_lock = false;
-        socket_core_ref socket;
+        socket_core_t *socket;
         tcp_socket_data_t *socket_data;
 
@@ -1613 +1613 @@
 {
         tcp_timeout_t *timeout = data;
-        socket_core_ref socket;
+        socket_core_t *socket;
         tcp_socket_data_t *socket_data;
         fibril_rwlock_t *local_lock;
@@ -1651 +1651 @@
 }
 
-void tcp_retransmit_packet(socket_core_ref socket, tcp_socket_data_t *
+void tcp_retransmit_packet(socket_core_t *socket, tcp_socket_data_t *
     socket_data, size_t sequence_number)
 {
@@ -1681 +1681 @@
     int backlog)
 {
-        socket_core_ref socket;
+        socket_core_t *socket;
         tcp_socket_data_t *socket_data;
 
@@ -1707 +1707 @@
     struct sockaddr *addr, socklen_t addrlen)
 {
-        socket_core_ref socket;
+        socket_core_t *socket;
         int rc;
 
@@ -1732 +1732 @@
 }
 
-int tcp_connect_core(socket_core_ref socket, socket_cores_ref local_sockets,
+int tcp_connect_core(socket_core_t *socket, socket_cores_ref local_sockets,
     struct sockaddr *addr, socklen_t addrlen)
 {
@@ -1823 +1823 @@
 }
 
-int tcp_queue_prepare_packet(socket_core_ref socket,
+int tcp_queue_prepare_packet(socket_core_t *socket,
     tcp_socket_data_t *socket_data, packet_t packet, size_t data_length)
 {
@@ -1854 +1854 @@
 }
 
-int tcp_queue_packet(socket_core_ref socket, tcp_socket_data_t *socket_data,
+int tcp_queue_packet(socket_core_t *socket, tcp_socket_data_t *socket_data,
     packet_t packet, size_t data_length)
 {
@@ -1876 +1876 @@
 }
 
-packet_t tcp_get_packets_to_send(socket_core_ref socket, tcp_socket_data_t *
+packet_t tcp_get_packets_to_send(socket_core_t *socket, tcp_socket_data_t *
     socket_data)
 {
@@ -1936 +1936 @@
 }
 
-packet_t tcp_send_prepare_packet(socket_core_ref socket, tcp_socket_data_t *
+packet_t tcp_send_prepare_packet(socket_core_t *socket, tcp_socket_data_t *
     socket_data, packet_t packet, size_t data_length, size_t sequence_number)
 {
@@ -1997 +1997 @@
 }
 
-packet_t tcp_prepare_copy(socket_core_ref socket, tcp_socket_data_t *
+packet_t tcp_prepare_copy(socket_core_t *socket, tcp_socket_data_t *
     socket_data, packet_t packet, size_t data_length, size_t sequence_number)
 {
@@ -2027 +2027 @@
 }
 
-void tcp_prepare_operation_header(socket_core_ref socket,
+void tcp_prepare_operation_header(socket_core_t *socket,
     tcp_socket_data_t *socket_data, tcp_header_t *header, int synchronize,
     int finalize)
@@ -2045 +2045 @@
 
 int tcp_prepare_timeout(int (*timeout_function)(void *tcp_timeout_t),
-    socket_core_ref socket, tcp_socket_data_t *socket_data,
+    socket_core_t *socket, tcp_socket_data_t *socket_data,
     size_t sequence_number, tcp_socket_state_t state, suseconds_t timeout,
     int globals_read_only)
@@ -2094 +2094 @@
     int flags, size_t *addrlen)
 {
-        socket_core_ref socket;
+        socket_core_t *socket;
         tcp_socket_data_t *socket_data;
         int packet_id;
@@ -2152 +2152 @@
     int fragments, size_t *data_fragment_size, int flags)
 {
-        socket_core_ref socket;
+        socket_core_t *socket;
         tcp_socket_data_t *socket_data;
         packet_dimension_t *packet_dimension;
@@ -2227 +2227 @@
 tcp_close_message(socket_cores_ref local_sockets, int socket_id)
 {
-        socket_core_ref socket;
+        socket_core_t *socket;
         tcp_socket_data_t *socket_data;
         packet_t packet;
@@ -2293 +2293 @@
 }
 
-int tcp_create_notification_packet(packet_t *packet, socket_core_ref socket,
+int tcp_create_notification_packet(packet_t *packet, socket_core_t *socket,
     tcp_socket_data_t *socket_data, int synchronize, int finalize)
 {
@@ -2330 +2330 @@
     int new_socket_id, size_t *data_fragment_size, size_t *addrlen)
 {
-        socket_core_ref accepted;
-        socket_core_ref socket;
+        socket_core_t *accepted;
+        socket_core_t *socket;
         tcp_socket_data_t *socket_data;
         packet_dimension_t *packet_dimension;
@@ -2400 +2400 @@
 }
 
-void tcp_free_socket_data(socket_core_ref socket)
+void tcp_free_socket_data(socket_core_t *socket)
 {
         tcp_socket_data_t *socket_data;

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

@@ -224 +224 @@
         int result;
         udp_header_t *header;
-        socket_core_ref socket;
+        socket_core_t *socket;
         packet_t next_packet;
         size_t total_length;
@@ -457 +457 @@
     size_t *data_fragment_size, int flags)
 {
-        socket_core_ref socket;
+        socket_core_t *socket;
         packet_t packet;
         packet_t next_packet;
@@ -612 +612 @@
     int flags, size_t *addrlen)
 {
-        socket_core_ref socket;
+        socket_core_t *socket;
         int packet_id;
         packet_t packet;