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

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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) (28 diffs)

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

@@ -129 +129 @@
  * @return              The result parameter.
  */
-static int ip_release_and_return(packet_t packet, int result)
+static int ip_release_and_return(packet_t *packet, int result)
 {
         pq_release_remote(ip_globals.net_phone, packet_get_id(packet));
@@ -170 +170 @@
  * @return              Other error codes as defined for the packet_set_addr().
  */
-static int ip_prepare_icmp(packet_t packet, ip_header_t *header)
-{
-        packet_t next;
+static int ip_prepare_icmp(packet_t *packet, ip_header_t *header)
+{
+        packet_t *next;
         struct sockaddr *dest;
         struct sockaddr_in dest_in;
@@ -233 +233 @@
  */
 static int
-ip_prepare_icmp_and_get_phone(services_t error, packet_t packet,
+ip_prepare_icmp_and_get_phone(services_t error, packet_t *packet,
     ip_header_t *header)
 {
@@ -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,
@@ -461 +461 @@
         
         if (ip_netif->packet_dimension.content < IP_MIN_CONTENT) {
-                printf("Maximum transmission unit %d bytes is too small, at "
+                printf("Maximum transmission unit %zu bytes is too small, at "
                     "least %d bytes are needed\n",
                     ip_netif->packet_dimension.content, IP_MIN_CONTENT);
@@ -502 +502 @@
         fibril_rwlock_write_unlock(&ip_globals.netifs_lock);
 
-        printf("%s: Device %d changed MTU to %d\n", NAME, device_id, mtu);
+        printf("%s: Device %d changed MTU to %zu\n", NAME, device_id, mtu);
 
         return EOK;
@@ -543 +543 @@
  */
 static ip_header_t *
-ip_create_middle_header(packet_t packet, ip_header_t *last)
+ip_create_middle_header(packet_t *packet, ip_header_t *last)
 {
         ip_header_t *middle;
@@ -622 +622 @@
  */
 static int
-ip_prepare_packet(in_addr_t *source, in_addr_t dest, packet_t packet,
+ip_prepare_packet(in_addr_t *source, in_addr_t dest, packet_t *packet,
     measured_string_t *destination)
 {
@@ -629 +629 @@
         ip_header_t *last_header;
         ip_header_t *middle_header;
-        packet_t next;
+        packet_t *next;
         int rc;
 
@@ -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);
@@ -754 +753 @@
  */
 static int
-ip_fragment_packet_data(packet_t packet, packet_t new_packet,
+ip_fragment_packet_data(packet_t *packet, packet_t *new_packet,
     ip_header_t *header, ip_header_t *new_header, size_t length,
     const struct sockaddr *src, const struct sockaddr *dest, socklen_t addrlen)
@@ -816 +815 @@
  */
 static int
-ip_fragment_packet(packet_t packet, size_t length, size_t prefix, size_t suffix,
+ip_fragment_packet(packet_t *packet, size_t length, size_t prefix, size_t suffix,
     socklen_t addr_len)
 {
-        packet_t new_packet;
+        packet_t *new_packet;
         ip_header_t *header;
         ip_header_t *middle_header;
@@ -922 +921 @@
  * @return              NULL if there are no packets left.
  */
-static packet_t
-ip_split_packet(packet_t packet, size_t prefix, size_t content, size_t suffix,
+static packet_t *
+ip_split_packet(packet_t *packet, size_t prefix, size_t content, size_t suffix,
     socklen_t addr_len, services_t error)
 {
         size_t length;
-        packet_t next;
-        packet_t new_packet;
+        packet_t *next;
+        packet_t *new_packet;
         int result;
         int phone;
@@ -993 +992 @@
  */
 static int
-ip_send_route(packet_t packet, ip_netif_t *netif, ip_route_t *route,
+ip_send_route(packet_t *packet, ip_netif_t *netif, ip_route_t *route,
     in_addr_t *src, in_addr_t dest, services_t error)
 {
@@ -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,
@@ -1247 +1246 @@
 
 static int
-ip_send_msg_local(int il_phone, device_id_t device_id, packet_t packet,
+ip_send_msg_local(int il_phone, device_id_t device_id, packet_t *packet,
     services_t sender, services_t error)
 {
@@ -1451 +1450 @@
  */
 static int
-ip_deliver_local(device_id_t device_id, packet_t packet, ip_header_t *header,
+ip_deliver_local(device_id_t device_id, packet_t *packet, ip_header_t *header,
     services_t error)
 {
@@ -1553 +1552 @@
  */
 static int
-ip_process_packet(device_id_t device_id, packet_t packet)
+ip_process_packet(device_id_t device_id, packet_t *packet)
 {
         ip_header_t *header;
@@ -1715 +1714 @@
 static int
 ip_received_error_msg_local(int ip_phone, device_id_t device_id,
-    packet_t packet, services_t target, services_t error)
+    packet_t *packet, services_t target, services_t error)
 {
         uint8_t *data;
@@ -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);
@@ -1859 +1857 @@
  * @return              ENOMEM if there is not enough memory left.
  */
-static int ip_receive_message(device_id_t device_id, packet_t packet)
-{
-        packet_t next;
+static int ip_receive_message(device_id_t device_id, packet_t *packet)
+{
+        packet_t *next;
 
         do {
@@ -1890 +1888 @@
     int *answer_count)
 {
-        packet_t packet;
+        packet_t *packet;
         struct sockaddr *addr;
         size_t addrlen;
@@ -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;