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

Timestamp:

2011-01-10T16:33:08Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b207803

Parents:

863d45e (diff), 6610565b (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 development/ changes

File:

• uspace/srv/net/il/ip/ip.c (modified) (23 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);
                         
@@ -477 +477 @@
                 ip_globals.gateway.gateway.s_addr = gateway.s_addr;
                 ip_globals.gateway.netif = ip_netif;
+                
+                char defgateway[INET_ADDRSTRLEN];
+                inet_ntop(AF_INET, (uint8_t *) &gateway.s_addr,
+                    defgateway, INET_ADDRSTRLEN);
+                printf("%s: Default gateway (%s)\n", NAME, defgateway);
         }
 
@@ -997 +1002 @@
         measured_string_t destination;
         measured_string_t *translation;
-        char *data;
+        uint8_t *data;
         int phone;
         int rc;
@@ -1004 +1009 @@
         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);
 
@@ -1069 +1074 @@
         int index;
         ip_route_t *route;
-
+        
         if (!netif)
                 return NULL;
-
-        // start with the first one - the direct route
+        
+        /* Start with the first one (the direct route) */
         for (index = 0; index < ip_routes_count(&netif->routes); index++) {
                 route = ip_routes_get_index(&netif->routes, index);
-                if (route &&
+                if ((route) &&
                     ((route->address.s_addr & route->netmask.s_addr) ==
-                    (destination.s_addr & route->netmask.s_addr))) {
+                    (destination.s_addr & route->netmask.s_addr)))
                         return route;
-                }
         }
 
@@ -1288 +1292 @@
         if (device_id > 0) {
                 netif = ip_netifs_find(&ip_globals.netifs, device_id);
-                route = ip_netif_find_route(netif, * dest);
+                route = ip_netif_find_route(netif, *dest);
                 if (netif && !route && (ip_globals.gateway.netif == netif))
                         route = &ip_globals.gateway;
@@ -1318 +1322 @@
                 }
         }
-
+        
         // if the local host is the destination
         if ((route->address.s_addr == dest->s_addr) &&
@@ -1562 +1566 @@
         socklen_t addrlen;
         int rc;
-
+        
         header = (ip_header_t *) packet_get_data(packet);
         if (!header)
@@ -1588 +1592 @@
                 return EINVAL;
         }
-
+        
         // process ipopt and get destination
         dest = ip_get_destination(header);
@@ -1609 +1613 @@
         if (rc != EOK)
                 return rc;
-
+        
         route = ip_find_route(dest);
         if (!route) {
@@ -1756 +1760 @@
                     (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,
@@ -1886 +1890 @@
 int
 ip_message_standalone(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer,
-    int *answer_count)
+    size_t *answer_count)
 {
         packet_t *packet;
@@ -1905 +1909 @@
         
         case IPC_M_CONNECT_TO_ME:
-                return ip_register(IL_GET_PROTO(call), IL_GET_SERVICE(call),
-                    IPC_GET_PHONE(call), NULL);
+                return ip_register(IL_GET_PROTO(*call), IL_GET_SERVICE(*call),
+                    IPC_GET_PHONE(*call), NULL);
         
         case NET_IL_DEVICE:
-                return ip_device_req_local(0, IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call));
+                return ip_device_req_local(0, IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call));
         
         case NET_IL_SEND:
                 rc = packet_translate_remote(ip_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return ip_send_msg_local(0, IPC_GET_DEVICE(call), packet, 0,
-                    IPC_GET_ERROR(call));
+                return ip_send_msg_local(0, IPC_GET_DEVICE(*call), packet, 0,
+                    IPC_GET_ERROR(*call));
         
         case NET_IL_DEVICE_STATE:
-                return ip_device_state_message(IPC_GET_DEVICE(call),
-                    IPC_GET_STATE(call));
+                return ip_device_state_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_STATE(*call));
         
         case NET_IL_RECEIVED:
                 rc = packet_translate_remote(ip_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return ip_receive_message(IPC_GET_DEVICE(call), packet);
+                return ip_receive_message(IPC_GET_DEVICE(*call), packet);
         
         case NET_IP_RECEIVED_ERROR:
                 rc = packet_translate_remote(ip_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return ip_received_error_msg_local(0, IPC_GET_DEVICE(call),
-                    packet, IPC_GET_TARGET(call), IPC_GET_ERROR(call));
+                return ip_received_error_msg_local(0, IPC_GET_DEVICE(*call),
+                    packet, IPC_GET_TARGET(*call), IPC_GET_ERROR(*call));
         
         case NET_IP_ADD_ROUTE:
-                return ip_add_route_req_local(0, IPC_GET_DEVICE(call),
-                    IP_GET_ADDRESS(call), IP_GET_NETMASK(call),
-                    IP_GET_GATEWAY(call));
+                return ip_add_route_req_local(0, IPC_GET_DEVICE(*call),
+                    IP_GET_ADDRESS(*call), IP_GET_NETMASK(*call),
+                    IP_GET_GATEWAY(*call));
 
         case NET_IP_SET_GATEWAY:
-                return ip_set_gateway_req_local(0, IPC_GET_DEVICE(call),
-                    IP_GET_GATEWAY(call));
+                return ip_set_gateway_req_local(0, IPC_GET_DEVICE(*call),
+                    IP_GET_GATEWAY(*call));
 
         case NET_IP_GET_ROUTE:
@@ -1954 +1958 @@
                         return rc;
                 
-                rc = ip_get_route_req_local(0, IP_GET_PROTOCOL(call), addr,
+                rc = ip_get_route_req_local(0, IP_GET_PROTOCOL(*call), addr,
                     (socklen_t) addrlen, &device_id, &header, &headerlen);
                 if (rc != EOK)
                         return rc;
                 
-                IPC_SET_DEVICE(answer, device_id);
-                IP_SET_HEADERLEN(answer, headerlen);
+                IPC_SET_DEVICE(*answer, device_id);
+                IP_SET_HEADERLEN(*answer, headerlen);
                 
                 *answer_count = 2;
@@ -1972 +1976 @@
         
         case NET_IL_PACKET_SPACE:
-                rc = ip_packet_size_message(IPC_GET_DEVICE(call), &addrlen,
+                rc = ip_packet_size_message(IPC_GET_DEVICE(*call), &addrlen,
                     &prefix, &content, &suffix);
                 if (rc != EOK)
                         return rc;
                 
-                IPC_SET_ADDR(answer, addrlen);
-                IPC_SET_PREFIX(answer, prefix);
-                IPC_SET_CONTENT(answer, content);
-                IPC_SET_SUFFIX(answer, suffix);
+                IPC_SET_ADDR(*answer, addrlen);
+                IPC_SET_PREFIX(*answer, prefix);
+                IPC_SET_CONTENT(*answer, content);
+                IPC_SET_SUFFIX(*answer, suffix);
                 *answer_count = 4;
                 return EOK;
         
         case NET_IL_MTU_CHANGED:
-                return ip_mtu_changed_message(IPC_GET_DEVICE(call),
-                    IPC_GET_MTU(call));
+                return ip_mtu_changed_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_MTU(*call));
         }
         
@@ -2007 +2011 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t count;
                 
                 /* Clear the answer structure */
-                refresh_answer(&answer, &answer_count);
+                refresh_answer(&answer, &count);
                 
                 /* Fetch the next message */
@@ -2018 +2022 @@
                 /* Process the message */
                 int res = il_module_message_standalone(callid, &call, &answer,
-                    &answer_count);
+                    &count);
                 
                 /*
@@ -2030 +2034 @@
                 
                 /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
+                answer_call(callid, res, &answer, count);
         }
 }