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

Timestamp:

2010-12-17T20:16:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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) (10 diffs)

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

@@ -430 +430 @@
         // binds the netif service which also initializes the device
         ip_netif->phone = nil_bind_service(ip_netif->service,
-            (ipcarg_t) ip_netif->device_id, SERVICE_IP,
+            (sysarg_t) ip_netif->device_id, SERVICE_IP,
             ip_globals.client_connection);
         if (ip_netif->phone < 0) {
@@ -442 +442 @@
                 if (route) {
                         address.value = (char *) &route->address.s_addr;
-                        address.length = CONVERT_SIZE(in_addr_t, char, 1);
+                        address.length = sizeof(in_addr_t);
                         
                         rc = arp_device_req(ip_netif->arp->phone,
@@ -639 +639 @@
         if (destination) {
                 rc = packet_set_addr(packet, NULL, (uint8_t *) destination->value,
-                    CONVERT_SIZE(char, uint8_t, destination->length));
+                    destination->length);
         } else {
                 rc = packet_set_addr(packet, NULL, NULL, 0);
@@ -687 +687 @@
                                 rc = packet_set_addr(next, NULL,
                                     (uint8_t *) destination->value,
-                                    CONVERT_SIZE(char, uint8_t,
-                                    destination->length));
+                                    destination->length);
                                 if (rc != EOK) {
                                         free(last_header);
@@ -718 +717 @@
                         rc = packet_set_addr(next, NULL,
                             (uint8_t *) destination->value,
-                            CONVERT_SIZE(char, uint8_t, destination->length));
+                            destination->length);
                         if (rc != EOK) {
                                 free(last_header);
@@ -1006 +1005 @@
                 destination.value = route->gateway.s_addr ?
                     (char *) &route->gateway.s_addr : (char *) &dest.s_addr;
-                destination.length = CONVERT_SIZE(dest.s_addr, char, 1);
+                destination.length = sizeof(dest.s_addr);
 
                 rc = arp_translate_req(netif->arp->phone, netif->device_id,
@@ -1758 +1757 @@
                         // clear the ARP mapping if any
                         address.value = (char *) &header->destination_address;
-                        address.length = CONVERT_SIZE(uint8_t, char,
-                            sizeof(header->destination_address));
+                        address.length = sizeof(header->destination_address);
                         arp_clear_address_req(netif->arp->phone,
                             netif->device_id, SERVICE_IP, &address);
@@ -1902 +1900 @@
         
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_PHONE_HUNGUP:
                 return EOK;
@@ -1951 +1949 @@
 
         case NET_IP_GET_ROUTE:
-                rc = data_receive((void **) &addr, &addrlen);
+                rc = async_data_write_accept((void **) &addr, false, 0, 0, 0,
+                    &addrlen);
                 if (rc != EOK)
                         return rc;
@@ -2025 +2024 @@
                  * result.
                  */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
                     (res == EHANGUP)) {
                         return;