Changeset 88a1bb9 in mainline for uspace/srv/net/il/ip/ip.c

Timestamp:

2010-11-18T23:20:09Z (13 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).

File:

• uspace/srv/net/il/ip/ip.c (modified) (24 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;