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

Timestamp:

2010-03-24T18:54:50Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

eaf22d4

Parents:

63f8966 (diff), 3db8889 (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 from lp:~lukasmejdrech/helenos/network.

File:

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

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

@@ -893 +893 @@
         struct sockaddr * addr;
         size_t addrlen;
+        size_t prefix;
+        size_t suffix;
+        size_t content;
         ip_pseudo_header_ref header;
         size_t headerlen;
@@ -924 +927 @@
                         ERROR_PROPAGATE(ip_get_route_req(0, IP_GET_PROTOCOL(call), addr, (socklen_t) addrlen,
                             &device_id, &header, &headerlen));
-                        *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;
                         if(! ERROR_OCCURRED(data_reply(&headerlen, sizeof(headerlen)))){
@@ -933 +936 @@
                         return ERROR_CODE;
                 case NET_IL_PACKET_SPACE:
-                        ERROR_PROPAGATE(ip_packet_size_message(IPC_GET_DEVICE(call), IPC_SET_ADDR(answer), IPC_SET_PREFIX(answer), IPC_SET_CONTENT(answer), IPC_SET_SUFFIX(answer)));
-                        *answer_count = 3;
+                        ERROR_PROPAGATE(ip_packet_size_message(IPC_GET_DEVICE(call), &addrlen, &prefix, &content, &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: