Changeset 12d7710 in mainline for uspace/srv/net/nil/nildummy/nildummy.c

Timestamp:

2010-03-26T22:01:28Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1faa995

Parents:

4204ad9 (diff), eaf22d4 (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/nil/nildummy/nildummy.c (modified) (3 diffs)

uspace/srv/net/nil/nildummy/nildummy.c

@@ -40 +40 @@
 #include <mem.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 
 #include <ipc/ipc.h>
@@ -316 +316 @@
         measured_string_ref address;
         packet_t packet;
+        size_t addrlen;
+        size_t prefix;
+        size_t suffix;
+        size_t content;
 
 //      printf("message %d - %d\n", IPC_GET_METHOD(*call), NET_NIL_FIRST);
@@ -328 +332 @@
                         return nildummy_send_message(IPC_GET_DEVICE(call), packet, IPC_GET_SERVICE(call));
                 case NET_NIL_PACKET_SPACE:
-                        ERROR_PROPAGATE(nildummy_packet_space_message(IPC_GET_DEVICE(call), IPC_SET_ADDR(answer), IPC_SET_PREFIX(answer), IPC_SET_CONTENT(answer), IPC_SET_SUFFIX(answer)));
+                        ERROR_PROPAGATE(nildummy_packet_space_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;