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

Timestamp:

2011-01-09T12:18:00Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

54de5ebd

Parents:

a3eeef45 (diff), 9d12059 (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

@@ -275 +275 @@
         if (rc != EOK)
                 goto out;
-        rc = add_module(NULL, &ip_globals.modules, ARP_NAME, ARP_FILENAME,
-            SERVICE_ARP, 0, arp_connect_module);
+        rc = add_module(NULL, &ip_globals.modules, (uint8_t *) ARP_NAME,
+            (uint8_t *) ARP_FILENAME, SERVICE_ARP, 0, arp_connect_module);
 
 out:
@@ -312 +312 @@
         measured_string_t names[] = {
                 {
-                        (char *) "IPV",
+                        (uint8_t *) "IPV",
                         3
                 },
                 {
-                        (char *) "IP_CONFIG",
+                        (uint8_t *) "IP_CONFIG",
                         9
                 },
                 {
-                        (char *) "IP_ADDR",
+                        (uint8_t *) "IP_ADDR",
                         7
                 },
                 {
-                        (char *) "IP_NETMASK",
+                        (uint8_t *) "IP_NETMASK",
                         10
                 },
                 {
-                        (char *) "IP_GATEWAY",
+                        (uint8_t *) "IP_GATEWAY",
                         10
                 },
                 {
-                        (char *) "IP_BROADCAST",
+                        (uint8_t *) "IP_BROADCAST",
                         12
                 },
                 {
-                        (char *) "ARP",
+                        (uint8_t *) "ARP",
                         3
                 },
                 {
-                        (char *) "IP_ROUTING",
+                        (uint8_t *) "IP_ROUTING",
                         10
                 }
@@ -346 +346 @@
         measured_string_t *configuration;
         size_t count = sizeof(names) / sizeof(measured_string_t);
-        char *data;
+        uint8_t *data;
         measured_string_t address;
         ip_route_t *route;
@@ -368 +368 @@
         if (configuration) {
                 if (configuration[0].value)
-                        ip_netif->ipv = strtol(configuration[0].value, NULL, 0);
-
-                ip_netif->dhcp = !str_lcmp(configuration[1].value, "dhcp",
+                        ip_netif->ipv = strtol((char *) configuration[0].value, NULL, 0);
+                
+                ip_netif->dhcp = !str_lcmp((char *) configuration[1].value, "dhcp",
                     configuration[1].length);
                 
@@ -394 +394 @@
                         }
                         
-                        if ((inet_pton(AF_INET, configuration[2].value,
+                        if ((inet_pton(AF_INET, (char *) configuration[2].value,
                             (uint8_t *) &route->address.s_addr) != EOK) ||
-                            (inet_pton(AF_INET, configuration[3].value,
+                            (inet_pton(AF_INET, (char *) configuration[3].value,
                             (uint8_t *) &route->netmask.s_addr) != EOK) ||
-                            (inet_pton(AF_INET, configuration[4].value,
+                            (inet_pton(AF_INET, (char *) configuration[4].value,
                             (uint8_t *) &gateway.s_addr) == EINVAL) ||
-                            (inet_pton(AF_INET, configuration[5].value,
+                            (inet_pton(AF_INET, (char *) configuration[5].value,
                             (uint8_t *) &ip_netif->broadcast.s_addr) == EINVAL))
                             {
@@ -441 +441 @@
         if (ip_netif->arp) {
                 if (route) {
-                        address.value = (char *) &route->address.s_addr;
+                        address.value = (uint8_t *) &route->address.s_addr;
                         address.length = sizeof(in_addr_t);
                         
@@ -997 +997 @@
         measured_string_t destination;
         measured_string_t *translation;
-        char *data;
+        uint8_t *data;
         int phone;
         int rc;
@@ -1004 +1004 @@
         if (netif->arp && (route->address.s_addr != dest.s_addr)) {
                 destination.value = route->gateway.s_addr ?
-                    (char *) &route->gateway.s_addr : (char *) &dest.s_addr;
+                    (uint8_t *) &route->gateway.s_addr : (uint8_t *) &dest.s_addr;
                 destination.length = sizeof(dest.s_addr);
 
@@ -1756 +1756 @@
                     (header->destination_address & route->netmask.s_addr))) {
                         // clear the ARP mapping if any
-                        address.value = (char *) &header->destination_address;
+                        address.value = (uint8_t *) &header->destination_address;
                         address.length = sizeof(header->destination_address);
                         arp_clear_address_req(netif->arp->phone,