Changeset b09e0d7 in mainline for uspace/srv/taskman/main.c

Timestamp:

2020-01-09T01:04:57Z (4 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

eaafee3

Parents:

5830c7b

git-author:

Matthieu Riolo <matthieu.riolo@…> (2020-01-04 20:16:49)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-01-09 01:04:57)

Message:

Correcting taskman handler for properly dealing with
TASKMAN_LOADER_CALLBACK calls

File:

• uspace/srv/taskman/main.c (modified) (3 diffs)

uspace/srv/taskman/main.c

@@ -232 +232 @@
         if (sess_ref == NULL) {
                 async_answer_0(icall, ENOMEM);
+                return;
         }
 
@@ -270 +271 @@
                         return;
                 }
-        } else if (ipc_get_imethod(icall) == IPC_M_CONNECT_TO_ME) {
-                switch (ipc_get_arg2(icall)) {
-                case TASKMAN_LOADER_CALLBACK:
-                        loader_callback(icall);
-                        return;
-                default:
-                        DPRINTF("%s:%d from %" PRIu64 "/%" SCNuPTR "/%" SCNuPTR "/%" SCNuPTR "\n",
-                            __func__, __LINE__,
-                            icall->task_id, ipc_get_imethod(icall),
-                            ipc_get_arg1(icall), ipc_get_arg2(icall));
-                        async_answer_0(icall, ENOTSUP);
-                        return;
-                }
         }
 
@@ -308 +296 @@
                         taskman_ctl_ev_callback(&call);
                         break;
+                case IPC_M_CONNECT_TO_ME:
+                        if (ipc_get_arg2(&call) == TASKMAN_LOADER_CALLBACK) {
+                                loader_callback(&call);
+                                break;
+                        }
+                        goto FALLTHROUGH_DEFAULT;
+                        break;
+                FALLTHROUGH_DEFAULT:
                 default:
                         DPRINTF("%s:%d from %" PRIu64 "/%" SCNuPTR "/%" SCNuPTR "/%" SCNuPTR "\n",