Handle multiple request types as recommended by the Mach Server Writer's Guide section 4, subsection "Handling Multiple Request Types". This avoids initializing the reply message in every X_server function. The reply message has already been properly initialized in libports, so there is no need to call mig_reply_setup.
* eth-multiplexer/multiplexer.c (multiplexer_demuxer): Improve the demuxer function. Prioritize the ethernet_demuxer. --- eth-multiplexer/multiplexer.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/eth-multiplexer/multiplexer.c b/eth-multiplexer/multiplexer.c index a133f45..cc0024e 100644 --- a/eth-multiplexer/multiplexer.c +++ b/eth-multiplexer/multiplexer.c @@ -79,12 +79,17 @@ static int multiplexer_demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp) { - int device_server (mach_msg_header_t *, mach_msg_header_t *); - int notify_server (mach_msg_header_t *, mach_msg_header_t *); - - return (device_server (inp, outp) - || notify_server (inp, outp) - || ethernet_demuxer (inp, outp)); + mig_routine_t routine; + if ((routine = NULL, ethernet_demuxer (inp, outp)) || + (routine = device_server_routine (inp)) || + (routine = notify_server_routine (inp))) + { + if (routine) + (*routine) (inp, outp); + return TRUE; + } + else + return FALSE; } static void * -- 1.9.1