[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 54/98: pfinet: improve the pfinet_demuxer function
From: |
Samuel Thibault |
Subject: |
[hurd] 54/98: pfinet: improve the pfinet_demuxer function |
Date: |
Tue, 14 Jan 2014 02:00:02 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch upstream
in repository hurd.
commit 9cec7a2482a68ca1ae41d65fc8b94584d5020c3f
Author: Justus Winter <address@hidden>
Date: Sat Nov 30 17:32:01 2013 +0100
pfinet: improve the pfinet_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.
* pfinet/main.c (pfinet_demuxer): Improve the demuxer function.
---
pfinet/main.c | 52 +++++++++++++++++++++++++++++++++++-----------------
1 file changed, 35 insertions(+), 17 deletions(-)
diff --git a/pfinet/main.c b/pfinet/main.c
index c952719..dce1600 100644
--- a/pfinet/main.c
+++ b/pfinet/main.c
@@ -77,11 +77,11 @@ pfinet_demuxer (mach_msg_header_t *inp,
mach_msg_header_t *outp)
{
struct port_info *pi;
- extern int io_server (mach_msg_header_t *, mach_msg_header_t *);
- extern int socket_server (mach_msg_header_t *, mach_msg_header_t *);
- extern int startup_notify_server (mach_msg_header_t *, mach_msg_header_t *);
- extern int pfinet_server (mach_msg_header_t *, mach_msg_header_t *);
- extern int iioctl_server (mach_msg_header_t *, mach_msg_header_t *);
+ mig_routine_t io_server_routine (mach_msg_header_t *);
+ mig_routine_t socket_server_routine (mach_msg_header_t *);
+ mig_routine_t pfinet_server_routine (mach_msg_header_t *);
+ mig_routine_t iioctl_server_routine (mach_msg_header_t *);
+ mig_routine_t startup_notify_server_routine (mach_msg_header_t *);
/* We have several classes in one bucket, which need to be demuxed
differently. */
@@ -90,20 +90,38 @@ pfinet_demuxer (mach_msg_header_t *inp,
if (pi)
{
ports_port_deref (pi);
-
- return (io_server (inp, outp)
- || socket_server (inp, outp)
- || pfinet_server (inp, outp)
- || iioctl_server (inp, outp)
- || trivfs_demuxer (inp, outp)
- || startup_notify_server (inp, outp));
+
+ mig_routine_t routine;
+ if ((routine = io_server_routine (inp)) ||
+ (routine = socket_server_routine (inp)) ||
+ (routine = pfinet_server_routine (inp)) ||
+ (routine = iioctl_server_routine (inp)) ||
+ (routine = NULL, trivfs_demuxer (inp, outp)) ||
+ (routine = startup_notify_server_routine (inp)))
+ {
+ if (routine)
+ (*routine) (inp, outp);
+ return TRUE;
+ }
+ else
+ return FALSE;
}
else
- return (socket_server (inp, outp)
- || pfinet_server (inp, outp)
- || iioctl_server (inp, outp)
- || trivfs_demuxer (inp, outp)
- || startup_notify_server (inp, outp));
+ {
+ mig_routine_t routine;
+ if ((routine = socket_server_routine (inp)) ||
+ (routine = pfinet_server_routine (inp)) ||
+ (routine = iioctl_server_routine (inp)) ||
+ (routine = NULL, trivfs_demuxer (inp, outp)) ||
+ (routine = startup_notify_server_routine (inp)))
+ {
+ if (routine)
+ (*routine) (inp, outp);
+ return TRUE;
+ }
+ else
+ return FALSE;
+ }
}
/* The system is going down; destroy all the extant port rights. That
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] 30/98: fatfs: fix error handling in diskfs_lookup_hard, (continued)
- [hurd] 30/98: fatfs: fix error handling in diskfs_lookup_hard, Samuel Thibault, 2014/01/13
- [hurd] 42/98: libports: improve error handling in ports_transfer_right, Samuel Thibault, 2014/01/13
- [hurd] 43/98: libdiskfs: improve error reporting in diskfs_start_disk_pager, Samuel Thibault, 2014/01/13
- [hurd] 44/98: libports: improve error reporting in adjust_priority, Samuel Thibault, 2014/01/13
- [hurd] 47/98: libfshelp: improve error handling in fshelp_start_translator_long, Samuel Thibault, 2014/01/13
- [hurd] 46/98: proc: store the device master port in _hurd_device_master, Samuel Thibault, 2014/01/13
- [hurd] 50/98: libnetfs: improve the netfs_demuxer function, Samuel Thibault, 2014/01/13
- [hurd] 31/98: fatfs: fix error handling in diskfs_get_directs, Samuel Thibault, 2014/01/13
- [hurd] 51/98: libtrivfs: improve the trivfs_demuxer function, Samuel Thibault, 2014/01/13
- [hurd] 24/98: Clean up the included header files, Samuel Thibault, 2014/01/13
- [hurd] 54/98: pfinet: improve the pfinet_demuxer function,
Samuel Thibault <=
- [hurd] 52/98: exec: improve the exec_demuxer function, Samuel Thibault, 2014/01/13
- [hurd] 34/98: mach-defpager: drop all register qualifiers, Samuel Thibault, 2014/01/13
- [hurd] 49/98: libdiskfs: improve the diskfs_demuxer function, Samuel Thibault, 2014/01/13
- [hurd] 56/98: auth: improve the auth_demuxer function, Samuel Thibault, 2014/01/13
- [hurd] 12/98: mach-defpager: remove unused variables, Samuel Thibault, 2014/01/13
- [hurd] 45/98: proc: store the privileged host port in _hurd_host_priv, Samuel Thibault, 2014/01/13
- [hurd] 36/98: libports: fix right leaks when adjusting priorities, Samuel Thibault, 2014/01/13
- [hurd] 65/98: trans: fix the use of the hash table in fakeroot.c, Samuel Thibault, 2014/01/13
- [hurd] 37/98: libshouldbeinlibc: fix minor port leak in maptime_map, Samuel Thibault, 2014/01/13
- [hurd] 38/98: init: fix port leak, Samuel Thibault, 2014/01/13