Changeset 4e5c7ba in mainline for uspace/srv/net/il/ip/ip.c

Timestamp:

2010-11-18T22:36:12Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f772bc55

Parents:

cb569e6

Message:

Remove xxx_ref typedefs (part 1).

File:

• uspace/srv/net/il/ip/ip.c (modified) (22 diffs)

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

@@ -144 +144 @@
 static int ip_get_icmp_phone(void)
 {
-        ip_proto_ref proto;
+        ip_proto_t *proto;
         int phone;
 
@@ -308 +308 @@
  *                      nil_packet_size_req() function.
  */
-static int ip_netif_initialize(ip_netif_ref ip_netif)
+static int ip_netif_initialize(ip_netif_t *ip_netif)
 {
         measured_string_t names[] = {
@@ -348 +348 @@
         char *data;
         measured_string_t address;
-        ip_route_ref route;
+        ip_route_t *route;
         in_addr_t gateway;
         int index;
@@ -378 +378 @@
                         return ENOTSUP;
                 } else if (ip_netif->ipv == IPV4) {
-                        route = (ip_route_ref) malloc(sizeof(ip_route_t));
+                        route = (ip_route_t *) malloc(sizeof(ip_route_t));
                         if (!route) {
                                 net_free_settings(configuration, data);
@@ -491 +491 @@
 static int ip_mtu_changed_message(device_id_t device_id, size_t mtu)
 {
-        ip_netif_ref netif;
+        ip_netif_t *netif;
 
         fibril_rwlock_write_lock(&ip_globals.netifs_lock);
@@ -516 +516 @@
 static int ip_device_state_message(device_id_t device_id, device_state_t state)
 {
-        ip_netif_ref netif;
+        ip_netif_t *netif;
 
         fibril_rwlock_write_lock(&ip_globals.netifs_lock);
@@ -993 +993 @@
  */
 static int
-ip_send_route(packet_t packet, ip_netif_ref netif, ip_route_ref route,
+ip_send_route(packet_t packet, ip_netif_t *netif, ip_route_t *route,
     in_addr_t *src, in_addr_t dest, services_t error)
 {
@@ -1065 +1065 @@
  * @returns             NULL if no route was found.
  */
-static ip_route_ref
-ip_netif_find_route(ip_netif_ref netif, in_addr_t destination)
+static ip_route_t
+*ip_netif_find_route(ip_netif_t *netif, in_addr_t destination)
 {
         int index;
-        ip_route_ref route;
+        ip_route_t *route;
 
         if (!netif)
@@ -1093 +1093 @@
  * @returns             NULL if no route was found.
  */
-static ip_route_ref ip_find_route(in_addr_t destination) {
+static ip_route_t *ip_find_route(in_addr_t destination) {
         int index;
-        ip_route_ref route;
-        ip_netif_ref netif;
+        ip_route_t *route;
+        ip_netif_t *netif;
 
         // start with the last netif - the newest one
@@ -1119 +1119 @@
  * @returns             NULL if no IP address was found.
  */
-static in_addr_t *ip_netif_address(ip_netif_ref netif)
-{
-        ip_route_ref route;
+static in_addr_t *ip_netif_address(ip_netif_t *netif)
+{
+        ip_route_t *route;
 
         route = ip_routes_get_index(&netif->routes, 0);
@@ -1147 +1147 @@
     tl_received_msg_t received_msg)
 {
-        ip_proto_ref proto;
+        ip_proto_t *proto;
         int index;
 
@@ -1153 +1153 @@
                 return EINVAL;
 
-        proto = (ip_proto_ref) malloc(sizeof(ip_protos_t));
+        proto = (ip_proto_t *) malloc(sizeof(ip_protos_t));
         if (!proto)
                 return ENOMEM;
@@ -1180 +1180 @@
 ip_device_req_local(int il_phone, device_id_t device_id, services_t netif)
 {
-        ip_netif_ref ip_netif;
-        ip_route_ref route;
+        ip_netif_t *ip_netif;
+        ip_route_t *route;
         int index;
         int rc;
 
-        ip_netif = (ip_netif_ref) malloc(sizeof(ip_netif_t));
+        ip_netif = (ip_netif_t *) malloc(sizeof(ip_netif_t));
         if (!ip_netif)
                 return ENOMEM;
@@ -1251 +1251 @@
 {
         int addrlen;
-        ip_netif_ref netif;
-        ip_route_ref route;
+        ip_netif_t *netif;
+        ip_route_t *route;
         struct sockaddr *addr;
         struct sockaddr_in *address_in;
@@ -1367 +1367 @@
     size_t *content, size_t *suffix)
 {
-        ip_netif_ref netif;
+        ip_netif_t *netif;
         int index;
 
@@ -1454 +1454 @@
     services_t error)
 {
-        ip_proto_ref proto;
+        ip_proto_t *proto;
         int phone;
         services_t service;
@@ -1557 +1557 @@
         ip_header_ref header;
         in_addr_t dest;
-        ip_route_ref route;
+        ip_route_t *route;
         int phone;
         struct sockaddr *addr;
@@ -1647 +1647 @@
     in_addr_t netmask, in_addr_t gateway)
 {
-        ip_route_ref route;
-        ip_netif_ref netif;
+        ip_route_t *route;
+        ip_netif_t *netif;
         int index;
 
@@ -1659 +1659 @@
         }
 
-        route = (ip_route_ref) malloc(sizeof(ip_route_t));
+        route = (ip_route_t *) malloc(sizeof(ip_route_t));
         if (!route) {
                 fibril_rwlock_write_unlock(&ip_globals.netifs_lock);
@@ -1681 +1681 @@
 ip_set_gateway_req_local(int ip_phone, device_id_t device_id, in_addr_t gateway)
 {
-        ip_netif_ref netif;
+        ip_netif_t *netif;
 
         fibril_rwlock_write_lock(&ip_globals.netifs_lock);
@@ -1721 +1721 @@
         icmp_type_t type;
         icmp_code_t code;
-        ip_netif_ref netif;
+        ip_netif_t *netif;
         measured_string_t address;
-        ip_route_ref route;
+        ip_route_t *route;
         ip_header_ref header;
 
@@ -1782 +1782 @@
         in_addr_t *dest;
         in_addr_t *src;
-        ip_route_ref route;
+        ip_route_t *route;
         ipv4_pseudo_header_ref header_in;