diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-04-12 12:22:11 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-04-12 12:22:11 +0200 |
| commit | 5b5839ab88fd7b621f2fe64f838666d428b20538 (patch) | |
| tree | a60890fcca5d4fb3930f8b61eb42f7989273d36c /eth-multiplexer/multiplexer.c | |
| parent | 842c229601af0d0a5cfbe11f1155d332094b580f (diff) | |
sync dde stuff
Diffstat (limited to 'eth-multiplexer/multiplexer.c')
| -rw-r--r-- | eth-multiplexer/multiplexer.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/eth-multiplexer/multiplexer.c b/eth-multiplexer/multiplexer.c index c36ab787..cc0024ef 100644 --- a/eth-multiplexer/multiplexer.c +++ b/eth-multiplexer/multiplexer.c @@ -39,6 +39,7 @@ #include <device/device.h> #include <hurd/ports.h> #include <hurd/netfs.h> +#include <version.h> #include "ethernet.h" #include "vdev.h" @@ -51,8 +52,8 @@ /* The device which the multiplexer connects to */ static char *device_file; -const char *argp_program_version = "eth-multiplexer 0.1"; -const char *argp_program_bug_address = "<bug-hurd@gnu.org>"; +const char *argp_program_version = STANDARD_HURD_VERSION (eth-multiplexer); + static const char doc[] = "Hurd multiplexer server."; static const struct argp_option options[] = { @@ -78,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 * |