summaryrefslogtreecommitdiff
path: root/auth/auth.c
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2013-12-04 10:13:56 +0100
committerJustus Winter <4winter@informatik.uni-hamburg.de>2013-12-04 12:04:49 +0100
commit03e6f1fa6846dd860d0cd7babee62b8767cade30 (patch)
tree53b7184c491de17bf6e95d01ab5f312444fdd0be /auth/auth.c
parentb8b92e2455c2a9652e60a17dd38fc8dc031b77c3 (diff)
auth: improve the auth_demuxer function
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. * auth/auth.c (auth_demuxer): Improve the demuxer function.
Diffstat (limited to 'auth/auth.c')
-rw-r--r--auth/auth.c18
1 files changed, 14 insertions, 4 deletions
diff --git a/auth/auth.c b/auth/auth.c
index 91a21e45..a395e79d 100644
--- a/auth/auth.c
+++ b/auth/auth.c
@@ -468,10 +468,20 @@ S_auth_server_authenticate (struct authhandle *serverauth,
static int
auth_demuxer (mach_msg_header_t *inp, mach_msg_header_t *outp)
{
- extern int auth_server (mach_msg_header_t *inp, mach_msg_header_t *outp);
- return (auth_server (inp, outp) ||
- ports_interrupt_server (inp, outp) ||
- ports_notify_server (inp, outp));
+ mig_routine_t auth_server_routine (mach_msg_header_t *);
+ mig_routine_t ports_notify_server_routine (mach_msg_header_t *);
+ mig_routine_t ports_interrupt_server_routine (mach_msg_header_t *);
+
+ mig_routine_t routine;
+ if ((routine = auth_server_routine (inp)) ||
+ (routine = ports_notify_server_routine (inp)) ||
+ (routine = ports_interrupt_server_routine (inp)))
+ {
+ (*routine) (inp, outp);
+ return TRUE;
+ }
+ else
+ return FALSE;
}