Changes in uspace/srv/net/il/ip/ip.c [02314f8:4eca056] in mainline

File:

• uspace/srv/net/il/ip/ip.c (modified) (41 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;
 
@@ -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;
@@ -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[] = {
@@ -344 +344 @@
                 }
         };
-        measured_string_ref configuration;
+        measured_string_t *configuration;
         size_t count = sizeof(names) / sizeof(measured_string_t);
         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);
@@ -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) ||
@@ -623 +623 @@
 static int
 ip_prepare_packet(in_addr_t *source, in_addr_t dest, packet_t packet,
-    measured_string_ref destination)
+    measured_string_t *destination)
 {
         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)
@@ -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)
 {
         measured_string_t destination;
-        measured_string_ref translation;
+        measured_string_t *translation;
         char *data;
         int phone;
@@ -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;
 
@@ -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)
 {
-        ip_proto_ref proto;
+        ip_proto_t *proto;
         int phone;
         services_t service;
@@ -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_ref route;
+        ip_route_t *route;
         int phone;
         struct sockaddr *addr;
@@ -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);
@@ -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_header_ref header;
+        ip_route_t *route;
+        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?
@@ -1782 +1782 @@
         in_addr_t *dest;
         in_addr_t *src;
-        ip_route_ref route;
-        ipv4_pseudo_header_ref header_in;
+        ip_route_t *route;
+        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;