Changeset 71780e0 in mainline for uspace/lib/hound/src/protocol.c

Timestamp:

2013-03-23T13:12:07Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a4165561

Parents:

5ae1c51

Message:

libhound: Use call data preserving handler to recognize the exit command.

File:

• uspace/lib/hound/src/protocol.c (modified) (2 diffs)

uspace/lib/hound/src/protocol.c

@@ -225 +225 @@
 
         ipc_callid_t callid;
+        ipc_call_t call;
         size_t size = 0;
-        while (async_data_write_receive(&callid, &size)) {
+        while (async_data_write_receive_call(&callid, &call, &size)) {
                 char *buffer = malloc(size);
                 if (!buffer) {
@@ -236 +237 @@
                         server_iface->stream_data_write(stream, buffer, size);
                 } else {
-                        // TODO did answering fail?
                         async_answer_0(callid, ret);
                 }
         }
-        //TODO we assume that the fail was caused by IPC_M_HOUND_STREAM_EXIT
-        async_answer_0(callid, EOK);
-        return EOK;
+        //TODO drain?
+        const int ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT
+            ? EOK : EINVAL;
+
+        async_answer_0(callid, ret);
+        return ret;
 }