Changeset 969d88e in mainline for uspace/srv/net/il/ip/ip.c

Timestamp:

2011-04-09T11:04:11Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

534d08e8

Parents:

88ccd8b8 (diff), 17279ead (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

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

@@ -365 +365 @@
                 
                 if (ip_netif->dhcp) {
-                        /* TODO dhcp */
+                        // TODO dhcp
                         net_free_settings(configuration, data);
                         return ENOTSUP;
@@ -398 +398 @@
                         }
                 } else {
-                        /* TODO ipv6 in separate module */
+                        // TODO ipv6 in separate module
                         net_free_settings(configuration, data);
                         return ENOTSUP;
@@ -517 +517 @@
             ip_netif->dhcp ? "dhcp" : "static");
         
-        /* TODO ipv6 addresses */
+        // TODO ipv6 addresses
         
         char address[INET_ADDRSTRLEN];
@@ -946 +946 @@
 
         /* Greatest multiple of 8 lower than content */
-        /* TODO even fragmentation? */
+        // TODO even fragmentation?
         length = length & ~0x7;
         
@@ -1212 +1212 @@
         }
         
-        /* Ff the local host is the destination */
+        /* If the local host is the destination */
         if ((route->address.s_addr == dest->s_addr) &&
             (dest->s_addr != IPV4_LOCALHOST_ADDRESS)) {
@@ -1279 +1279 @@
         in_addr_t destination;
 
-        /* TODO search set ipopt route? */
+        // TODO search set ipopt route?
         destination.s_addr = header->destination_address;
         return destination;
@@ -1321 +1321 @@
         if ((header->flags & IPFLAG_MORE_FRAGMENTS) ||
             IP_FRAGMENT_OFFSET(header)) {
-                /* TODO fragmented */
+                // TODO fragmented
                 return ENOTSUP;
         }
@@ -1437 +1437 @@
                 phone = ip_prepare_icmp_and_get_phone(0, packet, header);
                 if (phone >= 0) {
-                        /* ttl exceeded ICMP */
+                        /* TTL exceeded ICMP */
                         icmp_time_exceeded_msg(phone, ICMP_EXC_TTL, packet);
                 }
@@ -1777 +1777 @@
                 if ((type != ICMP_DEST_UNREACH) ||
                     (code != ICMP_HOST_UNREACH)) {
-                        /* No, something else */
+                        /* No, something else */
                         break;
                 }