remove all temporary files created by vim.

57 files changed, 0 insertions, 25747 deletions

diff --git a/boot-proxy-exc/boot.c~ b/boot-proxy-exc/boot.c~
deleted file mode 100644
index e7ce0f96..00000000
--- a/boot-proxy-exc/boot.c~
+++ /dev/null
@@ -1,2149 +0,0 @@
-/* Load a task using the single server, and then run it
-   as if we were the kernel.
-   Copyright (C) 1993,94,95,96,97,98,99,2000,01,02,2006
-     Free Software Foundation, Inc.
-
-This file is part of the GNU Hurd.
-
-The GNU Hurd is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-The GNU Hurd is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with the GNU Hurd; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* Written by Michael I. Bushnell.  */
-
-#include <mach.h>
-#include <mach/notify.h>
-#include <device/device.h>
-#include <a.out.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <cthreads.h>
-#include <fcntl.h>
-#include <elf.h>
-#include <mach/mig_support.h>
-#include <mach/default_pager.h>
-#include <argp.h>
-#include <hurd/store.h>
-#include <hurd/ports.h>
-#include <sys/mman.h>
-#include <version.h>
-
-#include "notify_S.h"
-#include "ourdevice_S.h"
-#include "io_S.h"
-#include "device_reply_U.h"
-#include "io_reply_U.h"
-#include "term_S.h"
-#include "bootstrap_S.h"
-/* #include "tioctl_S.h" */
-#include "util.h"
-#include "boot_script.h"
-#include "mach_proxy.h"
-
-#include <hurd/auth.h>
-
-#ifdef UX
-#undef STORE			/* We can't use libstore when under UX.  */
-#else
-#define STORE
-#endif
-
-#ifdef UX
-
-#include "ux.h"
-
-#else  /* !UX */
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <termios.h>
-#include <error.h>
-#include <hurd.h>
-#include <assert.h>
-
-static struct termios orig_tty_state;
-static int isig;
-static char *kernel_command_line;
-
-struct port_bucket *port_bucket;
-struct port_class *task_portclass;
-struct port_class *exc_portclass;
-struct port_class *priv_host_portclass;
-struct port_class *other_portclass;
-
-void destroy_priv_host (void *pi);
-
-static void
-init_termstate ()
-{
-  struct termios tty_state;
-
-  if (tcgetattr (0, &tty_state) < 0)
-    error (10, errno, "tcgetattr");
-
-  orig_tty_state = tty_state;
-  cfmakeraw (&tty_state);
-  if (isig)
-    tty_state.c_lflag |= ISIG;
-
-  if (tcsetattr (0, 0, &tty_state) < 0)
-    error (11, errno, "tcsetattr");
-}
-
-static void
-restore_termstate ()
-{
-  tcsetattr (0, 0, &orig_tty_state);
-}
-
-#define host_fstat fstat
-typedef struct stat host_stat_t;
-#define host_exit exit
-
-#endif /* UX */
-
-mach_port_t privileged_host_port, master_device_port, defpager;
-mach_port_t pseudo_master_device_port;
-mach_port_t receive_set;
-mach_port_t pseudo_console, pseudo_root;
-auth_t authserver;
-
-struct port_info *pseudo_priv_host_pi;
-
-struct store *root_store;
-
-spin_lock_t queuelock = SPIN_LOCK_INITIALIZER;
-spin_lock_t readlock = SPIN_LOCK_INITIALIZER;
-
-mach_port_t php_child_name, psmdp_child_name, taskname;
-
-task_t child_task;
-mach_port_t bootport;
-
-int console_mscount;
-
-vm_address_t fs_stack_base;
-vm_size_t fs_stack_size;
-
-void init_termstate ();
-void restore_termstate ();
-
-char *fsname;
-
-char bootstrap_args[100] = "-";
-char *bootdevice = 0;
-char *bootscript = 0;
-
-boolean_t is_user = 0;
-
-
-void safe_gets (char *buf, int buf_len)
-{
-  fgets (buf, buf_len, stdin);
-}
-
-char *useropen_dir;
-
-int
-useropen (const char *name, int flags, int mode)
-{
-  if (useropen_dir)
-    {
-      static int dlen;
-      if (!dlen) dlen = strlen (useropen_dir);
-      {
-	int len = strlen (name);
-	char try[dlen + 1 + len + 1];
-	int fd;
-	memcpy (try, useropen_dir, dlen);
-	try[dlen] = '/';
-	memcpy (&try[dlen + 1], name, len + 1);
-	fd = open (try, flags, mode);
-	if (fd >= 0)
-	  return fd;
-      }
-    }
-  return open (name, flags, mode);
-}
-
-int
-request_server (mach_msg_header_t *inp,
-		mach_msg_header_t *outp)
-{
-  extern int io_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern int device_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern int notify_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern int term_server (mach_msg_header_t *, mach_msg_header_t *);
-/*  extern int tioctl_server (mach_msg_header_t *, mach_msg_header_t *); */
-  extern int bootstrap_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern boolean_t mach_host_server (mach_msg_header_t *InHeadP,
-				     mach_msg_header_t *OutHeadP);
-  extern boolean_t mach_server (mach_msg_header_t *InHeadP,
-				mach_msg_header_t *OutHeadP);
-  extern void bootstrap_compat ();
-
-#if 0
-  if (inp->msgh_local_port == bootport && boot_like_cmudef)
-    {
-      if (inp->msgh_id == 999999)
-	{
-	  bootstrap_compat (inp, outp);
-	  return 1;
-	}
-      else
-	return bootstrap_server (inp, outp);
-    }
-  else
-#endif
-   return (io_server (inp, outp)
-	   || device_server (inp, outp)
-	   || notify_server (inp, outp)
-	   || term_server (inp, outp)
-	   /*	    || tioctl_server (inp, outp) */);
-}
-
-int
-mach_proxy_demuxer (mach_msg_header_t *inp,
-		   mach_msg_header_t *outp)
-{
-  extern boolean_t mach_server
-    (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP);
-  extern boolean_t mach_host_server
-    (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP);
-  extern boolean_t mach_port_server
-    (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP);
-  extern boolean_t exc_server
-    (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP);
-  extern int notify_server (mach_msg_header_t *, mach_msg_header_t *);
-  return (mach_server (inp, outp)
-	  || mach_host_server (inp, outp)
-	  || mach_port_server (inp, outp)
-	  || notify_server (inp, outp)
-	  || exc_server (inp, outp));
-}
-
-void
-mach_proxy_thread ()
-{
-  ports_manage_port_operations_multithread (port_bucket, 
-					    mach_proxy_demuxer,
-					    30 * 1000, 0, 0);
-}
-
-vm_address_t
-load_image (task_t t,
-	    char *file)
-{
-  int fd;
-  union
-    {
-      struct exec a;
-      Elf32_Ehdr e;
-    } hdr;
-  char msg[] = ": cannot open bootstrap file\n";
-
-  fd = useropen (file, O_RDONLY, 0);
-
-  if (fd == -1)
-    {
-      write (2, file, strlen (file));
-      write (2, msg, sizeof msg - 1);
-      task_terminate (t);
-      host_exit (1);
-    }
-
-  read (fd, &hdr, sizeof hdr);
-  if (*(Elf32_Word *) hdr.e.e_ident == *(Elf32_Word *) "\177ELF")
-    {
-      Elf32_Phdr phdrs[hdr.e.e_phnum], *ph;
-      lseek (fd, hdr.e.e_phoff, SEEK_SET);
-      read (fd, phdrs, sizeof phdrs);
-      for (ph = phdrs; ph < &phdrs[sizeof phdrs/sizeof phdrs[0]]; ++ph)
-	if (ph->p_type == PT_LOAD)
-	  {
-	    vm_address_t buf;
-	    vm_size_t offs = ph->p_offset & (ph->p_align - 1);
-	    vm_size_t bufsz = round_page (ph->p_filesz + offs);
-
-	    buf = (vm_address_t) mmap (0, bufsz,
-				       PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-
-	    lseek (fd, ph->p_offset, SEEK_SET);
-	    read (fd, (void *)(buf + offs), ph->p_filesz);
-
-	    ph->p_memsz = ((ph->p_vaddr + ph->p_memsz + ph->p_align - 1)
-			   & ~(ph->p_align - 1));
-	    ph->p_vaddr &= ~(ph->p_align - 1);
-	    ph->p_memsz -= ph->p_vaddr;
-
-	    vm_allocate (t, (vm_address_t*)&ph->p_vaddr, ph->p_memsz, 0);
-	    vm_write (t, ph->p_vaddr, buf, bufsz);
-	    munmap ((caddr_t) buf, bufsz);
-	    vm_protect (t, ph->p_vaddr, ph->p_memsz, 0,
-			((ph->p_flags & PF_R) ? VM_PROT_READ : 0) |
-			((ph->p_flags & PF_W) ? VM_PROT_WRITE : 0) |
-			((ph->p_flags & PF_X) ? VM_PROT_EXECUTE : 0));
-	  }
-      return hdr.e.e_entry;
-    }
-  else
-    {
-      /* a.out */
-      int magic = N_MAGIC (hdr.a);
-      int headercruft;
-      vm_address_t base = 0x10000;
-      int rndamount, amount;
-      vm_address_t bsspagestart, bssstart;
-      char *buf;
-
-      headercruft = sizeof (struct exec) * (magic == ZMAGIC);
-
-      amount = headercruft + hdr.a.a_text + hdr.a.a_data;
-      rndamount = round_page (amount);
-      buf = mmap (0, rndamount, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-      lseek (fd, sizeof hdr.a - headercruft, SEEK_SET);
-      read (fd, buf, amount);
-      vm_allocate (t, &base, rndamount, 0);
-      vm_write (t, base, (vm_address_t) buf, rndamount);
-      if (magic != OMAGIC)
-	vm_protect (t, base, trunc_page (headercruft + hdr.a.a_text),
-		    0, VM_PROT_READ | VM_PROT_EXECUTE);
-      munmap ((caddr_t) buf, rndamount);
-
-      bssstart = base + hdr.a.a_text + hdr.a.a_data + headercruft;
-      bsspagestart = round_page (bssstart);
-      vm_allocate (t, &bsspagestart,
-		   hdr.a.a_bss - (bsspagestart - bssstart), 0);
-
-      return hdr.a.a_entry;
-    }
-}
-
-
-void read_reply ();
-void msg_thread ();
-
-/* Callbacks for boot_script.c; see boot_script.h.  */
-
-mach_port_t
-boot_script_read_file (const char *filename)
-{
-  static const char msg[] = ": cannot open\n";
-  int fd = useropen (filename, O_RDONLY, 0);
-  host_stat_t st;
-  error_t err;
-  mach_port_t memobj;
-  vm_address_t region;
-
-  write (2, filename, strlen (filename));
-  if (fd < 0)
-    {
-      write (2, msg, sizeof msg - 1);
-      host_exit (1);
-    }
-  else
-    write (2, msg + sizeof msg - 2, 1);
-
-  host_fstat (fd, &st);
-
-  err = default_pager_object_create (defpager, &memobj,
-				     round_page (st.st_size));
-  if (err)
-    {
-      static const char msg[] = "cannot create default-pager object\n";
-      write (2, msg, sizeof msg - 1);
-      host_exit (1);
-    }
-
-  region = 0;
-  vm_map (mach_task_self (), &region, round_page (st.st_size),
-	  0, 1, memobj, 0, 0, VM_PROT_ALL, VM_PROT_ALL, VM_INHERIT_NONE);
-  read (fd, (char *) region, st.st_size);
-  munmap ((caddr_t) region, round_page (st.st_size));
-
-  close (fd);
-  return memobj;
-}
-
-int
-boot_script_exec_cmd (void *hook,
-		      mach_port_t task, char *path, int argc,
-		      char **argv, char *strings, int stringlen)
-{
-  char *args, *p;
-  int arg_len, i;
-  size_t reg_size;
-  void *arg_pos;
-  vm_offset_t stack_start, stack_end;
-  vm_address_t startpc, str_start;
-  thread_t thread;
-
-  write (2, path, strlen (path));
-  for (i = 1; i < argc; ++i)
-    {
-      write (2, " ", 1);
-      write (2, argv[i], strlen (argv[i]));
-    }
-  write (2, "\r\n", 2);
-
-  startpc = load_image (task, path);
-  arg_len = stringlen + (argc + 2) * sizeof (char *) + sizeof (integer_t);
-  arg_len += 5 * sizeof (int);
-  stack_end = VM_MAX_ADDRESS;
-  stack_start = VM_MAX_ADDRESS - 16 * 1024 * 1024;
-  vm_allocate (task, &stack_start, stack_end - stack_start, FALSE);
-  arg_pos = (void *) ((stack_end - arg_len) & ~(sizeof (natural_t) - 1));
-  args = mmap (0, stack_end - trunc_page ((vm_offset_t) arg_pos),
-	       PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-  str_start = ((vm_address_t) arg_pos
-	       + (argc + 2) * sizeof (char *) + sizeof (integer_t));
-  p = args + ((vm_address_t) arg_pos & (vm_page_size - 1));
-  *(int *) p = argc;
-  p = (void *) p + sizeof (int);
-  for (i = 0; i < argc; i++)
-    {
-      *(char **) p = argv[i] - strings + (char *) str_start;
-      p = (void *) p + sizeof (char *);
-    }
-  *(char **) p = 0;
-  p = (void *) p + sizeof (char *);
-  *(char **) p = 0;
-  p = (void *) p + sizeof (char *);
-  memcpy (p, strings, stringlen);
-  bzero (args, (vm_offset_t) arg_pos & (vm_page_size - 1));
-  vm_write (task, trunc_page ((vm_offset_t) arg_pos), (vm_address_t) args,
-	    stack_end - trunc_page ((vm_offset_t) arg_pos));
-  munmap ((caddr_t) args,
-	  stack_end - trunc_page ((vm_offset_t) arg_pos));
-
-  thread_create (task, &thread);
-#ifdef i386_THREAD_STATE_COUNT
-  {
-    struct i386_thread_state regs;
-    reg_size = i386_THREAD_STATE_COUNT;
-    thread_get_state (thread, i386_THREAD_STATE,
-		      (thread_state_t) &regs, &reg_size);
-    regs.eip = (int) startpc;
-    regs.uesp = (int) arg_pos;
-    thread_set_state (thread, i386_THREAD_STATE,
-		      (thread_state_t) &regs, reg_size);
-  }
-#elif defined(ALPHA_THREAD_STATE_COUNT)
-  {
-    struct alpha_thread_state regs;
-    reg_size = ALPHA_THREAD_STATE_COUNT;
-    thread_get_state (thread, ALPHA_THREAD_STATE,
-		      (thread_state_t) &regs, &reg_size);
-    regs.r30 = (natural_t) arg_pos;
-    regs.pc = (natural_t) startpc;
-    thread_set_state (thread, ALPHA_THREAD_STATE,
-		      (thread_state_t) &regs, reg_size);
-  }
-#else
-# error needs to be ported
-#endif
-
-  thread_resume (thread);
-  mach_port_deallocate (mach_task_self (), thread);
-  return 0;
-}
-
-const char *argp_program_version = STANDARD_HURD_VERSION (boot);
-
-static struct argp_option options[] =
-{
-  { "boot-root",   'D', "DIR", 0,
-    "Root of a directory tree in which to find files specified in BOOT-SCRIPT" },
-  { "single-user", 's', 0, 0,
-    "Boot in single user mode" },
-  { "kernel-command-line", 'c', "COMMAND LINE", 0,
-    "Simulated multiboot command line to supply" },
-  { "pause" ,      'd', 0, 0,
-    "Pause for user confirmation at various times during booting" },
-  { "isig",      'I', 0, 0,
-    "Do not disable terminal signals, so you can suspend and interrupt boot."},
-  { "device-map",   'm', "DEBICENAME=DEVICEFILE", 0,
-    "Map the device in subhurd to the device in the main Hurd."},
-  { "defpager",	    'p', "PAGER TRANSLATOR", 0,
-    "Specify the default pager for subhurd."},
-  { "user", 'u', 0, 0, "For normal user."},
-  { 0 }
-};
-static char args_doc[] = "BOOT-SCRIPT";
-static char doc[] = "Boot a second hurd";
-
-struct dev_map 
-{
-  char *name;
-  mach_port_t port;
-  struct dev_map *next;
-};
-
-static struct dev_map *dev_map_head;
-
-static struct dev_map *add_dev_map (char *dev_name, char *dev_file)
-{
-  struct dev_map *map = (struct dev_map *) malloc (sizeof (*map));
-
-  assert (map);
-  map->name = dev_name;
-  map->port = file_name_lookup (dev_file, 0, 0);
-  if (map->port == MACH_PORT_NULL)
-    error (1, errno, "file_name_lookup: %s", dev_file);
-  map->next = dev_map_head;
-  dev_map_head = map;
-  return map;
-}
-
-static struct dev_map *lookup_dev (char *dev_name)
-{
-  struct dev_map *map;
-
-  for (map = dev_map_head; map; map = map->next)
-    {
-      if (strcmp (map->name, dev_name) == 0)
-	return map;
-    }
-  return NULL;
-}
-
-char *pager_file;
-
-static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
-{
-  char *dev_file;
-
-  switch (key)
-    {
-      size_t len;
-
-    case 'c':  kernel_command_line = arg; break;
-
-    case 'D':  useropen_dir = arg; break;
-
-    case 'I':  isig = 1; break;
-
-    case 's': case 'd':
-      len = strlen (bootstrap_args);
-      if (len >= sizeof bootstrap_args - 1)
-	argp_error (state, "Too many bootstrap args");
-      bootstrap_args[len++] = key;
-      bootstrap_args[len] = '\0';
-      break;
-
-    case 'm':
-      dev_file = strchr (arg, '=');
-      if (dev_file == NULL)
-	return ARGP_ERR_UNKNOWN;
-      *dev_file = 0;
-      add_dev_map (arg, dev_file+1);
-      break;
-
-    case 'p':
-      pager_file = arg;
-      break;
-
-    case 'u':
-      is_user = 1;
-      break;
-
-    case ARGP_KEY_ARG:
-      if (state->arg_num == 0)
-	bootscript = arg;
-      else
-	return ARGP_ERR_UNKNOWN;
-      break;
-
-    case ARGP_KEY_INIT:
-      state->child_inputs[0] = state->input; break;
-
-    default:
-      return ARGP_ERR_UNKNOWN;
-    }
-  return 0;
-}
-
-static void
-sigint (int signo)
-{
-  int kill_task (struct task_info *task_pi)
-    {
-      task_terminate (task_pi->task_port);
-      return 0;
-    }
-
-  info ("receives an INT");
-  foreach_task (kill_task);
-  exit (0);
-}
-
-void
-init_signal ()
-{
-  struct sigaction sa;
-  sa.sa_handler = sigint;
-  sa.sa_flags = 0;		/* No SA_RESTART! */
-  sigemptyset(&sa.sa_mask);
-  if (sigaction (SIGINT, &sa, NULL))
-    error (2, errno, "cannot set SIGHUP handler");
-}
-
-void
-init_kernel_task ()
-{
-  error_t err;
-  task_t pseudo_task;
-  task_t pseudo_kernel_task;
-  process_t real_kernel_task_proc;
-  process_t proc;
-  extern int create_pseudo_task (task_t real_task, task_t *ret_pseudo_task);
-
-  err = task_create (mach_task_self (), 0, &pseudo_kernel_task);
-  if (err)
-    error (4, err, "cannot create the pseudo kernel task.");
-
-  err = proc_task2proc (getproc (), pseudo_kernel_task, &proc);
-  if (err)
-    error (4, err, "cannot get the proc port for the pseudo kernel task.");
-
-  err = task_set_bootstrap_port (pseudo_kernel_task, proc);
-  if (err)
-    error (4, err, "cannot set the pseudo kernel task's bootstrap port");
-
-  err = proc_pid2proc (getproc (), 2, &real_kernel_task_proc);
-  if (err)
-    error (4, err, "cannot get the kernel task's proc port");
-
-  vm_address_t kargv, kenvp;
-  err = proc_get_arg_locations (real_kernel_task_proc, &kargv, &kenvp);
-  if (err)
-    error (4, err, "cannot get the kernel task's argument");
-  proc_set_arg_locations (proc, kargv, kenvp);
-  create_pseudo_task (pseudo_kernel_task, &pseudo_task);
-  // TODO the pseudo kernel task has to been destroyed after subhurd exits.
-}
-
-FILE *logfile;
-
-int
-main (int argc, char **argv, char **envp)
-{
-  error_t err;
-  mach_port_t foo;
-  char *buf = 0;
-  int i, len;
-  char *root_store_name;
-  const struct argp_child kids[] = { { &store_argp }, { 0 }};
-  struct argp argp = { options, parse_opt, args_doc, doc, kids };
-  struct store_argp_params store_argp_params = { 0 };
-  mach_port_t subhurd_privileged_host_port = MACH_PORT_NULL;
-
-  LOG_START ();
-
-  argp_parse (&argp, argc, argv, 0, 0, &store_argp_params);
-  err = store_parsed_name (store_argp_params.result, &root_store_name);
-  if (err)
-    error (2, err, "store_parsed_name");
-
-  err = store_parsed_open (store_argp_params.result, 0, &root_store);
-  if (err)
-    error (4, err, "%s", root_store_name);
-
-  init_signal ();
-  if (!is_user)
-    {
-      get_privileged_ports (&privileged_host_port, &master_device_port);
-      defpager = MACH_PORT_NULL;
-      err = vm_set_default_memory_manager (privileged_host_port, &defpager);
-      if (err)
-	error (4, err, "vm_set_default_memory_manager");
-      subhurd_privileged_host_port = privileged_host_port;
-    }
-  else
-    {
-      port_bucket = ports_create_bucket ();
-      task_portclass = ports_create_class (clean_pseudo_task, 0);
-      priv_host_portclass = ports_create_class (destroy_priv_host, 0);
-      other_portclass = ports_create_class (0, 0);
-      init_kernel_task ();
-      cthread_detach (cthread_fork ((cthread_fn_t) mach_proxy_thread,
-				    (any_t) 0));
-	{
-	  mach_port_t priv_host;
-	  get_privileged_ports (&priv_host, NULL);
-	  defpager = MACH_PORT_NULL;
-	  err = vm_set_default_memory_manager (priv_host, &defpager);
-	  if (err)
-	    error (4, err, "vm_set_default_memory_manager");
-	  mach_port_deallocate (mach_task_self (), priv_host);
-	}
-//      if (pager_file == NULL)
-//	error (4, 0, "The default pager must be specified for subhurd.");
-//      defpager = file_name_lookup (pager_file, O_EXEC, 0);
-//      if (defpager == MACH_PORT_NULL)
-//	error (4, errno, "file_name_look: %s", pager_file);
-
-      /* Initialize the pseudo privileged host port. */
-      err = ports_create_port (priv_host_portclass, port_bucket,
-			       sizeof (struct port_info),
-			       &pseudo_priv_host_pi);
-      if (err)
-	error (4, err, "fail to create the pseudo privileged host port");
-      subhurd_privileged_host_port = ports_get_send_right (pseudo_priv_host_pi);
-      ports_port_deref (pseudo_priv_host_pi);
-    }
-
-  strcat (bootstrap_args, "f");
-
-  mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_PORT_SET,
-		      &receive_set);
-
-  if (root_store->class == &store_device_class && root_store->name
-      && (root_store->flags & STORE_ENFORCED)
-      && root_store->num_runs == 1 && root_store->runs[0].start == 0)
-    /* Let known device nodes pass through directly.  */
-    bootdevice = root_store->name;
-  else
-    /* Pass a magic value that we can use to do I/O to ROOT_STORE.  */
-    {
-      bootdevice = "pseudo-root";
-      mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE,
-			  &pseudo_root);
-      mach_port_move_member (mach_task_self (), pseudo_root, receive_set);
-    }
-
-  /* Initialize the pseudo master device port. */
-  mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE,
-		      &pseudo_master_device_port);
-  mach_port_insert_right (mach_task_self (),
-			  pseudo_master_device_port,
-			  pseudo_master_device_port,
-			  MACH_MSG_TYPE_MAKE_SEND);
-  mach_port_move_member (mach_task_self (), pseudo_master_device_port,
-			 receive_set);
-  mach_port_request_notification (mach_task_self (), pseudo_master_device_port,
-				  MACH_NOTIFY_NO_SENDERS, 1,
-				  pseudo_master_device_port,
-				  MACH_MSG_TYPE_MAKE_SEND_ONCE, &foo);
-  if (foo != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), foo);
-
-  /* Initialize the pseudo console port. */
-  mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE,
-		      &pseudo_console);
-  mach_port_move_member (mach_task_self (), pseudo_console, receive_set);
-  mach_port_request_notification (mach_task_self (), pseudo_console,
-				  MACH_NOTIFY_NO_SENDERS, 1, pseudo_console,
-				  MACH_MSG_TYPE_MAKE_SEND_ONCE, &foo);
-  if (foo != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), foo);
-
-  if (kernel_command_line == 0)
-    asprintf (&kernel_command_line, "%s %s root=%s",
-	      argv[0], bootstrap_args, bootdevice);
-
-  /* Initialize boot script variables.  */
-  if (boot_script_set_variable ("host-port", VAL_PORT,
-				(int) subhurd_privileged_host_port)
-      || boot_script_set_variable ("device-port", VAL_PORT,
-				   (integer_t) pseudo_master_device_port)
-      || boot_script_set_variable ("kernel-command-line", VAL_STR,
-				   (integer_t) kernel_command_line)
-      || boot_script_set_variable ("root-device",
-				   VAL_STR, (integer_t) bootdevice)
-      || boot_script_set_variable ("boot-args",
-				   VAL_STR, (integer_t) bootstrap_args))
-    {
-      static const char msg[] = "error setting variable";
-
-      write (2, msg, strlen (msg));
-      host_exit (1);
-    }
-
-  /* Turn each `FOO=BAR' word in the command line into a boot script
-     variable ${FOO} with value BAR.  */
-  {
-    int len = strlen (kernel_command_line) + 1;
-    char *s = memcpy (alloca (len), kernel_command_line, len);
-    char *word;
-
-    while ((word = strsep (&s, " \t")) != 0)
-      {
-       char *eq = strchr (word, '=');
-       if (eq == 0)
-         continue;
-       *eq++ = '\0';
-       err = boot_script_set_variable (word, VAL_STR, (integer_t) eq);
-       if (err)
-         {
-           char *msg;
-           asprintf (&msg, "cannot set boot-script variable %s: %s\n",
-                     word, boot_script_error_string (err));
-           assert (msg);
-           write (2, msg, strlen (msg));
-           free (msg);
-           host_exit (1);
-         }
-      }
-  }
-
-  /* Parse the boot script.  */
-  {
-    char *p, *line;
-    static const char filemsg[] = "Can't open boot script\n";
-    static const char memmsg[] = "Not enough memory\n";
-    int amt, fd, err;
-
-    fd = open (bootscript, O_RDONLY, 0);
-    if (fd < 0)
-      {
-	write (2, filemsg, sizeof (filemsg));
-	host_exit (1);
-      }
-    p = buf = malloc (500);
-    if (!buf)
-      {
-	write (2, memmsg, sizeof (memmsg));
-	host_exit (1);
-      }
-    len = 500;
-    amt = 0;
-    while (1)
-      {
-	i = read (fd, p, len - (p - buf));
-	if (i <= 0)
-	  break;
-	p += i;
-	amt += i;
-	if (p == buf + len)
-	  {
-	    char *newbuf;
-
-	    len += 500;
-	    newbuf = realloc (buf, len);
-	    if (!newbuf)
-	      {
-		write (2, memmsg, sizeof (memmsg));
-		host_exit (1);
-	      }
-	    p = newbuf + (p - buf);
-	    buf = newbuf;
-	  }
-      }
-    line = p = buf;
-    while (1)
-      {
-	while (p < buf + amt && *p != '\n')
-	  p++;
-	*p = '\0';
-	err = boot_script_parse_line (0, line);
-	if (err)
-	  {
-	    char *str;
-	    int i;
-
-	    str = boot_script_error_string (err);
-	    i = strlen (str);
-	    write (2, str, i);
-	    write (2, " in `", 5);
-	    write (2, line, strlen (line));
-	    write (2, "'\n", 2);
-	    host_exit (1);
-	  }
-	if (p == buf + amt)
-	  break;
-	line = ++p;
-      }
-  }
-
-  if (index (bootstrap_args, 'd'))
-    {
-      static const char msg[] = "Pausing. . .";
-      char c;
-      write (2, msg, sizeof (msg) - 1);
-      read (0, &c, 1);
-    }
-
-  init_termstate ();
-
-  /* The boot script has now been parsed into internal data structures.
-     Now execute its directives.  */
-  {
-    int err;
-
-    err = boot_script_exec ();
-    if (err)
-      {
-	char *str = boot_script_error_string (err);
-	int i = strlen (str);
-
-	write (2, str, i);
-	host_exit (1);
-      }
-    free (buf);
-  }
-
-  mach_port_deallocate (mach_task_self (), pseudo_master_device_port);
-  if (is_user)
-    mach_port_deallocate (mach_task_self (), subhurd_privileged_host_port);
-
-  cthread_detach (cthread_fork ((cthread_fn_t) msg_thread, (any_t) 0));
-
-  for (;;)
-    {
-      fd_set rmask;
-      FD_ZERO (&rmask);
-      FD_SET (0, &rmask);
-      if (select (1, &rmask, 0, 0, 0) == 1)
-	read_reply ();
-      else /* We hosed */
-	error (5, errno, "select");
-    }
-
-  LOG_END ();
-/*  mach_msg_server (request_server, __vm_page_size * 2, receive_set); */
-}
-
-void
-msg_thread()
-{
-  while (1)
-    mach_msg_server (request_server, 0, receive_set);
-}
-
-
-enum read_type
-{
-  DEV_READ,
-  DEV_READI,
-  IO_READ,
-};
-struct qr
-{
-  enum read_type type;
-  mach_port_t reply_port;
-  mach_msg_type_name_t reply_type;
-  int amount;
-  struct qr *next;
-};
-struct qr *qrhead, *qrtail;
-
-/* Queue a read for later reply. */
-kern_return_t
-queue_read (enum read_type type,
-	    mach_port_t reply_port,
-	    mach_msg_type_name_t reply_type,
-	    int amount)
-{
-  struct qr *qr;
-
-  qr = malloc (sizeof (struct qr));
-  if (!qr)
-    return D_NO_MEMORY;
-
-  spin_lock (&queuelock);
-
-  qr->type = type;
-  qr->reply_port = reply_port;
-  qr->reply_type = reply_type;
-  qr->amount = amount;
-  qr->next = 0;
-  if (qrtail)
-    qrtail->next = qr;
-  else
-    qrhead = qrtail = qr;
-
-  spin_unlock (&queuelock);
-  return D_SUCCESS;
-}
-
-/* TRUE if there's data available on stdin, which should be used to satisfy
-   console read requests.  */
-static int should_read = 0;
-
-/* Reply to a queued read. */
-void
-read_reply ()
-{
-  int avail;
-  struct qr *qr;
-  char * buf;
-  int amtread;
-
-  /* By forcing SHOULD_READ to true before trying the lock, we ensure that
-     either we get the lock ourselves or that whoever currently holds the
-     lock will service this read when he unlocks it.  */
-  should_read = 1;
-  if (! spin_try_lock (&readlock))
-    return;
-
-  /* Since we're commited to servicing the read, no one else need do so.  */
-  should_read = 0;
-
-  ioctl (0, FIONREAD, &avail);
-  if (!avail)
-    {
-      spin_unlock (&readlock);
-      return;
-    }
-
-  spin_lock (&queuelock);
-
-  if (!qrhead)
-    {
-      spin_unlock (&queuelock);
-      spin_unlock (&readlock);
-      return;
-    }
-
-  qr = qrhead;
-  qrhead = qr->next;
-  if (qr == qrtail)
-    qrtail = 0;
-
-  spin_unlock (&queuelock);
-
-  if (qr->type == DEV_READ)
-    buf = mmap (0, qr->amount, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-  else
-    buf = alloca (qr->amount);
-  amtread = read (0, buf, qr->amount);
-
-  spin_unlock (&readlock);
-
-  switch (qr->type)
-    {
-    case DEV_READ:
-      if (amtread >= 0)
-	ds_device_read_reply (qr->reply_port, qr->reply_type, 0,
-			      (io_buf_ptr_t) buf, amtread);
-      else
-	ds_device_read_reply (qr->reply_port, qr->reply_type, errno, 0, 0);
-      break;
-
-    case DEV_READI:
-      if (amtread >= 0)
-	ds_device_read_reply_inband (qr->reply_port, qr->reply_type, 0,
-				     buf, amtread);
-      else
-	ds_device_read_reply_inband (qr->reply_port, qr->reply_type, errno,
-				     0, 0);
-      break;
-
-    case IO_READ:
-      if (amtread >= 0)
-	io_read_reply (qr->reply_port, qr->reply_type, 0,
-		       buf, amtread);
-      else
-	io_read_reply (qr->reply_port, qr->reply_type, errno, 0, 0);
-      break;
-    }
-
-  free (qr);
-}
-
-/* Unlock READLOCK, and also service any new read requests that it was
-   blocking.  */
-static void
-unlock_readlock ()
-{
-  spin_unlock (&readlock);
-  while (should_read)
-    read_reply ();
-}
-
-/*
- *	Handle bootstrap requests.
- */
-/* These two functions from .../mk/bootstrap/default_pager.c. */
-
-kern_return_t
-do_bootstrap_privileged_ports(bootstrap, hostp, devicep)
-	mach_port_t bootstrap;
-	mach_port_t *hostp, *devicep;
-{
-  if (is_user)
-    /* I cannot use ports_get_right() here,
-     * because the port will be copied to the client. */
-    *hostp = pseudo_priv_host_pi->port_right;
-  else
-    *hostp = privileged_host_port;
-  *devicep = pseudo_master_device_port;
-  return KERN_SUCCESS;
-}
-
-void
-bootstrap_compat(in, out)
-	mach_msg_header_t *in, *out;
-{
-	mig_reply_header_t *reply = (mig_reply_header_t *) out;
-	mach_msg_return_t mr;
-
-	struct imsg {
-		mach_msg_header_t	hdr;
-		mach_msg_type_t		port_desc_1;
-		mach_port_t		port_1;
-		mach_msg_type_t		port_desc_2;
-		mach_port_t		port_2;
-	} imsg;
-
-	/*
-	 * Send back the host and device ports.
-	 */
-
-	imsg.hdr.msgh_bits = MACH_MSGH_BITS_COMPLEX |
-		MACH_MSGH_BITS(MACH_MSGH_BITS_REMOTE(in->msgh_bits), 0);
-	/* msgh_size doesn't need to be initialized */
-	imsg.hdr.msgh_remote_port = in->msgh_remote_port;
-	imsg.hdr.msgh_local_port = MACH_PORT_NULL;
-	/* msgh_seqno doesn't need to be initialized */
-	imsg.hdr.msgh_id = in->msgh_id + 100;	/* this is a reply msg */
-
-	imsg.port_desc_1.msgt_name = MACH_MSG_TYPE_COPY_SEND;
-	imsg.port_desc_1.msgt_size = (sizeof(mach_port_t) * 8);
-	imsg.port_desc_1.msgt_number = 1;
-	imsg.port_desc_1.msgt_inline = TRUE;
-	imsg.port_desc_1.msgt_longform = FALSE;
-	imsg.port_desc_1.msgt_deallocate = FALSE;
-	imsg.port_desc_1.msgt_unused = 0;
-
-	if (is_user)
-		imsg.port_1 = pseudo_priv_host_pi->port_right;
-	else
-		imsg.port_1 = privileged_host_port;
-
-	imsg.port_desc_2 = imsg.port_desc_1;
-
-	imsg.port_desc_2.msgt_name = MACH_MSG_TYPE_MAKE_SEND;
-	imsg.port_2 = pseudo_master_device_port;
-
-	/*
-	 * Send the reply message.
-	 * (mach_msg_server can not do this, because the reply
-	 * is not in standard format.)
-	 */
-
-	mr = mach_msg(&imsg.hdr, MACH_SEND_MSG,
-		      sizeof imsg, 0, MACH_PORT_NULL,
-		      MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
-	if (mr != MACH_MSG_SUCCESS)
-		(void) mach_port_deallocate(mach_task_self (),
-					    imsg.hdr.msgh_remote_port);
-
-	/*
-	 * Tell mach_msg_server to do nothing.
-	 */
-
-	reply->RetCode = MIG_NO_REPLY;
-}
-
-/* Implementation of device interface */
-
-kern_return_t
-ds_device_open (mach_port_t master_port,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type,
-		dev_mode_t mode,
-		dev_name_t name,
-		mach_port_t *device,
-		mach_msg_type_name_t *devicetype)
-{
-  struct dev_map *map;
-
-  if (master_port != pseudo_master_device_port)
-    return D_INVALID_OPERATION;
-
-  debug ("open %s", name);
-  if (!strcmp (name, "console"))
-    {
-#if 0
-      mach_port_insert_right (mach_task_self (), pseudo_console,
-			      pseudo_console, MACH_MSG_TYPE_MAKE_SEND);
-      console_send_rights++;
-#endif
-      console_mscount++;
-      *device = pseudo_console;
-      *devicetype = MACH_MSG_TYPE_MAKE_SEND;
-      return 0;
-    }
-  else if (strcmp (name, "pseudo-root") == 0)
-    /* Magic root device.  */
-    {
-      *device = pseudo_root;
-      *devicetype = MACH_MSG_TYPE_MAKE_SEND;
-      return 0;
-    }
-
-  map = lookup_dev (name);
-  if (map)
-    {
-      error_t err;
-      *devicetype = MACH_MSG_TYPE_MOVE_SEND;
-      err = device_open (map->port, mode, "", device);
-      return err;
-    }
-
-  if (is_user)
-    return D_NO_SUCH_DEVICE;
-  else
-    {
-      *devicetype = MACH_MSG_TYPE_MOVE_SEND;
-      return device_open (master_device_port, mode, name, device);
-    }
-}
-
-kern_return_t
-ds_device_close (device_t device)
-{
-  if (device != pseudo_console && device != pseudo_root)
-    return D_NO_SUCH_DEVICE;
-  return 0;
-}
-
-kern_return_t
-ds_device_write (device_t device,
-		 mach_port_t reply_port,
-		 mach_msg_type_name_t reply_type,
-		 dev_mode_t mode,
-		 recnum_t recnum,
-		 io_buf_ptr_t data,
-		 size_t datalen,
-		 int *bytes_written)
-{
-  if (device == pseudo_console)
-    {
-#if 0
-      if (console_send_rights)
-	{
-	  mach_port_mod_refs (mach_task_self (), pseudo_console,
-			      MACH_PORT_TYPE_SEND, -console_send_rights);
-	  console_send_rights = 0;
-	}
-#endif
-
-      *bytes_written = write (1, data, datalen);
-
-      return (*bytes_written == -1 ? D_IO_ERROR : D_SUCCESS);
-    }
-  else if (device == pseudo_root)
-    {
-      size_t wrote;
-      if (store_write (root_store, recnum, data, datalen, &wrote) != 0)
-	return D_IO_ERROR;
-      *bytes_written = wrote;
-      return D_SUCCESS;
-    }
-  else
-    return D_NO_SUCH_DEVICE;
-}
-
-kern_return_t
-ds_device_write_inband (device_t device,
-			mach_port_t reply_port,
-			mach_msg_type_name_t reply_type,
-			dev_mode_t mode,
-			recnum_t recnum,
-			io_buf_ptr_inband_t data,
-			size_t datalen,
-			int *bytes_written)
-{
-  if (device == pseudo_console)
-    {
-#if 0
-      if (console_send_rights)
-	{
-	  mach_port_mod_refs (mach_task_self (), pseudo_console,
-			      MACH_PORT_TYPE_SEND, -console_send_rights);
-	  console_send_rights = 0;
-	}
-#endif
-
-      *bytes_written = write (1, data, datalen);
-
-      return (*bytes_written == -1 ? D_IO_ERROR : D_SUCCESS);
-    }
-  else if (device == pseudo_root)
-    {
-      size_t wrote;
-      if (store_write (root_store, recnum, data, datalen, &wrote) != 0)
-	return D_IO_ERROR;
-      *bytes_written = wrote;
-      return D_SUCCESS;
-    }
-  else
-    return D_NO_SUCH_DEVICE;
-}
-
-kern_return_t
-ds_device_read (device_t device,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type,
-		dev_mode_t mode,
-		recnum_t recnum,
-		int bytes_wanted,
-		io_buf_ptr_t *data,
-		size_t *datalen)
-{
-  if (device == pseudo_console)
-    {
-      int avail;
-
-#if 0
-      if (console_send_rights)
-	{
-	  mach_port_mod_refs (mach_task_self (), pseudo_console,
-			      MACH_PORT_TYPE_SEND, -console_send_rights);
-	  console_send_rights = 0;
-	}
-#endif
-
-      spin_lock (&readlock);
-      ioctl (0, FIONREAD, &avail);
-      if (avail)
-	{
-	  *data = mmap (0, bytes_wanted, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-	  *datalen = read (0, *data, bytes_wanted);
-	  unlock_readlock ();
-	  return (*datalen == -1 ? D_IO_ERROR : D_SUCCESS);
-	}
-      else
-	{
-	  kern_return_t err;
-
-	  unlock_readlock ();
-	  err = queue_read (DEV_READ, reply_port, reply_type, bytes_wanted);
-	  if (err)
-	    return err;
-	  return MIG_NO_REPLY;
-	}
-    }
-  else if (device == pseudo_root)
-    {
-      *datalen = 0;
-      return
-	(store_read (root_store, recnum, bytes_wanted, (void **)data, datalen) == 0
-	 ? D_SUCCESS
-	 : D_IO_ERROR);
-    }
-  else
-    return D_NO_SUCH_DEVICE;
-}
-
-kern_return_t
-ds_device_read_inband (device_t device,
-		       mach_port_t reply_port,
-		       mach_msg_type_name_t reply_type,
-		       dev_mode_t mode,
-		       recnum_t recnum,
-		       int bytes_wanted,
-		       io_buf_ptr_inband_t data,
-		       size_t *datalen)
-{
-  if (device == pseudo_console)
-    {
-      int avail;
-
-#if 0
-      if (console_send_rights)
-	{
-	  mach_port_mod_refs (mach_task_self (), pseudo_console,
-			      MACH_PORT_TYPE_SEND, -console_send_rights);
-	  console_send_rights = 0;
-	}
-#endif
-
-      spin_lock (&readlock);
-      ioctl (0, FIONREAD, &avail);
-      if (avail)
-	{
-	  *datalen = read (0, data, bytes_wanted);
-	  unlock_readlock ();
-	  return (*datalen == -1 ? D_IO_ERROR : D_SUCCESS);
-	}
-      else
-	{
-	  kern_return_t err;
-
-	  unlock_readlock ();
-	  err = queue_read (DEV_READI, reply_port, reply_type, bytes_wanted);
-	  if (err)
-	    return err;
-	  return MIG_NO_REPLY;
-	}
-    }
-  else if (device == pseudo_root)
-    {
-      error_t err;
-      void *returned = data;
-
-      *datalen = bytes_wanted;
-      err =
-	store_read (root_store, recnum, bytes_wanted, (void **)&returned, datalen);
-
-      if (! err)
-	{
-	  if (returned != data)
-	    {
-	      bcopy (returned, (void *)data, *datalen);
-	      munmap ((caddr_t) returned, *datalen);
-	    }
-	  return D_SUCCESS;
-	}
-      else
-	return D_IO_ERROR;
-    }
-  else
-    return D_NO_SUCH_DEVICE;
-}
-
-kern_return_t
-ds_xxx_device_set_status (device_t device,
-			  dev_flavor_t flavor,
-			  dev_status_t status,
-			  size_t statu_cnt)
-{
-  if (device != pseudo_console)
-    return D_NO_SUCH_DEVICE;
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_get_status (device_t device,
-			  dev_flavor_t flavor,
-			  dev_status_t status,
-			  size_t *statuscnt)
-{
-  if (device != pseudo_console && device != pseudo_root)
-    return D_NO_SUCH_DEVICE;
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_set_filter (device_t device,
-			  mach_port_t rec,
-			  int pri,
-			  filter_array_t filt,
-			  size_t len)
-{
-  if (device != pseudo_console && device != pseudo_root)
-    return D_NO_SUCH_DEVICE;
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_map (device_t device,
-	       vm_prot_t prot,
-	       vm_offset_t offset,
-	       vm_size_t size,
-	       memory_object_t *pager,
-	       int unmap)
-{
-  if (device != pseudo_console && device != pseudo_root)
-    return D_NO_SUCH_DEVICE;
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_set_status (device_t device,
-		      dev_flavor_t flavor,
-		      dev_status_t status,
-		      size_t statuslen)
-{
-  if (device != pseudo_console && device != pseudo_root)
-    return D_NO_SUCH_DEVICE;
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_get_status (device_t device,
-		      dev_flavor_t flavor,
-		      dev_status_t status,
-		      size_t *statuslen)
-{
-  if (device == pseudo_console)
-    return D_INVALID_OPERATION;
-  else if (device == pseudo_root)
-    if (flavor == DEV_GET_SIZE)
-      if (*statuslen < DEV_GET_SIZE_COUNT)
-	return D_INVALID_SIZE;
-      else
-	{
-	  status[DEV_GET_SIZE_DEVICE_SIZE] = root_store->size;
-	  status[DEV_GET_SIZE_RECORD_SIZE] = root_store->block_size;
-	  *statuslen = DEV_GET_SIZE_COUNT;
-	  return D_SUCCESS;
-	}
-    else
-      return D_INVALID_OPERATION;
-  else
-    return D_NO_SUCH_DEVICE;
-}
-
-kern_return_t
-ds_device_set_filter (device_t device,
-		      mach_port_t receive_port,
-		      int priority,
-		      filter_array_t filter,
-		      size_t filterlen)
-{
-  if (device != pseudo_console && device != pseudo_root)
-    return D_NO_SUCH_DEVICE;
-  return D_INVALID_OPERATION;
-}
-
-
-/* Implementation of notify interface */
-kern_return_t
-do_mach_notify_port_deleted (mach_port_t notify,
-			     mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_msg_accepted (mach_port_t notify,
-			     mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_port_destroyed (mach_port_t notify,
-			       mach_port_t port)
-{
-  return EOPNOTSUPP;
-}
-
-boolean_t pseudo_priv_host_destroyed = FALSE;
-
-void
-destroy_priv_host (void *pi)
-{
-  pseudo_priv_host_destroyed = TRUE;
-  info ("pseudo privileged host port is destroyed");
-}
-
-kern_return_t
-do_mach_notify_no_senders (mach_port_t notify,
-			   mach_port_mscount_t mscount)
-{
-  static int no_console;
-  mach_port_t foo;
-  error_t err = EOPNOTSUPP;
-  
-  if (notify == pseudo_master_device_port)
-    {
-      info ("pseudo master device port has no senders");
-      /* for the root */
-      if (no_console && !is_user)
-	goto bye;
-      /* for the normal user */
-      if (no_console && is_user && pseudo_priv_host_destroyed)
-	goto bye;
-      pseudo_master_device_port = MACH_PORT_NULL;
-      return 0;
-    }
-  if (pseudo_priv_host_pi->port_right == notify && is_user)
-    {
-      if (no_console && pseudo_master_device_port == MACH_PORT_NULL)
-	goto bye;
-      pseudo_priv_host_destroyed = TRUE;
-      return 0;
-    }
-  if (notify == pseudo_console)
-    {
-      info ("pseudo console has no senders");
-      if (
-	  /* for the root */
-	  (mscount == console_mscount &&
-	  pseudo_master_device_port == MACH_PORT_NULL &&
-	  !is_user) ||
-	  /* for the normal user */
-	  (mscount == console_mscount &&
-	  pseudo_master_device_port == MACH_PORT_NULL &&
-	  pseudo_priv_host_destroyed &&
-	  is_user))
-	{
-	bye:
-	  restore_termstate ();
-	  write (2, "bye\n", 4);
-	  host_exit (0);
-	}
-      else
-	{
-	  no_console = (mscount == console_mscount);
-	  info ("no console: %d", no_console);
-
-	  mach_port_request_notification (mach_task_self (), pseudo_console,
-					  MACH_NOTIFY_NO_SENDERS,
-					  console_mscount == mscount
-					  ? mscount + 1
-					  : console_mscount,
-					  pseudo_console,
-					  MACH_MSG_TYPE_MAKE_SEND_ONCE, &foo);
-	  if (foo != MACH_PORT_NULL)
-	    mach_port_deallocate (mach_task_self (), foo);
-	}
-    }
-  
-  err = ports_do_mach_notify_no_senders (notify, mscount);
-
-  return err;
-}
-
-kern_return_t
-do_mach_notify_send_once (mach_port_t notify)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_dead_name (mach_port_t notify,
-			  mach_port_t name)
-{
-#if 0
-  if (name == child_task && notify == bootport)
-    host_exit (0);
-#endif
-  return EOPNOTSUPP;
-}
-
-
-/* Implementation of the Hurd I/O interface, which
-   we support for the console port only. */
-
-kern_return_t
-S_io_write (mach_port_t object,
-	    mach_port_t reply_port,
-	    mach_msg_type_name_t reply_type,
-	    char *data,
-	    mach_msg_type_number_t datalen,
-	    off_t offset,
-	    mach_msg_type_number_t *amtwritten)
-{
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-
-#if 0
-  if (console_send_rights)
-    {
-      mach_port_mod_refs (mach_task_self (), pseudo_console,
-			  MACH_PORT_TYPE_SEND, -console_send_rights);
-      console_send_rights = 0;
-    }
-#endif
-
-  *amtwritten = write (1, data, datalen);
-  return *amtwritten == -1 ? errno : 0;
-}
-
-kern_return_t
-S_io_read (mach_port_t object,
-	   mach_port_t reply_port,
-	   mach_msg_type_name_t reply_type,
-	   char **data,
-	   mach_msg_type_number_t *datalen,
-	   off_t offset,
-	   mach_msg_type_number_t amount)
-{
-  mach_msg_type_number_t avail;
-
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-
-#if 0
-  if (console_send_rights)
-    {
-      mach_port_mod_refs (mach_task_self (), pseudo_console,
-			  MACH_PORT_TYPE_SEND, -console_send_rights);
-      console_send_rights = 0;
-    }
-#endif
-
-  spin_lock (&readlock);
-  ioctl (0, FIONREAD, &avail);
-  if (avail)
-    {
-      if (amount > *datalen)
-	*data = mmap (0, amount, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-      *datalen = read (0, *data, amount);
-      unlock_readlock ();
-      return *datalen == -1 ? errno : 0;
-    }
-  else
-    {
-      kern_return_t err;
-      unlock_readlock ();
-      err = queue_read (IO_READ, reply_port, reply_type, amount);
-      if (err)
-	return err;
-      return MIG_NO_REPLY;
-    }
-}
-
-kern_return_t
-S_io_seek (mach_port_t object,
-	   mach_port_t reply_port,
-	   mach_msg_type_name_t reply_type,
-	   off_t offset,
-	   int whence,
-	   off_t *newp)
-{
-  return object == pseudo_console ? ESPIPE : EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_readable (mach_port_t object,
-	       mach_port_t reply_port,
-	       mach_msg_type_name_t reply_type,
-	       mach_msg_type_number_t *amt)
-{
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-  ioctl (0, FIONREAD, amt);
-  return 0;
-}
-
-kern_return_t
-S_io_set_all_openmodes (mach_port_t object,
-			mach_port_t reply_port,
-			mach_msg_type_name_t reply_type,
-			int bits)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_get_openmodes (mach_port_t object,
-		    mach_port_t reply_port,
-		    mach_msg_type_name_t reply_type,
-		    int *modes)
-{
-  *modes = O_READ | O_WRITE;
-  return object == pseudo_console ? 0 : EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_set_some_openmodes (mach_port_t object,
-			 mach_port_t reply_port,
-			 mach_msg_type_name_t reply_type,
-			 int bits)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_clear_some_openmodes (mach_port_t object,
-			   mach_port_t reply_port,
-			   mach_msg_type_name_t reply_type,
-			   int bits)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_async (mach_port_t object,
-	    mach_port_t reply_port,
-	    mach_msg_type_name_t reply_type,
-	    mach_port_t notify,
-	    mach_port_t *id,
-	    mach_msg_type_name_t *idtype)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_mod_owner (mach_port_t object,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type,
-		pid_t owner)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_get_owner (mach_port_t object,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type,
-		pid_t *owner)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_get_icky_async_id (mach_port_t object,
-			mach_port_t reply_port,
-			mach_msg_type_name_t reply_type,
-			mach_port_t *id,
-			mach_msg_type_name_t *idtype)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_select (mach_port_t object,
-	     mach_port_t reply_port,
-	     mach_msg_type_name_t reply_type,
-	     int *type)
-{
-  fd_set r, w, x;
-  int n;
-
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-
-  FD_ZERO (&r);
-  FD_ZERO (&w);
-  FD_ZERO (&x);
-  FD_SET (0, &r);
-  FD_SET (0, &w);
-  FD_SET (0, &x);
-
-  n = select (1,
-	      (*type & SELECT_READ) ? &r : 0,
-	      (*type & SELECT_WRITE) ? &w : 0,
-	      (*type & SELECT_URG) ? &x : 0,
-	      0);
-  if (n < 0)
-    return errno;
-
-  if (! FD_ISSET (0, &r))
-    *type &= ~SELECT_READ;
-  if (! FD_ISSET (0, &w))
-    *type &= ~SELECT_WRITE;
-  if (! FD_ISSET (0, &x))
-    *type &= ~SELECT_URG;
-
-  return 0;
-}
-
-kern_return_t
-S_io_stat (mach_port_t object,
-	   mach_port_t reply_port,
-	   mach_msg_type_name_t reply_type,
-	   struct stat *st)
-{
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-
-  bzero (st, sizeof (struct stat));
-  st->st_blksize = 1024;
-  return 0;
-}
-
-kern_return_t
-S_io_reauthenticate (mach_port_t object,
-		     mach_port_t reply_port,
-		     mach_msg_type_name_t reply_type,
-		     mach_port_t rend)
-{
-  uid_t *gu, *au;
-  gid_t *gg, *ag;
-  size_t gulen = 0, aulen = 0, gglen = 0, aglen = 0;
-  error_t err;
-
-  err = mach_port_insert_right (mach_task_self (), object, object,
-				MACH_MSG_TYPE_MAKE_SEND);
-  assert_perror (err);
-
-  if (! auth_server_authenticate (authserver,
-				  rend, MACH_MSG_TYPE_COPY_SEND,
-				  object, MACH_MSG_TYPE_COPY_SEND,
-				  &gu, &gulen,
-				  &au, &aulen,
-				  &gg, &gglen,
-				  &ag, &aglen))
-    {
-      mig_deallocate ((vm_address_t) gu, gulen * sizeof *gu);
-      mig_deallocate ((vm_address_t) au, aulen * sizeof *gu);
-      mig_deallocate ((vm_address_t) gg, gglen * sizeof *gu);
-      mig_deallocate ((vm_address_t) au, aulen * sizeof *gu);
-    }
-  mach_port_deallocate (mach_task_self (), rend);
-  mach_port_deallocate (mach_task_self (), object);
-
-  return 0;
-}
-
-kern_return_t
-S_io_restrict_auth (mach_port_t object,
-		    mach_port_t reply_port,
-		    mach_msg_type_name_t reply_type,
-		    mach_port_t *newobject,
-		    mach_msg_type_name_t *newobjtype,
-		    uid_t *uids,
-		    size_t nuids,
-		    uid_t *gids,
-		    size_t ngids)
-{
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-  *newobject = pseudo_console;
-  *newobjtype = MACH_MSG_TYPE_MAKE_SEND;
-  console_mscount++;
-  return 0;
-}
-
-kern_return_t
-S_io_duplicate (mach_port_t object,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type,
-		mach_port_t *newobj,
-		mach_msg_type_name_t *newobjtype)
-{
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-  *newobj = pseudo_console;
-  *newobjtype = MACH_MSG_TYPE_MAKE_SEND;
-  console_mscount++;
-  return 0;
-}
-
-kern_return_t
-S_io_server_version (mach_port_t object,
-		     mach_port_t reply_port,
-		     mach_msg_type_name_t reply_type,
-		     char *name,
-		     int *maj,
-		     int *min,
-		     int *edit)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_map (mach_port_t obj,
-	  mach_port_t reply_port,
-	  mach_msg_type_name_t reply_type,
-	  mach_port_t *rd,
-	  mach_msg_type_name_t *rdtype,
-	  mach_port_t *wr,
-	  mach_msg_type_name_t *wrtype)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_map_cntl (mach_port_t obj,
-	       mach_port_t reply_port,
-	       mach_msg_type_name_t reply_type,
-	       mach_port_t *mem,
-	       mach_msg_type_name_t *memtype)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_get_conch (mach_port_t obj,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_release_conch (mach_port_t obj,
-		    mach_port_t reply_port,
-		    mach_msg_type_name_t reply_type)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_eofnotify (mach_port_t obj,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type)
-
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_prenotify (mach_port_t obj,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type,
-		vm_offset_t start,
-		vm_offset_t end)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_postnotify (mach_port_t obj,
-		 mach_port_t reply_port,
-		 mach_msg_type_name_t reply_type,
-		 vm_offset_t start,
-		 vm_offset_t end)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_readsleep (mach_port_t obj,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_readnotify (mach_port_t obj,
-		 mach_port_t reply_port,
-		 mach_msg_type_name_t reply_type)
-{
-  return EOPNOTSUPP;
-}
-
-
-kern_return_t
-S_io_sigio (mach_port_t obj,
-	    mach_port_t reply_port,
-	    mach_msg_type_name_t reply_type)
-{
-  return EOPNOTSUPP;
-}
-
-
-kern_return_t
-S_io_pathconf (mach_port_t obj,
-	       mach_port_t reply_port,
-	       mach_msg_type_name_t reply_type,
-	       int name, int *value)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_identity (mach_port_t obj,
-	       mach_port_t reply,
-	       mach_msg_type_name_t replytype,
-	       mach_port_t *id,
-	       mach_msg_type_name_t *idtype,
-	       mach_port_t *fsid,
-	       mach_msg_type_name_t *fsidtype,
-	       ino_t *fileno)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_revoke (mach_port_t obj,
-	     mach_port_t reply, mach_msg_type_name_t replyPoly)
-{
-  return EOPNOTSUPP;
-}
-
-
-
-/* Implementation of the Hurd terminal driver interface, which we only
-   support on the console device.  */
-
-kern_return_t
-S_termctty_open_terminal (mach_port_t object,
-			  int flags,
-			  mach_port_t *result,
-			  mach_msg_type_name_t *restype)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_term_getctty (mach_port_t object,
-		mach_port_t *cttyid, mach_msg_type_name_t *cttyPoly)
-{
-  static mach_port_t id = MACH_PORT_NULL;
-
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-
-  if (id == MACH_PORT_NULL)
-    mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_DEAD_NAME, &id);
-
-  *cttyid = id;
-  *cttyPoly = MACH_MSG_TYPE_COPY_SEND;
-  return 0;
-}
-
-
-kern_return_t S_term_open_ctty
-(
-	io_t terminal,
-	pid_t pid,
-	pid_t pgrp,
-	mach_port_t *newtty,
-	mach_msg_type_name_t *newttytype
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_set_nodename
-(
-	io_t terminal,
-	string_t name
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_get_nodename
-(
-	io_t terminal,
-	string_t name
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_get_peername
-(
-	io_t terminal,
-	string_t name
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_set_filenode
-(
-	io_t terminal,
-	file_t filenode
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_get_bottom_type
-(
-	io_t terminal,
-	int *ttype
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_on_machdev
-(
-	io_t terminal,
-	mach_port_t machdev
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_on_hurddev
-(
-	io_t terminal,
-	io_t hurddev
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_on_pty
-(
-	io_t terminal,
-	io_t *ptymaster
-)
-{ return EOPNOTSUPP; }
diff --git a/boot-proxy-exc/exc_impl.c~ b/boot-proxy-exc/exc_impl.c~
deleted file mode 100644
index a99a7e3c..00000000
--- a/boot-proxy-exc/exc_impl.c~
+++ /dev/null
@@ -1,67 +0,0 @@
-/* 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* This file implements the server-side RPC functions of mach_host. */
-
-#include <mach.h>
-#include <hurd.h>
-#include <assert.h>
-
-#include "util.h"
-#include "mach_proxy.h"
-
-kern_return_t
-catch_exception_raise (mach_port_t exception_port, mach_port_t thread,
-		       mach_port_t task, integer_t exception,
-		       integer_t code, integer_t subcode)
-{
-  error_t err;
-  struct task_info *fault_task_pi = NULL;
-  debug ("");
-
-  int match_task (struct task_info *task_pi)
-    {
-      if (task_pi->task_port == task)
-	{
-	  fault_task_pi = task_pi;
-	  ports_port_ref (fault_task_pi);
-	  return 1;
-	}
-      return 0;
-    }
-  foreach_task (match_task);
-  
-  if (fault_task_pi == NULL)
-    {
-      fault_task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-    }
-
-  if (fault_task_pi == NULL)
-    {
-      info ("cannot find the task: %d", task);
-      return EINVAL;
-    }
-
-  err = catch_exception_raise (fault_task_pi->user_exc_port,
-			       thread, fault_task_pi->task.port_right,
-			       exception, code, subcode);
-  ports_port_deref (fault_task_pi);
-  return err;
-}
diff --git a/boot-proxy-exc/mach_host_impl.c~ b/boot-proxy-exc/mach_host_impl.c~
deleted file mode 100644
index 0ce0d0b6..00000000
--- a/boot-proxy-exc/mach_host_impl.c~
+++ /dev/null
@@ -1,545 +0,0 @@
-/* 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* This file implements the server-side RPC functions of mach_host. */
-
-#include <stdio.h>
-#include <assert.h>
-
-#include <mach.h>
-#include <hurd.h>
-#include <hurd/ports.h>
-
-#include "util.h"
-#include "list.h"
-#include "mach_proxy.h"
-
-extern mach_port_t privileged_host_port;
-
-/* Set task priority. */
-kern_return_t
-S_task_priority (mach_port_t task, int priority, boolean_t change_threads)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = task_priority (task_pi->task_port, priority, change_threads);
-  debug ("%s", strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine processor_set_tasks */
-kern_return_t
-S_processor_set_tasks (mach_port_t processor_set, task_array_t *task_list,
-		       mach_msg_type_number_t *task_listCnt)
-{
-  error_t err = 0;
-  mach_port_t *subhurd_tasks = NULL;
-  int size = 0;
-  /* no pseudo task port is created for the kernel task. */
-  int num = 0;
-  int tot_nbtasks = ports_count_class (task_portclass) + num;
-
-  size = tot_nbtasks * sizeof (mach_port_t);
-  err = vm_allocate (mach_task_self (),
-		     (vm_address_t *) (void *) &subhurd_tasks,
-		     size, 1);
-  if (err) 
-    goto out;
-
-  int get_pseudo_task_port (struct task_info *task_pi)
-    {
-      assert (num < tot_nbtasks);
-      subhurd_tasks[num++] = ports_get_right (task_pi);
-      return 0;
-    }
-
-  foreach_task (get_pseudo_task_port);
-  assert (num == tot_nbtasks);
-  debug ("get %d tasks", tot_nbtasks);
-  *task_list = subhurd_tasks;
-  *task_listCnt = tot_nbtasks;
-
-out:
-  /* I enable the class here,
-   * so no pseudo task port can be created when I count the number of tasks. */
-  ports_enable_class (task_portclass);
-  /* The array will be deallocated after it is sent,
-   * but the task ports in it don't need to,
-   * because I only call ports_get_right()
-   * and the reference count isn't increased. */
-  return err;
-}
-
-/* Get control port for a processor set. */
-kern_return_t
-S_host_processor_set_priv (mach_port_t host_priv, mach_port_t set_name,
-			   mach_port_t *set, mach_msg_type_name_t *setPoly)
-{
-  extern struct port_class *other_portclass;
-  struct port_info *pi;
-  kern_return_t ret = 0;
-
-  // TODO create a port for each processor set
-  debug ("");
-  // TODO I should create the port for the processor set only once.
-  ret = ports_create_port (other_portclass, port_bucket,
-			   sizeof (*pi), &pi);
-  debug ("%s", strerror (ret));
-  if (ret)
-    return ret;
-  *set = ports_get_right (pi);
-  *setPoly = MACH_MSG_TYPE_MAKE_SEND;
-  ports_port_deref (pi);
-  return ret;
-}
-
-/* Routine host_reboot */
-kern_return_t
-S_host_reboot (mach_port_t host_priv, int options)
-{
-  debug ("");
-  assert (0);
-  // TODO
-  return EOPNOTSUPP;
-}
-
-/* Routine vm_wire */
-kern_return_t
-S_vm_wire (mach_port_t host_priv, mach_port_t task,
-	   vm_address_t address, vm_size_t size, vm_prot_t access)
-{
-  debug ("");
-  assert (0);
-  // TODO
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_wire */
-kern_return_t
-S_thread_wire (mach_port_t host_priv, mach_port_t thread, boolean_t wired)
-{
-  debug ("");
-  assert (0);
-  // TODO
-  return EOPNOTSUPP;
-}
-
-//////////the request to the host isn't forwarded by the proxy//////////
-
-/* Routine host_processor_sets */
-kern_return_t
-S_host_processor_sets (mach_port_t host,
-		       processor_set_name_array_t *processor_sets,
-		       mach_msg_type_number_t *processor_setsCnt)
-{
-  debug ("");
-  assert (0);
-  // the request to the host isn't forwarded.
-  return EOPNOTSUPP;
-}
-
-/* Routine host_get_time */
-kern_return_t
-S_host_get_time (mach_port_t host, time_value_t *current_time)
-{
-  debug ("");
-  assert (0);
-  // the request to the host isn't forwarded.
-  return EOPNOTSUPP;
-}
-
-/* Routine host_info */
-kern_return_t
-S_host_info (mach_port_t host, int flavor, host_info_t host_info_out,
-	     mach_msg_type_number_t *host_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  // the request to the host isn't forwarded.
-  return EOPNOTSUPP;
-}
-
-/* Get string describing current kernel version. */
-kern_return_t
-S_host_kernel_version (mach_port_t host, kernel_version_t kernel_version)
-{
-  debug ("");
-  assert (0);
-  // the proxy doesn't forward the request to the host port.
-  return EOPNOTSUPP;
-}
-
-///////////////////the RPCs not used by Hurd//////////////////////
-
-/* Get list of processors on this host. */
-kern_return_t
-S_host_processors (mach_port_t host_priv,
-		   processor_array_t *processor_list,
-		   mach_msg_type_number_t *processor_listCnt)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Start processor. */
-kern_return_t
-S_processor_start (mach_port_t processor)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Exit processor -- may not be restartable. */
-kern_return_t
-S_processor_exit (mach_port_t processor)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Get default processor set for host. */
-kern_return_t
-S_processor_set_default (mach_port_t host, mach_port_t *default_set)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/*
- * Create new processor set.  Returns real port for manipulations,
- *      and name port for obtaining information.
- */
-kern_return_t
-S_processor_set_create (mach_port_t host, mach_port_t *new_set,
-			mach_port_t *new_name)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Destroy processor set. */
-kern_return_t
-S_processor_set_destroy (mach_port_t set)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Assign processor to processor set. */
-kern_return_t
-S_processor_assign (mach_port_t processor, mach_port_t new_set, boolean_t wait)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Get current assignment for thread. */
-kern_return_t
-S_processor_get_assignment (mach_port_t processor, mach_port_t *assigned_set)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Assign task to processor set. */
-kern_return_t
-S_task_assign (mach_port_t task, mach_port_t new_set, boolean_t assign_threads)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Assign task to default set. */
-kern_return_t
-S_task_assign_default (mach_port_t task, boolean_t assign_threads)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Get current assignment for task. */
-kern_return_t
-S_task_get_assignment (mach_port_t task, mach_port_t *assigned_set)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Set max priority for processor_set. */
-kern_return_t
-S_processor_set_max_priority (mach_port_t processor_set, int max_priority,
-			      boolean_t change_threads)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine processor_set_policy_enable */
-kern_return_t
-S_processor_set_policy_enable (mach_port_t processor_set, int policy)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine processor_set_policy_disable */
-kern_return_t
-S_processor_set_policy_disable (mach_port_t processor_set, int policy,
-				boolean_t change_threads)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine processor_set_threads */
-kern_return_t
-S_processor_set_threads (mach_port_t processor_set,
-			 thread_array_t *thread_list,
-			 mach_msg_type_number_t *thread_listCnt)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine host_set_time */
-kern_return_t
-S_host_set_time (mach_port_t host_priv, time_value_t new_time)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine host_adjust_time */
-kern_return_t
-S_host_adjust_time (mach_port_t host_priv, time_value_t new_adjustment,
-		    time_value_t *old_adjustment)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine processor_info */
-kern_return_t
-S_processor_info (mach_port_t processor, int flavor, mach_port_t *host,
-		  processor_info_t processor_info_out,
-		  mach_msg_type_number_t *processor_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine processor_set_info */
-kern_return_t
-S_processor_set_info (mach_port_t set_name, int flavor, mach_port_t *host,
-		      processor_set_info_t info_out,
-		      mach_msg_type_number_t *info_outCnt)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine processor_control */
-kern_return_t
-S_processor_control (mach_port_t processor, processor_info_t processor_cmd,
-		     mach_msg_type_number_t processor_cmdCnt)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine host_get_boot_info */
-kern_return_t
-S_host_get_boot_info (mach_port_t host_priv, kernel_boot_info_t boot_info)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-///////////////////it's not a proxy for thread requests///////////////////
-
-/* Assign thread to processor set. */
-kern_return_t
-S_thread_assign (mach_port_t thread, mach_port_t new_set)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Assign thread to default set. */
-kern_return_t
-S_thread_assign_default (mach_port_t thread)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Get current assignment for thread. */
-kern_return_t
-S_thread_get_assignment (mach_port_t thread, mach_port_t *assigned_set)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Set priority for thread. */
-kern_return_t S_thread_priority (mach_port_t thread, int priority,
-				 boolean_t set_max)
-{
-  debug ("");
-  assert (0);
-  return thread_priority (thread, priority, set_max);
-}
-
-/* Set max priority for thread. */
-kern_return_t S_thread_max_priority (mach_port_t thread,
-				     mach_port_t processor_set,
-				     int max_priority)
-{
-  debug ("");
-  assert (0);
-  return thread_max_priority (thread, processor_set, max_priority);
-}
-
-/* Routine thread_depress_abort */
-kern_return_t S_thread_depress_abort (mach_port_t thread)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Set policy for thread */
-kern_return_t S_thread_policy (mach_port_t thread, int policy, int data)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-////////////////////don't support obsolete requests///////////////////////
-
-/* Routine yyy_host_info */
-/* obsolete */
-kern_return_t
-S_yyy_host_info (mach_port_t host, int flavor, host_info_t host_info_out,
-		 mach_msg_type_number_t *host_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine yyy_processor_info */
-/* obsolete */
-kern_return_t
-S_yyy_processor_info (mach_port_t processor, int flavor, mach_port_t *host,
-		      processor_info_t processor_info_out,
-		      mach_msg_type_number_t *processor_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine yyy_processor_control */
-/* obsolete */
-kern_return_t
-S_yyy_processor_control (mach_port_t processor,
-			 processor_info_t processor_cmd,
-			 mach_msg_type_number_t processor_cmdCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/*
- * Get rights to default processor set for host.
- * Replaced by host_processor_set_priv.
- */
-kern_return_t
-S_xxx_processor_set_default_priv (mach_port_t host, mach_port_t *default_set)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine yyy_processor_set_info */
-/* obsolete */
-kern_return_t
-S_yyy_processor_set_info (mach_port_t set_name, int flavor,
-			  mach_port_t *host, processor_set_info_t info_out,
-			  mach_msg_type_number_t *info_outCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
diff --git a/boot-proxy-exc/mach_impl.c~ b/boot-proxy-exc/mach_impl.c~
deleted file mode 100644
index a5c53197..00000000
--- a/boot-proxy-exc/mach_impl.c~
+++ /dev/null
@@ -1,906 +0,0 @@
-/* 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* This file implements the server-side RPC functions of mach_host. */
-
-#include <string.h>
-#include <mach.h>
-#include <hurd.h>
-#include <assert.h>
-
-#include "util.h"
-#include "mach_proxy.h"
-#include "list.h"
-
-/* Routine task_create */
-kern_return_t
-S_task_create (mach_port_t target_task, boolean_t inherit_memory,
-	       mach_port_t *child_task, mach_msg_type_name_t *child_taskPoly)
-{
-  struct task_info *target_task_pi;
-  task_t real_child_task;
-  task_t pseudo_child_task;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = task_create (target_task_pi->task_port,
-		     inherit_memory, &real_child_task);
-  debug ("get a request from task %d: %s",
-	 target_task_pi->task_port, strerror (err));
-  ports_port_deref (target_task_pi);
-  if (err) 
-    return err;
-
-  err = create_pseudo_task (real_child_task, &pseudo_child_task);
-  if (err)
-    {
-      task_terminate (real_child_task);
-      return err;
-    }
-  
-  *child_task = pseudo_child_task;
-  *child_taskPoly = MACH_MSG_TYPE_COPY_SEND;
-
-  debug ("new task: %d", real_child_task);
-  return err;
-}
-
-/* Routine task_terminate */
-kern_return_t
-S_task_terminate (mach_port_t target_task)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = task_terminate (target_task_pi->task_port);
-  debug ("get request from task %d: %s",
-	 target_task_pi->task_port, strerror (err));
-  ports_destroy_right (target_task_pi);
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine task_info */
-kern_return_t
-S_task_info (mach_port_t target_task, int flavor,
-	     task_info_t task_info_out,
-	     mach_msg_type_number_t *task_info_outCnt)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  err = task_info (target_task_pi->task_port, flavor,
-		   task_info_out, task_info_outCnt);
-  debug ("%s", strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_allocate */
-kern_return_t
-S_vm_allocate (mach_port_t target_task, vm_address_t *address,
-	       vm_size_t size, boolean_t anywhere)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  /* This should be enough. */
-  err = vm_allocate (target_task_pi->task_port, address, size, anywhere);
-  debug ("request is from task %d, address: %d, size: %d, anywhere: %d, %s",
-	 target_task_pi->task_port, *address, size, anywhere, strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_deallocate */
-kern_return_t
-S_vm_deallocate (mach_port_t target_task,
-		 vm_address_t address, vm_size_t size)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = vm_deallocate (target_task_pi->task_port, address, size);
-  debug ("get a request from task %d: %s",
-	 target_task_pi->task_port, strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_protect */
-kern_return_t
-S_vm_protect (mach_port_t target_task, vm_address_t address,
-	      vm_size_t size, boolean_t set_maximum,
-	      vm_prot_t new_protection)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = vm_protect (target_task_pi->task_port, address,
-		    size, set_maximum, new_protection);
-  debug ("request is from task %d: %s",
-	 target_task_pi->task_port, strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_inherit */
-kern_return_t
-S_vm_inherit (mach_port_t target_task, vm_address_t address,
-	      vm_size_t size, vm_inherit_t new_inheritance)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = vm_inherit (target_task_pi->task_port, address,
-		    size, new_inheritance);
-  debug ("%s", strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_read */
-kern_return_t
-S_vm_read (mach_port_t target_task, vm_address_t address,
-	   vm_size_t size, vm_offset_t *data,
-	   mach_msg_type_number_t *dataCnt)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  err = vm_read (target_task_pi->task_port, address, size, data, dataCnt);
-  debug ("get a request from task %d: %s",
-	 target_task_pi->task_port, strerror (err));
-  ports_port_deref (target_task_pi);
-  /* The deallocation bit is set.*/
-  return err;
-}
-
-/* Routine vm_write */
-kern_return_t
-S_vm_write (mach_port_t target_task, vm_address_t address,
-	    vm_offset_t data, mach_msg_type_number_t dataCnt)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = vm_write (target_task_pi->task_port, address, data, dataCnt);
-  debug ("get a request from task %d: %s",
-	 target_task_pi->task_port, strerror (err));
-  ports_port_deref (target_task_pi);
-  /* the proxy get the mapped pages from the client,
-   * deallocate it here. */
-  vm_deallocate (mach_task_self (), data, dataCnt);
-  return err;
-}
-
-/* Routine vm_copy */
-kern_return_t
-S_vm_copy (mach_port_t target_task, vm_address_t source_address,
-	   vm_size_t size, vm_address_t dest_address)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  err = vm_copy (target_task_pi->task_port, source_address,
-		 size, dest_address);
-  debug ("%s", strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_region */
-kern_return_t
-S_vm_region (mach_port_t target_task, vm_address_t *address,
-	     vm_size_t *size, vm_prot_t *protection,
-	     vm_prot_t *max_protection, vm_inherit_t *inheritance,
-	     boolean_t *is_shared, mach_port_t *object_name,
-	     vm_offset_t *offset)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  err = vm_region (target_task_pi->task_port, address, size, protection,
-		   max_protection, inheritance, is_shared, object_name, offset);
-  debug ("get a request from task %d: %s, object: %d",
-	 target_task_pi->task_port, strerror (err), *object_name);
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_statistics */
-kern_return_t
-S_vm_statistics (mach_port_t target_task, vm_statistics_data_t *vm_stats)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  err = vm_statistics (target_task_pi->task_port, vm_stats);
-  debug ("request is from task %d: %s",
-	 target_task_pi->task_port, strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine mach_ports_register */
-kern_return_t
-S_mach_ports_register (mach_port_t target_task,
-		       mach_port_array_t init_port_set,
-		       mach_msg_type_number_t init_port_setCnt)
-{
-  debug ("");
-  assert (0);
-  // not used by Hurd
-  return EOPNOTSUPP;
-}
-
-/* Routine mach_ports_lookup */
-kern_return_t
-S_mach_ports_lookup (mach_port_t target_task,
-		     mach_port_array_t *init_port_set,
-		     mach_msg_type_number_t *init_port_setCnt)
-{
-  debug ("");
-  assert (0);
-  // not used by Hurd
-  return EOPNOTSUPP;
-}
-
-/* Routine vm_set_default_memory_manager */
-kern_return_t
-S_vm_set_default_memory_manager (mach_port_t host_priv,
-				 mach_port_t *default_manager)
-{
-  extern mach_port_t defpager;
-  debug ("");
-  *default_manager = defpager;
-  return 0;
-}
-
-
-/* Routine xxx_task_info */
-kern_return_t
-S_xxx_task_info (mach_port_t target_task, int flavor,
-		 task_info_t task_info_out,
-		 mach_msg_type_number_t *task_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_host_info */
-kern_return_t
-S_xxx_host_info (mach_port_t target_task, machine_info_data_t *info)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_slot_info */
-kern_return_t
-S_xxx_slot_info (mach_port_t target_task, int slot, machine_slot_data_t *info)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_cpu_control */
-kern_return_t
-S_xxx_cpu_control (mach_port_t target_task, int cpu, boolean_t running)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine task_suspend */
-kern_return_t
-S_task_suspend (mach_port_t target_task)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = task_suspend (target_task_pi->task_port);
-  debug ("get request from task %d: %s",
-	 target_task_pi->task_port, strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine task_resume */
-kern_return_t
-S_task_resume (mach_port_t target_task)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  err = task_resume (target_task_pi->task_port);
-  debug ("get request from task %d: %s",
-	 target_task_pi->task_port, strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine task_get_special_port */
-kern_return_t
-S_task_get_special_port (mach_port_t target_task, int which_port,
-			 mach_port_t *special_port,
-			 mach_msg_type_name_t *special_portPoly)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  err = task_get_special_port (target_task_pi->task_port,
-			       which_port, special_port);
-  debug ("request is from task %d (%d, %d): %s\n",
-	 target_task_pi->task_port, which_port, *special_port, strerror (err));
-  ports_port_deref (target_task_pi);
-  if (err)
-    return err;
-  *special_portPoly = MACH_MSG_TYPE_MOVE_SEND;
-  return err;
-}
-
-/* Routine task_set_special_port */
-kern_return_t
-S_task_set_special_port (mach_port_t target_task, int which_port,
-			 mach_port_t special_port)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  if (which_port == TASK_EXCEPTION_PORT)
-    {
-      struct port_info *new_exc_pi;
-      struct port_info *old_exc_pi;
-      mach_port_t old_user_exc_port;
-      mach_port_t new_exc_port;
-
-      err = ports_create_port (exc_portclass, port_bucket,
-			       sizeof (new_exc_pi), &new_exc_pi);
-      if (err)
-	{
-	  ports_port_deref (target_task_pi);
-	  return err;
-	}
-      new_exc_port = ports_get_send_right (new_exc_pi);
-
-      mutex_lock (&target_task_pi->lock);
-      old_exc_pi = target_task_pi->exc_pi;
-      old_user_exc_port = target_task_pi->user_exc_port;
-      err = task_set_special_port (target_task_pi->task_port,
-				   which_port, new_exc_port);
-      target_task_pi->user_exc_port = special_port;
-      target_task_pi->exc_pi = new_exc_pi;
-      mutex_unlock (&target_task_pi->lock);
-
-      ports_port_deref (new_exc_pi);
-      if (old_user_exc_port)
-	mach_port_deallocate (mach_task_self (), old_user_exc_port);
-      if (old_exc_pi)
-	ports_destroy_right (old_exc_pi);
-    }
-  else
-    {
-      err = task_set_special_port (target_task_pi->task_port,
-				   which_port, special_port);
-      debug ("get request from task %d (%d, %d): %s",
-	     target_task_pi->task_port, which_port,
-	     special_port, strerror (err));
-      mach_port_deallocate (mach_task_self (), special_port);
-    }
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine task_ras_control */
-kern_return_t
-S_task_ras_control (mach_port_t target_task, vm_address_t basepc,
-		    vm_address_t boundspc, int flavor)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = task_ras_control (target_task_pi->task_port, basepc, boundspc, flavor);
-  debug ("%s", strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_map */
-kern_return_t
-S_vm_map (mach_port_t target_task, vm_address_t *address, vm_size_t size,
-	  vm_address_t mask, boolean_t anywhere, mach_port_t memory_object,
-	  vm_offset_t offset, boolean_t copy, vm_prot_t cur_protection,
-	  vm_prot_t max_protection, vm_inherit_t inheritance)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = vm_map (target_task_pi->task_port, address, size, mask,
-		anywhere, memory_object, offset, copy,
-		cur_protection, max_protection, inheritance);
-  debug ("request is from task %d, anywhere: %d: %s",
-	 target_task_pi->task_port, anywhere, strerror (err));
-  ports_port_deref (target_task_pi);
-  mach_port_deallocate (mach_task_self (), memory_object);
-  return err;
-}
-
-/* Routine vm_machine_attribute */
-kern_return_t
-S_vm_machine_attribute (mach_port_t target_task, vm_address_t address,
-			vm_size_t size, vm_machine_attribute_t attribute,
-			vm_machine_attribute_val_t *value)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = vm_machine_attribute (target_task_pi->task_port, address,
-			      size, attribute, value);
-  debug ("%s", strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine task_threads */
-kern_return_t
-S_task_threads (mach_port_t target_task, thread_array_t *thread_list,
-		mach_msg_type_number_t *thread_listCnt)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  // TODO: use move send
-  err = task_threads (target_task_pi->task_port,
-		      thread_list, thread_listCnt);
-  debug ("get a request from task %d: %s",
-	 target_task_pi->task_port, strerror (err));
-//  info ("task_threads: %s, number of threads: %d",
-//	 strerror (err), *thread_listCnt);
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine thread_create */
-kern_return_t
-S_thread_create (mach_port_t parent_task, mach_port_t *child_thread,
-		 mach_msg_type_name_t *child_threadPoly)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      parent_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = thread_create (target_task_pi->task_port, child_thread);
-  debug ("get a request from task %d: thread port: %d: %s",
-	 target_task_pi->task_port, *child_thread, strerror (err));
-  ports_port_deref (target_task_pi);
-  *child_threadPoly = MACH_MSG_TYPE_MOVE_SEND;
-  return err;
-}
-
-////////////////////it doesn't forward thread request////////////////
-
-/* Routine thread_suspend */
-kern_return_t
-S_thread_suspend (mach_port_t target_thread)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_resume */
-kern_return_t
-S_thread_resume (mach_port_t target_thread)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_abort */
-kern_return_t
-S_thread_abort (mach_port_t target_thread)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_thread_get_state */
-kern_return_t
-S_xxx_thread_get_state (mach_port_t target_thread, int flavor,
-			thread_state_t old_state,
-			mach_msg_type_number_t *old_stateCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_thread_set_state */
-kern_return_t
-S_xxx_thread_set_state (mach_port_t target_thread, int flavor,
-			thread_state_t new_state,
-			mach_msg_type_number_t new_stateCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_thread_info */
-kern_return_t
-S_xxx_thread_info (mach_port_t target_thread, int flavor,
-		   thread_info_t thread_info_out,
-		   mach_msg_type_number_t *thread_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_get_special_port */
-kern_return_t
-S_thread_get_special_port (mach_port_t thread, int which_port,
-			   mach_port_t *special_port)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_set_special_port */
-kern_return_t
-S_thread_set_special_port (mach_port_t thread, int which_port,
-			   mach_port_t special_port)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_terminate */
-kern_return_t
-S_thread_terminate (mach_port_t target_thread)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_get_state */
-kern_return_t
-S_thread_get_state (mach_port_t target_thread, int flavor,
-		    thread_state_t old_state,
-		    mach_msg_type_number_t *old_stateCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_set_state */
-kern_return_t
-S_thread_set_state (mach_port_t target_thread, int flavor,
-		    thread_state_t new_state,
-		    mach_msg_type_number_t new_stateCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_info */
-kern_return_t
-S_thread_info (mach_port_t target_thread, int flavor,
-	       thread_info_t thread_info_out,
-	       mach_msg_type_number_t *thread_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/////////////////////RPC related to memory object////////////////////
-//////////////////they are not needed to be forwarded////////////////
-
-/* SimpleRoutine memory_object_data_provided */
-kern_return_t
-S_memory_object_data_provided (mach_port_t memory_control,
-			       vm_offset_t offset, vm_offset_t data,
-			       mach_msg_type_number_t dataCnt,
-			       vm_prot_t lock_value)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_data_unavailable */
-kern_return_t
-S_memory_object_data_unavailable (mach_port_t memory_control,
-				  vm_offset_t offset, vm_size_t size)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine memory_object_get_attributes */
-kern_return_t
-S_memory_object_get_attributes (mach_port_t memory_control,
-				boolean_t *object_ready, boolean_t *may_cache,
-				memory_object_copy_strategy_t *copy_strategy)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine xxx_memory_object_lock_request */
-kern_return_t
-S_xxx_memory_object_lock_request (mach_port_t memory_control,
-				  vm_offset_t offset, vm_size_t size,
-				  boolean_t should_clean,
-				  boolean_t should_flush,
-				  vm_prot_t lock_value,
-				  mach_port_t reply_to,
-				  mach_msg_type_name_t reply_toPoly)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_lock_request */
-kern_return_t
-S_memory_object_lock_request ( mach_port_t memory_control,
-			      vm_offset_t offset, vm_size_t size,
-			      memory_object_return_t should_return,
-			      boolean_t should_flush,
-			      vm_prot_t lock_value, mach_port_t reply_to,
-			      mach_msg_type_name_t reply_toPoly)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_data_error */
-kern_return_t
-S_memory_object_data_error (mach_port_t memory_control,
-			    vm_offset_t offset, vm_size_t size,
-			    kern_return_t error_value)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_set_attributes */
-kern_return_t
-S_memory_object_set_attributes (mach_port_t memory_control,
-				boolean_t object_ready, boolean_t may_cache,
-				memory_object_copy_strategy_t copy_strategy)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_destroy */
-kern_return_t
-S_memory_object_destroy (mach_port_t memory_control, kern_return_t reason)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_data_supply */
-kern_return_t
-S_memory_object_data_supply (mach_port_t memory_control,
-			     vm_offset_t offset, vm_offset_t data,
-			     mach_msg_type_number_t dataCnt,
-			     vm_prot_t lock_value, boolean_t precious,
-			     mach_port_t reply_to,
-			     mach_msg_type_name_t reply_toPoly)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_ready */
-kern_return_t
-S_memory_object_ready (mach_port_t memory_control, boolean_t may_cache,
-		       memory_object_copy_strategy_t copy_strategy)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_change_attributes */
-kern_return_t
-S_memory_object_change_attributes (mach_port_t memory_control,
-				   boolean_t may_cache,
-				   memory_object_copy_strategy_t copy_strategy,
-				   mach_port_t reply_to,
-				   mach_msg_type_name_t reply_toPoly)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-///////////////////////RPCs related to emulation/////////////////////
-//////////////////////subhurd doesn't support it.////////////////////
-
-/* Routine task_get_emulation_vector */
-kern_return_t
-S_task_get_emulation_vector (mach_port_t task, int *vector_start,
-			     emulation_vector_t *emulation_vector,
-			     mach_msg_type_number_t *emulation_vectorCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine task_set_emulation_vector */
-kern_return_t
-S_task_set_emulation_vector (mach_port_t task, int vector_start,
-			     emulation_vector_t emulation_vector,
-			     mach_msg_type_number_t emulation_vectorCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_task_get_emulation_vector */
-kern_return_t
-S_xxx_task_get_emulation_vector (mach_port_t task, int *vector_start,
-				 emulation_vector_t emulation_vector,
-				 mach_msg_type_number_t *emulation_vectorCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_task_set_emulation_vector */
-kern_return_t
-S_xxx_task_set_emulation_vector (mach_port_t task, int vector_start,
-				 emulation_vector_t emulation_vector,
-				 mach_msg_type_number_t emulation_vectorCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine task_set_emulation */
-kern_return_t
-S_task_set_emulation (mach_port_t target_port,
-		      vm_address_t routine_entry_pt, int routine_number)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
diff --git a/boot-proxy-exc/mach_port_impl.c~ b/boot-proxy-exc/mach_port_impl.c~
deleted file mode 100644
index b49ae789..00000000
--- a/boot-proxy-exc/mach_port_impl.c~
+++ /dev/null
@@ -1,377 +0,0 @@
-/* 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* This file implements the server-side RPC functions of mach_host. */
-
-#include <mach.h>
-#include <hurd.h>
-#include <string.h>
-#include <assert.h>
-
-#include "util.h"
-#include "mach_proxy.h"
-
-kern_return_t
-S_mach_port_names (mach_port_t task, mach_port_array_t *names,
-		   mach_msg_type_number_t *namesCnt,
-		   mach_port_type_array_t *types,
-		   mach_msg_type_number_t *typesCnt)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_names (task_pi->task_port,
-			 names, namesCnt, types, typesCnt);
-  debug ("%s", strerror (err));
-  /* The deallocation bit is set,
-   * so 'names' and 'types' will be deallocated after the reply is sent. */
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_type */
-kern_return_t
-S_mach_port_type (mach_port_t task, mach_port_t name, mach_port_type_t *ptype)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_type (task_pi->task_port, name, ptype);
-  debug ("%s", strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_rename */
-kern_return_t
-S_mach_port_rename (mach_port_t task,
-		    mach_port_t old_name, mach_port_t new_name)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  /* old_name and new_name are just names,
-   * so I don't need to deallocate them.
-   * It should be the same for other RPCs that only deal with port names */
-  err = mach_port_rename (task_pi->task_port, old_name, new_name);
-  debug ("%s", strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_allocate_name */
-kern_return_t
-S_mach_port_allocate_name (mach_port_t task,
-			   mach_port_right_t right, mach_port_t name)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_allocate_name (task_pi->task_port, right, name);
-  debug ("%s", strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_allocate */
-kern_return_t
-S_mach_port_allocate (mach_port_t task,
-		      mach_port_right_t right, mach_port_t *name)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_allocate (task_pi->task_port, right, name);
-  debug ("get a request from task %d: %s", task_pi->task_port, strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_destroy */
-kern_return_t
-S_mach_port_destroy (mach_port_t task, mach_port_t name)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_destroy (task_pi->task_port, name);
-  debug ("get a request from port %d: %s",
-	 task_pi->task_port, strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_deallocate */
-kern_return_t
-S_mach_port_deallocate (mach_port_t task, mach_port_t name)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_deallocate (task_pi->task_port, name);
-  debug ("get a request from task %d, name: %d, %s",
-	 task_pi->task_port, name, strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_get_refs */
-kern_return_t
-S_mach_port_get_refs (mach_port_t task, mach_port_t name,
-		      mach_port_right_t right, mach_port_urefs_t *refs)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_get_refs (task_pi->task_port, name, right, refs);
-  debug ("%s", strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_mod_refs */
-kern_return_t
-S_mach_port_mod_refs (mach_port_t task, mach_port_t name,
-		      mach_port_right_t right, mach_port_delta_t delta)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_mod_refs (task_pi->task_port, name, right, delta);
-  debug ("get a request from task %d: port: %d, right: %d, delta: %d, %s",
-	 task_pi->task_port, name, right, delta, strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine old_mach_port_get_receive_status */
-kern_return_t
-S_old_mach_port_get_receive_status (mach_port_t task, mach_port_t name,
-				    old_mach_port_status_t *status)
-{
-  debug ("%s", strerror (EOPNOTSUPP));
-  assert (0);
-  /* Hurd currently doesn't use it. */
-  return EOPNOTSUPP;
-}
-
-/* Routine mach_port_set_qlimit */
-kern_return_t
-S_mach_port_set_qlimit (mach_port_t task, mach_port_t name,
-			mach_port_msgcount_t qlimit)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_set_qlimit (task_pi->task_port, name, qlimit);
-  debug ("%s", strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_set_mscount */
-kern_return_t
-S_mach_port_set_mscount (mach_port_t task, mach_port_t name,
-			 mach_port_mscount_t mscount)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_set_mscount (task_pi->task_port, name, mscount);
-  debug ("%s", strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_get_set_status */
-kern_return_t
-S_mach_port_get_set_status (mach_port_t task, mach_port_t name,
-			    mach_port_array_t *members,
-			    mach_msg_type_number_t *membersCnt)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_get_set_status (task_pi->task_port,
-				  name, members, membersCnt);
-  debug ("%s", strerror (err));
-  ports_port_deref (task_pi);
-  /* The deallocation bit is set,
-   * so 'members' will be deallocated after the reply is sent. */
-  return err;
-}
-
-/* Routine mach_port_move_member */
-kern_return_t
-S_mach_port_move_member (mach_port_t task, mach_port_t member,
-			 mach_port_t after)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_move_member (task_pi->task_port, member, after);
-  debug ("%s", strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_request_notification */
-kern_return_t
-S_mach_port_request_notification (mach_port_t task, mach_port_t name,
-				  mach_msg_id_t id, mach_port_mscount_t sync,
-				  mach_port_t notify, mach_port_t *previous,
-				  mach_msg_type_name_t *previousPoly)
-{
-  struct task_info *task_pi;
-  mach_msg_type_name_t notify_type = MACH_MSG_TYPE_MOVE_SEND_ONCE;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  if (notify == 0)
-    notify_type = 0;
-  /* notify is send-once right from the client. */
-  err = mach_port_request_notification (task_pi->task_port, name, id, sync,
-					notify, notify_type, previous);
-  debug ("get a request from task %d, port: %d, id: %d, notify: %d, notify_type: %d, old port: %d, %s",
-	 task_pi->task_port, name, id, notify, notify_type, *previous, strerror (err));
-  ports_port_deref (task_pi);
-  if (err)
-    return err;
-  *previousPoly = MACH_MSG_TYPE_MOVE_SEND_ONCE;
-
-  return 0;
-}
-
-/* Routine mach_port_insert_right */
-kern_return_t
-S_mach_port_insert_right (mach_port_t task, mach_port_t name,
-			  mach_port_t poly, mach_msg_type_name_t polyPoly)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  /* polyPoly can only be three possible values: MACH_MSG_TYPE_PORT_SEND,
-   * MACH_MSG_TYPE_PORT_SEND_ONCE and MACH_MSG_TYPE_PORT_RECEIVE,
-   * so port will be deallocated when mach_port_insert_right is called. */
-  err = mach_port_insert_right (task_pi->task_port, name, poly, polyPoly);
-  debug ("get a request from task %d: %s", task_pi->task_port, strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_extract_right */
-kern_return_t
-S_mach_port_extract_right (mach_port_t task, mach_port_t name,
-			   mach_msg_type_name_t msgt_name, mach_port_t *poly,
-			   mach_msg_type_name_t *polyPoly)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_extract_right (task_pi->task_port, name, msgt_name,
-				 poly, polyPoly);
-  debug ("%s", strerror (err));
-  ports_port_deref (task_pi);
-  /* *polyPoly can only be MACH_MSG_TYPE_PORT_SEND, MACH_MSG_TYPE_PORT_RECEIVE,
-   * or MACH_MSG_TYPE_PORT_SEND_ONCE, so the port extracted from 'task' 
-   * will be moved to the client. */
-  return err;
-}
-
-/* Routine mach_port_get_receive_status */
-kern_return_t
-S_mach_port_get_receive_status (mach_port_t task, mach_port_t name,
-				mach_port_status_t *status)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_get_receive_status (task_pi->task_port, name, status);
-  debug ("%s", strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_set_seqno */
-kern_return_t
-S_mach_port_set_seqno (mach_port_t task, mach_port_t name,
-		       mach_port_seqno_t seqno)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_set_seqno (task_pi->task_port, name, seqno);
-  debug ("%s", strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
diff --git a/boot-proxy-exc/mach_proxy.c~ b/boot-proxy-exc/mach_proxy.c~
deleted file mode 100644
index 1bb46821..00000000
--- a/boot-proxy-exc/mach_proxy.c~
+++ /dev/null
@@ -1,97 +0,0 @@
-/* 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#include <string.h>
-
-#include "util.h"
-#include "mach_proxy.h"
-
-static LIST_HEADER (tasks_head);
-
-static struct mutex tasks_lock = MUTEX_INITIALIZER;
-
-int create_pseudo_task (task_t real_task, task_t *ret_pseudo_task)
-{
-  /* the first task is the kernel task. */
-  struct task_info *task_pi;
-  task_t pseudo_task;
-  error_t err;
-
-  err = ports_create_port (task_portclass, port_bucket,
-			   sizeof (struct task_info), &task_pi);
-  if (err)
-    return err;
-
-  task_pi->task_port = real_task;
-  task_pi->exc_pi = NULL;
-  task_pi->user_exc_port = 0;
-  mutex_info (&task_pi->lock);
-  entry_init (&task_pi->list);
-  mutex_lock (&tasks_lock);
-  add_entry_end (&tasks_head, &task_pi->list);
-  mutex_unlock (&tasks_lock);
-
-  pseudo_task = ports_get_right (task_pi);
-  mach_port_insert_right (mach_task_self (), pseudo_task, pseudo_task,
-			  MACH_MSG_TYPE_MAKE_SEND);
-  ports_port_deref (task_pi);
-
-  if (ret_pseudo_task)
-    *ret_pseudo_task = pseudo_task;
-
-  err = task_set_kernel_port (real_task, pseudo_task);
-  if (err) 
-    {
-      debug ("fail to set the kernel port: %s", strerror (err));
-      ports_destroy_right (task_pi);
-    }
-
-  return err;
-}
-
-void clean_pseudo_task (void *pi)
-{
-  struct task_info *task = pi;
-
-  debug ("remove a pseudo task from the list");
-  mutex_lock (&tasks_lock);
-  remove_entry (&task->list);
-  mutex_unlock (&tasks_lock);
-  
-  if (task->exc_pi)
-    ports_destroy_right (task->exc_pi);
-  if (task->user_exc_port)
-    mach_port_deallocate (mach_task_self (), task->user_exc_port);
-}
-
-void foreach_task (task_callback_t callback)
-{
-  struct list *entry = &tasks_head;
-  mutex_lock (&tasks_lock);
-  for (entry = tasks_head.next; entry != &tasks_head; entry = entry->next) 
-    {
-//      mutex_unlock (&tasks_lock);
-      struct task_info *task_pi = LIST_ENTRY (entry, struct task_info, list);
-      if (callback (task_pi))
-	break;
-//      mutex_lock (&tasks_lock);
-    }
-  mutex_unlock (&tasks_lock);
-}
diff --git a/boot-proxy-exc/mach_proxy.h~ b/boot-proxy-exc/mach_proxy.h~
deleted file mode 100644
index a7806c1f..00000000
--- a/boot-proxy-exc/mach_proxy.h~
+++ /dev/null
@@ -1,59 +0,0 @@
-/* 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef PROXY_H
-#define PROXY_H
-
-#include <mach.h>
-#include <hurd.h>
-#include <hurd/ports.h>
-
-#include "list.h"
-
-struct task_info
-{
-  struct port_info task;
-  task_t task_port;
-  struct port_info *exc_pi;
-  volatile mach_port_t user_exc_port;
-  struct mutex lock;
-  /* The linked list is used to keep the order of tasks */
-  struct list list;
-};
-
-struct thread_info
-{
-  struct port_info thread;
-  thread_t thread_port;
-};
-
-typedef int (*task_callback_t) (struct task_info *);
-
-extern struct port_bucket *port_bucket;
-extern struct port_class *task_portclass;
-extern struct port_class *thread_portclass;
-
-int create_pseudo_task (task_t real_task, task_t *ret_pseudo_task);
-void clean_pseudo_task (void *pi);
-void foreach_task (task_callback_t callback);
-
-#define UNTESTED
-
-#endif
diff --git a/boot-proxy-exc/util.h~ b/boot-proxy-exc/util.h~
deleted file mode 100644
index 7073cdd2..00000000
--- a/boot-proxy-exc/util.h~
+++ /dev/null
@@ -1,113 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#include <stdio.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/ip.h>
-#include <syslog.h>
-
-#include <mach.h>
-#include <hurd.h>
-
-#define DEBUG 0
-#define INFO 1
-#define LOGLEVEL INFO
-
-extern FILE *logfile;
-
-#define LOG_START() do					\
-{							\
-  logfile = fopen("boot.log", "a");			\
-  assert (logfile != NULL);				\
-} while (0)
-
-#define LOG_END() fclose (logfile)
-
-#define output(format, ...) do				\
-{							\
-  char buf[1024];                                       \
-  snprintf (buf, 1024, "boot: %s: %s\r\n", __func__, format);       \
-  fprintf (stderr , buf, ## __VA_ARGS__);		\
-  fflush (stderr);					\
-} while (0)
-
-#if DEBUG >= LOGLEVEL
-#define debug(format, ...) do				\
-{							\
-  char buf[1024];                                       \
-  snprintf (buf, 1024, "boot: %s: %s\r\n", __func__, format);       \
-  fprintf (logfile , buf, ## __VA_ARGS__);		\
-  fflush (logfile);					\
-} while (0)
-#else
-#define debug(format, ...) do {} while (0)
-#endif
-
-#if INFO >= LOGLEVEL
-#define info output
-#else
-#define info(format, ...) do {} while (0)
-#endif
-
-#if ERROR >= LOGLEVEL
-#define logerror(format, ...) do				\
-{							\
-  char buf[1024];                                       \
-  snprintf (buf, 1024, "boot ERROR: %s: %s\r\n", __func__, format);       \
-  fprintf (stderr , buf, ## __VA_ARGS__);		\
-  fflush (stderr);					\
-} while (0)
-#else
-#define logerror(format, ...) do {} while (0)
-#endif
-
-#define print_port_type(port) do				    \
-{								    \
-  mach_port_type_t ptype;					    \
-  error_t err =	mach_port_type (mach_task_self (), port, &ptype);   \
-  if (err)							    \
-    debug ("mach_port_type: %s", strerror (err));		    \
-  else if (ptype & MACH_PORT_TYPE_SEND)				    \
-    debug ("port %d has send right", port);			    \
-  else if (ptype & MACH_PORT_TYPE_RECEIVE)			    \
-    debug ("port %d has receive right", port);			    \
-  else if (ptype & MACH_PORT_TYPE_SEND_ONCE)			    \
-    debug ("port %d has send once right", port);		    \
-  else if (ptype & MACH_PORT_TYPE_PORT_SET)			    \
-    debug ("port %d is port set", port);			    \
-  else if (ptype & MACH_PORT_TYPE_DEAD_NAME)			    \
-    debug ("port %d is a dead name", port);			    \
-  else								    \
-    debug ("the type of port %d is %d", port, ptype);		    \
-  mach_port_urefs_t refs;					    \
-  err = mach_port_get_refs (mach_task_self (), port,	    \
-			    MACH_PORT_RIGHT_SEND, &refs);	    \
-  if (!err)							    \
-    debug ("port send right references: %d", refs);		    \
-} while (0)
-
-#endif
diff --git a/boot.backup1/Makefile~ b/boot.backup1/Makefile~
deleted file mode 100644
index 33c475fb..00000000
--- a/boot.backup1/Makefile~
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 1993,94,95,96,97,2001 Free Software Foundation, Inc.
-# This file is part of the GNU Hurd.
-#
-# The GNU Hurd is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# The GNU Hurd is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the GNU Hurd; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-dir := boot
-makemode := utility
-
-SRCS = mach-crt0.c boot.c ux.c sigvec.S syscall.S \
-       boot_script.c userland-boot.c list.c mach_proxy.c
-COMMON-OBJS = notifyServer.o ourdeviceServer.o \
-       ioServer.o io_replyUser.o device_replyUser.o \
-       termServer.o bootstrapServer.o boot_script.o userland-boot.o	\
-       ourmach_hostServer.o ourmachServer.o ourmach_portServer.o excServer.o
-OBJS = boot.o mach_host_impl.o mach_impl.o mach_port_impl.o \
-       exc_impl.o list.o mach_proxy.o $(COMMON-OBJS)
-UX-OBJS = mach-crt0.o uxboot.o sigvec.o syscall.o ux.o $(COMMON-OBJS)
-LCLHDRS = boot_script.h ux.h util.h
-target = boot
-io-MIGSFLAGS=-DREPLY_PORTS
-DIST_FILES=frank1.ld frankemul.ld
-HURDLIBS=store shouldbeinlibc threads ports
-
-include ../Makeconf
-
-#install: /usr/local/bin/uxboot
-#
-#/usr/local/bin/uxboot: uxboot
-#	cp $< $@
-
-all: boot # uxboot
-
-ourdevice.defs: device.defs
-	$(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[ 	]*device[ 	]*:[ 	]*device_t/s/device_t/mach_port_send_t/' > $@
-
-uxboot.o: boot.c
-	$(COMPILE.c) -DUX $< -o $@
-
-uxboot.0: $(UX-OBJS) ../libthreads/libthreads.a
-	$(LINK.o) -o $@ -static -nostartfiles -Wl,-T -Wl,$(srcdir)/frank1.ld $^
-uxboot.1: frankemul.ld uxboot.0
-	$(LD) -o $@ -T $^
-uxboot: uxboot.1
-	-$(OBJCOPY) -S --remove-section=.comment -O a.out-mach3 $< $@
diff --git a/boot.backup1/boot.c~ b/boot.backup1/boot.c~
deleted file mode 100644
index 94bcdac5..00000000
--- a/boot.backup1/boot.c~
+++ /dev/null
@@ -1,2073 +0,0 @@
-/* Load a task using the single server, and then run it
-   as if we were the kernel.
-   Copyright (C) 1993,94,95,96,97,98,99,2000,01,02,2006
-     Free Software Foundation, Inc.
-
-This file is part of the GNU Hurd.
-
-The GNU Hurd is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-The GNU Hurd is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with the GNU Hurd; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* Written by Michael I. Bushnell.  */
-
-#include <mach.h>
-#include <mach/notify.h>
-#include <device/device.h>
-#include <a.out.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <cthreads.h>
-#include <fcntl.h>
-#include <elf.h>
-#include <mach/mig_support.h>
-#include <mach/default_pager.h>
-#include <argp.h>
-#include <hurd/store.h>
-#include <hurd/ports.h>
-#include <sys/mman.h>
-#include <version.h>
-
-#include "notify_S.h"
-#include "ourdevice_S.h"
-#include "io_S.h"
-#include "device_reply_U.h"
-#include "io_reply_U.h"
-#include "term_S.h"
-#include "bootstrap_S.h"
-/* #include "tioctl_S.h" */
-#include "util.h"
-#include "boot_script.h"
-#include "mach_proxy.h"
-
-#include <hurd/auth.h>
-
-#ifdef UX
-#undef STORE			/* We can't use libstore when under UX.  */
-#else
-#define STORE
-#endif
-
-#ifdef UX
-
-#include "ux.h"
-
-#else  /* !UX */
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <termios.h>
-#include <error.h>
-#include <hurd.h>
-#include <assert.h>
-
-//task_t kernel_task;
-static struct termios orig_tty_state;
-static int isig;
-static char *kernel_command_line;
-
-struct port_bucket *port_bucket;
-struct port_class *task_portclass;
-struct port_class *thread_portclass;
-
-static void
-init_termstate ()
-{
-  struct termios tty_state;
-
-  if (tcgetattr (0, &tty_state) < 0)
-    error (10, errno, "tcgetattr");
-
-  orig_tty_state = tty_state;
-  cfmakeraw (&tty_state);
-  if (isig)
-    tty_state.c_lflag |= ISIG;
-
-  if (tcsetattr (0, 0, &tty_state) < 0)
-    error (11, errno, "tcsetattr");
-}
-
-static void
-restore_termstate ()
-{
-  tcsetattr (0, 0, &orig_tty_state);
-}
-
-#define host_fstat fstat
-typedef struct stat host_stat_t;
-#define host_exit exit
-
-#endif /* UX */
-
-mach_port_t privileged_host_port, /*master_device_port,*/ defpager;
-mach_port_t pseudo_master_device_port;
-mach_port_t pseudo_privileged_host_port;
-mach_port_t receive_set;
-mach_port_t pseudo_console, pseudo_root;
-auth_t authserver;
-
-struct store *root_store;
-
-spin_lock_t queuelock = SPIN_LOCK_INITIALIZER;
-spin_lock_t readlock = SPIN_LOCK_INITIALIZER;
-
-mach_port_t php_child_name, psmdp_child_name, taskname;
-
-task_t child_task;
-mach_port_t bootport;
-
-int console_mscount;
-
-vm_address_t fs_stack_base;
-vm_size_t fs_stack_size;
-
-void init_termstate ();
-void restore_termstate ();
-
-char *fsname;
-
-char bootstrap_args[100] = "-";
-char *bootdevice = 0;
-char *bootscript = 0;
-
-
-void safe_gets (char *buf, int buf_len)
-{
-  fgets (buf, buf_len, stdin);
-}
-
-char *useropen_dir;
-
-int
-useropen (const char *name, int flags, int mode)
-{
-  if (useropen_dir)
-    {
-      static int dlen;
-      if (!dlen) dlen = strlen (useropen_dir);
-      {
-	int len = strlen (name);
-	char try[dlen + 1 + len + 1];
-	int fd;
-	memcpy (try, useropen_dir, dlen);
-	try[dlen] = '/';
-	memcpy (&try[dlen + 1], name, len + 1);
-	fd = open (try, flags, mode);
-	if (fd >= 0)
-	  return fd;
-      }
-    }
-  return open (name, flags, mode);
-}
-
-int
-request_server (mach_msg_header_t *inp,
-		mach_msg_header_t *outp)
-{
-  extern int io_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern int device_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern int notify_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern int term_server (mach_msg_header_t *, mach_msg_header_t *);
-/*  extern int tioctl_server (mach_msg_header_t *, mach_msg_header_t *); */
-  extern int bootstrap_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern boolean_t mach_host_server (mach_msg_header_t *InHeadP,
-				     mach_msg_header_t *OutHeadP);
-  extern boolean_t mach_server (mach_msg_header_t *InHeadP,
-				mach_msg_header_t *OutHeadP);
-  extern void bootstrap_compat ();
-
-#if 0
-  if (inp->msgh_local_port == bootport && boot_like_cmudef)
-    {
-      if (inp->msgh_id == 999999)
-	{
-	  bootstrap_compat (inp, outp);
-	  return 1;
-	}
-      else
-	return bootstrap_server (inp, outp);
-    }
-  else
-#endif
-   return (io_server (inp, outp)
-	   || device_server (inp, outp)
-	   || notify_server (inp, outp)
-	   || term_server (inp, outp)
-	   || mach_host_server (inp, outp)
-	   || mach_server (inp, outp)
-	   /*	    || tioctl_server (inp, outp) */);
-}
-
-int
-mach_proxy_demuxer (mach_msg_header_t *inp,
-		   mach_msg_header_t *outp)
-{
-  extern boolean_t mach_server
-    (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP);
-  extern boolean_t mach_host_server
-    (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP);
-  extern boolean_t mach_port_server
-    (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP);
-  extern boolean_t exc_server
-    (mach_msg_header_t *InHeadP, mach_msg_header_t *OutHeadP);
-  extern int notify_server (mach_msg_header_t *, mach_msg_header_t *);
-  return (mach_server (inp, outp)
-	  || mach_host_server (inp, outp)
-	  || mach_port_server (inp, outp)
-	  || notify_server (inp, outp)
-	  || exc_server (inp, outp));
-}
-
-void
-mach_proxy_thread ()
-{
-  ports_manage_port_operations_one_thread (port_bucket, 
-					   mach_proxy_demuxer, 0);
-}
-
-vm_address_t
-load_image (task_t t,
-	    char *file)
-{
-  int fd;
-  union
-    {
-      struct exec a;
-      Elf32_Ehdr e;
-    } hdr;
-  char msg[] = ": cannot open bootstrap file\n";
-
-  fd = useropen (file, O_RDONLY, 0);
-
-  if (fd == -1)
-    {
-      write (2, file, strlen (file));
-      write (2, msg, sizeof msg - 1);
-      task_terminate (t);
-      host_exit (1);
-    }
-
-  read (fd, &hdr, sizeof hdr);
-  if (*(Elf32_Word *) hdr.e.e_ident == *(Elf32_Word *) "\177ELF")
-    {
-      Elf32_Phdr phdrs[hdr.e.e_phnum], *ph;
-      lseek (fd, hdr.e.e_phoff, SEEK_SET);
-      read (fd, phdrs, sizeof phdrs);
-      for (ph = phdrs; ph < &phdrs[sizeof phdrs/sizeof phdrs[0]]; ++ph)
-	if (ph->p_type == PT_LOAD)
-	  {
-	    vm_address_t buf;
-	    vm_size_t offs = ph->p_offset & (ph->p_align - 1);
-	    vm_size_t bufsz = round_page (ph->p_filesz + offs);
-
-	    buf = (vm_address_t) mmap (0, bufsz,
-				       PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-
-	    lseek (fd, ph->p_offset, SEEK_SET);
-	    read (fd, (void *)(buf + offs), ph->p_filesz);
-
-	    ph->p_memsz = ((ph->p_vaddr + ph->p_memsz + ph->p_align - 1)
-			   & ~(ph->p_align - 1));
-	    ph->p_vaddr &= ~(ph->p_align - 1);
-	    ph->p_memsz -= ph->p_vaddr;
-
-	    vm_allocate (t, (vm_address_t*)&ph->p_vaddr, ph->p_memsz, 0);
-	    vm_write (t, ph->p_vaddr, buf, bufsz);
-	    munmap ((caddr_t) buf, bufsz);
-	    vm_protect (t, ph->p_vaddr, ph->p_memsz, 0,
-			((ph->p_flags & PF_R) ? VM_PROT_READ : 0) |
-			((ph->p_flags & PF_W) ? VM_PROT_WRITE : 0) |
-			((ph->p_flags & PF_X) ? VM_PROT_EXECUTE : 0));
-	  }
-      return hdr.e.e_entry;
-    }
-  else
-    {
-      /* a.out */
-      int magic = N_MAGIC (hdr.a);
-      int headercruft;
-      vm_address_t base = 0x10000;
-      int rndamount, amount;
-      vm_address_t bsspagestart, bssstart;
-      char *buf;
-
-      headercruft = sizeof (struct exec) * (magic == ZMAGIC);
-
-      amount = headercruft + hdr.a.a_text + hdr.a.a_data;
-      rndamount = round_page (amount);
-      buf = mmap (0, rndamount, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-      lseek (fd, sizeof hdr.a - headercruft, SEEK_SET);
-      read (fd, buf, amount);
-      vm_allocate (t, &base, rndamount, 0);
-      vm_write (t, base, (vm_address_t) buf, rndamount);
-      if (magic != OMAGIC)
-	vm_protect (t, base, trunc_page (headercruft + hdr.a.a_text),
-		    0, VM_PROT_READ | VM_PROT_EXECUTE);
-      munmap ((caddr_t) buf, rndamount);
-
-      bssstart = base + hdr.a.a_text + hdr.a.a_data + headercruft;
-      bsspagestart = round_page (bssstart);
-      vm_allocate (t, &bsspagestart,
-		   hdr.a.a_bss - (bsspagestart - bssstart), 0);
-
-      return hdr.a.a_entry;
-    }
-}
-
-
-void read_reply ();
-void msg_thread ();
-
-/* Callbacks for boot_script.c; see boot_script.h.  */
-
-mach_port_t
-boot_script_read_file (const char *filename)
-{
-  static const char msg[] = ": cannot open\n";
-  int fd = useropen (filename, O_RDONLY, 0);
-  host_stat_t st;
-  error_t err;
-  mach_port_t memobj;
-  vm_address_t region;
-
-  write (2, filename, strlen (filename));
-  if (fd < 0)
-    {
-      write (2, msg, sizeof msg - 1);
-      host_exit (1);
-    }
-  else
-    write (2, msg + sizeof msg - 2, 1);
-
-  host_fstat (fd, &st);
-
-  err = default_pager_object_create (defpager, &memobj,
-				     round_page (st.st_size));
-  if (err)
-    {
-      static const char msg[] = "cannot create default-pager object\n";
-      write (2, msg, sizeof msg - 1);
-      host_exit (1);
-    }
-
-  region = 0;
-  vm_map (mach_task_self (), &region, round_page (st.st_size),
-	  0, 1, memobj, 0, 0, VM_PROT_ALL, VM_PROT_ALL, VM_INHERIT_NONE);
-  read (fd, (char *) region, st.st_size);
-  munmap ((caddr_t) region, round_page (st.st_size));
-
-  close (fd);
-  return memobj;
-}
-
-int
-boot_script_exec_cmd (void *hook,
-		      mach_port_t task, char *path, int argc,
-		      char **argv, char *strings, int stringlen)
-{
-  char *args, *p;
-  int arg_len, i;
-  size_t reg_size;
-  void *arg_pos;
-  vm_offset_t stack_start, stack_end;
-  vm_address_t startpc, str_start;
-  thread_t thread;
-
-  write (2, path, strlen (path));
-  for (i = 1; i < argc; ++i)
-    {
-      write (2, " ", 1);
-      write (2, argv[i], strlen (argv[i]));
-    }
-  write (2, "\r\n", 2);
-
-  debug ("load the executable file...");
-  startpc = load_image (task, path);
-  arg_len = stringlen + (argc + 2) * sizeof (char *) + sizeof (integer_t);
-  arg_len += 5 * sizeof (int);
-  stack_end = VM_MAX_ADDRESS;
-  stack_start = VM_MAX_ADDRESS - 16 * 1024 * 1024;
-  vm_allocate (task, &stack_start, stack_end - stack_start, FALSE);
-  arg_pos = (void *) ((stack_end - arg_len) & ~(sizeof (natural_t) - 1));
-  args = mmap (0, stack_end - trunc_page ((vm_offset_t) arg_pos),
-	       PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-  str_start = ((vm_address_t) arg_pos
-	       + (argc + 2) * sizeof (char *) + sizeof (integer_t));
-  p = args + ((vm_address_t) arg_pos & (vm_page_size - 1));
-  *(int *) p = argc;
-  p = (void *) p + sizeof (int);
-  for (i = 0; i < argc; i++)
-    {
-      *(char **) p = argv[i] - strings + (char *) str_start;
-      p = (void *) p + sizeof (char *);
-    }
-  *(char **) p = 0;
-  p = (void *) p + sizeof (char *);
-  *(char **) p = 0;
-  p = (void *) p + sizeof (char *);
-  memcpy (p, strings, stringlen);
-  bzero (args, (vm_offset_t) arg_pos & (vm_page_size - 1));
-  vm_write (task, trunc_page ((vm_offset_t) arg_pos), (vm_address_t) args,
-	    stack_end - trunc_page ((vm_offset_t) arg_pos));
-  munmap ((caddr_t) args,
-	  stack_end - trunc_page ((vm_offset_t) arg_pos));
-
-  thread_create (task, &thread);
-#ifdef i386_THREAD_STATE_COUNT
-  {
-    struct i386_thread_state regs;
-    reg_size = i386_THREAD_STATE_COUNT;
-    thread_get_state (thread, i386_THREAD_STATE,
-		      (thread_state_t) &regs, &reg_size);
-    regs.eip = (int) startpc;
-    regs.uesp = (int) arg_pos;
-    thread_set_state (thread, i386_THREAD_STATE,
-		      (thread_state_t) &regs, reg_size);
-  }
-#elif defined(ALPHA_THREAD_STATE_COUNT)
-  {
-    struct alpha_thread_state regs;
-    reg_size = ALPHA_THREAD_STATE_COUNT;
-    thread_get_state (thread, ALPHA_THREAD_STATE,
-		      (thread_state_t) &regs, &reg_size);
-    regs.r30 = (natural_t) arg_pos;
-    regs.pc = (natural_t) startpc;
-    thread_set_state (thread, ALPHA_THREAD_STATE,
-		      (thread_state_t) &regs, reg_size);
-  }
-#else
-# error needs to be ported
-#endif
-
-  thread_resume (thread);
-  mach_port_deallocate (mach_task_self (), thread);
-  return 0;
-}
-
-const char *argp_program_version = STANDARD_HURD_VERSION (boot);
-
-static struct argp_option options[] =
-{
-  { "boot-root",   'D', "DIR", 0,
-    "Root of a directory tree in which to find files specified in BOOT-SCRIPT" },
-  { "single-user", 's', 0, 0,
-    "Boot in single user mode" },
-  { "kernel-command-line", 'c', "COMMAND LINE", 0,
-    "Simulated multiboot command line to supply" },
-  { "pause" ,      'd', 0, 0,
-    "Pause for user confirmation at various times during booting" },
-  { "isig",      'I', 0, 0,
-    "Do not disable terminal signals, so you can suspend and interrupt boot."},
-  { "device-map",   'm', "DEBICENAME=DEVICEFILE", 0,
-    "Map the device in subhurd to the device in the main Hurd."},
-  { "defpager",	    'p', "PAGER TRANSLATOR", 0,
-    "Specify the default pager for subhurd."},
-  { 0 }
-};
-static char args_doc[] = "BOOT-SCRIPT";
-static char doc[] = "Boot a second hurd";
-
-struct dev_map 
-{
-  char *name;
-  mach_port_t port;
-  struct dev_map *next;
-};
-
-static struct dev_map *dev_map_head;
-
-static struct dev_map *add_dev_map (char *dev_name, char *dev_file)
-{
-  struct dev_map *map = (struct dev_map *) malloc (sizeof (*map));
-
-  assert (map);
-  map->name = dev_name;
-  map->port = file_name_lookup (dev_file, 0, 0);
-  if (map->port == MACH_PORT_NULL)
-    error (1, errno, "file_name_lookup: %s", dev_file);
-  map->next = dev_map_head;
-  dev_map_head = map;
-  return map;
-}
-
-static struct dev_map *lookup_dev (char *dev_name)
-{
-  struct dev_map *map;
-
-  for (map = dev_map_head; map; map = map->next)
-    {
-      if (strcmp (map->name, dev_name) == 0)
-	return map;
-    }
-  return NULL;
-}
-
-char *pager_file;
-
-static error_t
-parse_opt (int key, char *arg, struct argp_state *state)
-{
-  char *dev_file;
-
-  switch (key)
-    {
-      size_t len;
-
-    case 'c':  kernel_command_line = arg; break;
-
-    case 'D':  useropen_dir = arg; break;
-
-    case 'I':  isig = 1; break;
-
-    case 's': case 'd':
-      len = strlen (bootstrap_args);
-      if (len >= sizeof bootstrap_args - 1)
-	argp_error (state, "Too many bootstrap args");
-      bootstrap_args[len++] = key;
-      bootstrap_args[len] = '\0';
-      break;
-
-    case 'm':
-      dev_file = strchr (arg, '=');
-      if (dev_file == NULL)
-	return ARGP_ERR_UNKNOWN;
-      *dev_file = 0;
-      add_dev_map (arg, dev_file+1);
-      break;
-
-    case 'p':
-      pager_file = arg;
-      break;
-
-    case ARGP_KEY_ARG:
-      if (state->arg_num == 0)
-	bootscript = arg;
-      else
-	return ARGP_ERR_UNKNOWN;
-      break;
-
-    case ARGP_KEY_INIT:
-      state->child_inputs[0] = state->input; break;
-
-    default:
-      return ARGP_ERR_UNKNOWN;
-    }
-  return 0;
-}
-
-void init_kernel_task ()
-{
-  error_t err;
-  task_t pseudo_task;
-  task_t kernel_task;
-  int create_pseudo_task (task_t real_task, task_t *ret_pseudo_task);
-
-  err = proc_pid2task (getproc (), 2, &kernel_task);
-  if (err)
-    error (4, err, "cannot get the kernel task port");
-  create_pseudo_task (kernel_task, &pseudo_task);
-}
-
-int
-main (int argc, char **argv, char **envp)
-{
-  error_t err;
-  mach_port_t foo;
-  char *buf = 0;
-  int i, len;
-  char *root_store_name;
-  const struct argp_child kids[] = { { &store_argp }, { 0 }};
-  struct argp argp = { options, parse_opt, args_doc, doc, kids };
-  struct store_argp_params store_argp_params = { 0 };
-
-#ifdef UNTESTED
-  fprintf (stderr, "running untested code\n");
-#else
-  fprintf (stderr, "running tested code\n");
-#endif
-
-  port_bucket = ports_create_bucket ();
-  task_portclass = ports_create_class (clean_pseudo_task, 0);
-  thread_portclass = ports_create_class (0, 0);
-  init_kernel_task ();
-  cthread_detach (cthread_fork ((cthread_fn_t) mach_proxy_thread, (any_t) 0));
-
-  argp_parse (&argp, argc, argv, 0, 0, &store_argp_params);
-  err = store_parsed_name (store_argp_params.result, &root_store_name);
-  if (err)
-    error (2, err, "store_parsed_name");
-
-  err = store_parsed_open (store_argp_params.result, 0, &root_store);
-  if (err)
-    error (4, err, "%s", root_store_name);
-
-//  get_privileged_ports (&privileged_host_port, 0 /*&master_device_port*/);
-//  if (privileged_host_port == MACH_PORT_NULL)
-//    {
-//      debug ("Cannot get the privileged host port");
-//      exit (4);
-//    }
-//  if (master_device_port == MACH_PORT_NULL)
-//    {
-//      debug ("Cannot get the master device port");
-//      exit (4);
-//    }
-
-  if (pager_file == NULL)
-    {
-      fprintf (stderr, "The default pager must be specified for subhurd.");
-      exit (4);
-    }
-  defpager = file_name_lookup (pager_file, O_EXEC, 0);
-  if (defpager == MACH_PORT_NULL)
-    error (4, errno, "file_name_look: %s", pager_file);
-//  defpager = MACH_PORT_NULL;
-//  err = vm_set_default_memory_manager (privileged_host_port, &defpager);
-//  if (err)
-//    error (4, err, "vm_set_default_memory_manager");
-
-  strcat (bootstrap_args, "f");
-
-  mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_PORT_SET,
-		      &receive_set);
-
-  if (root_store->class == &store_device_class && root_store->name
-      && (root_store->flags & STORE_ENFORCED)
-      && root_store->num_runs == 1 && root_store->runs[0].start == 0)
-    /* Let known device nodes pass through directly.  */
-    bootdevice = root_store->name;
-  else
-    /* Pass a magic value that we can use to do I/O to ROOT_STORE.  */
-    {
-      bootdevice = "pseudo-root";
-      mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE,
-			  &pseudo_root);
-      mach_port_move_member (mach_task_self (), pseudo_root, receive_set);
-    }
-
-  /* Initialize the pseudo master device port. */
-  mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE,
-		      &pseudo_master_device_port);
-  mach_port_insert_right (mach_task_self (),
-			  pseudo_master_device_port,
-			  pseudo_master_device_port,
-			  MACH_MSG_TYPE_MAKE_SEND);
-  mach_port_move_member (mach_task_self (), pseudo_master_device_port,
-			 receive_set);
-  mach_port_request_notification (mach_task_self (), pseudo_master_device_port,
-				  MACH_NOTIFY_NO_SENDERS, 1,
-				  pseudo_master_device_port,
-				  MACH_MSG_TYPE_MAKE_SEND_ONCE, &foo);
-  if (foo != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), foo);
-
-  /* Initialize the pseudo privileged host port. */
-  mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE,
-		      &pseudo_privileged_host_port);
-  mach_port_insert_right (mach_task_self (),
-			  pseudo_privileged_host_port,
-			  pseudo_privileged_host_port,
-			  MACH_MSG_TYPE_MAKE_SEND);
-  mach_port_move_member (mach_task_self (), pseudo_privileged_host_port,
-			 receive_set);
-  mach_port_request_notification (mach_task_self (), 
-				  pseudo_privileged_host_port,
-				  MACH_NOTIFY_NO_SENDERS, 1,
-				  pseudo_privileged_host_port,
-				  MACH_MSG_TYPE_MAKE_SEND_ONCE, &foo);
-  if (foo != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), foo);
-
-  /* Initialize the pseudo console port. */
-  mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE,
-		      &pseudo_console);
-  mach_port_move_member (mach_task_self (), pseudo_console, receive_set);
-  mach_port_request_notification (mach_task_self (), pseudo_console,
-				  MACH_NOTIFY_NO_SENDERS, 1, pseudo_console,
-				  MACH_MSG_TYPE_MAKE_SEND_ONCE, &foo);
-  if (foo != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), foo);
-
-  if (kernel_command_line == 0)
-    asprintf (&kernel_command_line, "%s %s root=%s",
-	      argv[0], bootstrap_args, bootdevice);
-
-  /* Initialize boot script variables.  */
-  if (boot_script_set_variable ("host-port", VAL_PORT,
-//				(int) privileged_host_port)
-				(int) pseudo_privileged_host_port)
-      || boot_script_set_variable ("device-port", VAL_PORT,
-				   (integer_t) pseudo_master_device_port)
-      || boot_script_set_variable ("kernel-command-line", VAL_STR,
-				   (integer_t) kernel_command_line)
-      || boot_script_set_variable ("root-device",
-				   VAL_STR, (integer_t) bootdevice)
-      || boot_script_set_variable ("boot-args",
-				   VAL_STR, (integer_t) bootstrap_args))
-    {
-      static const char msg[] = "error setting variable";
-
-      write (2, msg, strlen (msg));
-      host_exit (1);
-    }
-
-  /* Turn each `FOO=BAR' word in the command line into a boot script
-     variable ${FOO} with value BAR.  */
-  {
-    int len = strlen (kernel_command_line) + 1;
-    char *s = memcpy (alloca (len), kernel_command_line, len);
-    char *word;
-
-    while ((word = strsep (&s, " \t")) != 0)
-      {
-       char *eq = strchr (word, '=');
-       if (eq == 0)
-         continue;
-       *eq++ = '\0';
-       err = boot_script_set_variable (word, VAL_STR, (integer_t) eq);
-       if (err)
-         {
-           char *msg;
-           asprintf (&msg, "cannot set boot-script variable %s: %s\n",
-                     word, boot_script_error_string (err));
-           assert (msg);
-           write (2, msg, strlen (msg));
-           free (msg);
-           host_exit (1);
-         }
-      }
-  }
-
-  /* Parse the boot script.  */
-  {
-    char *p, *line;
-    static const char filemsg[] = "Can't open boot script\n";
-    static const char memmsg[] = "Not enough memory\n";
-    int amt, fd, err;
-
-    fd = open (bootscript, O_RDONLY, 0);
-    if (fd < 0)
-      {
-	write (2, filemsg, sizeof (filemsg));
-	host_exit (1);
-      }
-    p = buf = malloc (500);
-    if (!buf)
-      {
-	write (2, memmsg, sizeof (memmsg));
-	host_exit (1);
-      }
-    len = 500;
-    amt = 0;
-    while (1)
-      {
-	i = read (fd, p, len - (p - buf));
-	if (i <= 0)
-	  break;
-	p += i;
-	amt += i;
-	if (p == buf + len)
-	  {
-	    char *newbuf;
-
-	    len += 500;
-	    newbuf = realloc (buf, len);
-	    if (!newbuf)
-	      {
-		write (2, memmsg, sizeof (memmsg));
-		host_exit (1);
-	      }
-	    p = newbuf + (p - buf);
-	    buf = newbuf;
-	  }
-      }
-    line = p = buf;
-    while (1)
-      {
-	while (p < buf + amt && *p != '\n')
-	  p++;
-	*p = '\0';
-	err = boot_script_parse_line (0, line);
-	if (err)
-	  {
-	    char *str;
-	    int i;
-
-	    str = boot_script_error_string (err);
-	    i = strlen (str);
-	    write (2, str, i);
-	    write (2, " in `", 5);
-	    write (2, line, strlen (line));
-	    write (2, "'\n", 2);
-	    host_exit (1);
-	  }
-	if (p == buf + amt)
-	  break;
-	line = ++p;
-      }
-  }
-
-  if (index (bootstrap_args, 'd'))
-    {
-      static const char msg[] = "Pausing. . .";
-      char c;
-      write (2, msg, sizeof (msg) - 1);
-      read (0, &c, 1);
-    }
-
-  init_termstate ();
-
-  /* The boot script has now been parsed into internal data structures.
-     Now execute its directives.  */
-  {
-    int err;
-
-    err = boot_script_exec ();
-    if (err)
-      {
-	char *str = boot_script_error_string (err);
-	int i = strlen (str);
-
-	write (2, str, i);
-	host_exit (1);
-      }
-    free (buf);
-  }
-
-  mach_port_deallocate (mach_task_self (), pseudo_master_device_port);
-  mach_port_deallocate (mach_task_self (), pseudo_privileged_host_port);
-
-  cthread_detach (cthread_fork ((cthread_fn_t) msg_thread, (any_t) 0));
-
-  debug ("start the select loop...");
-  for (;;)
-    {
-      fd_set rmask;
-      FD_ZERO (&rmask);
-      FD_SET (0, &rmask);
-      if (select (1, &rmask, 0, 0, 0) == 1)
-	read_reply ();
-      else /* We hosed */
-	error (5, errno, "select");
-    }
-
-/*  mach_msg_server (request_server, __vm_page_size * 2, receive_set); */
-}
-
-void
-msg_thread()
-{
-  while (1)
-    mach_msg_server (request_server, 0, receive_set);
-}
-
-
-enum read_type
-{
-  DEV_READ,
-  DEV_READI,
-  IO_READ,
-};
-struct qr
-{
-  enum read_type type;
-  mach_port_t reply_port;
-  mach_msg_type_name_t reply_type;
-  int amount;
-  struct qr *next;
-};
-struct qr *qrhead, *qrtail;
-
-/* Queue a read for later reply. */
-kern_return_t
-queue_read (enum read_type type,
-	    mach_port_t reply_port,
-	    mach_msg_type_name_t reply_type,
-	    int amount)
-{
-  struct qr *qr;
-
-  qr = malloc (sizeof (struct qr));
-  if (!qr)
-    return D_NO_MEMORY;
-
-  spin_lock (&queuelock);
-
-  qr->type = type;
-  qr->reply_port = reply_port;
-  qr->reply_type = reply_type;
-  qr->amount = amount;
-  qr->next = 0;
-  if (qrtail)
-    qrtail->next = qr;
-  else
-    qrhead = qrtail = qr;
-
-  spin_unlock (&queuelock);
-  return D_SUCCESS;
-}
-
-/* TRUE if there's data available on stdin, which should be used to satisfy
-   console read requests.  */
-static int should_read = 0;
-
-/* Reply to a queued read. */
-void
-read_reply ()
-{
-  int avail;
-  struct qr *qr;
-  char * buf;
-  int amtread;
-
-  /* By forcing SHOULD_READ to true before trying the lock, we ensure that
-     either we get the lock ourselves or that whoever currently holds the
-     lock will service this read when he unlocks it.  */
-  should_read = 1;
-  if (! spin_try_lock (&readlock))
-    return;
-
-  /* Since we're commited to servicing the read, no one else need do so.  */
-  should_read = 0;
-
-  ioctl (0, FIONREAD, &avail);
-  if (!avail)
-    {
-      spin_unlock (&readlock);
-      return;
-    }
-
-  spin_lock (&queuelock);
-
-  if (!qrhead)
-    {
-      spin_unlock (&queuelock);
-      spin_unlock (&readlock);
-      return;
-    }
-
-  qr = qrhead;
-  qrhead = qr->next;
-  if (qr == qrtail)
-    qrtail = 0;
-
-  spin_unlock (&queuelock);
-
-  if (qr->type == DEV_READ)
-    buf = mmap (0, qr->amount, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-  else
-    buf = alloca (qr->amount);
-  amtread = read (0, buf, qr->amount);
-
-  spin_unlock (&readlock);
-
-  switch (qr->type)
-    {
-    case DEV_READ:
-      if (amtread >= 0)
-	ds_device_read_reply (qr->reply_port, qr->reply_type, 0,
-			      (io_buf_ptr_t) buf, amtread);
-      else
-	ds_device_read_reply (qr->reply_port, qr->reply_type, errno, 0, 0);
-      break;
-
-    case DEV_READI:
-      if (amtread >= 0)
-	ds_device_read_reply_inband (qr->reply_port, qr->reply_type, 0,
-				     buf, amtread);
-      else
-	ds_device_read_reply_inband (qr->reply_port, qr->reply_type, errno,
-				     0, 0);
-      break;
-
-    case IO_READ:
-      if (amtread >= 0)
-	io_read_reply (qr->reply_port, qr->reply_type, 0,
-		       buf, amtread);
-      else
-	io_read_reply (qr->reply_port, qr->reply_type, errno, 0, 0);
-      break;
-    }
-
-  free (qr);
-}
-
-/* Unlock READLOCK, and also service any new read requests that it was
-   blocking.  */
-static void
-unlock_readlock ()
-{
-  spin_unlock (&readlock);
-  while (should_read)
-    read_reply ();
-}
-
-/*
- *	Handle bootstrap requests.
- */
-/* These two functions from .../mk/bootstrap/default_pager.c. */
-
-kern_return_t
-do_bootstrap_privileged_ports(bootstrap, hostp, devicep)
-	mach_port_t bootstrap;
-	mach_port_t *hostp, *devicep;
-{
-	*hostp = pseudo_privileged_host_port;
-//	*hostp = privileged_host_port;
-	*devicep = pseudo_master_device_port;
-	return KERN_SUCCESS;
-}
-
-void
-bootstrap_compat(in, out)
-	mach_msg_header_t *in, *out;
-{
-	mig_reply_header_t *reply = (mig_reply_header_t *) out;
-	mach_msg_return_t mr;
-
-	struct imsg {
-		mach_msg_header_t	hdr;
-		mach_msg_type_t		port_desc_1;
-		mach_port_t		port_1;
-		mach_msg_type_t		port_desc_2;
-		mach_port_t		port_2;
-	} imsg;
-
-	/*
-	 * Send back the host and device ports.
-	 */
-
-	imsg.hdr.msgh_bits = MACH_MSGH_BITS_COMPLEX |
-		MACH_MSGH_BITS(MACH_MSGH_BITS_REMOTE(in->msgh_bits), 0);
-	/* msgh_size doesn't need to be initialized */
-	imsg.hdr.msgh_remote_port = in->msgh_remote_port;
-	imsg.hdr.msgh_local_port = MACH_PORT_NULL;
-	/* msgh_seqno doesn't need to be initialized */
-	imsg.hdr.msgh_id = in->msgh_id + 100;	/* this is a reply msg */
-
-	imsg.port_desc_1.msgt_name = MACH_MSG_TYPE_COPY_SEND;
-	imsg.port_desc_1.msgt_size = (sizeof(mach_port_t) * 8);
-	imsg.port_desc_1.msgt_number = 1;
-	imsg.port_desc_1.msgt_inline = TRUE;
-	imsg.port_desc_1.msgt_longform = FALSE;
-	imsg.port_desc_1.msgt_deallocate = FALSE;
-	imsg.port_desc_1.msgt_unused = 0;
-
-	imsg.port_1 = pseudo_privileged_host_port;
-//	imsg.port_1 = privileged_host_port;
-
-	imsg.port_desc_2 = imsg.port_desc_1;
-
-	imsg.port_desc_2.msgt_name = MACH_MSG_TYPE_MAKE_SEND;
-	imsg.port_2 = pseudo_master_device_port;
-
-	/*
-	 * Send the reply message.
-	 * (mach_msg_server can not do this, because the reply
-	 * is not in standard format.)
-	 */
-
-	mr = mach_msg(&imsg.hdr, MACH_SEND_MSG,
-		      sizeof imsg, 0, MACH_PORT_NULL,
-		      MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
-	if (mr != MACH_MSG_SUCCESS)
-		(void) mach_port_deallocate(mach_task_self (),
-					    imsg.hdr.msgh_remote_port);
-
-	/*
-	 * Tell mach_msg_server to do nothing.
-	 */
-
-	reply->RetCode = MIG_NO_REPLY;
-}
-
-/* Implementation of device interface */
-
-kern_return_t
-ds_device_open (mach_port_t master_port,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type,
-		dev_mode_t mode,
-		dev_name_t name,
-		mach_port_t *device,
-		mach_msg_type_name_t *devicetype)
-{
-  struct dev_map *map;
-
-  if (master_port != pseudo_master_device_port)
-    return D_INVALID_OPERATION;
-
-  debug ("open %s", name);
-  if (!strcmp (name, "console"))
-    {
-#if 0
-      mach_port_insert_right (mach_task_self (), pseudo_console,
-			      pseudo_console, MACH_MSG_TYPE_MAKE_SEND);
-      console_send_rights++;
-#endif
-      console_mscount++;
-      *device = pseudo_console;
-      *devicetype = MACH_MSG_TYPE_MAKE_SEND;
-      return 0;
-    }
-  else if (strcmp (name, "pseudo-root") == 0)
-    /* Magic root device.  */
-    {
-      *device = pseudo_root;
-      *devicetype = MACH_MSG_TYPE_MAKE_SEND;
-      return 0;
-    }
-
-  map = lookup_dev (name);
-  if (map)
-    {
-      error_t err;
-      *devicetype = MACH_MSG_TYPE_MOVE_SEND;
-      err = device_open (map->port, mode, "", device);
-      return err;
-    }
-
-  return D_NO_SUCH_DEVICE;
-//  *devicetype = MACH_MSG_TYPE_MOVE_SEND;
-//  return device_open (master_device_port, mode, name, device);
-}
-
-kern_return_t
-ds_device_close (device_t device)
-{
-  if (device != pseudo_console && device != pseudo_root)
-    return D_NO_SUCH_DEVICE;
-  return 0;
-}
-
-kern_return_t
-ds_device_write (device_t device,
-		 mach_port_t reply_port,
-		 mach_msg_type_name_t reply_type,
-		 dev_mode_t mode,
-		 recnum_t recnum,
-		 io_buf_ptr_t data,
-		 size_t datalen,
-		 int *bytes_written)
-{
-  if (device == pseudo_console)
-    {
-      debug ("device_write to console: %d", datalen);
-#if 0
-      if (console_send_rights)
-	{
-	  mach_port_mod_refs (mach_task_self (), pseudo_console,
-			      MACH_PORT_TYPE_SEND, -console_send_rights);
-	  console_send_rights = 0;
-	}
-#endif
-
-      *bytes_written = write (1, data, datalen);
-
-      return (*bytes_written == -1 ? D_IO_ERROR : D_SUCCESS);
-    }
-  else if (device == pseudo_root)
-    {
-      size_t wrote;
-      debug ("device_write to pseudo root: %d", datalen);
-      if (store_write (root_store, recnum, data, datalen, &wrote) != 0)
-	return D_IO_ERROR;
-      *bytes_written = wrote;
-      return D_SUCCESS;
-    }
-  else
-    return D_NO_SUCH_DEVICE;
-}
-
-kern_return_t
-ds_device_write_inband (device_t device,
-			mach_port_t reply_port,
-			mach_msg_type_name_t reply_type,
-			dev_mode_t mode,
-			recnum_t recnum,
-			io_buf_ptr_inband_t data,
-			size_t datalen,
-			int *bytes_written)
-{
-  if (device == pseudo_console)
-    {
-#if 0
-      if (console_send_rights)
-	{
-	  mach_port_mod_refs (mach_task_self (), pseudo_console,
-			      MACH_PORT_TYPE_SEND, -console_send_rights);
-	  console_send_rights = 0;
-	}
-#endif
-
-      *bytes_written = write (1, data, datalen);
-
-      return (*bytes_written == -1 ? D_IO_ERROR : D_SUCCESS);
-    }
-  else if (device == pseudo_root)
-    {
-      size_t wrote;
-      debug ("device_write_inband to pseudo root: %d", datalen);
-      if (store_write (root_store, recnum, data, datalen, &wrote) != 0)
-	return D_IO_ERROR;
-      *bytes_written = wrote;
-      return D_SUCCESS;
-    }
-  else
-    return D_NO_SUCH_DEVICE;
-}
-
-kern_return_t
-ds_device_read (device_t device,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type,
-		dev_mode_t mode,
-		recnum_t recnum,
-		int bytes_wanted,
-		io_buf_ptr_t *data,
-		size_t *datalen)
-{
-  if (device == pseudo_console)
-    {
-      int avail;
-
-#if 0
-      if (console_send_rights)
-	{
-	  mach_port_mod_refs (mach_task_self (), pseudo_console,
-			      MACH_PORT_TYPE_SEND, -console_send_rights);
-	  console_send_rights = 0;
-	}
-#endif
-
-      spin_lock (&readlock);
-      ioctl (0, FIONREAD, &avail);
-      if (avail)
-	{
-	  *data = mmap (0, bytes_wanted, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-	  *datalen = read (0, *data, bytes_wanted);
-	  unlock_readlock ();
-	  return (*datalen == -1 ? D_IO_ERROR : D_SUCCESS);
-	}
-      else
-	{
-	  kern_return_t err;
-
-	  unlock_readlock ();
-	  err = queue_read (DEV_READ, reply_port, reply_type, bytes_wanted);
-	  if (err)
-	    return err;
-	  return MIG_NO_REPLY;
-	}
-    }
-  else if (device == pseudo_root)
-    {
-      *datalen = 0;
-      return
-	(store_read (root_store, recnum, bytes_wanted, (void **)data, datalen) == 0
-	 ? D_SUCCESS
-	 : D_IO_ERROR);
-    }
-  else
-    return D_NO_SUCH_DEVICE;
-}
-
-kern_return_t
-ds_device_read_inband (device_t device,
-		       mach_port_t reply_port,
-		       mach_msg_type_name_t reply_type,
-		       dev_mode_t mode,
-		       recnum_t recnum,
-		       int bytes_wanted,
-		       io_buf_ptr_inband_t data,
-		       size_t *datalen)
-{
-  if (device == pseudo_console)
-    {
-      int avail;
-
-#if 0
-      if (console_send_rights)
-	{
-	  mach_port_mod_refs (mach_task_self (), pseudo_console,
-			      MACH_PORT_TYPE_SEND, -console_send_rights);
-	  console_send_rights = 0;
-	}
-#endif
-
-      spin_lock (&readlock);
-      ioctl (0, FIONREAD, &avail);
-      if (avail)
-	{
-	  *datalen = read (0, data, bytes_wanted);
-	  unlock_readlock ();
-	  return (*datalen == -1 ? D_IO_ERROR : D_SUCCESS);
-	}
-      else
-	{
-	  kern_return_t err;
-
-	  unlock_readlock ();
-	  err = queue_read (DEV_READI, reply_port, reply_type, bytes_wanted);
-	  if (err)
-	    return err;
-	  return MIG_NO_REPLY;
-	}
-    }
-  else if (device == pseudo_root)
-    {
-      error_t err;
-      void *returned = data;
-
-      *datalen = bytes_wanted;
-      err =
-	store_read (root_store, recnum, bytes_wanted, (void **)&returned, datalen);
-
-      if (! err)
-	{
-	  if (returned != data)
-	    {
-	      bcopy (returned, (void *)data, *datalen);
-	      munmap ((caddr_t) returned, *datalen);
-	    }
-	  return D_SUCCESS;
-	}
-      else
-	return D_IO_ERROR;
-    }
-  else
-    return D_NO_SUCH_DEVICE;
-}
-
-kern_return_t
-ds_xxx_device_set_status (device_t device,
-			  dev_flavor_t flavor,
-			  dev_status_t status,
-			  size_t statu_cnt)
-{
-  if (device != pseudo_console)
-    return D_NO_SUCH_DEVICE;
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_get_status (device_t device,
-			  dev_flavor_t flavor,
-			  dev_status_t status,
-			  size_t *statuscnt)
-{
-  if (device != pseudo_console && device != pseudo_root)
-    return D_NO_SUCH_DEVICE;
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_set_filter (device_t device,
-			  mach_port_t rec,
-			  int pri,
-			  filter_array_t filt,
-			  size_t len)
-{
-  if (device != pseudo_console && device != pseudo_root)
-    return D_NO_SUCH_DEVICE;
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_map (device_t device,
-	       vm_prot_t prot,
-	       vm_offset_t offset,
-	       vm_size_t size,
-	       memory_object_t *pager,
-	       int unmap)
-{
-  if (device != pseudo_console && device != pseudo_root)
-    return D_NO_SUCH_DEVICE;
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_set_status (device_t device,
-		      dev_flavor_t flavor,
-		      dev_status_t status,
-		      size_t statuslen)
-{
-  if (device != pseudo_console && device != pseudo_root)
-    return D_NO_SUCH_DEVICE;
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_get_status (device_t device,
-		      dev_flavor_t flavor,
-		      dev_status_t status,
-		      size_t *statuslen)
-{
-  if (device == pseudo_console)
-    return D_INVALID_OPERATION;
-  else if (device == pseudo_root)
-    if (flavor == DEV_GET_SIZE)
-      if (*statuslen < DEV_GET_SIZE_COUNT)
-	return D_INVALID_SIZE;
-      else
-	{
-	  status[DEV_GET_SIZE_DEVICE_SIZE] = root_store->size;
-	  status[DEV_GET_SIZE_RECORD_SIZE] = root_store->block_size;
-	  *statuslen = DEV_GET_SIZE_COUNT;
-	  return D_SUCCESS;
-	}
-    else
-      return D_INVALID_OPERATION;
-  else
-    return D_NO_SUCH_DEVICE;
-}
-
-kern_return_t
-ds_device_set_filter (device_t device,
-		      mach_port_t receive_port,
-		      int priority,
-		      filter_array_t filter,
-		      size_t filterlen)
-{
-  if (device != pseudo_console && device != pseudo_root)
-    return D_NO_SUCH_DEVICE;
-  return D_INVALID_OPERATION;
-}
-
-
-/* Implementation of notify interface */
-kern_return_t
-do_mach_notify_port_deleted (mach_port_t notify,
-			     mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_msg_accepted (mach_port_t notify,
-			     mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_port_destroyed (mach_port_t notify,
-			       mach_port_t port)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_no_senders (mach_port_t notify,
-			   mach_port_mscount_t mscount)
-{
-  static int no_console;
-  mach_port_t foo;
-  error_t err;
-  
-  err = ports_do_mach_notify_no_senders (notify, mscount);
-  if (!err)
-    {
-      info ("a task die");
-      return 0;
-    }
-  
-  if (notify == pseudo_master_device_port)
-    {
-      if (no_console && pseudo_privileged_host_port == MACH_PORT_NULL)
-	goto bye;
-      pseudo_master_device_port = MACH_PORT_NULL;
-      return 0;
-    }
-  if (notify == pseudo_privileged_host_port)
-    {
-      if (no_console && pseudo_master_device_port == MACH_PORT_NULL)
-	goto bye;
-      pseudo_privileged_host_port = MACH_PORT_NULL;
-      return 0;
-    }
-  if (notify == pseudo_console)
-    {
-      if (mscount == console_mscount &&
-	  pseudo_master_device_port == MACH_PORT_NULL &&
-	  pseudo_privileged_host_port == MACH_PORT_NULL)
-	{
-	bye:
-	  restore_termstate ();
-	  write (2, "bye\n", 4);
-	  host_exit (0);
-	}
-      else
-	{
-	  no_console = (mscount == console_mscount);
-
-	  mach_port_request_notification (mach_task_self (), pseudo_console,
-					  MACH_NOTIFY_NO_SENDERS,
-					  console_mscount == mscount
-					  ? mscount + 1
-					  : console_mscount,
-					  pseudo_console,
-					  MACH_MSG_TYPE_MAKE_SEND_ONCE, &foo);
-	  if (foo != MACH_PORT_NULL)
-	    mach_port_deallocate (mach_task_self (), foo);
-	}
-    }
-
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_send_once (mach_port_t notify)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_dead_name (mach_port_t notify,
-			  mach_port_t name)
-{
-#if 0
-  if (name == child_task && notify == bootport)
-    host_exit (0);
-#endif
-  return EOPNOTSUPP;
-}
-
-
-/* Implementation of the Hurd I/O interface, which
-   we support for the console port only. */
-
-kern_return_t
-S_io_write (mach_port_t object,
-	    mach_port_t reply_port,
-	    mach_msg_type_name_t reply_type,
-	    char *data,
-	    mach_msg_type_number_t datalen,
-	    off_t offset,
-	    mach_msg_type_number_t *amtwritten)
-{
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-
-#if 0
-  if (console_send_rights)
-    {
-      mach_port_mod_refs (mach_task_self (), pseudo_console,
-			  MACH_PORT_TYPE_SEND, -console_send_rights);
-      console_send_rights = 0;
-    }
-#endif
-
-  *amtwritten = write (1, data, datalen);
-  return *amtwritten == -1 ? errno : 0;
-}
-
-kern_return_t
-S_io_read (mach_port_t object,
-	   mach_port_t reply_port,
-	   mach_msg_type_name_t reply_type,
-	   char **data,
-	   mach_msg_type_number_t *datalen,
-	   off_t offset,
-	   mach_msg_type_number_t amount)
-{
-  mach_msg_type_number_t avail;
-
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-
-#if 0
-  if (console_send_rights)
-    {
-      mach_port_mod_refs (mach_task_self (), pseudo_console,
-			  MACH_PORT_TYPE_SEND, -console_send_rights);
-      console_send_rights = 0;
-    }
-#endif
-
-  spin_lock (&readlock);
-  ioctl (0, FIONREAD, &avail);
-  if (avail)
-    {
-      if (amount > *datalen)
-	*data = mmap (0, amount, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-      *datalen = read (0, *data, amount);
-      unlock_readlock ();
-      return *datalen == -1 ? errno : 0;
-    }
-  else
-    {
-      kern_return_t err;
-      unlock_readlock ();
-      err = queue_read (IO_READ, reply_port, reply_type, amount);
-      if (err)
-	return err;
-      return MIG_NO_REPLY;
-    }
-}
-
-kern_return_t
-S_io_seek (mach_port_t object,
-	   mach_port_t reply_port,
-	   mach_msg_type_name_t reply_type,
-	   off_t offset,
-	   int whence,
-	   off_t *newp)
-{
-  return object == pseudo_console ? ESPIPE : EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_readable (mach_port_t object,
-	       mach_port_t reply_port,
-	       mach_msg_type_name_t reply_type,
-	       mach_msg_type_number_t *amt)
-{
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-  ioctl (0, FIONREAD, amt);
-  return 0;
-}
-
-kern_return_t
-S_io_set_all_openmodes (mach_port_t object,
-			mach_port_t reply_port,
-			mach_msg_type_name_t reply_type,
-			int bits)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_get_openmodes (mach_port_t object,
-		    mach_port_t reply_port,
-		    mach_msg_type_name_t reply_type,
-		    int *modes)
-{
-  *modes = O_READ | O_WRITE;
-  return object == pseudo_console ? 0 : EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_set_some_openmodes (mach_port_t object,
-			 mach_port_t reply_port,
-			 mach_msg_type_name_t reply_type,
-			 int bits)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_clear_some_openmodes (mach_port_t object,
-			   mach_port_t reply_port,
-			   mach_msg_type_name_t reply_type,
-			   int bits)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_async (mach_port_t object,
-	    mach_port_t reply_port,
-	    mach_msg_type_name_t reply_type,
-	    mach_port_t notify,
-	    mach_port_t *id,
-	    mach_msg_type_name_t *idtype)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_mod_owner (mach_port_t object,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type,
-		pid_t owner)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_get_owner (mach_port_t object,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type,
-		pid_t *owner)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_get_icky_async_id (mach_port_t object,
-			mach_port_t reply_port,
-			mach_msg_type_name_t reply_type,
-			mach_port_t *id,
-			mach_msg_type_name_t *idtype)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_select (mach_port_t object,
-	     mach_port_t reply_port,
-	     mach_msg_type_name_t reply_type,
-	     int *type)
-{
-  fd_set r, w, x;
-  int n;
-
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-
-  FD_ZERO (&r);
-  FD_ZERO (&w);
-  FD_ZERO (&x);
-  FD_SET (0, &r);
-  FD_SET (0, &w);
-  FD_SET (0, &x);
-
-  n = select (1,
-	      (*type & SELECT_READ) ? &r : 0,
-	      (*type & SELECT_WRITE) ? &w : 0,
-	      (*type & SELECT_URG) ? &x : 0,
-	      0);
-  if (n < 0)
-    return errno;
-
-  if (! FD_ISSET (0, &r))
-    *type &= ~SELECT_READ;
-  if (! FD_ISSET (0, &w))
-    *type &= ~SELECT_WRITE;
-  if (! FD_ISSET (0, &x))
-    *type &= ~SELECT_URG;
-
-  return 0;
-}
-
-kern_return_t
-S_io_stat (mach_port_t object,
-	   mach_port_t reply_port,
-	   mach_msg_type_name_t reply_type,
-	   struct stat *st)
-{
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-
-  bzero (st, sizeof (struct stat));
-  st->st_blksize = 1024;
-  return 0;
-}
-
-kern_return_t
-S_io_reauthenticate (mach_port_t object,
-		     mach_port_t reply_port,
-		     mach_msg_type_name_t reply_type,
-		     mach_port_t rend)
-{
-  uid_t *gu, *au;
-  gid_t *gg, *ag;
-  size_t gulen = 0, aulen = 0, gglen = 0, aglen = 0;
-  error_t err;
-
-  err = mach_port_insert_right (mach_task_self (), object, object,
-				MACH_MSG_TYPE_MAKE_SEND);
-  assert_perror (err);
-
-  if (! auth_server_authenticate (authserver,
-				  rend, MACH_MSG_TYPE_COPY_SEND,
-				  object, MACH_MSG_TYPE_COPY_SEND,
-				  &gu, &gulen,
-				  &au, &aulen,
-				  &gg, &gglen,
-				  &ag, &aglen))
-    {
-      mig_deallocate ((vm_address_t) gu, gulen * sizeof *gu);
-      mig_deallocate ((vm_address_t) au, aulen * sizeof *gu);
-      mig_deallocate ((vm_address_t) gg, gglen * sizeof *gu);
-      mig_deallocate ((vm_address_t) au, aulen * sizeof *gu);
-    }
-  mach_port_deallocate (mach_task_self (), rend);
-  mach_port_deallocate (mach_task_self (), object);
-
-  return 0;
-}
-
-kern_return_t
-S_io_restrict_auth (mach_port_t object,
-		    mach_port_t reply_port,
-		    mach_msg_type_name_t reply_type,
-		    mach_port_t *newobject,
-		    mach_msg_type_name_t *newobjtype,
-		    uid_t *uids,
-		    size_t nuids,
-		    uid_t *gids,
-		    size_t ngids)
-{
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-  *newobject = pseudo_console;
-  *newobjtype = MACH_MSG_TYPE_MAKE_SEND;
-  console_mscount++;
-  return 0;
-}
-
-kern_return_t
-S_io_duplicate (mach_port_t object,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type,
-		mach_port_t *newobj,
-		mach_msg_type_name_t *newobjtype)
-{
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-  *newobj = pseudo_console;
-  *newobjtype = MACH_MSG_TYPE_MAKE_SEND;
-  console_mscount++;
-  return 0;
-}
-
-kern_return_t
-S_io_server_version (mach_port_t object,
-		     mach_port_t reply_port,
-		     mach_msg_type_name_t reply_type,
-		     char *name,
-		     int *maj,
-		     int *min,
-		     int *edit)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_map (mach_port_t obj,
-	  mach_port_t reply_port,
-	  mach_msg_type_name_t reply_type,
-	  mach_port_t *rd,
-	  mach_msg_type_name_t *rdtype,
-	  mach_port_t *wr,
-	  mach_msg_type_name_t *wrtype)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_map_cntl (mach_port_t obj,
-	       mach_port_t reply_port,
-	       mach_msg_type_name_t reply_type,
-	       mach_port_t *mem,
-	       mach_msg_type_name_t *memtype)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_get_conch (mach_port_t obj,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_release_conch (mach_port_t obj,
-		    mach_port_t reply_port,
-		    mach_msg_type_name_t reply_type)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_eofnotify (mach_port_t obj,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type)
-
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_prenotify (mach_port_t obj,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type,
-		vm_offset_t start,
-		vm_offset_t end)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_postnotify (mach_port_t obj,
-		 mach_port_t reply_port,
-		 mach_msg_type_name_t reply_type,
-		 vm_offset_t start,
-		 vm_offset_t end)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_readsleep (mach_port_t obj,
-		mach_port_t reply_port,
-		mach_msg_type_name_t reply_type)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_readnotify (mach_port_t obj,
-		 mach_port_t reply_port,
-		 mach_msg_type_name_t reply_type)
-{
-  return EOPNOTSUPP;
-}
-
-
-kern_return_t
-S_io_sigio (mach_port_t obj,
-	    mach_port_t reply_port,
-	    mach_msg_type_name_t reply_type)
-{
-  return EOPNOTSUPP;
-}
-
-
-kern_return_t
-S_io_pathconf (mach_port_t obj,
-	       mach_port_t reply_port,
-	       mach_msg_type_name_t reply_type,
-	       int name, int *value)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_identity (mach_port_t obj,
-	       mach_port_t reply,
-	       mach_msg_type_name_t replytype,
-	       mach_port_t *id,
-	       mach_msg_type_name_t *idtype,
-	       mach_port_t *fsid,
-	       mach_msg_type_name_t *fsidtype,
-	       ino_t *fileno)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_io_revoke (mach_port_t obj,
-	     mach_port_t reply, mach_msg_type_name_t replyPoly)
-{
-  return EOPNOTSUPP;
-}
-
-
-
-/* Implementation of the Hurd terminal driver interface, which we only
-   support on the console device.  */
-
-kern_return_t
-S_termctty_open_terminal (mach_port_t object,
-			  int flags,
-			  mach_port_t *result,
-			  mach_msg_type_name_t *restype)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-S_term_getctty (mach_port_t object,
-		mach_port_t *cttyid, mach_msg_type_name_t *cttyPoly)
-{
-  static mach_port_t id = MACH_PORT_NULL;
-
-  if (object != pseudo_console)
-    return EOPNOTSUPP;
-
-  if (id == MACH_PORT_NULL)
-    mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_DEAD_NAME, &id);
-
-  *cttyid = id;
-  *cttyPoly = MACH_MSG_TYPE_COPY_SEND;
-  return 0;
-}
-
-
-kern_return_t S_term_open_ctty
-(
-	io_t terminal,
-	pid_t pid,
-	pid_t pgrp,
-	mach_port_t *newtty,
-	mach_msg_type_name_t *newttytype
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_set_nodename
-(
-	io_t terminal,
-	string_t name
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_get_nodename
-(
-	io_t terminal,
-	string_t name
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_get_peername
-(
-	io_t terminal,
-	string_t name
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_set_filenode
-(
-	io_t terminal,
-	file_t filenode
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_get_bottom_type
-(
-	io_t terminal,
-	int *ttype
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_on_machdev
-(
-	io_t terminal,
-	mach_port_t machdev
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_on_hurddev
-(
-	io_t terminal,
-	io_t hurddev
-)
-{ return EOPNOTSUPP; }
-
-kern_return_t S_term_on_pty
-(
-	io_t terminal,
-	io_t *ptymaster
-)
-{ return EOPNOTSUPP; }
diff --git a/boot.backup1/exc_impl.c~ b/boot.backup1/exc_impl.c~
deleted file mode 100644
index bd48d542..00000000
--- a/boot.backup1/exc_impl.c~
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* This file implements the server-side RPC functions of mach_host. */
-
-#include <mach.h>
-#include <hurd.h>
-#include <assert.h>
-
-#include "util.h"
-#include "mach_proxy.h"
-
-kern_return_t
-catch_exception_raise (mach_port_t exception_port, mach_port_t thread,
-		       mach_port_t task, integer_t exception,
-		       integer_t code, integer_t subcode)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
diff --git a/boot.backup1/list.h~ b/boot.backup1/list.h~
deleted file mode 100644
index c94c0628..00000000
--- a/boot.backup1/list.h~
+++ /dev/null
@@ -1,40 +0,0 @@
-/* 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef __LIST_H__
-#define __LIST_H__
-
-#include <stddef.h>
-
-struct list 
-{
-  struct list *next, *prev;
-};
-
-void entry_init (struct list *entry);
-void add_entry_head (struct list *head, struct list *entry);
-void add_entry_end (struct list *head, struct list *entry);
-void remove_entry (struct list *entry);
-
-#define LIST_HEADER_INIT() {&head, &head}
-#define EMPTY_LIST(head) ((head)->next == (head))
-#define LIST_ENTRY(entry, type, field) ((type *) (((char *) entry) - offsetof (type, field)))
-
-#endif
diff --git a/boot.backup1/mach_host_impl.c~ b/boot.backup1/mach_host_impl.c~
deleted file mode 100644
index 4947751a..00000000
--- a/boot.backup1/mach_host_impl.c~
+++ /dev/null
@@ -1,551 +0,0 @@
-/* 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* This file implements the server-side RPC functions of mach_host. */
-
-#include <stdio.h>
-#include <assert.h>
-
-#include <mach.h>
-#include <hurd.h>
-#include <hurd/ports.h>
-
-#include "util.h"
-#include "list.h"
-#include "mach_proxy.h"
-
-extern mach_port_t privileged_host_port;
-
-/* Set task priority. */
-kern_return_t
-S_task_priority (mach_port_t task, int priority, boolean_t change_threads)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  debug ("");
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = task_priority (task_pi->task_port, priority, change_threads);
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine processor_set_tasks */
-kern_return_t
-S_processor_set_tasks (mach_port_t processor_set, task_array_t *task_list,
-		       mach_msg_type_number_t *task_listCnt)
-{
-//  extern task_t kernel_task;
-  error_t err = 0;
-  mach_port_t *subhurd_tasks = NULL;
-  int size = 0;
-  struct list *entry;
-  /* no pseudo task port is created for the kernel task. */
-  int num = 0;
-  int tot_nbtasks = ports_count_class (task_portclass) + num;
-
-  size = tot_nbtasks * sizeof (mach_port_t);
-  err = vm_allocate (mach_task_self (),
-		     (vm_address_t *) (void *) &subhurd_tasks,
-		     size, 1);
-  if (err) 
-    goto out;
-
-//  subhurd_tasks[0] = kernel_task;
-  entry = &tasks_head;
-  for (entry = tasks_head.next; entry != &tasks_head; entry = entry->next) 
-    {
-      struct task_info *task_pi = LIST_ENTRY (entry, struct task_info, list);
-      assert (num < tot_nbtasks);
-      subhurd_tasks[num++] = ports_get_right (task_pi);
-    }
-  assert (num == tot_nbtasks);
-  debug ("get %d tasks", tot_nbtasks);
-  *task_list = subhurd_tasks;
-  *task_listCnt = tot_nbtasks;
-
-out:
-  /* I enable the class here,
-   * so no pseudo task port can be created when I count the number of tasks. */
-  ports_enable_class (task_portclass);
-  /* The array will be deallocated after it is sent,
-   * but the task ports in it don't need to,
-   * because I only call ports_get_right()
-   * and the reference count isn't increased. */
-  return err;
-}
-
-/* Get control port for a processor set. */
-kern_return_t
-S_host_processor_set_priv (mach_port_t host_priv, mach_port_t set_name,
-			   mach_port_t *set, mach_msg_type_name_t *setPoly)
-{
-  static mach_port_t set_port = MACH_PORT_NULL;
-  kern_return_t ret = 0;
-
-  // TODO create a port for each processor set
-  debug ("");
-  if (set_port == MACH_PORT_NULL)
-    {
-      extern mach_port_t receive_set;
-      // TODO use libports
-      mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE,
-			  &set_port);
-      mach_port_move_member (mach_task_self (), set_port,
-			     receive_set);
-      mach_port_insert_right (mach_task_self (), set_port,
-			      set_port, MACH_MSG_TYPE_MAKE_SEND);
-    }
-  *set = set_port;
-  *setPoly = MACH_MSG_TYPE_COPY_SEND;
-  return ret;
-}
-
-/* Routine host_reboot */
-kern_return_t
-S_host_reboot (mach_port_t host_priv, int options)
-{
-  debug ("");
-  assert (0);
-  // TODO
-  return EOPNOTSUPP;
-}
-
-/* Routine vm_wire */
-kern_return_t
-S_vm_wire (mach_port_t host_priv, mach_port_t task,
-	   vm_address_t address, vm_size_t size, vm_prot_t access)
-{
-  debug ("");
-  assert (0);
-  // TODO
-  return 0;
-}
-
-/* Routine thread_wire */
-kern_return_t
-S_thread_wire (mach_port_t host_priv, mach_port_t thread, boolean_t wired)
-{
-  debug ("");
-  assert (0);
-  // TODO
-  return 0;
-}
-
-//////////the request to the host isn't forwarded by the proxy//////////
-
-/* Routine host_processor_sets */
-kern_return_t
-S_host_processor_sets (mach_port_t host,
-		       processor_set_name_array_t *processor_sets,
-		       mach_msg_type_number_t *processor_setsCnt)
-{
-  debug ("");
-  assert (0);
-  // the request to the host isn't forwarded.
-  return EOPNOTSUPP;
-}
-
-/* Routine host_get_time */
-kern_return_t
-S_host_get_time (mach_port_t host, time_value_t *current_time)
-{
-  debug ("");
-  assert (0);
-  // the request to the host isn't forwarded.
-  return EOPNOTSUPP;
-}
-
-/* Routine host_info */
-kern_return_t
-S_host_info (mach_port_t host, int flavor, host_info_t host_info_out,
-	     mach_msg_type_number_t *host_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  // the request to the host isn't forwarded.
-  return EOPNOTSUPP;
-}
-
-/* Get string describing current kernel version. */
-kern_return_t
-S_host_kernel_version (mach_port_t host, kernel_version_t kernel_version)
-{
-  debug ("");
-  assert (0);
-  // the proxy doesn't forward the request to the host port.
-  return EOPNOTSUPP;
-}
-
-///////////////////the RPCs not used by Hurd//////////////////////
-
-/* Get list of processors on this host. */
-kern_return_t
-S_host_processors (mach_port_t host_priv,
-		   processor_array_t *processor_list,
-		   mach_msg_type_number_t *processor_listCnt)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Start processor. */
-kern_return_t
-S_processor_start (mach_port_t processor)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Exit processor -- may not be restartable. */
-kern_return_t
-S_processor_exit (mach_port_t processor)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Get default processor set for host. */
-kern_return_t
-S_processor_set_default (mach_port_t host, mach_port_t *default_set)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/*
- * Create new processor set.  Returns real port for manipulations,
- *      and name port for obtaining information.
- */
-kern_return_t
-S_processor_set_create (mach_port_t host, mach_port_t *new_set,
-			mach_port_t *new_name)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Destroy processor set. */
-kern_return_t
-S_processor_set_destroy (mach_port_t set)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Assign processor to processor set. */
-kern_return_t
-S_processor_assign (mach_port_t processor, mach_port_t new_set, boolean_t wait)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Get current assignment for thread. */
-kern_return_t
-S_processor_get_assignment (mach_port_t processor, mach_port_t *assigned_set)
-{
-  debug ("");
-  assert (0);
-  // TODO change the interface of the function.
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Assign task to processor set. */
-kern_return_t
-S_task_assign (mach_port_t task, mach_port_t new_set, boolean_t assign_threads)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Assign task to default set. */
-kern_return_t
-S_task_assign_default (mach_port_t task, boolean_t assign_threads)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Get current assignment for task. */
-kern_return_t
-S_task_get_assignment (mach_port_t task, mach_port_t *assigned_set)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Set max priority for processor_set. */
-kern_return_t
-S_processor_set_max_priority (mach_port_t processor_set, int max_priority,
-			      boolean_t change_threads)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine processor_set_policy_enable */
-kern_return_t
-S_processor_set_policy_enable (mach_port_t processor_set, int policy)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine processor_set_policy_disable */
-kern_return_t
-S_processor_set_policy_disable (mach_port_t processor_set, int policy,
-				boolean_t change_threads)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine processor_set_threads */
-kern_return_t
-S_processor_set_threads (mach_port_t processor_set,
-			 thread_array_t *thread_list,
-			 mach_msg_type_number_t *thread_listCnt)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine host_set_time */
-kern_return_t
-S_host_set_time (mach_port_t host_priv, time_value_t new_time)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine host_adjust_time */
-kern_return_t
-S_host_adjust_time (mach_port_t host_priv, time_value_t new_adjustment,
-		    time_value_t *old_adjustment)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine processor_info */
-kern_return_t
-S_processor_info (mach_port_t processor, int flavor, mach_port_t *host,
-		  processor_info_t processor_info_out,
-		  mach_msg_type_number_t *processor_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine processor_set_info */
-kern_return_t
-S_processor_set_info (mach_port_t set_name, int flavor, mach_port_t *host,
-		      processor_set_info_t info_out,
-		      mach_msg_type_number_t *info_outCnt)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine processor_control */
-kern_return_t
-S_processor_control (mach_port_t processor, processor_info_t processor_cmd,
-		     mach_msg_type_number_t processor_cmdCnt)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-/* Routine host_get_boot_info */
-kern_return_t
-S_host_get_boot_info (mach_port_t host_priv, kernel_boot_info_t boot_info)
-{
-  debug ("");
-  assert (0);
-  // Hurd currently doesn't use it.
-  return EOPNOTSUPP;
-}
-
-///////////////////it's not a proxy for thread requests///////////////////
-
-/* Assign thread to processor set. */
-kern_return_t
-S_thread_assign (mach_port_t thread, mach_port_t new_set)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Assign thread to default set. */
-kern_return_t
-S_thread_assign_default (mach_port_t thread)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Get current assignment for thread. */
-kern_return_t
-S_thread_get_assignment (mach_port_t thread, mach_port_t *assigned_set)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Set priority for thread. */
-kern_return_t S_thread_priority (mach_port_t thread, int priority,
-				 boolean_t set_max)
-{
-  debug ("");
-  assert (0);
-  return thread_priority (thread, priority, set_max);
-}
-
-/* Set max priority for thread. */
-kern_return_t S_thread_max_priority (mach_port_t thread,
-				     mach_port_t processor_set,
-				     int max_priority)
-{
-  debug ("");
-  assert (0);
-  return thread_max_priority (thread, processor_set, max_priority);
-}
-
-/* Routine thread_depress_abort */
-kern_return_t S_thread_depress_abort (mach_port_t thread)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Set policy for thread */
-kern_return_t S_thread_policy (mach_port_t thread, int policy, int data)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-////////////////////don't support obsolete requests///////////////////////
-
-/* Routine yyy_host_info */
-/* obsolete */
-kern_return_t
-S_yyy_host_info (mach_port_t host, int flavor, host_info_t host_info_out,
-		 mach_msg_type_number_t *host_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine yyy_processor_info */
-/* obsolete */
-kern_return_t
-S_yyy_processor_info (mach_port_t processor, int flavor, mach_port_t *host,
-		      processor_info_t processor_info_out,
-		      mach_msg_type_number_t *processor_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine yyy_processor_control */
-/* obsolete */
-kern_return_t
-S_yyy_processor_control (mach_port_t processor,
-			 processor_info_t processor_cmd,
-			 mach_msg_type_number_t processor_cmdCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/*
- * Get rights to default processor set for host.
- * Replaced by host_processor_set_priv.
- */
-kern_return_t
-S_xxx_processor_set_default_priv (mach_port_t host, mach_port_t *default_set)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine yyy_processor_set_info */
-/* obsolete */
-kern_return_t
-S_yyy_processor_set_info (mach_port_t set_name, int flavor,
-			  mach_port_t *host, processor_set_info_t info_out,
-			  mach_msg_type_number_t *info_outCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
diff --git a/boot.backup1/mach_impl.c~ b/boot.backup1/mach_impl.c~
deleted file mode 100644
index 6e294218..00000000
--- a/boot.backup1/mach_impl.c~
+++ /dev/null
@@ -1,869 +0,0 @@
-/* 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* This file implements the server-side RPC functions of mach_host. */
-
-#include <string.h>
-#include <mach.h>
-#include <hurd.h>
-#include <assert.h>
-
-#include "util.h"
-#include "mach_proxy.h"
-#include "list.h"
-
-/* Routine task_create */
-kern_return_t
-S_task_create (mach_port_t target_task, boolean_t inherit_memory,
-	       mach_port_t *child_task, mach_msg_type_name_t *child_taskPoly)
-{
-  struct task_info *target_task_pi;
-  task_t real_child_task;
-  task_t pseudo_child_task;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("get a request from task %d", target_task_pi->task_port);
-  err = task_create (target_task_pi->task_port,
-		     inherit_memory, &real_child_task);
-  ports_port_deref (target_task_pi);
-  if (err) 
-    return err;
-
-  err = create_pseudo_task (real_child_task, &pseudo_child_task);
-  if (err)
-    {
-      task_terminate (real_child_task);
-      return err;
-    }
-  
-  *child_task = pseudo_child_task;
-  *child_taskPoly = MACH_MSG_TYPE_COPY_SEND;
-
-  debug ("new task: %d", real_child_task);
-  return err;
-}
-
-/* Routine task_terminate */
-kern_return_t
-S_task_terminate (mach_port_t target_task)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("get request from task %d", target_task_pi->task_port);
-  err = task_terminate (target_task_pi->task_port);
-  debug ("task_terminate: %s", strerror (err));
-  ports_destroy_right (target_task_pi);
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine task_info */
-kern_return_t
-S_task_info (mach_port_t target_task, int flavor,
-	     task_info_t task_info_out,
-	     mach_msg_type_number_t *task_info_outCnt)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  debug ("");
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  err = task_info (target_task_pi->task_port, flavor,
-		   task_info_out, task_info_outCnt);
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_allocate */
-kern_return_t
-S_vm_allocate (mach_port_t target_task, vm_address_t *address,
-	       vm_size_t size, boolean_t anywhere)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("request is from task %d", target_task_pi->task_port);
-
-  /* This should be enough. */
-  err = vm_allocate (target_task_pi->task_port, address, size, anywhere);
-  debug ("address: %d, size: %d, anywhere: %d, %s",
-	 *address, size, anywhere, strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_deallocate */
-kern_return_t
-S_vm_deallocate (mach_port_t target_task,
-		 vm_address_t address, vm_size_t size)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("get a request from task %d", target_task_pi->task_port);
-  err = vm_deallocate (target_task_pi->task_port, address, size);
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_protect */
-kern_return_t
-S_vm_protect (mach_port_t target_task, vm_address_t address,
-	      vm_size_t size, boolean_t set_maximum,
-	      vm_prot_t new_protection)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("request is from task %d", target_task_pi->task_port);
-  err = vm_protect (target_task_pi->task_port, address,
-		    size, set_maximum, new_protection);
-  debug ("vm_protect: %s", strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_inherit */
-kern_return_t
-S_vm_inherit (mach_port_t target_task, vm_address_t address,
-	      vm_size_t size, vm_inherit_t new_inheritance)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  debug ("");
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = vm_inherit (target_task_pi->task_port, address,
-		    size, new_inheritance);
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_read */
-kern_return_t
-S_vm_read (mach_port_t target_task, vm_address_t address,
-	   vm_size_t size, vm_offset_t *data,
-	   mach_msg_type_number_t *dataCnt)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  debug ("get a request from task %d", target_task_pi->task_port);
-  err = vm_read (target_task_pi->task_port, address, size, data, dataCnt);
-  ports_port_deref (target_task_pi);
-  /* The deallocation bit is set.*/
-  return err;
-}
-
-/* Routine vm_write */
-kern_return_t
-S_vm_write (mach_port_t target_task, vm_address_t address,
-	    vm_offset_t data, mach_msg_type_number_t dataCnt)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("get a request from task %d", target_task_pi->task_port);
-  err = vm_write (target_task_pi->task_port, address, data, dataCnt);
-  ports_port_deref (target_task_pi);
-  /* the proxy get the mapped pages from the client,
-   * deallocate it here. */
-  vm_deallocate (mach_task_self (), data, dataCnt);
-  return err;
-}
-
-/* Routine vm_copy */
-kern_return_t
-S_vm_copy (mach_port_t target_task, vm_address_t source_address,
-	   vm_size_t size, vm_address_t dest_address)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  debug ("");
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  err = vm_copy (target_task_pi->task_port, source_address,
-		 size, dest_address);
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_region */
-kern_return_t
-S_vm_region (mach_port_t target_task, vm_address_t *address,
-	     vm_size_t *size, vm_prot_t *protection,
-	     vm_prot_t *max_protection, vm_inherit_t *inheritance,
-	     boolean_t *is_shared, mach_port_t *object_name,
-	     vm_offset_t *offset)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  debug ("get a request from task %d", target_task_pi->task_port);
-  err = vm_region (target_task_pi->task_port, address, size, protection,
-		   max_protection, inheritance, is_shared, object_name, offset);
-  debug ("vm_region: %s, object: %d", strerror (err), *object_name);
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_statistics */
-kern_return_t
-S_vm_statistics (mach_port_t target_task, vm_statistics_data_t *vm_stats)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  debug ("request is from task %d", target_task_pi->task_port);
-  err = vm_statistics (target_task_pi->task_port, vm_stats);
-  ports_port_deref (target_task_pi);
-  debug ("vm_statistics: %s", strerror (err));
-  return err;
-}
-
-/* Routine mach_ports_register */
-kern_return_t
-S_mach_ports_register (mach_port_t target_task,
-		       mach_port_array_t init_port_set,
-		       mach_msg_type_number_t init_port_setCnt)
-{
-  debug ("");
-  assert (0);
-  // not used by Hurd
-  return EOPNOTSUPP;
-}
-
-/* Routine mach_ports_lookup */
-kern_return_t
-S_mach_ports_lookup (mach_port_t target_task,
-		     mach_port_array_t *init_port_set,
-		     mach_msg_type_number_t *init_port_setCnt)
-{
-  debug ("");
-  assert (0);
-  // not used by Hurd
-  return EOPNOTSUPP;
-}
-
-/* Routine vm_set_default_memory_manager */
-kern_return_t
-S_vm_set_default_memory_manager (mach_port_t host_priv,
-				 mach_port_t *default_manager)
-{
-  extern mach_port_t defpager;
-  debug ("");
-  *default_manager = defpager;
-  return 0;
-}
-
-
-/* Routine xxx_task_info */
-kern_return_t
-S_xxx_task_info (mach_port_t target_task, int flavor,
-		 task_info_t task_info_out,
-		 mach_msg_type_number_t *task_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_host_info */
-kern_return_t
-S_xxx_host_info (mach_port_t target_task, machine_info_data_t *info)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_slot_info */
-kern_return_t
-S_xxx_slot_info (mach_port_t target_task, int slot, machine_slot_data_t *info)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_cpu_control */
-kern_return_t
-S_xxx_cpu_control (mach_port_t target_task, int cpu, boolean_t running)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine task_suspend */
-kern_return_t
-S_task_suspend (mach_port_t target_task)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("get request from task %d", target_task_pi->task_port);
-  err = task_suspend (target_task_pi->task_port);
-  debug ("task_suspend: %s", strerror (err));
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine task_resume */
-kern_return_t
-S_task_resume (mach_port_t target_task)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  debug ("get request from task %d", target_task_pi->task_port);
-  err = task_resume (target_task_pi->task_port);
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine task_get_special_port */
-kern_return_t
-S_task_get_special_port (mach_port_t target_task, int which_port,
-			 mach_port_t *special_port,
-			 mach_msg_type_name_t *special_portPoly)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  debug ("request is from task %d", target_task_pi->task_port);
-  err = task_get_special_port (target_task_pi->task_port,
-			       which_port, special_port);
-  debug ("task_get_special_port (%d, %d): %s\n",
-	 which_port, *special_port, strerror (err));
-  ports_port_deref (target_task_pi);
-  if (err)
-    return err;
-  *special_portPoly = MACH_MSG_TYPE_MOVE_SEND;
-  return err;
-}
-
-/* Routine task_set_special_port */
-kern_return_t
-S_task_set_special_port (mach_port_t target_task, int which_port,
-			 mach_port_t special_port)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  debug ("get request from task %d", target_task_pi->task_port);
-  err = task_set_special_port (target_task_pi->task_port, which_port,
-			       special_port);
-  ports_port_deref (target_task_pi);
-  debug ("task_set_special_port (%d, %d): %s",
-	 which_port, special_port, strerror (err));
-  mach_port_deallocate (mach_task_self (), special_port);
-  return err;
-}
-
-/* Routine task_ras_control */
-kern_return_t
-S_task_ras_control (mach_port_t target_task, vm_address_t basepc,
-		    vm_address_t boundspc, int flavor)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  debug ("");
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = task_ras_control (target_task_pi->task_port, basepc, boundspc, flavor);
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine vm_map */
-kern_return_t
-S_vm_map (mach_port_t target_task, vm_address_t *address, vm_size_t size,
-	  vm_address_t mask, boolean_t anywhere, mach_port_t memory_object,
-	  vm_offset_t offset, boolean_t copy, vm_prot_t cur_protection,
-	  vm_prot_t max_protection, vm_inherit_t inheritance)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("request is from task %d", target_task_pi->task_port);
-  err = vm_map (target_task_pi->task_port, address, size, mask,
-		anywhere, memory_object, offset, copy,
-		cur_protection, max_protection, inheritance);
-  ports_port_deref (target_task_pi);
-  debug ("vm_map: %s", strerror (err));
-  mach_port_deallocate (mach_task_self (), memory_object);
-  return err;
-}
-
-/* Routine vm_machine_attribute */
-kern_return_t
-S_vm_machine_attribute (mach_port_t target_task, vm_address_t address,
-			vm_size_t size, vm_machine_attribute_t attribute,
-			vm_machine_attribute_val_t *value)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  debug ("");
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  err = vm_machine_attribute (target_task_pi->task_port, address,
-			      size, attribute, value);
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine task_threads */
-kern_return_t
-S_task_threads (mach_port_t target_task, thread_array_t *thread_list,
-		mach_msg_type_number_t *thread_listCnt)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      target_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-
-  debug ("get a request from task %d", target_task_pi->task_port);
-  // TODO: use move send
-  err = task_threads (target_task_pi->task_port,
-		      thread_list, thread_listCnt);
-  info ("task_threads: %s, number of threads: %d",
-	 strerror (err), *thread_listCnt);
-  ports_port_deref (target_task_pi);
-  return err;
-}
-
-/* Routine thread_create */
-kern_return_t
-S_thread_create (mach_port_t parent_task, mach_port_t *child_thread,
-		 mach_msg_type_name_t *child_threadPoly)
-{
-  struct task_info *target_task_pi;
-  error_t err;
-
-  target_task_pi = ports_lookup_port (port_bucket,
-				      parent_task, task_portclass);
-  if (target_task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("get a request from task %d", target_task_pi->task_port);
-  err = thread_create (target_task_pi->task_port, child_thread);
-  debug ("thread_create: thread port: %d: %s",
-	 *child_thread, strerror (err));
-  ports_port_deref (target_task_pi);
-  *child_threadPoly = MACH_MSG_TYPE_MOVE_SEND;
-  return err;
-}
-
-////////////////////it doesn't forward thread request////////////////
-
-/* Routine thread_suspend */
-kern_return_t
-S_thread_suspend (mach_port_t target_thread)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_resume */
-kern_return_t
-S_thread_resume (mach_port_t target_thread)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_abort */
-kern_return_t
-S_thread_abort (mach_port_t target_thread)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_thread_get_state */
-kern_return_t
-S_xxx_thread_get_state (mach_port_t target_thread, int flavor,
-			thread_state_t old_state,
-			mach_msg_type_number_t *old_stateCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_thread_set_state */
-kern_return_t
-S_xxx_thread_set_state (mach_port_t target_thread, int flavor,
-			thread_state_t new_state,
-			mach_msg_type_number_t new_stateCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_thread_info */
-kern_return_t
-S_xxx_thread_info (mach_port_t target_thread, int flavor,
-		   thread_info_t thread_info_out,
-		   mach_msg_type_number_t *thread_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_get_special_port */
-kern_return_t
-S_thread_get_special_port (mach_port_t thread, int which_port,
-			   mach_port_t *special_port)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_set_special_port */
-kern_return_t
-S_thread_set_special_port (mach_port_t thread, int which_port,
-			   mach_port_t special_port)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_terminate */
-kern_return_t
-S_thread_terminate (mach_port_t target_thread)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_get_state */
-kern_return_t
-S_thread_get_state (mach_port_t target_thread, int flavor,
-		    thread_state_t old_state,
-		    mach_msg_type_number_t *old_stateCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_set_state */
-kern_return_t
-S_thread_set_state (mach_port_t target_thread, int flavor,
-		    thread_state_t new_state,
-		    mach_msg_type_number_t new_stateCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine thread_info */
-kern_return_t
-S_thread_info (mach_port_t target_thread, int flavor,
-	       thread_info_t thread_info_out,
-	       mach_msg_type_number_t *thread_info_outCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/////////////////////RPC related to memory object////////////////////
-//////////////////they are not needed to be forwarded////////////////
-
-/* SimpleRoutine memory_object_data_provided */
-kern_return_t
-S_memory_object_data_provided (mach_port_t memory_control,
-			       vm_offset_t offset, vm_offset_t data,
-			       mach_msg_type_number_t dataCnt,
-			       vm_prot_t lock_value)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_data_unavailable */
-kern_return_t
-S_memory_object_data_unavailable (mach_port_t memory_control,
-				  vm_offset_t offset, vm_size_t size)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine memory_object_get_attributes */
-kern_return_t
-S_memory_object_get_attributes (mach_port_t memory_control,
-				boolean_t *object_ready, boolean_t *may_cache,
-				memory_object_copy_strategy_t *copy_strategy)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine xxx_memory_object_lock_request */
-kern_return_t
-S_xxx_memory_object_lock_request (mach_port_t memory_control,
-				  vm_offset_t offset, vm_size_t size,
-				  boolean_t should_clean,
-				  boolean_t should_flush,
-				  vm_prot_t lock_value,
-				  mach_port_t reply_to,
-				  mach_msg_type_name_t reply_toPoly)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_lock_request */
-kern_return_t
-S_memory_object_lock_request ( mach_port_t memory_control,
-			      vm_offset_t offset, vm_size_t size,
-			      memory_object_return_t should_return,
-			      boolean_t should_flush,
-			      vm_prot_t lock_value, mach_port_t reply_to,
-			      mach_msg_type_name_t reply_toPoly)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_data_error */
-kern_return_t
-S_memory_object_data_error (mach_port_t memory_control,
-			    vm_offset_t offset, vm_size_t size,
-			    kern_return_t error_value)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_set_attributes */
-kern_return_t
-S_memory_object_set_attributes (mach_port_t memory_control,
-				boolean_t object_ready, boolean_t may_cache,
-				memory_object_copy_strategy_t copy_strategy)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_destroy */
-kern_return_t
-S_memory_object_destroy (mach_port_t memory_control, kern_return_t reason)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_data_supply */
-kern_return_t
-S_memory_object_data_supply (mach_port_t memory_control,
-			     vm_offset_t offset, vm_offset_t data,
-			     mach_msg_type_number_t dataCnt,
-			     vm_prot_t lock_value, boolean_t precious,
-			     mach_port_t reply_to,
-			     mach_msg_type_name_t reply_toPoly)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_ready */
-kern_return_t
-S_memory_object_ready (mach_port_t memory_control, boolean_t may_cache,
-		       memory_object_copy_strategy_t copy_strategy)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* SimpleRoutine memory_object_change_attributes */
-kern_return_t
-S_memory_object_change_attributes (mach_port_t memory_control,
-				   boolean_t may_cache,
-				   memory_object_copy_strategy_t copy_strategy,
-				   mach_port_t reply_to,
-				   mach_msg_type_name_t reply_toPoly)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-///////////////////////RPCs related to emulation/////////////////////
-//////////////////////subhurd doesn't support it.////////////////////
-
-/* Routine task_get_emulation_vector */
-kern_return_t
-S_task_get_emulation_vector (mach_port_t task, int *vector_start,
-			     emulation_vector_t *emulation_vector,
-			     mach_msg_type_number_t *emulation_vectorCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine task_set_emulation_vector */
-kern_return_t
-S_task_set_emulation_vector (mach_port_t task, int vector_start,
-			     emulation_vector_t emulation_vector,
-			     mach_msg_type_number_t emulation_vectorCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_task_get_emulation_vector */
-kern_return_t
-S_xxx_task_get_emulation_vector (mach_port_t task, int *vector_start,
-				 emulation_vector_t emulation_vector,
-				 mach_msg_type_number_t *emulation_vectorCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine xxx_task_set_emulation_vector */
-kern_return_t
-S_xxx_task_set_emulation_vector (mach_port_t task, int vector_start,
-				 emulation_vector_t emulation_vector,
-				 mach_msg_type_number_t emulation_vectorCnt)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
-
-/* Routine task_set_emulation */
-kern_return_t
-S_task_set_emulation (mach_port_t target_port,
-		      vm_address_t routine_entry_pt, int routine_number)
-{
-  debug ("");
-  assert (0);
-  return EOPNOTSUPP;
-}
diff --git a/boot.backup1/mach_port_impl.c~ b/boot.backup1/mach_port_impl.c~
deleted file mode 100644
index 2933950e..00000000
--- a/boot.backup1/mach_port_impl.c~
+++ /dev/null
@@ -1,378 +0,0 @@
-/* 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/* This file implements the server-side RPC functions of mach_host. */
-
-#include <mach.h>
-#include <hurd.h>
-#include <string.h>
-#include <assert.h>
-
-#include "util.h"
-#include "mach_proxy.h"
-
-kern_return_t
-S_mach_port_names (mach_port_t task, mach_port_array_t *names,
-		   mach_msg_type_number_t *namesCnt,
-		   mach_port_type_array_t *types,
-		   mach_msg_type_number_t *typesCnt)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  debug ("");
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_names (task_pi->task_port,
-			 names, namesCnt, types, typesCnt);
-  /* The deallocation bit is set,
-   * so 'names' and 'types' will be deallocated after the reply is sent. */
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_type */
-kern_return_t
-S_mach_port_type (mach_port_t task, mach_port_t name, mach_port_type_t *ptype)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  debug ("");
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_type (task_pi->task_port, name, ptype);
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_rename */
-kern_return_t
-S_mach_port_rename (mach_port_t task,
-		    mach_port_t old_name, mach_port_t new_name)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  debug ("");
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  /* old_name and new_name are just names,
-   * so I don't need to deallocate them.
-   * It should be the same for other RPCs that only deal with port names */
-  err = mach_port_rename (task_pi->task_port, old_name, new_name);
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_allocate_name */
-kern_return_t
-S_mach_port_allocate_name (mach_port_t task,
-			   mach_port_right_t right, mach_port_t name)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  debug ("");
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_allocate_name (task_pi->task_port, right, name);
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_allocate */
-kern_return_t
-S_mach_port_allocate (mach_port_t task,
-		      mach_port_right_t right, mach_port_t *name)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("get a request from task %d", task_pi->task_port);
-  print_port_type (task_pi->task_port);
-  err = mach_port_allocate (task_pi->task_port, right, name);
-  debug ("mach_port_allocate: %s", strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_destroy */
-kern_return_t
-S_mach_port_destroy (mach_port_t task, mach_port_t name)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("get a request from port %d", task_pi->task_port);
-  err = mach_port_destroy (task_pi->task_port, name);
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_deallocate */
-kern_return_t
-S_mach_port_deallocate (mach_port_t task, mach_port_t name)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("get a request from task %d", task_pi->task_port);
-  err = mach_port_deallocate (task_pi->task_port, name);
-  debug ("mach_port_deallocate port: %d: %s", name, strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_get_refs */
-kern_return_t
-S_mach_port_get_refs (mach_port_t task, mach_port_t name,
-		      mach_port_right_t right, mach_port_urefs_t *refs)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  debug ("");
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_get_refs (task_pi->task_port, name, right, refs);
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_mod_refs */
-kern_return_t
-S_mach_port_mod_refs (mach_port_t task, mach_port_t name,
-		      mach_port_right_t right, mach_port_delta_t delta)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("get a request from task %d", task_pi->task_port);
-  err = mach_port_mod_refs (task_pi->task_port, name, right, delta);
-  debug ("mach_port_mod_refs: %s, port: %d, delta: %d",
-	 strerror (err), right, delta);
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine old_mach_port_get_receive_status */
-kern_return_t
-S_old_mach_port_get_receive_status (mach_port_t task, mach_port_t name,
-				    old_mach_port_status_t *status)
-{
-  debug ("");
-  assert (0);
-  /* Hurd currently doesn't use it. */
-  return EOPNOTSUPP;
-}
-
-/* Routine mach_port_set_qlimit */
-kern_return_t
-S_mach_port_set_qlimit (mach_port_t task, mach_port_t name,
-			mach_port_msgcount_t qlimit)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  debug ("");
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_set_qlimit (task_pi->task_port, name, qlimit);
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_set_mscount */
-kern_return_t
-S_mach_port_set_mscount (mach_port_t task, mach_port_t name,
-			 mach_port_mscount_t mscount)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  debug ("");
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_set_mscount (task_pi->task_port, name, mscount);
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_get_set_status */
-kern_return_t
-S_mach_port_get_set_status (mach_port_t task, mach_port_t name,
-			    mach_port_array_t *members,
-			    mach_msg_type_number_t *membersCnt)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  debug ("");
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_get_set_status (task_pi->task_port,
-				  name, members, membersCnt);
-  ports_port_deref (task_pi);
-  /* The deallocation bit is set,
-   * so 'members' will be deallocated after the reply is sent. */
-  return err;
-}
-
-/* Routine mach_port_move_member */
-kern_return_t
-S_mach_port_move_member (mach_port_t task, mach_port_t member,
-			 mach_port_t after)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  debug ("");
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_move_member (task_pi->task_port, member, after);
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_request_notification */
-kern_return_t
-S_mach_port_request_notification (mach_port_t task, mach_port_t name,
-				  mach_msg_id_t id, mach_port_mscount_t sync,
-				  mach_port_t notify, mach_port_t *previous,
-				  mach_msg_type_name_t *previousPoly)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("get a request from task %d", task_pi->task_port);
-  /* notify is send-once right from the client. */
-  err = mach_port_request_notification (task_pi->task_port, name, id, sync,
-					notify, MACH_MSG_TYPE_MOVE_SEND_ONCE,
-					previous);
-  debug ("mach_port_request_notification, id: %d, old port: %d, %s",
-	 id, *previous, strerror (err));
-  ports_port_deref (task_pi);
-  if (err)
-    return err;
-  *previousPoly = MACH_MSG_TYPE_MOVE_SEND_ONCE;
-  return 0;
-}
-
-/* Routine mach_port_insert_right */
-kern_return_t
-S_mach_port_insert_right (mach_port_t task, mach_port_t name,
-			  mach_port_t poly, mach_msg_type_name_t polyPoly)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  debug ("get a request from task %d", task_pi->task_port);
-  /* polyPoly can only be three possible values: MACH_MSG_TYPE_PORT_SEND,
-   * MACH_MSG_TYPE_PORT_SEND_ONCE and MACH_MSG_TYPE_PORT_RECEIVE,
-   * so port will be deallocated when mach_port_insert_right is called. */
-  err = mach_port_insert_right (task_pi->task_port, name, poly, polyPoly);
-  debug ("mach_port_insert_right: %s", strerror (err));
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_extract_right */
-kern_return_t
-S_mach_port_extract_right (mach_port_t task, mach_port_t name,
-			   mach_msg_type_name_t msgt_name, mach_port_t *poly,
-			   mach_msg_type_name_t *polyPoly)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  debug ("");
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_extract_right (task_pi->task_port, name, msgt_name,
-				 poly, polyPoly);
-  ports_port_deref (task_pi);
-  /* *polyPoly can only be MACH_MSG_TYPE_PORT_SEND, MACH_MSG_TYPE_PORT_RECEIVE,
-   * or MACH_MSG_TYPE_PORT_SEND_ONCE, so the port extracted from 'task' 
-   * will be moved to the client. */
-  return err;
-}
-
-/* Routine mach_port_get_receive_status */
-kern_return_t
-S_mach_port_get_receive_status (mach_port_t task, mach_port_t name,
-				mach_port_status_t *status)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  debug ("");
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_get_receive_status (task_pi->task_port, name, status);
-  ports_port_deref (task_pi);
-  return err;
-}
-
-/* Routine mach_port_set_seqno */
-kern_return_t
-S_mach_port_set_seqno (mach_port_t task, mach_port_t name,
-		       mach_port_seqno_t seqno)
-{
-  struct task_info *task_pi;
-  error_t err;
-
-  debug ("");
-  task_pi = ports_lookup_port (port_bucket, task, task_portclass);
-  if (task_pi == NULL)
-    return EOPNOTSUPP;
-  err = mach_port_set_seqno (task_pi->task_port, name, seqno);
-  ports_port_deref (task_pi);
-  return err;
-}
diff --git a/boot.backup1/mach_proxy.c~ b/boot.backup1/mach_proxy.c~
deleted file mode 100644
index 54c84edd..00000000
--- a/boot.backup1/mach_proxy.c~
+++ /dev/null
@@ -1,68 +0,0 @@
-/* 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#include <string.h>
-
-#include "util.h"
-#include "mach_proxy.h"
-
-LIST_HEADER (tasks_head);
-
-int create_pseudo_task (task_t real_task, task_t *ret_pseudo_task)
-{
-  /* the first task is the kernel task. */
-  struct task_info *task_pi;
-  task_t pseudo_task;
-  error_t err;
-
-  err = ports_create_port (task_portclass, port_bucket,
-			   sizeof (struct task_info), &task_pi);
-  if (err)
-    return err;
-
-  pseudo_task = ports_get_right (task_pi);
-  mach_port_insert_right (mach_task_self (), pseudo_task, pseudo_task,
-			  MACH_MSG_TYPE_MAKE_SEND);
-  ports_port_deref (task_pi);
-
-  task_pi->task_port = real_task;
-  entry_init (&task_pi->list);
-  add_entry_end (&tasks_head, &task_pi->list);
-  /* 0 is used by kernel task */
-  if (ret_pseudo_task)
-    *ret_pseudo_task = pseudo_task;
-
-  err = task_set_kernel_port (real_task, pseudo_task);
-  if (err) 
-    {
-      debug ("fail to set the kernel port: %s", strerror (err));
-      // TODO: I hope I destroy it in the right way.
-      ports_destroy_right (task_pi);
-    }
-
-  return err;
-}
-
-void clean_pseudo_task (void *pi)
-{
-  struct task_info *task = pi;
-  debug ("remove a pseudo task from the list");
-  remove_entry (&task->list);
-}
diff --git a/boot.backup1/mach_proxy.h~ b/boot.backup1/mach_proxy.h~
deleted file mode 100644
index 28778402..00000000
--- a/boot.backup1/mach_proxy.h~
+++ /dev/null
@@ -1,54 +0,0 @@
-/* 
-   Copyright (C) 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef PROXY_H
-#define PROXY_H
-
-#include <mach.h>
-#include <hurd.h>
-#include <hurd/ports.h>
-
-#include "list.h"
-
-struct task_info
-{
-  struct port_info task;
-  task_t task_port;
-  /* The linked list is used to keep the order of tasks */
-  struct list list;
-};
-
-struct thread_info
-{
-  struct port_info thread;
-  thread_t thread_port;
-};
-
-extern struct port_bucket *port_bucket;
-extern struct port_class *task_portclass;
-extern struct port_class *thread_portclass;
-extern struct list task_list;
-
-int create_pseudo_task (task_t real_task, task_t *ret_pseudo_task);
-void clean_pseudo_task (void *pi);
-
-#define UNTESTED
-
-#endif
diff --git a/boot.backup1/ourmach.defs~ b/boot.backup1/ourmach.defs~
deleted file mode 100644
index 5265269f..00000000
--- a/boot.backup1/ourmach.defs~
+++ /dev/null
@@ -1,770 +0,0 @@
-/*
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University.
- * Copyright (c) 1993,1994 The University of Utah and
- * the Computer Systems Laboratory (CSL).
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON, THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF
- * THIS SOFTWARE IN ITS "AS IS" CONDITION, AND DISCLAIM ANY LIABILITY
- * OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF
- * THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- *	Matchmaker definitions file for Mach kernel interface.
- */
-
-#ifdef	MACH_KERNEL
-simport <kern/compat_xxx_defs.h>;	/* for obsolete routines */
-#endif	/* MACH_KERNEL */
-
-subsystem
-#if	KERNEL_USER
-	  KernelUser
-#endif	/* KERNEL_USER */
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-		       mach 2000;
-
-serverprefix S_;
-
-#ifdef	KERNEL_USER
-userprefix r_;
-#endif	/* KERNEL_USER */
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-skip;	/* old port_allocate */
-skip;	/* old port_deallocate */
-skip;	/* old port_enable */
-skip;	/* old port_disable */
-skip;	/* old port_select */
-skip;	/* old port_set_backlog */
-skip;	/* old port_status */
-
-/*
- *	Create a new task with an empty set of IPC rights,
- *	and having an address space constructed from the
- *	target task (or empty, if inherit_memory is FALSE).
- */
-routine task_create(
-		target_task	: task_t;
-		inherit_memory	: boolean_t;
-	out	child_task	: mach_port_send_t);
-
-/*
- *	Destroy the target task, causing all of its threads
- *	to be destroyed, all of its IPC rights to be deallocated,
- *	and all of its address space to be deallocated.
- */
-routine task_terminate(
-		target_task	: task_t);
-
-/*
- *	Get user-level handler entry points for all
- *	emulated system calls.
- */
-routine task_get_emulation_vector(
-		task		: task_t;
-	out	vector_start	: int;
-	out	emulation_vector: emulation_vector_t);
-
-/*
- *	Establish user-level handlers for the specified
- *	system calls. Non-emulated system calls are specified
- *	with emulation_vector[i] == EML_ROUTINE_NULL.
- */
-routine task_set_emulation_vector(
-		task		: task_t;
-		vector_start	: int;
-		emulation_vector: emulation_vector_t);
-
-/*
- *	Returns the set of threads belonging to the target task.
- */
-routine task_threads(
-		target_task	: task_t;
-	out	thread_list	: thread_array_t = 
-					array[] of mach_port_move_send_t,
-					dealloc);
-
-/*
- *	Returns information about the target task.
- */
-routine	task_info(
-		target_task	: task_t;
-		flavor		: int;
-	out	task_info_out	: task_info_t, CountInOut);
-
-
-skip;	/* old task_status */
-skip;	/* old task_set_notify */
-skip;	/* old thread_create */
-
-/*
- *	Destroy the target thread.
- */
-routine thread_terminate(
-		target_thread	: thread_t);
-
-/*
- *	Return the selected state information for the target
- *	thread.  If the thread is currently executing, the results
- *	may be stale.  [Flavor THREAD_STATE_FLAVOR_LIST provides a
- *	list of valid flavors for the target thread.]
- */
-routine thread_get_state(
-		target_thread	: thread_t;
-		flavor		: int;
-	out	old_state	: thread_state_t, CountInOut);
-
-/*
- *	Set the selected state information for the target thread.
- *	If the thread is currently executing, the state change
- *	may be ill-defined.
- */
-routine	thread_set_state(
-		target_thread	: thread_t;
-		flavor		: int;
-		new_state	: thread_state_t);
-
-/*
- *	Returns information about the target thread.
- */
-routine	thread_info(
-		target_thread	: thread_t;
-		flavor		: int;
-	out	thread_info_out	: thread_info_t, CountInOut);
-
-skip;	/* old thread_mutate */
-
-/*
- *	Allocate zero-filled memory in the address space
- *	of the target task, either at the specified address,
- *	or wherever space can be found (if anywhere is TRUE),
- *	of the specified size.  The address at which the
- *	allocation actually took place is returned.
- */
-#ifdef	EMULATOR
-skip;	/* the emulator redefines vm_allocate using vm_map */
-#else	/* EMULATOR */
-routine vm_allocate(
-		target_task	: vm_task_t;
-	inout	address		: vm_address_t;
-		size		: vm_size_t;
-		anywhere	: boolean_t);
-#endif	/* EMULATOR */
-
-skip;	/* old vm_allocate_with_pager */
-
-/*
- *	Deallocate the specified range from the virtual
- *	address space of the target task.
- */
-routine vm_deallocate(
-		target_task	: vm_task_t;
-		address		: vm_address_t;
-		size		: vm_size_t);
-
-/*
- *	Set the current or maximum protection attribute
- *	for the specified range of the virtual address
- *	space of the target task.  The current protection
- *	limits the memory access rights of threads within
- *	the task; the maximum protection limits the accesses
- *	that may be given in the current protection.
- *	Protections are specified as a set of {read, write, execute}
- *	*permissions*.
- */
-routine vm_protect(
-		target_task	: vm_task_t;
-		address		: vm_address_t;
-		size		: vm_size_t;
-		set_maximum	: boolean_t;
-		new_protection	: vm_prot_t);
-
-/*
- *	Set the inheritance attribute for the specified range
- *	of the virtual address space of the target task.
- *	The inheritance value is one of {none, copy, share}, and
- *	specifies how the child address space should acquire
- *	this memory at the time of a task_create call.
- */
-routine vm_inherit(
-		target_task	: vm_task_t;
-		address		: vm_address_t;
-		size		: vm_size_t;
-		new_inheritance	: vm_inherit_t);
-
-/*
- *	Returns the contents of the specified range of the
- *	virtual address space of the target task.  [The
- *	range must be aligned on a virtual page boundary,
- *	and must be a multiple of pages in extent.  The
- *	protection on the specified range must permit reading.]
- */
-routine vm_read(
-		target_task	: vm_task_t;
-		address		: vm_address_t;
-		size		: vm_size_t;
-	out	data		: pointer_t, dealloc);
-
-/*
- *	Writes the contents of the specified range of the
- *	virtual address space of the target task.  [The
- *	range must be aligned on a virtual page boundary,
- *	and must be a multiple of pages in extent.  The
- *	protection on the specified range must permit writing.]
- */
-routine vm_write(
-		target_task	: vm_task_t;
-		address		: vm_address_t;
-		data		: pointer_t);
-
-/*
- *	Copy the contents of the source range of the virtual
- *	address space of the target task to the destination
- *	range in that same address space.  [Both of the
- *	ranges must be aligned on a virtual page boundary,
- *	and must be multiples of pages in extent.  The
- *	protection on the source range must permit reading,
- *	and the protection on the destination range must
- *	permit writing.]
- */
-routine vm_copy(
-		target_task	: vm_task_t;
-		source_address	: vm_address_t;
-		size		: vm_size_t;
-		dest_address	: vm_address_t);
-
-/*
- *	Returns information about the contents of the virtual
- *	address space of the target task at the specified
- *	address.  The returned protection, inheritance, sharing
- *	and memory object values apply to the entire range described
- *	by the address range returned; the memory object offset
- *	corresponds to the beginning of the address range.
- *	[If the specified address is not allocated, the next
- *	highest address range is described.  If no addresses beyond
- *	the one specified are allocated, the call returns KERN_NO_SPACE.]
- */
-routine vm_region(
-		target_task	: vm_task_t;
-	inout	address		: vm_address_t;
-	out	size		: vm_size_t;
-	out	protection	: vm_prot_t;
-	out	max_protection	: vm_prot_t;
-	out	inheritance	: vm_inherit_t;
-	out	is_shared	: boolean_t;
-	/* avoid out-translation of the argument */
-	out	object_name	: memory_object_name_t =
-					MACH_MSG_TYPE_COPY_SEND
-					ctype: mach_port_t;
-	out	offset		: vm_offset_t);
-
-/*
- *	Return virtual memory statistics for the host
- *	on which the target task resides.  [Note that the
- *	statistics are not specific to the target task.]
- */
-routine vm_statistics(
-		target_task	: vm_task_t;
-	out	vm_stats	: vm_statistics_data_t);
-
-skip;	/* old task_by_u*x_pid */
-skip;	/* old vm_pageable */
-
-/*
- *	Stash a handful of ports for the target task; child
- *	tasks inherit this stash at task_create time.
- */
-routine	mach_ports_register(
-		target_task	: task_t;
-		init_port_set	: mach_port_array_t =
-					^array[] of mach_port_t);
-
-/*
- *	Retrieve the stashed ports for the target task.
- */
-routine	mach_ports_lookup(
-		target_task	: task_t;
-	out	init_port_set	: mach_port_array_t =
-					^array[] of mach_port_t);
-
-skip;	/* old u*x_pid */
-skip;	/* old netipc_listen */
-skip;	/* old netipc_ignore */
-
-/*
- *	Provide the data contents of a range of the given memory
- *	object, with the access restriction specified.  [Only
- *	whole virtual pages of data can be accepted; partial pages
- *	will be discarded.  Data should be provided on request, but
- *	may be provided in advance as desired.  When data already
- *	held by this kernel is provided again, the new data is ignored.
- *	The access restriction is the subset of {read, write, execute}
- *	which are prohibited.  The kernel may not provide any data (or
- *	protection) consistency among pages with different virtual page
- *	alignments within the same object.]
- */
-simpleroutine memory_object_data_provided(
-		memory_control	: memory_object_control_t;
-		offset		: vm_offset_t;
-		data		: pointer_t;
-		lock_value	: vm_prot_t);
-
-/*
- *	Indicate that a range of the given temporary memory object does
- *	not exist, and that the backing memory object should be used
- *	instead (or zero-fill memory be used, if no backing object exists).
- *	[This call is intended for use only by the default memory manager.
- *	It should not be used to indicate a real error --
- *	memory_object_data_error should be used for that purpose.]
- */
-simpleroutine memory_object_data_unavailable(
-		memory_control	: memory_object_control_t;
-		offset		: vm_offset_t;
-		size		: vm_size_t);
-
-/*
- *	Retrieves the attributes currently associated with
- *	a memory object.
- */
-routine memory_object_get_attributes(
-		memory_control	: memory_object_control_t;
-	out	object_ready	: boolean_t;
-	out	may_cache	: boolean_t;
-	out	copy_strategy	: memory_object_copy_strategy_t);
-
-/*
- *	Sets the default memory manager, the port to which
- *	newly-created temporary memory objects are delivered.
- *	[See (memory_object_default)memory_object_create.]
- *	The old memory manager port is returned.
- */
-routine vm_set_default_memory_manager(
-		host_priv	: host_priv_t;
-	inout	default_manager	: mach_port_copy_send_t);
-
-skip;	/* old pager_flush_request */
-
-/*
- *	Control use of the data associated with the given
- *	memory object.  For each page in the given range,
- *	perform the following operations, in order:
- *		1)  restrict access to the page (disallow
- *		    forms specified by "prot");
- *		2)  write back modifications (if "should_return"
- *		    is RETURN_DIRTY and the page is dirty, or
- *		    "should_return" is RETURN_ALL and the page
- * 		    is either dirty or precious); and,
- *		3)  flush the cached copy (if "should_flush"
- *		    is asserted).
- *	The set of pages is defined by a starting offset
- *	("offset") and size ("size").  Only pages with the
- *	same page alignment as the starting offset are
- *	considered.
- *
- *	A single acknowledgement is sent (to the "reply_to"
- *	port) when these actions are complete.
- *
- *	There are two versions of this routine because IPC distinguishes
- *	between booleans and integers (a 2-valued integer is NOT a
- *	boolean).  The new routine is backwards compatible at the C
- *	language interface.
- */
-simpleroutine xxx_memory_object_lock_request(
-		memory_control	: memory_object_control_t;
-		offset		: vm_offset_t;
-		size		: vm_size_t;
-		should_clean	: boolean_t;
-		should_flush	: boolean_t;
-		lock_value	: vm_prot_t;
-		reply_to	: mach_port_t =
-			MACH_MSG_TYPE_MAKE_SEND_ONCE|polymorphic);
-
-
-simpleroutine memory_object_lock_request(
-		memory_control	: memory_object_control_t;
-		offset		: vm_offset_t;
-		size		: vm_size_t;
-		should_return	: memory_object_return_t;
-		should_flush	: boolean_t;
-		lock_value	: vm_prot_t;
-		reply_to	: mach_port_t =
-			MACH_MSG_TYPE_MAKE_SEND_ONCE|polymorphic);
-
-/* obsolete */
-routine xxx_task_get_emulation_vector(
-		task		: task_t;
-	out	vector_start	: int;
-	out	emulation_vector: xxx_emulation_vector_t, IsLong);
-
-/* obsolete */
-routine xxx_task_set_emulation_vector(
-		task		: task_t;
-		vector_start	: int;
-		emulation_vector: xxx_emulation_vector_t, IsLong);
-
-/*
- *	Returns information about the host on which the
- *	target object resides.  [This object may be
- *	a task, thread, or memory_object_control port.]
- */
-routine xxx_host_info(
-		target_task	: mach_port_t;
-	out	info		: machine_info_data_t);
-
-/*
- *	Returns information about a particular processor on
- *	the host on which the target task resides.
- */
-routine xxx_slot_info(
-		target_task	: task_t;
-		slot		: int;
-	out	info		: machine_slot_data_t);
-
-/*
- *	Performs control operations (currently only
- *	turning off or on) on a particular processor on
- *	the host on which the target task resides.
- */
-routine xxx_cpu_control(
-		target_task	: task_t;
-		cpu		: int;
-		running		: boolean_t);
-
-skip;	/* old thread_statistics */
-skip;	/* old task_statistics */
-skip;	/* old netport_init */
-skip;	/* old netport_enter */
-skip;	/* old netport_remove */
-skip;	/* old thread_set_priority */
-
-/*
- *	Increment the suspend count for the target task.
- *	No threads within a task may run when the suspend
- *	count for that task is non-zero.
- */
-routine	task_suspend(
-		target_task	: task_t);
-
-/*
- *	Decrement the suspend count for the target task,
- *	if the count is currently non-zero.  If the resulting
- *	suspend	count is zero, then threads within the task
- *	that also have non-zero suspend counts may execute.
- */
-routine	task_resume(
-		target_task	: task_t);
-
-/*
- *	Returns the current value of the selected special port
- *	associated with the target task.
- */
-routine task_get_special_port(
-		task		: task_t;
-		which_port	: int;
-	out	special_port	: mach_port_send_t);
-
-/*
- *	Set one of the special ports associated with the
- *	target task.
- */
-routine task_set_special_port(
-		task		: task_t;
-		which_port	: int;
-		special_port	: mach_port_t);
-
-/* obsolete */
-routine	xxx_task_info(
-		target_task	: task_t;
-		flavor		: int;
-	out	task_info_out	: task_info_t, IsLong);
-
-
-/*
- *	Create a new thread within the target task, returning
- *	the port representing that new thread.  The
- *	initial execution state of the thread is undefined.
- */
-routine thread_create(
-		parent_task	: task_t;
-	out	child_thread	: mach_port_send_t);
-
-/*
- *	Increment the suspend count for the target thread.
- *	Once this call has completed, the thread will not
- *	execute any further user or meta- instructions.
- *	Once suspended, a thread may not execute again until
- *	its suspend count is zero, and the suspend count
- *	for its task is also zero.
- */
-routine	thread_suspend(
-		target_thread	: thread_t);
-
-/*
- *	Decrement the suspend count for the target thread,
- *	if that count is not already zero.
- */
-routine	thread_resume(
-		target_thread	: thread_t);
-
-/*
- *	Cause any user or meta- instructions currently being
- *	executed by the target thread to be aborted.  [Meta-
- *	instructions consist of the basic traps for IPC
- *	(e.g., msg_send, msg_receive) and self-identification
- *	(e.g., task_self, thread_self, thread_reply).  Calls
- *	described by MiG interfaces are not meta-instructions
- *	themselves.]
- */
-routine thread_abort(
-		target_thread	: thread_t);
-
-/* obsolete */
-routine xxx_thread_get_state(
-		target_thread	: thread_t;
-		flavor		: int;
-	out	old_state	: thread_state_t, IsLong);
-
-/* obsolete */
-routine	xxx_thread_set_state(
-		target_thread	: thread_t;
-		flavor		: int;
-		new_state	: thread_state_t, IsLong);
-
-/*
- *	Returns the current value of the selected special port
- *	associated with the target thread.
- */
-routine thread_get_special_port(
-		thread		: thread_t;
-		which_port	: int;
-	out	special_port	: mach_port_t);
-
-/*
- *	Set one of the special ports associated with the
- *	target thread.
- */
-routine thread_set_special_port(
-		thread		: thread_t;
-		which_port	: int;
-		special_port	: mach_port_t);
-
-/* obsolete */
-routine	xxx_thread_info(
-		target_thread	: thread_t;
-		flavor		: int;
-	out	thread_info_out	: thread_info_t, IsLong);
-
-/*
- *	Establish a user-level handler for the specified
- *	system call.
- */
-routine task_set_emulation(
-		target_port	: task_t;
-		routine_entry_pt: vm_address_t;
-		routine_number  : int);
-
-/*
- *      Establish restart pc for interrupted atomic sequences.
- *	This reuses the message number for the old task_get_io_port.
- *	See task_info.h for description of flavors.
- *
- */
-routine task_ras_control(
-		target_task     : task_t;
-		basepc          : vm_address_t;
-		boundspc        : vm_address_t;
-		flavor		: int);
-
-
-
-skip;	/* old host_ipc_statistics */
-skip;	/* old port_names */
-skip;	/* old port_type */
-skip;	/* old port_rename */
-skip;	/* old port_allocate */
-skip;	/* old port_deallocate */
-skip;	/* old port_set_backlog */
-skip;	/* old port_status */
-skip;	/* old port_set_allocate */
-skip;	/* old port_set_deallocate */
-skip;	/* old port_set_add */
-skip;	/* old port_set_remove */
-skip;	/* old port_set_status */
-skip;	/* old port_insert_send */
-skip;	/* old port_extract_send */
-skip;	/* old port_insert_receive */
-skip;	/* old port_extract_receive */
-
-/*
- *	Map a user-defined memory object into the virtual address
- *	space of the target task.  If desired (anywhere is TRUE),
- *	the kernel will find a suitable address range of the
- *	specified size; else, the specific address will be allocated.
- *
- *	The beginning address of the range will be aligned on a virtual
- *	page boundary, be at or beyond the address specified, and
- *	meet the mask requirements (bits turned on in the mask must not
- *	be turned on in the result); the size of the range, in bytes,
- *	will be rounded	up to an integral number of virtual pages.
- *
- *	The memory in the resulting range will be associated with the
- *	specified memory object, with the beginning of the memory range
- *	referring to the specified offset into the memory object.
- *
- *	The mapping will take the current and maximum protections and
- *	the inheritance attributes specified; see the vm_protect and
- *	vm_inherit calls for a description of these attributes.
- *
- *	If desired (copy is TRUE), the memory range will be filled
- *	with a copy of the data from the memory object; this copy will
- *	be private to this mapping in this target task.  Otherwise,
- *	the memory in this mapping will be shared with other mappings
- *	of the same memory object at the same offset (in this task or
- *	in other tasks).  [The Mach kernel only enforces shared memory
- *	consistency among mappings on one host with similar page alignments.
- *	The user-defined memory manager for this object is responsible
- *	for further consistency.]
- */
-#ifdef	EMULATOR
-routine htg_vm_map(
-		target_task	: vm_task_t;
-	ureplyport reply_port	: mach_port_make_send_once_t;
-	inout	address		: vm_address_t;
-		size		: vm_size_t;
-		mask		: vm_address_t;
-		anywhere	: boolean_t;
-		memory_object	: memory_object_t;
-		offset		: vm_offset_t;
-		copy		: boolean_t;
-		cur_protection	: vm_prot_t;
-		max_protection	: vm_prot_t;
-		inheritance	: vm_inherit_t);
-#else	/* EMULATOR */
-routine vm_map(
-		target_task	: vm_task_t;
-	inout	address		: vm_address_t;
-		size		: vm_size_t;
-		mask		: vm_address_t;
-		anywhere	: boolean_t;
-		memory_object	: memory_object_t;
-		offset		: vm_offset_t;
-		copy		: boolean_t;
-		cur_protection	: vm_prot_t;
-		max_protection	: vm_prot_t;
-		inheritance	: vm_inherit_t);
-#endif	/* EMULATOR */
-
-/*
- *	Indicate that a range of the specified memory object cannot
- *	be provided at this time.  [Threads waiting for memory pages
- *	specified by this call will experience a memory exception.
- *	Only threads waiting at the time of the call are affected.]
- */
-simpleroutine memory_object_data_error(
-		memory_control	: memory_object_control_t;
-		offset		: vm_offset_t;
-		size		: vm_size_t;
-		error_value	: kern_return_t);
-
-/*
- *	Make decisions regarding the use of the specified
- *	memory object.
- */
-simpleroutine memory_object_set_attributes(
-		memory_control	: memory_object_control_t;
-		object_ready	: boolean_t;
-		may_cache	: boolean_t;
-		copy_strategy	: memory_object_copy_strategy_t);
-
-/*
- */
-simpleroutine memory_object_destroy(
-		memory_control	: memory_object_control_t;
-		reason		: kern_return_t);
-
-/*
- *	Provide the data contents of a range of the given memory
- *	object, with the access restriction specified, optional
- *	precious attribute, and reply message.  [Only
- *	whole virtual pages of data can be accepted; partial pages
- *	will be discarded.  Data should be provided on request, but
- *	may be provided in advance as desired.  When data already
- *	held by this kernel is provided again, the new data is ignored.
- *	The access restriction is the subset of {read, write, execute}
- *	which are prohibited.  The kernel may not provide any data (or
- *	protection) consistency among pages with different virtual page
- *	alignments within the same object.  The precious value controls
- *	how the kernel treats the data.  If it is FALSE, the kernel treats
- *	its copy as a temporary and may throw it away if it hasn't been
- *	changed.  If the precious value is TRUE, the kernel treats its
- *	copy as a data repository and promises to return it to the manager;
- *	the manager may tell the kernel to throw it away instead by flushing
- *	and not cleaning the data -- see memory_object_lock_request.  The
- *	reply_to port is for a compeletion message; it will be
- *	memory_object_supply_completed.]
- */
-
-simpleroutine memory_object_data_supply(
-		memory_control	: memory_object_control_t;
-		offset		: vm_offset_t;
-		data		: pointer_t, Dealloc[];
-		lock_value	: vm_prot_t;
-		precious	: boolean_t;
-		reply_to	: mach_port_t =
-			MACH_MSG_TYPE_MAKE_SEND_ONCE|polymorphic);
-
-simpleroutine memory_object_ready(
-		memory_control	: memory_object_control_t;
-		may_cache	: boolean_t;
-		copy_strategy	: memory_object_copy_strategy_t);
-
-simpleroutine memory_object_change_attributes(
-		memory_control	: memory_object_control_t;
-		may_cache	: boolean_t;
-		copy_strategy	: memory_object_copy_strategy_t;
-		reply_to	: mach_port_t =
-			MACH_MSG_TYPE_MAKE_SEND_ONCE|polymorphic);
-
-skip;	/* old host_callout_statistics_reset */
-skip;	/* old port_set_select */
-skip;	/* old port_set_backup */
-
-/*
- *	Set/Get special properties of memory associated
- *	to some virtual address range, such as cachability,
- *	migrability, replicability.  Machine-dependent.
- */
-routine vm_machine_attribute(
-		target_task	: vm_task_t;
-		address		: vm_address_t;
-		size		: vm_size_t;
-		attribute	: vm_machine_attribute_t;
-	inout	value		: vm_machine_attribute_val_t);
-
-skip;	/* old host_fpa_counters_reset */
-
-/*
- *	There is no more room in this interface for additional calls.
- */
diff --git a/boot.backup1/ourmach_host.defs~ b/boot.backup1/ourmach_host.defs~
deleted file mode 100644
index 0e7e367e..00000000
--- a/boot.backup1/ourmach_host.defs~
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University.
- * Copyright (c) 1993,1994 The University of Utah and
- * the Computer Systems Laboratory (CSL).
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON, THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF
- * THIS SOFTWARE IN ITS "AS IS" CONDITION, AND DISCLAIM ANY LIABILITY
- * OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF
- * THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- * File:	mach/mach_host.defs
- *
- * Abstract:
- *	Mach host operations support.  Includes processor allocation and
- *	control.  
- */
-
-#ifdef	MACH_KERNEL
-simport <kern/compat_xxx_defs.h>;	/* for obsolete routines */
-#endif
-
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif
-		       mach_host 2600;
-
-serverprefix S_;
-
-/*
- *	Basic types
- */
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-/*
- *	Get list of processors on this host.
- */
-
-routine host_processors(
-		host_priv	: host_priv_t;
-	out	processor_list	: processor_array_t);
-
-/* obsolete */
-routine yyy_host_info(
-		host		: host_t;
-		flavor		: int;
-	out	host_info_out	: host_info_t, IsLong);
-
-
-/* obsolete */
-routine yyy_processor_info(
-		processor	: processor_t;
-		flavor		: int;
-	out	host		: host_t;
-	out	processor_info_out: processor_info_t, IsLong);
-
-/*
- *	Start processor.
- */
-
-routine	processor_start(
-		processor	: processor_t);
-
-/*
- *	Exit processor -- may not be restartable.
- */
-
-routine	processor_exit(
-		processor	: processor_t);
-
-/* obsolete */
-routine yyy_processor_control(
-		processor	: processor_t;
-		processor_cmd	: processor_info_t, IsLong);
-
-/*
- *	Get default processor set for host.
- */
-routine processor_set_default(
-		host		: host_t;
-	out	default_set	: processor_set_name_t);
-
-/*
- *	Get rights to default processor set for host.
- *	Replaced by host_processor_set_priv.
- */
-routine xxx_processor_set_default_priv(
-		host		: host_priv_t;
-	out	default_set	: processor_set_t);
-
-/*
- *	Create new processor set.  Returns real port for manipulations,
- *	and name port for obtaining information.
- */
-routine processor_set_create(
-		host		: host_t;
-	out	new_set		: processor_set_t;
-	out	new_name	: processor_set_name_t);
-
-/*
- *	Destroy processor set.
- */
-routine processor_set_destroy(
-		set		: processor_set_t);
-
-/* obsolete */
-routine yyy_processor_set_info(
-		set_name	: processor_set_name_t;
-		flavor		: int;
-	out	host		: host_t;
-	out	info_out	: processor_set_info_t, IsLong);
-
-/*
- *	Assign processor to processor set.
- */
-routine processor_assign(
-		processor	: processor_t;
-		new_set		: processor_set_t;
-		wait		: boolean_t);
-
-/*
- *	Get current assignment for processor.
- */
-
-routine processor_get_assignment(
-		processor	: processor_t;
-	out	assigned_set	: processor_set_name_t);
-
-/*
- *	Assign thread to processor set.
- */
-routine	thread_assign(
-		thread		: thread_t;
-		new_set		: processor_set_t);
-
-/*
- *	Assign thread to default set.
- */
-routine thread_assign_default(
-		thread		: thread_t);
-
-/*
- *	Get current assignment for thread.
- */
-routine thread_get_assignment(
-		thread		: thread_t;
-	out	assigned_set	: processor_set_name_t);
-
-/*
- *	Assign task to processor set.
- */
-routine task_assign(
-		task		: task_t;
-		new_set		: processor_set_t;
-		assign_threads	: boolean_t);
-/*
- *	Assign task to default set.
- */
-routine task_assign_default(
-		task		: task_t;
-		assign_threads	: boolean_t);
-
-/*
- *	Get current assignment for task.
- */
-routine task_get_assignment(
-		task		: task_t;
-	out	assigned_set	: processor_set_name_t);
-
-/*
- *	Get string describing current kernel version.
- */
-routine	host_kernel_version(
-		host		: host_t;
-	out	kernel_version	: kernel_version_t);
-
-/*
- *	Set priority for thread.
- */
-routine thread_priority(
-		thread		: thread_t;
-		priority	: int;
-		set_max		: boolean_t);
-
-/*
- *	Set max priority for thread.
- */
-routine thread_max_priority(
-		thread		: thread_t;
-		processor_set	: processor_set_t;
-		max_priority	: int);
-
-/*
- *	Set task priority.
- */
-routine task_priority(
-		task		: task_t;
-		priority	: int;
-		change_threads	: boolean_t);
-
-/*
- *	Set max priority for processor_set.
- */
-routine processor_set_max_priority(
-		processor_set	: processor_set_t;
-		max_priority	: int;
-		change_threads	: boolean_t);
-
-/*
- *	Set policy for thread
- */
-routine thread_policy(
-		thread		: thread_t;
-		policy		: int;
-		data		: int);
-
-/*
- *	Enable policy for processor set
- */
-routine processor_set_policy_enable(
-		processor_set	: processor_set_t;
-		policy		: int);
-
-/*
- *	Disable policy for processor set
- */
-routine processor_set_policy_disable(
-		processor_set	: processor_set_t;
-		policy		: int;
-		change_threads	: boolean_t);
-/*
- *	List all tasks in processor set.
- */
-routine processor_set_tasks(
-		processor_set	: processor_set_t;
-	out	task_list	: task_array_t);
-
-/*
- *	List all threads in processor set.
- */
-routine processor_set_threads(
-		processor_set	: processor_set_t;
-	out	thread_list	: thread_array_t);
-
-/*
- *	List all processor sets on host.
- */
-routine host_processor_sets(
-		host		: host_t;
-	out	processor_sets	: processor_set_name_array_t);
-
-/*
- *	Get control port for a processor set.
- */
-routine host_processor_set_priv(
-		host_priv	: host_priv_t;
-		set_name	: processor_set_name_t;
-	out	set		: mach_port_send_t);
-
-routine thread_depress_abort(
-		thread		: thread_t);
-
-/*
- *	Set the time on this host.
- *	Only available to privileged users.
- */
-routine host_set_time(
-		host_priv	: host_priv_t;
-		new_time	: time_value_t);
-
-/*
- *	Arrange for the time on this host to be gradually changed
- *	by an adjustment value, and return the old value.
- *	Only available to privileged users.
- */
-routine	host_adjust_time(
-		host_priv	: host_priv_t;
-	in	new_adjustment	: time_value_t;
-	out	old_adjustment	: time_value_t);
-
-/*
- *	Get the time on this host.
- *	Available to all.
- */
-routine	host_get_time(
-		host		: host_t;
-	out	current_time	: time_value_t);
-
-/*
- *	Reboot this host.
- *	Only available to privileged users.
- */
-routine host_reboot(
-		host_priv	: host_priv_t;
-		options		: int);
-
-/*
- *	Specify that the range of the virtual address space
- *	of the target task must not cause page faults for
- *	the indicated accesses.
- *
- *	[ To unwire the pages, specify VM_PROT_NONE. ]
- */
-routine	vm_wire(
-		host_priv	: host_priv_t;
-		task		: vm_task_t;
-		address		: vm_address_t;
-		size		: vm_size_t;
-		access		: vm_prot_t);
-
-/*
- *	Specify that the target thread must always be able
- *	to run and to allocate memory.
- */
-routine	thread_wire(
-		host_priv	: host_priv_t;
-		thread		: thread_t;
-		wired		: boolean_t);
-
-/*
- *	Return information about this host.
- */
-
-routine host_info(
-		host		: host_t;
-		flavor		: int;
-	out	host_info_out	: host_info_t, CountInOut);
-
-
-/*
- *	Return information about this processor.
- */
-routine processor_info(
-		processor	: processor_t;
-		flavor		: int;
-	out	host		: host_t;
-	out	processor_info_out: processor_info_t, CountInOut);
-
-/*
- *	Get information about processor set.
- */
-routine processor_set_info(
-		set_name	: processor_set_name_t;
-		flavor		: int;
-	out	host		: host_t;
-	out	info_out	: processor_set_info_t, CountInOut);
-
-/*
- *	Do something machine-dependent to processor.
- */
-routine processor_control(
-		processor	: processor_t;
-		processor_cmd	: processor_info_t);
-
-/*
- *      Get boot configuration information from kernel.
- */
-routine host_get_boot_info(
-		host_priv	: host_priv_t;
-	out	boot_info	: kernel_boot_info_t);
diff --git a/boot.backup1/ourmach_port.defs~ b/boot.backup1/ourmach_port.defs~
deleted file mode 100644
index fb3e552c..00000000
--- a/boot.backup1/ourmach_port.defs~
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University.
- * Copyright (c) 1993,1994 The University of Utah and
- * the Computer Systems Laboratory (CSL).
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON, THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF
- * THIS SOFTWARE IN ITS "AS IS" CONDITION, AND DISCLAIM ANY LIABILITY
- * OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF
- * THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- *	File:	mach/mach_port.defs
- *	Author:	Rich Draves
- *
- *	Copyright (c) 1989 Richard P. Draves, Jr.
- *
- *	Exported kernel calls.
- */
-
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif
-		       mach_port 3200;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-/*
- *	Returns the set of port and port set names
- *	to which the target task has access, along with
- *	the type (set or port) for each name.
- */
-
-routine mach_port_names(
-		task		: ipc_space_t;
-	out	names		: mach_port_name_array_t =
-					^array[] of mach_port_name_t
-					ctype: mach_port_array_t,
-					dealloc;
-	out	types		: mach_port_type_array_t =
-					^array[] of mach_port_type_t,
-					dealloc);
-
-/*
- *	Returns the type (set or port) for the port name
- *	within the target task.  Also indicates whether
- *	there is a dead-name request for the name.
- */
-
-routine mach_port_type(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-	out	ptype		: mach_port_type_t);
-
-/*
- *	Changes the name by which a port (or port set) is known to
- *	the target task.  The new name can't be in use.  The
- *	old name becomes available for recycling.
- */
-
-routine mach_port_rename(
-		task		: ipc_space_t;
-		old_name	: mach_port_name_t;
-		new_name	: mach_port_name_t);
-
-/*
- *	Allocates the specified kind of object, with the given name.
- *	The right must be one of
- *		MACH_PORT_RIGHT_RECEIVE
- *		MACH_PORT_RIGHT_PORT_SET
- *		MACH_PORT_RIGHT_DEAD_NAME
- *	New port sets are empty.  New ports don't have any
- *	send/send-once rights or queued messages.  The make-send
- *	count is zero and their queue limit is MACH_PORT_QLIMIT_DEFAULT.
- *	New sets, ports, and dead names have one user reference.
- */
-
-routine mach_port_allocate_name(
-		task		: ipc_space_t;
-		right		: mach_port_right_t;
-		name		: mach_port_name_t);
-
-/*
- *	Allocates the specified kind of object.
- *	The right must be one of
- *		MACH_PORT_RIGHT_RECEIVE
- *		MACH_PORT_RIGHT_PORT_SET
- *		MACH_PORT_RIGHT_DEAD_NAME
- *	Like port_allocate_name, but the kernel picks a name.
- *	It can use any name not associated with a right.
- */
-
-routine mach_port_allocate(
-		task		: ipc_space_t;
-		right		: mach_port_right_t;
-	out	name		: mach_port_name_t);
-
-/*
- *	Destroys all rights associated with the name and makes it
- *	available for recycling immediately.  The name can be a
- *	port (possibly with multiple user refs), a port set, or
- *	a dead name (again, with multiple user refs).
- */
-
-routine mach_port_destroy(
-		task		: ipc_space_t;
-		name		: mach_port_name_t);
-
-/*
- *	Releases one send/send-once/dead-name user ref.
- *	Just like mach_port_mod_refs -1, but deduces the
- *	correct type of right.  This allows a user task
- *	to release a ref for a port without worrying
- *	about whether the port has died or not.
- */
-
-routine mach_port_deallocate(
-		task		: ipc_space_t;
-		name		: mach_port_name_t);
-
-/*
- *	A port set always has one user ref.
- *	A send-once right always has one user ref.
- *	A dead name always has one or more user refs.
- *	A send right always has one or more user refs.
- *	A receive right always has one user ref.
- *	The right must be one of
- *		MACH_PORT_RIGHT_RECEIVE
- *		MACH_PORT_RIGHT_PORT_SET
- *		MACH_PORT_RIGHT_DEAD_NAME
- *		MACH_PORT_RIGHT_SEND
- *		MACH_PORT_RIGHT_SEND_ONCE
- */
-
-routine mach_port_get_refs(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		right		: mach_port_right_t;
-	out	refs		: mach_port_urefs_t);
-
-/*
- *	The delta is a signed change to the task's
- *	user ref count for the right.  Only dead names
- *	and send rights can have a positive delta.
- *	The resulting user ref count can't be negative.
- *	If it is zero, the right is deallocated.
- *	If the name isn't a composite right, it becomes
- *	available for recycling.  The right must be one of
- *		MACH_PORT_RIGHT_RECEIVE
- *		MACH_PORT_RIGHT_PORT_SET
- *		MACH_PORT_RIGHT_DEAD_NAME
- *		MACH_PORT_RIGHT_SEND
- *		MACH_PORT_RIGHT_SEND_ONCE
- */
-
-routine mach_port_mod_refs(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		right		: mach_port_right_t;
-		delta		: mach_port_delta_t);
-
-/*
- *	Temporary compatibility call.
- */
-
-routine old_mach_port_get_receive_status(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-	out	status		: old_mach_port_status_t);
-
-/*
- *	Only valid for receive rights.
- *	Sets the queue-limit for the port.
- *	The limit must be
- *		1 <= qlimit <= MACH_PORT_QLIMIT_MAX
- */
-
-routine mach_port_set_qlimit(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		qlimit		: mach_port_msgcount_t);
-
-/*
- *	Only valid for receive rights.
- *	Sets the make-send count for the port.
- */
-
-routine mach_port_set_mscount(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		mscount		: mach_port_mscount_t);
-
-/*
- *	Only valid for port sets.  Returns a list of
- *	the members.
- */
-
-routine mach_port_get_set_status(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-	out	members		: mach_port_name_array_t =
-					^array[] of mach_port_name_t
-					ctype: mach_port_array_t);
-
-/*
- *	Puts the member port (the task must have receive rights)
- *	into the after port set.  (Or removes it from any port set
- *	if after is MACH_PORT_NULL.)  If the port is already in
- *	a set, does an atomic move.
- */
-
-routine mach_port_move_member(
-		task		: ipc_space_t;
-		member		: mach_port_name_t;
-		after		: mach_port_name_t);
-
-/*
- *	Requests a notification from the kernel.  The request
- *	must supply the send-once right which is used for
- *	the notification.  If a send-once right was previously
- *	registered, it is returned.  The msg_id must be one of
- *		MACH_NOTIFY_PORT_DESTROYED (receive rights)
- *		MACH_NOTIFY_DEAD_NAME (send/receive/send-once rights)
- *		MACH_NOTIFY_NO_SENDERS (receive rights)
- *
- *	The sync value specifies whether a notification should
- *	get sent immediately, if appropriate.  The exact meaning
- *	depends on the notification:
- *		MACH_NOTIFY_PORT_DESTROYED: must be zero.
- *		MACH_NOTIFY_DEAD_NAME: if non-zero, then name can be dead,
- *			and the notification gets sent immediately.
- *			If zero, then name can't be dead.
- *		MACH_NOTIFY_NO_SENDERS: the notification gets sent
- *			immediately if the current mscount is greater
- *			than or equal to the sync value and there are no
- *			extant send rights.
- */
-
-routine mach_port_request_notification(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		id		: mach_msg_id_t;
-		sync		: mach_port_mscount_t;
-		notify		: mach_port_send_once_t;
-	out	previous	: mach_port_send_once_t);
-
-/*
- *	Inserts the specified rights into the target task,
- *	using the specified name.  If inserting send/receive
- *	rights and the task already has send/receive rights
- *	for the port, then the names must agree.  In any case,
- *	the task gains a user ref for the port.
- */
-
-routine mach_port_insert_right(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		poly		: mach_port_poly_t);
-
-/*
- *	Returns the specified right for the named port
- *	in the target task, extracting that right from
- *	the target task.  The target task loses a user
- *	ref and the name may be available for recycling.
- *	msgt_name must be one of
- *		MACH_MSG_TYPE_MOVE_RECEIVE
- *		MACH_MSG_TYPE_COPY_SEND
- *		MACH_MSG_TYPE_MAKE_SEND
- *		MACH_MSG_TYPE_MOVE_SEND
- *		MACH_MSG_TYPE_MAKE_SEND_ONCE
- *		MACH_MSG_TYPE_MOVE_SEND_ONCE
- */
-
-routine mach_port_extract_right(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		msgt_name	: mach_msg_type_name_t;
-	out	poly		: mach_port_poly_t);
-
-/*
- *	The task must have receive rights for the named port.
- *	Returns a status structure (see mach/port.h).
- */
-
-routine mach_port_get_receive_status(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-	out	status		: mach_port_status_t);
-
-/*
- *	Only valid for receive rights.
- *	Sets the sequence number for the port.
- */
-
-routine mach_port_set_seqno(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		seqno		: mach_port_seqno_t);
-
-#ifdef MIGRATING_THREADS
-/*
- *	Only valid for receive rights.
- *	Set the user-mode entry info for RPCs coming through this port.
- *	Do this BEFORE attaching an ActPool to this port,
- *	unless you can be sure no RPCs will be coming through it yet.
- */
-
-routine mach_port_set_rpcinfo(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		rpc_info	: thread_info_t);	/* XXX */
-
-/*
- *	Only valid for receive rights.
- *	Create a new activation for migrating RPC, and attach it to the port's ActPool.
- *	Create an ActPool for the port if it doesn't already have one.
- *	Supply a stack and receive memory buffer.
- */
-
-routine mach_port_create_act(
-		task		: task_t;
-		name		: mach_port_name_t;
-		user_stack	: vm_offset_t;
-		user_rbuf	: vm_offset_t;
-		user_rbuf_size	: vm_size_t;
-	out	new_act		: thread_t);
-
-#endif /* MIGRATING_THREADS */
-
diff --git a/boot.backup1/util.h~ b/boot.backup1/util.h~
deleted file mode 100644
index 81a1a671..00000000
--- a/boot.backup1/util.h~
+++ /dev/null
@@ -1,96 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#include <stdio.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/ip.h>
-
-#include <mach.h>
-#include <hurd.h>
-
-#define DEBUG 0
-#define INFO 1
-#define LOGLEVEL DEBUG
-
-#define output(format, ...) do				\
-{							\
-  char buf[1024];                                       \
-  snprintf (buf, 1024, "boot: %s: %s\r\n", __func__, format);       \
-  fprintf (stderr , buf, ## __VA_ARGS__);		\
-  fflush (stderr);					\
-} while (0)
-
-#if DEBUG >= LOGLEVEL
-#define debug output
-#else
-#define debug(format, ...) do {} while (0)
-#endif
-
-#if INFO >= LOGLEVEL
-#define info output
-#else
-#define info(format, ...) do {} while (0)
-#endif
-
-#if ERROR >= LOGLEVEL
-#define logerror(format, ...) do				\
-{							\
-  char buf[1024];                                       \
-  snprintf (buf, 1024, "boot ERROR: %s: %s\r\n", __func__, format);       \
-  fprintf (stderr , buf, ## __VA_ARGS__);		\
-  fflush (stderr);					\
-} while (0)
-#else
-#define logerror(format, ...) do {} while (0)
-#endif
-
-#define print_port_type(port) do				    \
-{								    \
-  mach_port_type_t ptype;					    \
-  error_t err =	mach_port_type (mach_task_self (), port, &ptype);   \
-  if (err)							    \
-    debug ("mach_port_type: %s", strerror (err));		    \
-  else if (ptype & MACH_PORT_TYPE_SEND)				    \
-    debug ("port %d has send right", port);			    \
-  else if (ptype & MACH_PORT_TYPE_RECEIVE)			    \
-    debug ("port %d has receive right", port);			    \
-  else if (ptype & MACH_PORT_TYPE_SEND_ONCE)			    \
-    debug ("port %d has send once right", port);		    \
-  else if (ptype & MACH_PORT_TYPE_PORT_SET)			    \
-    debug ("port %d is port set", port);			    \
-  else if (ptype & MACH_PORT_TYPE_DEAD_NAME)			    \
-    debug ("port %d is a dead name", port);			    \
-  else								    \
-    debug ("the type of port %d is %d", port, ptype);		    \
-  mach_port_urefs_t refs;					    \
-  err = mach_port_get_refs (mach_task_self (), port,	    \
-			    MACH_PORT_RIGHT_SEND, &refs);	    \
-  if (!err)							    \
-    debug ("port send right references: %d", refs);		    \
-} while (0)
-
-#endif
diff --git a/configure.in~ b/configure.in~
deleted file mode 100644
index 3fbfb28f..00000000
--- a/configure.in~
+++ /dev/null
@@ -1,252 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_REVISION([$Id: configure.in,v 1.37.8.1 2008/08/13 13:52:37 zhengda Exp $])
-AC_PREREQ(2.54)			dnl Minimum Autoconf version required.
-AC_INIT
-AC_CONFIG_SRCDIR([hurd/hurd_types.h])	dnl File to look for in srcdir.
-
-AC_PREFIX_DEFAULT()		dnl Default to empty prefix, not /usr/local.
-
-AC_CANONICAL_HOST
-case "$host_os" in
-gnu*) ;;
-none) AC_MSG_ERROR([
-*** You must specify a host of $host_cpu-gnu or $host_cpu-$host_vendor-gnu
-*** to configure; you will need to use the same host specification
-*** to configure other packages for the GNU/Hurd system.]) ;;
-*) AC_MSG_ERROR([this is the gnu os, host cannot be $host_os
-*** Host configuration must be \`MACHINE-gnu' or \`MACHINE-VENDOR-gnu'.
-*** To cross-compile, you must specify both --host and --build;
-*** for example \`--build=$host --host=$host_cpu-gnu'.
-*** Run $0 --help for more information.]) ;;
-esac
-
-case "$host_cpu" in
-alpha*)
-  asm_syntax=alpha
-  ;;
-arm*)
-  asm_syntax=arm
-  ;;
-m68k | m680?0)
-  asm_syntax=m68k
-  ;;
-mips*)
-  asm_syntax=mips
-  ;;
-i?86)
-  asm_syntax=i386
-  ;;
-powerpc*)
-  asm_syntax=ppc
-  ;;
-sparc64* | ultrasparc*)
-  asm_syntax=sparc64
-  ;;
-sparc*)
-  asm_syntax=sparc
-  ;;
-*)
-  asm_syntax="$host_cpu"
-  ;;
-esac
-AC_SUBST(asm_syntax)
-
-test -r "$srcdir/libthreads/$asm_syntax/cthreads.h" || {
-  AC_MSG_WARN([unsupported CPU type $host_cpu])
-}
-
-AC_ARG_ENABLE(profile,
-[  --disable-profile	  do not build profiled libraries and programs])
-AC_SUBST(enable_profile)
-
-define([default_static],['ext2fs,ufs'])dnl
-AC_ARG_ENABLE(static-progs,
-[  --enable-static-progs=PROGRAMS...
-                          build statically-linked PROGRAM.static versions
-                          of (only) the listed programs ]dnl
-changequote(',')[default_static]changequote([,]))
-case "$enable_static_progs" in
-'no')	enable_static_progs= ;;		# we got --disable-static
-'')	enable_static_progs=default_static ;;
-esac
-# Convert comma/space-separated list into space-separated list.
-enable_static_progs=`echo "$enable_static_progs" | sed 's/[[, ]][[, ]]*/ /g'`
-AC_SUBST(enable_static_progs)
-
-AC_PROG_INSTALL
-AC_PROG_AWK
-
-AC_PROG_CC
-# Require GCC.
-if test x$GCC != xyes; then
-  AC_MSG_ERROR([this code uses GNU C extensions, you must compile with GCC])
-fi
-
-AC_CHECK_TOOL(LD, ld)
-AC_CHECK_TOOL(OBJCOPY, objcopy)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib)
-AC_CHECK_TOOL(MIG, mig)
-# Require MiG.
-if test x${MIG} = x; then
-  AC_MSG_ERROR([
-*** You need GNU MiG to compile the GNU Hurd, please see
-*** http://www.gnu.org/software/hurd/mig.html for further details, or
-*** download it directly from the main GNU server (ftp.gnu.org) or any
-*** GNU mirror.])
-fi
-
-dnl Let these propagate from the environment.
-AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS)
-
-# See if there's a separate libcrypt (many systems put crypt there).
-AC_CHECK_LIB(crypt, crypt, LIBCRYPT=-lcrypt)
-AC_SUBST(LIBCRYPT)
-
-hurd_MIG_RETCODE
-
-# See if --version-script is available.
-AC_CACHE_CHECK(for ld --version-script, hurd_cv_ld_version_script_option, [dnl
-cat > conftest.c <<\EOF
-void foobar() {}
-EOF
-cat > conftest.map <<\EOF
-VERS_1 {
-	global: sym;
-};
-
-VERS_2 {
-        global: sym;
-} VERS_1;
-EOF
-
-if AC_TRY_COMMAND([eval $ac_compile 1>&AS_MESSAGE_LOG_FD()]) &&
-   AC_TRY_COMMAND([${CC-cc} $CFLAGS -shared -o conftest.so conftest.o
-				    -nostartfiles -nostdlib
-				    -Wl,--version-script,conftest.map
-		   1>&AS_MESSAGE_LOG_FD()]); then
-  hurd_cv_ld_version_script_option=yes
-else
-  hurd_cv_ld_version_script_option=no
-fi
-rm -f conftest*])
-
-# See if libc was built with --enable-libio.
-AC_CACHE_CHECK([for libio],
-  hurd_cv_libio,
-  AC_TRY_COMPILE([#include <stdio.h>
-#ifndef _STDIO_USES_IOSTREAM
-# error No libio found.
-#endif],,
-    hurd_cv_libio=yes,
-    hurd_cv_libio=no))
-
-# The versions of the symbols in libthreads have to match those in
-# libc.so.  Since the symbols in a libc that includes libio will be
-# versioned differently from the ones in a libc that uses stdio, this
-# isn't easy to accomplish.  Instead we leave things unversioned if
-# libio isn't found.
-if test $hurd_cv_libio = yes; then
-  VERSIONING=$hurd_cv_ld_version_script_option
-else
-  VERSIONING=no
-fi
-AC_SUBST(VERSIONING)
-
-# Check if libc contains getgrouplist and/or uselocale.
-AC_CHECK_FUNCS(getgrouplist uselocale)
-
-
-# From glibc HEAD, 2007-11-07.
-AC_CACHE_CHECK(for -fgnu89-inline, libc_cv_gnu89_inline, [dnl
-cat > conftest.c <<EOF
-int foo;
-#ifdef __GNUC_GNU_INLINE__
-main () { return 0;}
-#else
-#error
-#endif
-EOF
-if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -S -std=gnu99 -fgnu89-inline
-			    -o conftest.s conftest.c 1>&AS_MESSAGE_LOG_FD])
-then
-  libc_cv_gnu89_inline=yes
-else
-  libc_cv_gnu89_inline=no
-fi
-rm -f conftest*])
-if test $libc_cv_gnu89_inline = yes; then
-  libc_cv_gnu89_inline=-fgnu89-inline
-else
-  libc_cv_gnu89_inline=
-fi
-AC_SUBST(libc_cv_gnu89_inline)
-
-
-AC_ARG_WITH(parted, dnl
-[  --without-parted        don't try to use GNU Parted libraries],
-	    , with_parted=yes)
-
-AC_ARG_ENABLE(boot-store-types,
-[  --enable-boot-store-types=TYPES...
-			  list of store types included in statically
-			  linked filesystems used for booting])dnl
-if test -z "$enable_boot_store_types"; then
-  boot_store_types='device remap gunzip bunzip2'
-
-  # Check for Parted's static store module.
-  if test "x$with_parted" != xno; then
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS -static"
-    AC_CHECK_LIB(store_part, store_part_open, [dnl
-		 boot_store_types="$boot_store_types part"], , -luuid -lstore)
-    LDFLAGS="$save_LDFLAGS"
-  fi
-elif test "x$enable_boot_store_types" = xno; then
-  AC_MSG_WARN([you probably wanted --disable-static-progs])
-else
-  boot_store_types="$enable_boot_store_types"
-fi
-AC_SUBST(boot_store_types)dnl
-AC_MSG_CHECKING(boot store types)
-AC_MSG_RESULT($boot_store_types)
-
-AC_ARG_ENABLE(pcap, AS_HELP_STRING([--disable-pcap --enable-pcap], [Disable pcap]),
-      [install_pcap=$enableval pcap_fail=yes], [install_pcap=yes pcap_fail=no])
-
-if test "$install_pcap" = "yes"; then
-  AC_CHECK_LIB(pcap, pcap_compile, LIBPCAP=-lpcap, LIBPCAP=no)
-  AC_SUBST(LIBPCAP)
-  if test "$LIBPCAP" = "no"; then
-    if test "$pcap_fail" = "yes"; then
-      AC_MSG_ERROR([libpcap must be install in order to use eth-filter])
-    else
-      LIBPCAP=""
-    fi
-  fi
-fi
-
-# Check for ncursesw, which is needed for the console-curses client.
-hurd_LIB_NCURSESW
-
-if test -f ./$ac_unique_file; then
-  # Configuring in source directory; don't create any Makefiles.
-  makefiles=
-else
-  # We are configuring in a separate build tree.
-  # Create a Makefile in the top-level build directory and
-  # one for each subdirectory Makefile in the source.
-  makefiles="Makeconf:build.mkcf.in \
-	     `cd $srcdir; for file in Makefile */Makefile; do \
-			    echo ${file}:build.mk.in; done`"
-fi
-
-AC_CONFIG_FILES([config.make ${makefiles}])
-AC_OUTPUT
-
-dnl Local Variables:
-dnl comment-start: "dnl "
-dnl comment-end: ""
-dnl comment-start-skip: "\\bdnl\\b\\s *"
-dnl compile-command: "autoconf"
-dnl End:
diff --git a/devnode/ChangeLog~ b/devnode/ChangeLog~
deleted file mode 100644
index 5efa8a5e..00000000
--- a/devnode/ChangeLog~
+++ /dev/null
@@ -1,25 +0,0 @@
-2008-08-28 Zheng Da <zhengda1936@gmail.com>
-
-	* devnode.c (ds_device_open): Return the error instead of stopping the
-	translator.
-
-2008-08-20 Zheng Da <zhengda1936@gmail.com>
-
-	* devnode.c (ds_device_open): Test device_name before using it.
-
-	* util.h (DEBUG): Remove the macro.
-
-2008-08-18 Zheng Da <zhengda1936@gmail.com>
-
-	* README: New file.
-
-	* devnode.c (options): Replace the option '-i' with '-d'.
-	(parse_opt): Handle the option '-d'. 
-
-2008-08-17 Zheng Da <zhengda1936@gmail.com>
-
-	* Makefile: New file.
-
-	* util.h: New file.
-
-	* devnode.c: New file.
diff --git a/devnode/README~ b/devnode/README~
deleted file mode 100644
index 5686da7b..00000000
--- a/devnode/README~
+++ /dev/null
@@ -1,25 +0,0 @@
-[Introduction]
-
-devnode is a translator that creates the device file for the kernel device. It provides another way for other programs to open the kernel device.
-The device file should be created in /dev with the device name as its file name, so clients can find the device file easily.
-Clients need to get the port to the devnode translator by calling file_name_lookup() and uses this port as a master device port to open the device by calling device_open(). The device name used in device_open() is specified by '-n' option of devnode.
-
-
-[Usage]
-
-Usage: devnode [OPTION...] device
-Hurd devnode translator.
-
-  -n, --name=DEVICENAME      Accept open from clients only with DEVICENAME
-  -M, --master_device=FILE   Get a pseudo master device port
-  -?, --help                 Give this help list
-      --usage                Give a short usage message
-  -V, --version              Print program version
-
-The '-n' option specifies the device name used by clients in device_open(). It can be optional. If it's specified, clients must use the name to open the device. Otherwise, every device name used by clients in device_open() is acceptable. 
-The '-M' option specifies the file where devnode can get the master device port. This option can be useful to open the virtual interface created by eth-multiplexer, for example.
-
-
-[Internal]
-
-devnode is very simple. It implements the server side functions in device.defs, so it can receive the request of opening a device from other programs. Only ds_device_open is actually implemented, which opens the device and returns the port to the device. Normally, devnode shouldn't get other requests.
diff --git a/devnode/devnode.c~ b/devnode/devnode.c~
deleted file mode 100644
index 5b85fcb5..00000000
--- a/devnode/devnode.c~
+++ /dev/null
@@ -1,337 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/*
- * This program is a translator that sits on the top of the network
- * interface and helps socket servers open the interface.
- */
-
-#include <argp.h>
-#include <errno.h>
-#include <error.h>
-#include <stddef.h>
-
-#include <hurd.h>
-#include <mach.h>
-#include <device/device.h>
-#include <hurd/trivfs.h>
-#include <hurd/ports.h>
-
-#include "ourdevice_S.h"
-#include "notify_S.h"
-#include "util.h"
-
-/* The name of the network interface that the translator sits on. */
-static char *device_name;
-/* The device name used by the socket servers. */
-static char *user_device_name;
-/* The master device port for opening the interface. */
-static mach_port_t master_device;
-
-const char *argp_program_version = "devnode 0.1";
-const char *argp_program_bug_address = "<bug-hurd@gnu.org>";
-static const char args_doc[] = "device";
-static const char doc[] = "Hurd devnode translator.";
-static const struct argp_option options[] =
-{
-    {"name", 'n', "DEVICENAME", 0,
-      "The device name used by clients in device_open()", 2},
-    {"master-device", 'M', "FILE", 0, 
-      "Get a pseudo master device port", 3},
-    {0}
-};
-
-/* Port bucket we service requests on.  */
-struct port_bucket *port_bucket;
-
-/* Trivfs hooks.  */
-int trivfs_fstype = FSTYPE_MISC;
-int trivfs_fsid = 0;
-int trivfs_support_read = 0;
-int trivfs_support_write = 0;
-int trivfs_support_exec = 0;
-int trivfs_allow_open = 0;
-
-struct port_class *trivfs_protid_portclasses[1];
-struct port_class *trivfs_cntl_portclasses[1];
-int trivfs_protid_nportclasses = 1;
-int trivfs_cntl_nportclasses = 1;
-
-static int
-devnode_demuxer (mach_msg_header_t *inp,
-		    mach_msg_header_t *outp)
-{
-  extern int device_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern int notify_server (mach_msg_header_t *, mach_msg_header_t *);
-  return device_server (inp, outp) || notify_server (inp, outp)
-    || trivfs_demuxer (inp, outp);
-}
-
-/* Implementation of notify interface */
-kern_return_t
-do_mach_notify_port_deleted (mach_port_t notify,
-			     mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_msg_accepted (mach_port_t notify,
-			     mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_port_destroyed (mach_port_t notify,
-			       mach_port_t port)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_no_senders (mach_port_t notify,
-			   mach_port_mscount_t mscount)
-{
-  return ports_do_mach_notify_no_senders (notify, mscount);
-}
-
-kern_return_t
-do_mach_notify_send_once (mach_port_t notify)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_dead_name (mach_port_t notify,
-			  mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-/* Implementation of device interface */
-kern_return_t 
-ds_xxx_device_set_status (device_t device, dev_flavor_t flavor,
-			  dev_status_t status, size_t statu_cnt)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_get_status (device_t device, dev_flavor_t flavor,
-			  dev_status_t status, size_t *statuscnt)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_set_filter (device_t device, mach_port_t rec,
-			  int pri, filter_array_t filt, size_t len)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_open (mach_port_t master_port, mach_port_t reply_port,
-		mach_msg_type_name_t reply_portPoly,
-		dev_mode_t mode, dev_name_t name, mach_port_t *device, 
-		mach_msg_type_name_t *devicetype)
-{
-  error_t err;
-
-  debug ("ds_device_open is called\n");
-
-  if ((user_device_name && strcmp (user_device_name, name))
-      || device_name == NULL) 
-      return D_NO_SUCH_DEVICE;
-
-  err = device_open (master_device, mode, device_name, device); 
-  *devicetype = MACH_MSG_TYPE_MOVE_SEND;
-  return err;
-}
-
-kern_return_t
-ds_device_close (device_t device)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_write (device_t device, mach_port_t reply_port,
-		 mach_msg_type_name_t reply_type, dev_mode_t mode,
-		 recnum_t recnum, io_buf_ptr_t data, size_t datalen,
-		 int *bytes_written)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_write_inband (device_t device, mach_port_t reply_port,
-			mach_msg_type_name_t reply_type, dev_mode_t mode,
-			recnum_t recnum, io_buf_ptr_inband_t data,
-			size_t datalen, int *bytes_written)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_read (device_t device, mach_port_t reply_port,
-		mach_msg_type_name_t reply_type, dev_mode_t mode,
-		recnum_t recnum, int bytes_wanted,
-		io_buf_ptr_t *data, size_t *datalen)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_read_inband (device_t device, mach_port_t reply_port,
-		       mach_msg_type_name_t reply_type, dev_mode_t mode,
-		       recnum_t recnum, int bytes_wanted,
-		       io_buf_ptr_inband_t data, size_t *datalen)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_map (device_t device, vm_prot_t prot, vm_offset_t offset,
-	       vm_size_t size, memory_object_t *pager, int unmap)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_set_status (device_t device, dev_flavor_t flavor,
-		      dev_status_t status, size_t statuslen)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_get_status (device_t device, dev_flavor_t flavor,
-		      dev_status_t status, size_t *statuslen)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_set_filter (device_t device, mach_port_t receive_port,
-		      int priority, filter_array_t filter, size_t filterlen)
-{
-  return D_INVALID_OPERATION;
-}
-
-void
-trivfs_modify_stat (struct trivfs_protid *cred, io_statbuf_t *stat)
-{
-}
-
-error_t
-trivfs_goaway (struct trivfs_control *fsys, int flags)
-{
-  int count;
-
-  /* Stop new requests.  */
-  ports_inhibit_class_rpcs (trivfs_cntl_portclasses[0]);
-  ports_inhibit_class_rpcs (trivfs_protid_portclasses[0]);
-
-  count = ports_count_class (trivfs_protid_portclasses[0]);
-  debug ("the number of ports alive: %d\n", count);
-
-  if (count && !(flags & FSYS_GOAWAY_FORCE)) 
-    {
-      /* We won't go away, so start things going again...  */
-      ports_enable_class (trivfs_protid_portclasses[0]);
-      ports_resume_class_rpcs (trivfs_cntl_portclasses[0]);
-      ports_resume_class_rpcs (trivfs_protid_portclasses[0]); 
-      return EBUSY;
-    } 
-
-  mach_port_deallocate (mach_task_self (), master_device);
-  debug ("the translator is gone away\n");
-  exit (0);
-}
-
-static error_t
-parse_opt (int opt, char *arg, struct argp_state *state)
-{
-  switch (opt)
-    {
-    case 'M':
-      master_device = file_name_lookup (arg, 0, 0);
-      if (master_device == MACH_PORT_NULL)
-	error (1, errno, "file_name_lookup");
-      break;
-    case 'n':
-      user_device_name = arg;
-      break;
-    case ARGP_KEY_ARG:
-      device_name = arg;
-      break;
-    case ARGP_KEY_ERROR:
-    case ARGP_KEY_SUCCESS:
-    case ARGP_KEY_INIT:
-      break;
-    default:
-      return ARGP_ERR_UNKNOWN;
-    }
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  error_t err;
-  mach_port_t bootstrap;
-  struct trivfs_control *fsys;
-  const struct argp argp = { options, parse_opt, args_doc, doc };
-
-  port_bucket = ports_create_bucket ();
-  trivfs_cntl_portclasses[0] = ports_create_class (trivfs_clean_cntl, 0);
-  trivfs_protid_portclasses[0] = ports_create_class (trivfs_clean_protid, 0);
-
-  argp_parse (&argp, argc, argv, 0, 0, 0);
-
-  task_get_bootstrap_port (mach_task_self (), &bootstrap);
-  if (bootstrap == MACH_PORT_NULL)
-    error (1, 0, "must be started as a translator");
-
-  if (master_device == MACH_PORT_NULL) 
-    {
-      err = get_privileged_ports (0, &master_device);
-      if (err)
-	error (1, err, "get_privileged_ports");
-    }
-
-  /* Reply to our parent.  */
-  err = trivfs_startup (bootstrap, 0,
-			trivfs_cntl_portclasses[0], port_bucket,
-			trivfs_protid_portclasses[0], port_bucket, &fsys);
-  mach_port_deallocate (mach_task_self (), bootstrap);
-  if (err)
-    error (1, err, "Contacting parent");
-
-  /* Launch.  */
-  do 
-    {
-      ports_manage_port_operations_one_thread (port_bucket, 
-					       devnode_demuxer, 0);
-    } while (trivfs_goaway (fsys, 0)); 
-  return 0;
-}
diff --git a/eth-filter.multi-thread/Makefile~ b/eth-filter.multi-thread/Makefile~
deleted file mode 100644
index 53578306..00000000
--- a/eth-filter.multi-thread/Makefile~
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 2008 Free Software Foundation, Inc.
-# This file is part of the GNU Hurd.
-#
-# The GNU Hurd is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# The GNU Hurd is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the GNU Hurd; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-dir := eth-filter
-makemode := server
-
-SRCS = bpf_impl.c filter.c queue.c pcap_filter.c #msg_queue.c
-LCLHDRS = bpf_impl.h queue.h util.h #filter.h msg_queue.h
-DIST_FILES = ourdevice.defs notify.defs #device_reply.defs
-HURDLIBS = threads ports trivfs fshelp ihash shouldbeinlibc
-target = eth-filter
-MIGSTUBS = ourdeviceServer.o notifyServer.o #device_replyUser.o
-OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
-
-include ../Makeconf
-
-CFLAGS += -I../pfinet/linux-src/include -I../pfinet/glue-include
-LDFLAGS += -lpcap
-
-ourdevice.defs: device.defs
-	$(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[ 	]*device[ 	]*:[ 	]*device_t/s/device_t/mach_port_send_t/' > $@
diff --git a/eth-filter.multi-thread/filter.c~ b/eth-filter.multi-thread/filter.c~
deleted file mode 100644
index 0746f5a4..00000000
--- a/eth-filter.multi-thread/filter.c~
+++ /dev/null
@@ -1,878 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/*
- * This program is a filter translator which sits on the top of the network
- * interface. 
- * It provides two filters: for outgoing packets and for incoming packets.
- * Only one pfinet server are allowed to run on the top of the translator. 
- */
-
-#include <argp.h>
-#include <errno.h>
-#include <error.h>
-#include <stddef.h>
-#include <unistd.h>
-
-#include <hurd.h>
-#include <mach.h>
-#include <cthreads.h>
-#include <device/device.h>
-#include <hurd/trivfs.h>
-#include <hurd/ports.h>
-#include <hurd/ihash.h>
-
-#include "ourdevice_S.h"
-#include "notify_S.h"
-#include "device_reply_U.h"
-#include "bpf_impl.h"
-#include "util.h"
-#include "filter.h"
-#include "msg_queue.h"
-
-#ifdef DEBUG
-
-FILE *logfile;
-
-#endif 
-
-static struct hurd_ihash proxy_deliverport_ht
-= HURD_IHASH_INITIALIZER (offsetof (struct proxy, p_deliverport_hashloc));
-
-/* The name of the network interface that the filter translator sits on. */
-static char *device_file;
-const char *argp_program_version = "eth-filter 0.1";
-const char *argp_program_bug_address = "<bug-hurd@gnu.org>";
-static const char doc[] = "Hurd filter translator.";
-static const struct argp_option options[] =
-{
-    {"interface", 'i', "DEVICE", 0,
-      "Network interface to use", 2},
-    {"send-filter", 's', "string", 0,
-      "The filter rule which applies to the outgoing packet", 4},
-    {"receive-filter", 'r', "string", 0,
-      "The filter rule which applies to the ingoing packet", 5},
-    {"send-ip-range", 'S', "IP range", 0,
-      "A range of IP to create the send filter", 6},
-    {"receive-ip-range", 'R', "IP range", 0,
-      "A range of IP to create the receive filter", 7},
-    {0}
-};
-
-/* A filter allows every packet to be sent and be received. */
-static struct bpf_insn default_snd_filter[] = 
-{
-    {NETF_OUT|NETF_BPF, 0, 0, 0},
-    {6, 0, 0, 1500}
-};
-static struct bpf_insn default_rcv_filter[] = 
-{
-    {NETF_IN|NETF_BPF, 0, 0, 0},
-    {6, 0, 0, 1500}
-};
-static struct bpf_insn *snd_filter = NULL;
-static int snd_filter_length;
-static struct bpf_insn *rcv_filter = NULL;
-static int rcv_filter_length;
-
-static cthread_t send_thread;
-static int send_thread_running = 1;
-
-/* Port bucket we service requests on.  */
-struct port_bucket *port_bucket;
-
-struct port_class *user_portclass;
-struct port_class *device_portclass;
-struct port_class *other_portclass;
-
-/* Trivfs hooks.  */
-int trivfs_fstype = FSTYPE_MISC;
-int trivfs_fsid = 0;
-int trivfs_support_read = 0;
-int trivfs_support_write = 0;
-int trivfs_support_exec = 0;
-int trivfs_allow_open = 0;
-
-struct port_class *trivfs_protid_portclasses[1];
-struct port_class *trivfs_cntl_portclasses[1];
-int trivfs_protid_nportclasses = 1;
-int trivfs_cntl_nportclasses = 1;
-
-/* For getting the notification of ports from the kernel. */
-struct port_info *notify_pi;
-
-/* Write the data from the client to the device. */
-int 
-filter_device_write (struct filter_msg *msg)
-{
-  error_t err = 0;
-  int ret_count = 0;
-  int has_filter = 0;
-  net_hash_entry_t entp, *hash_headp;
-  net_rcv_port_t infp, nextfp;
-  int bytes_written;
-  struct filter_write_msg *write_msg = (struct filter_write_msg *) msg;
-
-  /* The packet can be sent as long as it passes one filter,
-   * even thought there is usually only one filter in the list. */
-  FILTER_ITERATE (&snd_port_list, infp, nextfp, &infp->chain) 
-    {
-      has_filter = 1;
-      ret_count = mach_bpf_do_filter (infp,
-				      write_msg->data + sizeof (struct ethhdr),
-				      write_msg->datalen - sizeof (struct ethhdr),
-				      write_msg->data, sizeof (struct ethhdr),
-				      &hash_headp, &entp);
-      if (ret_count)
-	break;
-    }
-  FILTER_ITERATE_END
-
-  if (ret_count || !has_filter) 
-    err = device_write (msg->proxy->device_port, write_msg->mode,
-			write_msg->recnum, write_msg->data,
-			write_msg->datalen, &bytes_written);
-  ds_device_write_reply (write_msg->reply_port, write_msg->reply_type,
-			 err, bytes_written);
-  return 0;
-}
-
-/* Deliver the data from the device to the client. */
-int
-filter_deliver (struct filter_msg *msg)
-{
-  deliver_msg (((struct filter_deliver_msg *)msg)->net_msg,
-	       &rcv_port_list, msg->proxy->deliver_port);
-  return 0;
-}
-
-error_t
-create_proxy_user (struct proxy *proxy, mach_port_t *port)
-{
-  error_t err;
-  struct proxy_user *user;
-
-  err = ports_create_port (user_portclass, port_bucket, sizeof (*user), &user);
-  if (err)
-      return err;
-  user->proxy = proxy;
-
-  *port = ports_get_right (user);
-  ports_port_deref (user);
-  return 0;
-}
-
-error_t 
-create_proxy_device (struct proxy *proxy, mach_port_t *port)
-{
-  error_t err;
-  struct proxy_device *device;
-
-  err = ports_create_port (device_portclass, port_bucket, sizeof (*device), &device);
-  if (err)
-      return err;
-  device->proxy = proxy;
-  proxy->device = device;
-
-  *port = ports_get_right (device);
-  ports_port_deref (device);
-  return 0;
-}
-
-void
-clean_proxy_user (void *p)
-{
-  struct proxy_user *user = p;
-  struct proxy *proxy = user->proxy;
-
-  if (proxy->p_deliverport_hashloc)
-    hurd_ihash_locp_remove (&proxy_deliverport_ht, proxy->p_deliverport_hashloc);
-
-  if (proxy->deliver_port != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), proxy->deliver_port);
-  if (proxy->device_port != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), proxy->device_port);
-
-  if (proxy->device)
-    ports_destroy_right (proxy->device);
-
-  free (proxy);
-}
-
-void
-clean_proxy_device (void *p)
-{
-  struct proxy_device *device = p;
-  if (device->proxy)
-    device->proxy->device = NULL;
-}
-
-static int
-filter_demuxer (mach_msg_header_t *inp,
-		mach_msg_header_t *outp)
-{
-  extern int device_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern int notify_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern int ethernet_demuxer (mach_msg_header_t *, mach_msg_header_t *);
-  return device_server (inp, outp) || notify_server (inp, outp)
-    || ethernet_demuxer (inp, outp) || trivfs_demuxer (inp, outp);
-}
-
-int
-ethernet_demuxer (mach_msg_header_t *inp,
-		  mach_msg_header_t *outp)
-{
-  struct net_rcv_msg *msg = (struct net_rcv_msg *) inp;
-  struct proxy_device *device;
-  struct proxy *proxy;
-
-  if (inp->msgh_id != NET_RCV_MSG_ID)
-    return 0;
-
-  device = ports_lookup_port (port_bucket, inp->msgh_local_port,
-			      device_portclass);
-  if (device == NULL)
-    return 0;
-
-  proxy = device->proxy;
-  ports_port_deref (device);
-
-  if (proxy && proxy->deliver_port != MACH_PORT_NULL)
-    queue_deliver (msg, proxy);
-//    deliver_msg (msg, &rcv_port_list, proxy->deliver_port);
-
-  return 1;
-}
-
-/* Implementation of notify interface */
-kern_return_t
-do_mach_notify_port_deleted (mach_port_t notify,
-			     mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_msg_accepted (mach_port_t notify,
-			     mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_port_destroyed (mach_port_t notify,
-			       mach_port_t port)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_no_senders (mach_port_t notify,
-			   mach_port_mscount_t mscount)
-{
-  debug ("do_mach_notify_no_senders is called\n");
-  return ports_do_mach_notify_no_senders (notify, mscount);
-}
-
-kern_return_t
-do_mach_notify_send_once (mach_port_t notify)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_dead_name (mach_port_t notify,
-			  mach_port_t name)
-{
-  struct proxy *proxy;
-
-  debug ("do_mach_notify_dead_name is called\n");
-  mach_port_deallocate (mach_task_self (), name);
-  proxy = hurd_ihash_find (&proxy_deliverport_ht, name);
-  if (proxy)
-    {
-      proxy->deliver_port = MACH_PORT_NULL;
-      return 0;
-    }
-  return EINVAL;
-}
-
-/* Implementation of device interface */
-kern_return_t 
-ds_xxx_device_set_status (device_t device, dev_flavor_t flavor,
-			  dev_status_t status, size_t statu_cnt)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_get_status (device_t device, dev_flavor_t flavor,
-			  dev_status_t status, size_t *statuscnt)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_set_filter (device_t device, mach_port_t rec,
-			  int pri, filter_array_t filt, size_t len)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_open (mach_port_t master_port, mach_port_t reply_port,
-		mach_msg_type_name_t reply_portPoly,
-		dev_mode_t mode, dev_name_t name, mach_port_t *device, 
-		mach_msg_type_name_t *devicetype)
-{
-  kern_return_t err;
-  mach_port_t master_device;
-  mach_port_t user_port;
-  struct proxy *proxy;
-
-  if (device_file == NULL)
-    return D_NO_SUCH_DEVICE;
-
-  master_device = file_name_lookup (device_file, 0, 0);
-  if (master_device == MACH_PORT_NULL)
-    return errno;
-
-  proxy = (struct proxy *)calloc (1, sizeof (*proxy));
-  if (proxy == NULL)
-    {
-      mach_port_deallocate (mach_task_self (), master_device);
-      return D_NO_MEMORY;
-    }
-
-  err = device_open (master_device, mode, name, &proxy->device_port);
-  mach_port_deallocate (mach_task_self (), master_device);
-  if (err != KERN_SUCCESS)
-    {
-      free (proxy);
-      return err;
-    }
-
-  err = create_proxy_user (proxy, &user_port);
-  if (err)
-    {
-      mach_port_deallocate (mach_task_self (), master_device);
-      free (proxy);
-      return err;
-    }
-
-  *device = user_port;
-  *devicetype = MACH_MSG_TYPE_MAKE_SEND;
-
-  return 0;
-}
-
-kern_return_t
-ds_device_close (device_t device)
-{
-  return 0;
-}
-
-kern_return_t
-ds_device_write (device_t device, mach_port_t reply_port,
-		 mach_msg_type_name_t reply_type, dev_mode_t mode,
-		 recnum_t recnum, io_buf_ptr_t data, size_t datalen,
-		 int *bytes_written)
-{
-  kern_return_t err = 0;
-  struct proxy_user *user;
-  struct proxy *proxy;
-  int ret_count = 0;
-  int has_filter = 0;
-  net_hash_entry_t entp, *hash_headp;
-  net_rcv_port_t infp, nextfp;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-
-  /* The packet can be sent as long as it passes one filter,
-   * even thought there is usually only one filter in the list. */
-  FILTER_ITERATE (&snd_port_list, infp, nextfp, &infp->chain) 
-    {
-      has_filter = 1;
-      ret_count = mach_bpf_do_filter (infp,
-				      data + sizeof (struct ethhdr),
-				      datalen - sizeof (struct ethhdr),
-				      data, sizeof (struct ethhdr),
-				      &hash_headp, &entp);
-      if (ret_count)
-	break;
-    }
-  FILTER_ITERATE_END
-
-  if (ret_count || !has_filter) 
-    err = device_write (proxy->device_port, mode, recnum, data,
-			datalen, bytes_written);
-  ports_port_deref (user);
-  return err;
-}
-
-kern_return_t
-ds_device_write_inband (device_t device, mach_port_t reply_port,
-			mach_msg_type_name_t reply_type, dev_mode_t mode,
-			recnum_t recnum, io_buf_ptr_inband_t data,
-			size_t datalen, int *bytes_written)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_write_inband (proxy->device_port, mode, recnum, data,
-			     datalen, bytes_written);
-  return ret;
-}
-
-kern_return_t
-ds_device_read (device_t device, mach_port_t reply_port,
-		mach_msg_type_name_t reply_type, dev_mode_t mode,
-		recnum_t recnum, int bytes_wanted,
-		io_buf_ptr_t *data, size_t *datalen)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_read (proxy->device_port, mode, recnum,
-		     bytes_wanted, data, datalen);
-  return ret;
-}
-
-kern_return_t
-ds_device_read_inband (device_t device, mach_port_t reply_port,
-		       mach_msg_type_name_t reply_type, dev_mode_t mode,
-		       recnum_t recnum, int bytes_wanted,
-		       io_buf_ptr_inband_t data, size_t *datalen)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_read_inband (proxy->device_port, mode, recnum, 
-			    bytes_wanted, data, datalen);
-  return ret;
-}
-
-kern_return_t
-ds_device_map (device_t device, vm_prot_t prot, vm_offset_t offset,
-	       vm_size_t size, memory_object_t *pager, int unmap)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_map (proxy->device_port, prot, offset,
-		    size, pager, unmap);
-  return ret;
-}
-
-kern_return_t
-ds_device_set_status (device_t device, dev_flavor_t flavor,
-		      dev_status_t status, size_t statuslen)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_set_status (proxy->device_port, flavor,
-			   status, statuslen);
-  return ret;
-}
-
-kern_return_t
-ds_device_get_status (device_t device, dev_flavor_t flavor,
-		      dev_status_t status, size_t *statuslen)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_get_status (proxy->device_port, flavor, status, statuslen);
-  return ret;
-}
-
-kern_return_t
-ds_device_set_filter (device_t device, mach_port_t receive_port,
-		      int priority, filter_array_t filter, size_t filterlen)
-{
-  mach_port_t tmp;
-  kern_return_t err;
-  mach_port_t device_receive_port;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  if (proxy->device == NULL)
-    {
-      error_t err;
-      err = create_proxy_device (proxy, &device_receive_port);
-      if (err)
-	return err;
-    }
-  else
-    device_receive_port = ports_get_right (proxy->device);
-
-  /* Set the filter from pfinet into the interface,
-   * but the packet will be delivered to the translator,
-   * so the translator has the chance to filter some packets. */
-  err = device_set_filter (proxy->device_port,
-			   device_receive_port,
-			   MACH_MSG_TYPE_MAKE_SEND, priority,
-			   filter, filterlen);
-  if (err)
-    return err;
-
-  proxy->deliver_port = receive_port;
-  hurd_ihash_add (&proxy_deliverport_ht, receive_port, proxy);
-
-  err = mach_port_request_notification (mach_task_self (), receive_port, 
-					MACH_NOTIFY_DEAD_NAME, 0,
-					ports_get_right (notify_pi), 
-					MACH_MSG_TYPE_MAKE_SEND_ONCE, &tmp);
-  if (tmp != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), tmp);
-
-  return err;
-}
-
-void
-trivfs_modify_stat (struct trivfs_protid *cred, io_statbuf_t *stat)
-{
-}
-
-error_t
-trivfs_goaway (struct trivfs_control *fsys, int flags)
-{
-  int count;
-
-  /* Stop new requests.  */
-  ports_inhibit_class_rpcs (trivfs_cntl_portclasses[0]);
-  ports_inhibit_class_rpcs (trivfs_protid_portclasses[0]);
-
-  count = ports_count_class (user_portclass);
-  debug ("the number of ports alive: %d\n", count);
-
-  if (count && !(flags & FSYS_GOAWAY_FORCE)) 
-    {
-      /* We won't go away, so start things going again...  */
-      ports_enable_class (trivfs_protid_portclasses[0]);
-      ports_resume_class_rpcs (trivfs_cntl_portclasses[0]);
-      ports_resume_class_rpcs (trivfs_protid_portclasses[0]); 
-      return EBUSY;
-    } 
-
-  queue_flush ();
-  send_thread_running = 0;
-//  cthread_join (send_thread);
-
-#ifdef DEBUG
-  fclose (logfile);
-#endif
-  debug ("the translator is gone away\n");
-  exit (0);
-}
-
-/* Convert the network address input by the user into
- * a form that is accepted by libpcap. */
-int
-correct_net_addr (char *orig, char *result, int result_len)
-{
-  char *ptr;
-  int netmask_len;
-  int remain_bits;
-  int remain_bytes;
-  char netmask;
-  char addr[4];
-  char buf[INET_ADDRSTRLEN];
-  int i;
-
-  ptr = strstr (orig, "/");
-  if (ptr == NULL)
-    {
-      strncpy (result, orig, result_len);
-      return 0;
-    }
-
-  *ptr = 0;
-  ptr++;
-  netmask_len = atoi (ptr);
-  if (inet_pton (AF_INET, orig, addr) < 0)
-    {
-      perror ("inet_pton");
-      return -1;
-    }
-  remain_bits = netmask_len % 8;
-  netmask = ~0;
-  netmask >>= 8 - remain_bits;
-  netmask <<= 8 - remain_bits;
-  remain_bytes = netmask_len / 8;
-  addr[remain_bytes] &= netmask;
-  for (i=remain_bytes+1 ; i < 4 ; i++)
-    addr[i] = 0;
-
-  snprintf (result, result_len, "%s/%s",
-	    inet_ntop (AF_INET, addr, buf, INET_ADDRSTRLEN), ptr);
-  return 0;
-}
-
-static error_t
-parse_opt (int opt, char *arg, struct argp_state *state)
-{
-  struct bpf_insn *trans_filter_program (char *str, int send,
-					 int *filter_len);
-  char buf[1024];
-  char addr[INET_ADDRSTRLEN+4];
-
-  switch (opt)
-    {
-    case 'i':
-      device_file = arg;
-      break;
-    case 's':
-      if (snd_filter) 
-	free (snd_filter);
-      snd_filter = trans_filter_program (arg, 1, &snd_filter_length);
-      break;
-    case 'r':
-      if (rcv_filter)
-	free (rcv_filter);
-      rcv_filter = trans_filter_program (arg, 0, &rcv_filter_length);
-      break;
-    case 'S':
-      if (correct_net_addr (arg, addr, INET_ADDRSTRLEN+4) < 0)
-	return 0;
-      snprintf (buf, sizeof (buf), "arp or (ip and src net %s)", addr);
-      if (snd_filter) 
-	free (snd_filter);
-      snd_filter = trans_filter_program (buf, 1, &snd_filter_length);
-      break;
-    case 'R':
-      if (correct_net_addr (arg, addr, INET_ADDRSTRLEN+4) < 0)
-	return 0;
-      snprintf (buf, sizeof (buf), "arp or (ip and dst net %s)", addr);
-      if (rcv_filter) 
-	free (rcv_filter);
-      rcv_filter = trans_filter_program (buf, 0, &rcv_filter_length);
-      break;
-    case ARGP_KEY_ERROR:
-    case ARGP_KEY_SUCCESS:
-    case ARGP_KEY_INIT:
-      break;
-    default:
-      return ARGP_ERR_UNKNOWN;
-    }
-  return 0;
-}
-
-void *send_thread_func (void *arg)
-{
-  struct filter_msg *msg;
-  
-  while (send_thread_running)
-    {
-      msg = dequeue_msg ();
-      if (msg == NULL)
-	{
-	  queue_empty_wait ();
-	  continue;
-	}
-      msg->forward (msg);
-      msg->destroy (msg);
-      free (msg);
-    }
-  return NULL;
-}
-
-int
-main (int argc, char *argv[])
-{
-  error_t err;
-  mach_port_t bootstrap;
-  struct trivfs_control *fsys;
-  const struct argp argp = { options, parse_opt, 0, doc };
-
-#ifdef DEBUG
-  logfile = fopen ("/root/filter.log", "a+");
-  if (logfile == NULL)
-    error (1, errno, "fopen");
-#endif
-
-  port_bucket = ports_create_bucket ();
-  user_portclass = ports_create_class (clean_proxy_user, 0);
-  device_portclass = ports_create_class (clean_proxy_device, 0);
-  other_portclass = ports_create_class (0, 0);
-  trivfs_cntl_portclasses[0] = ports_create_class (trivfs_clean_cntl, 0);
-  trivfs_protid_portclasses[0] = ports_create_class (trivfs_clean_protid, 0);
-
-  argp_parse (&argp, argc, argv, 0, 0, 0);
-
-  /* Prepare the filter. */
-  if (snd_filter == NULL) 
-    {
-      snd_filter = default_snd_filter;
-      snd_filter_length = sizeof (default_snd_filter) / sizeof (short);
-    }
-  if (rcv_filter == NULL) 
-    {
-      rcv_filter = default_rcv_filter;
-      rcv_filter_length = sizeof (default_rcv_filter) / sizeof (short);
-    }
-
-  task_get_bootstrap_port (mach_task_self (), &bootstrap);
-  if (bootstrap == MACH_PORT_NULL)
-    error (1, 0, "must be started as a translator");
-
-  err = ports_create_port (other_portclass, port_bucket, 
-			   sizeof (struct port_info), &notify_pi);
-  if (err)
-    error (1, err, "ports_create_port for notification");
-
-  /* Reply to our parent.  */
-  err = trivfs_startup (bootstrap, 0,
-			trivfs_cntl_portclasses[0], port_bucket,
-			trivfs_protid_portclasses[0], port_bucket, &fsys);
-  mach_port_deallocate (mach_task_self (), bootstrap);
-  if (err)
-    error (1, err, "Contacting parent");
-
-  /* Initialize the bpf, and set the filter for outgoing packets.
-   * MACH_PORT_DEAD is used because we don't need a receiving port. */
-  bpf_init ();
-  err = net_set_filter (MACH_PORT_DEAD, 0, (filter_t *) snd_filter,
-			snd_filter_length);
-  if (err)
-    error (1, err, "set the sending filter");
-  /* Set the filter translator's own rule. */
-  err = net_set_filter (MACH_PORT_DEAD, 0, (filter_t *) rcv_filter,
-			rcv_filter_length);
-  if (err)
-    error (1, err, "set the receiving filter");
-
-  cthread_init ();
-  send_thread = cthread_fork (send_thread_func, NULL);
-  /* TODO if the main thread exits,
-   * does the created thread exit if cthread_detach is called */
-  cthread_detach (send_thread);
-
-  /* Launch.  */
-  do 
-    {
-      ports_manage_port_operations_one_thread (port_bucket, 
-					       filter_demuxer, 0);
-    } while (trivfs_goaway (fsys, 0)); 
-  return 0;
-}
-
-int
-deliver_msg (struct net_rcv_msg *msg, queue_head_t *port_list, 
-	     mach_port_t dest)
-{
-  static int count = 0;
-  mach_msg_return_t err;
-  net_rcv_port_t infp, nextfp;
-
-  msg->msg_hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_COPY_SEND, 0);
-  msg->msg_hdr.msgh_local_port = MACH_PORT_NULL;
-  msg->msg_hdr.msgh_kind = MACH_MSGH_KIND_NORMAL;
-
-  /* Deliver the packet to the right pfinet,
-   * actually there should be only one filter in the list. */
-  FILTER_ITERATE (port_list, infp, nextfp, &infp->chain) 
-    {
-      net_hash_entry_t entp, *hash_headp;
-      int ret_count;
-
-      entp = (net_hash_entry_t) 0;
-      ret_count = mach_bpf_do_filter (infp,
-				      msg->packet + sizeof (struct packet_header),
-				      msg->net_rcv_msg_packet_count,
-				      msg->header,
-				      sizeof (struct ethhdr),
-				      &hash_headp, &entp);
-
-      if (ret_count) 
-	{
-	  msg->msg_hdr.msgh_remote_port = dest;
-	  debug ("before delivering the packet to port %d, count: %d\n",
-		 dest, ++count);
-	  err = mach_msg ((mach_msg_header_t *)msg,
-			  MACH_SEND_MSG|MACH_SEND_TIMEOUT,
-			  msg->msg_hdr.msgh_size, 0, MACH_PORT_NULL,
-			  /*MACH_MSG_TIMEOUT_NONE*/500, MACH_PORT_NULL);
-	  if (err != MACH_MSG_SUCCESS)
-	    {
-	      mach_port_deallocate(mach_task_self (),
-				   ((mach_msg_header_t *)msg)->msgh_remote_port);
-	      error (0, err, "mach_msg");
-	      return -1;
-	    }
-	  debug ("after delivering the packet\n");
-	}
-    }
-  FILTER_ITERATE_END
-
-    return 0;
-}
diff --git a/eth-filter.multi-thread/filter.h~ b/eth-filter.multi-thread/filter.h~
deleted file mode 100644
index e5ec7e7c..00000000
--- a/eth-filter.multi-thread/filter.h~
+++ /dev/null
@@ -1,60 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef FILTER_H
-#define FILTER_H
-
-#include <hurd.h>
-#include <mach.h>
-#include <hurd/ports.h>
-
-#include "bpf_impl.h"
-
-struct filter_msg;
-
-struct proxy_user
-{
-  struct port_info pi;
-  struct proxy *proxy;
-};
-
-struct proxy_device
-{
-  struct port_info pi;
-  struct proxy *proxy;
-};
-
-struct proxy
-{
-  struct proxy_device *device;
-  mach_port_t deliver_port;
-  hurd_ihash_locp_t p_deliverport_hashloc;
-  mach_port_t device_port;
-};
-
-extern struct mutex condition_mutex;
-extern struct condition condition_cond;
-
-int deliver_msg (struct net_rcv_msg *msg, queue_head_t *port_list, 
-		 mach_port_t dest);
-int filter_device_write (struct filter_msg *msg);
-int filter_deliver (struct filter_msg *msg);
-
-#endif
diff --git a/eth-filter.multi-thread/msg_queue.c~ b/eth-filter.multi-thread/msg_queue.c~
deleted file mode 100644
index 9e5a6766..00000000
--- a/eth-filter.multi-thread/msg_queue.c~
+++ /dev/null
@@ -1,224 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "msg_queue.h"
-#include "filter.h"
-#include "util.h"
-
-static struct filter_msg *queue_head;
-static struct filter_msg *queue_tail;
-static int queue_len = 0;
-
-static struct mutex queuelock = MUTEX_INITIALIZER;
-static struct mutex condition_mutex = MUTEX_INITIALIZER;
-static struct condition condition_cond = CONDITION_INITIALIZER;
-
-void
-queue_msg (struct filter_msg *msg)
-{
-  msg->next = NULL;
-  // TODO what kind of lock do I need?
-  mutex_lock (&queuelock);
-  if (queue_head == NULL)
-    {
-      assert (queue_tail == NULL);
-      assert (queue_len == 0);
-      /* When the queue is empty. */
-      queue_head = msg;
-      queue_tail = msg;
-    }
-  else
-    {
-      queue_tail->next = msg;
-      queue_tail = msg;
-    }
-  queue_len++;
-  debug ("queue a message, queue length: %d.\n", queue_len);
-  mutex_unlock (&queuelock);
-  queue_wakeup ();
-}
-
-struct filter_msg *
-dequeue_msg ()
-{
-  struct filter_msg *msg;
-
-  mutex_lock (&queuelock);
-  if (queue_head == NULL)
-    {
-      assert (queue_tail == NULL);
-      assert (queue_len == 0);
-      msg = NULL;
-    }
-  else
-    {
-      msg = queue_head;
-      queue_head = msg->next;
-      if (queue_head == NULL)
-	queue_tail = NULL;
-      queue_len--;
-    }
-  debug ("dequeue a message, the queue length: %d.\n", queue_len);
-  mutex_unlock (&queuelock);
-
-  return msg;
-}
-
-/* It can be called when the translator exits. */
-void
-queue_flush ()
-{
-  struct filter_msg *msg;
-  struct filter_msg *tmp;
-
-  mutex_lock (&queuelock);
-  msg = queue_head;
-  queue_head = queue_tail = NULL;
-  queue_len = 0;
-  mutex_unlock (&queuelock);
-
-  while (msg)
-    {
-      tmp = msg;
-      msg = msg->next;
-      if (tmp->destroy)
-	tmp->destroy (tmp);
-      free (tmp);
-    }
-}
-
-void
-filter_write_destroy (struct filter_msg *msg)
-{
-  struct filter_write_msg *write_msg = (struct filter_write_msg *) msg;
-
-  free (write_msg->data);
-}
-
-void filter_deliver_destroy (struct filter_msg *msg)
-{
-  struct filter_deliver_msg *deliver_msg = (struct filter_deliver_msg *) msg;
-
-  free (deliver_msg->net_msg);
-}
-
-kern_return_t
-queue_write (char *data, size_t datalen, mach_port_t reply_port,
-	     mach_msg_type_name_t reply_type, dev_mode_t mode,
-	     recnum_t recnum, struct proxy *proxy)
-{
-  /* Make a copy of the data */
-  char *new_data;
-  struct filter_msg *msg;
-  struct filter_write_msg *write_msg;
-
-  if (queue_len >= MAX_QUEUE)
-    return D_NO_MEMORY;
-  
-  new_data = (char *) malloc (datalen);
-  if (new_data == NULL)
-    return D_NO_MEMORY;
-
-  memcpy (new_data, data, datalen);
-
-  write_msg = (struct filter_write_msg *) malloc (sizeof (*write_msg));
-  if (write_msg == NULL)
-    {
-      free (new_data);
-      return D_NO_MEMORY;
-    }
-  msg = (struct filter_msg *) write_msg;
-
-  msg->proxy = proxy;
-  msg->forward = filter_device_write;
-  msg->destroy = filter_write_destroy;
-
-  write_msg->data = new_data;
-  write_msg->datalen = datalen;
-  write_msg->reply_port = reply_port;
-  write_msg->reply_type = reply_type;
-  write_msg->mode = mode;
-  write_msg->recnum = recnum;
-
-  queue_msg (msg);
-  return D_SUCCESS;
-}
-
-int
-queue_deliver (struct net_rcv_msg *msg, struct proxy *proxy)
-{
-  struct net_rcv_msg *msg_copy;
-  struct filter_deliver_msg *deliver_msg;
-
-  if (queue_len >= MAX_QUEUE)
-    return D_NO_MEMORY;
-
-  /* Make a copy of the data */
-  msg_copy = (struct net_rcv_msg *) malloc (sizeof (*msg_copy));
-  if (msg_copy == NULL)
-    return D_NO_MEMORY;
-
-  deliver_msg = (struct filter_deliver_msg *) malloc (sizeof (*deliver_msg));
-  if (deliver_msg == NULL)
-    {
-      free (msg_copy);
-      return D_NO_MEMORY;
-    }
-
-  *msg_copy = *msg;
-
-  deliver_msg->msg.proxy = proxy;
-  deliver_msg->msg.forward = filter_deliver;
-  deliver_msg->msg.destroy = filter_deliver_destroy;
-
-  deliver_msg->net_msg = msg_copy;
-
-  queue_msg ((struct filter_msg *)deliver_msg);
-  return D_SUCCESS;
-}
-
-void
-queue_empty_wait ()
-{
-  mutex_lock (&condition_mutex);
-//  debug ("queue length is %d\n", queue_len);
-  while (queue_head == NULL)
-    {
-      debug ("thread waits for a signal.\n");
-      condition_wait (&condition_cond, &condition_mutex);
-    }
-  mutex_unlock (&condition_mutex);
-}
-
-void
-queue_wakeup ()
-{
-  if (queue_head)
-    {
-      debug ("wake up a thread.\n");
-      condition_signal (&condition_cond);
-    }
-}
-
diff --git a/eth-filter.multi-thread/msg_queue.h~ b/eth-filter.multi-thread/msg_queue.h~
deleted file mode 100644
index 448b7475..00000000
--- a/eth-filter.multi-thread/msg_queue.h~
+++ /dev/null
@@ -1,69 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef MSG_QUEUE_H
-#define MSG_QUEUE_H
-
-#include <hurd.h>
-#include <mach.h>
-
-//#define MAX_QUEUE 1000
-
-struct proxy;
-
-struct filter_msg 
-{
-  struct proxy *proxy;
-  struct filter_msg *next;
-
-  int (*forward) (struct filter_msg *);
-  void (*destroy) (struct filter_msg *);
-};
-
-struct filter_write_msg
-{
-  struct filter_msg msg;
-
-  char *data;
-  size_t datalen;
-  dev_mode_t mode;
-  recnum_t recnum;
-  mach_port_t reply_port;
-  mach_msg_type_name_t reply_type;
-};
-
-struct filter_deliver_msg 
-{
-  struct filter_msg msg;
-  
-  struct net_rcv_msg *net_msg;
-};
-
-void queue_msg (struct filter_msg *msg);
-struct filter_msg * dequeue_msg ();
-void queue_flush ();
-kern_return_t queue_write (char *data, size_t datalen, mach_port_t reply_port,
-	     mach_msg_type_name_t reply_type, dev_mode_t mode,
-	     recnum_t recnum, struct proxy *proxy);
-int queue_deliver (struct net_rcv_msg *msg, struct proxy *proxy);
-void queue_wakeup ();
-void queue_empty_wait ();
-
-#endif 
diff --git a/eth-filter.multi-thread/tmp.patch~ b/eth-filter.multi-thread/tmp.patch~
deleted file mode 100644
index cca91c30..00000000
--- a/eth-filter.multi-thread/tmp.patch~
+++ /dev/null
@@ -1,49 +0,0 @@
-? bpf_impl.d
-? device.defs
-? eth-filter
-? eth-filter.prof_d
-? filter.d
-? notify.defs
-? notify.sdefs.d
-? notifyServer.c
-? notifyServer.d
-? notify_S.h
-? ourdevice.defs
-? ourdevice.sdefs.d
-? ourdeviceServer.c
-? ourdeviceServer.d
-? ourdevice_S.h
-? pcap_filter.d
-? queue.d
-? tmp.patch
-Index: filter.c
-===================================================================
-RCS file: /sources/hurd/hurd/eth-filter/Attic/filter.c,v
-retrieving revision 1.1.2.8
-diff -r1.1.2.8 filter.c
-208a209
->   mach_msg_header_t header;
-213c214,215
-<   device = ports_lookup_port (port_bucket, inp->msgh_local_port, device_portclass);
----
->   device = ports_lookup_port (port_bucket, inp->msgh_local_port,
-> 			      device_portclass);
-215a218
-> 
-218a222
->   header = msg->msg_hdr;
-220a225
->   msg->msg_hdr = header;
-789c794,796
-< 	  err = mach_msg ((mach_msg_header_t *)msg, MACH_SEND_MSG,
----
-> 	  debug ("before delivering the packet\n");
-> 	  err = mach_msg ((mach_msg_header_t *)msg,
-> 			  MACH_SEND_MSG,
-794,795c801
-< 	      fprintf (stderr, "deliver msg: mach_msg: %s\n",
-< 		       strerror (err));
----
-> 	      error (0, err, "mach_msg");
-797a804
-> 	  debug ("after delivering the packet\n");
diff --git a/eth-filter.multi-thread/util.h~ b/eth-filter.multi-thread/util.h~
deleted file mode 100644
index 44755152..00000000
--- a/eth-filter.multi-thread/util.h~
+++ /dev/null
@@ -1,73 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#include <stdio.h>
-
-#include <linux/if_ether.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/ip.h>
-
-#define DEBUG
-
-#ifdef DEBUG 
-
-#define debug(format, ...) do				\
-{							\
-  extern FILE *logfile;					\
-  char buf[1024];                                       \
-  snprintf (buf, 1024, "filter: %s", format);		\
-  fprintf (logfile , buf, ## __VA_ARGS__);		\
-  fflush (logfile);					\
-} while (0)
-
-#else
-
-#define debug(format, ...) do {} while (0)
-
-#endif
-
-static inline void
-print_pack (char *packet, int len)
-{
-#ifdef DEBUG
-  struct ethhdr *ethh = (struct ethhdr *) packet;
-  struct iphdr *iph = (struct iphdr *)(ethh + 1);
-  char src_str[INET_ADDRSTRLEN];
-  char dst_str[INET_ADDRSTRLEN];
-  if (ntohs (ethh->h_proto) == ETH_P_IP
-      && len >= sizeof (struct ethhdr) + sizeof (struct iphdr)) 
-    {
-      debug ("pack: get a IP packet from %s to %s\n",
-             inet_ntop (AF_INET, &iph->saddr, src_str, INET_ADDRSTRLEN),
-             inet_ntop (AF_INET, &iph->daddr, dst_str, INET_ADDRSTRLEN));
-    }
-  else 
-    {
-      debug ("pack: get a non-IP packet: %x\n", ntohs (ethh->h_proto));
-    }
-#endif
-}
-
-#endif
diff --git a/eth-filter/ChangeLog~ b/eth-filter/ChangeLog~
deleted file mode 100644
index 392c5c15..00000000
--- a/eth-filter/ChangeLog~
+++ /dev/null
@@ -1,122 +0,0 @@
-2009-01-02  Zheng Da  <zhengda1936@gmail.com>
-
-	* filter.c (ds_device_write): Deallocate the out-of-line data.
-
-2008-10-03  Zheng Da  <zhengda1936@gmail.com>
-
-	* Makefile: Remove the include paths from pfinet.
-
-	* util.h: Remove the line of including linux/if_ether.h
-	(ETH_ALEN): New macro.
-	(ethhdr): New structure.
-
-2008-09-26  Zheng Da  <zhengda1936@gmail.com>
-
-	* filter.c (ethernet_demuxer): Save and restore the message header.
-	(deliver_msg): Use the non-block send.
-
-2008-08-22 Zheng Da <zhengda1936@gmail.com>
-
-	* README: Update.
-
-	* filter.c (proxy_info): Removed.
-	(proxy_pfinetpi_ht): Removed.
-	(proxy_devicepi_ht): Removed.
-	(create_proxy): Removed.
-	(destroy_proxy): Removed.
-	(proxy_device): New structure.
-	(proxy_user): New structure.
-	(proxy): New structure.
-	(create_proxy_user): New function.
-	(create_proxy_device): New function.
-	(clean_proxy_user): New function.
-	(clean_proxy_device): New function.
-	(ethernet_demuxer): Get the data from proxy object instead of from
-	proxy_info.
-	(do_mach_notify_dead_name): Likewise.
-	(ds_device_write): Likewise.
-	(ds_device_write_inband): Likewise.
-	(ds_device_read): Likewise.
-	(ds_device_read_inband): Likewise.
-	(ds_device_map): Likewise.
-	(ds_device_set_status): Likewise.
-	(ds_device_get_status): Likewise.
-	(ds_device_set_filter): Likewise. Create the proxy_device object.
-	(do_mach_notify_no_senders): Use ports_do_mach_notify_no_senders().
-	(ds_device_open): Create proxy_user and proxy objects.
-	(main): Add the cleaning routine when creating the port class.
-
-2008-08-20 Zheng Da <zhengda1936@gmail.com>
-
-	* README: Update.
-
-	* filter.c (options): Update.
-
-2008-08-20 Zheng Da <zhengda1936@gmail.com>
-
-	* filter.c (destroy_proxy): Test p_deliverport_hashloc before removing
-	it from proxy_deliverport_ht, and reverse the order of calling
-	ports_destroy_right and ports_port_deref.
-	(ds_device_open): Test device_file and replace "eth" with the variable
-	name.
-
-2008-08-20 Zheng Da <zhengda1936@gmail.com>
-
-	* filter.c (device_file): Change the name of a variable.
-	(ds_device_open): Use device_file directly.
-
-2008-08-19 Zheng Da <zhengda1936@gmail.com>
-
-	* filter.c (ds_device_open): Generate the device file name, and use it
-	to open the device.
-
-2008-08-18 Zheng Da <zhengda1936@gmail.com>
-
-	* README: New file.
-
-
-2008-08-17 Zheng Da <zhengda1936@gmail.com>
-
-	* filter.c (device_name): Remove its default value.
-	(options): Remove the option '-M'.
-	(create_proxy): Get the port directly from port_right field in port_info.
-	(ds_device_open): Remove the code of checking the device name, 
-	and open the device from the device file.
-	(parse_opt): Remove the code of handling the option '-M'.
-	(main): Remove the code of getting the master device port.
-	
-
-2008-08-14 Zheng Da <zhengda1936@gmail.com>
-
-	* filter.c (pfinet_portclass, device_portclass, other_portclass): 
-	New variables.
-	(create_proxy): Use pfinet_portclass and device_portclass to create the
-	port.
-	(destroy_proxy): Dereference the port before destroying it.
-	(trivfs_goaway): Test the number of ports in pfinet_portclass and destroy
-	the master_device.
-	(main): Create pfinet_portclass, device_portclass, other_portclass.
-	(print_msg): Deleted.
-	(deliver_msg): Remove debuging print.
-
-	* ChangeLog: New file.
-	
-
-2008-08-13 Zheng Da <zhengda1936@gmail.com>
-
-	* bpf_impl.c: New file.
-
-	* Makefile: New file.
-
-	* queue.c: New file.
-
-	* util.h: New file.
-
-	* bpf_impl.h: New file.
-
-	* filter.c: New file.
-
-	* pcap_filter.c: New file.
-
-	* queue.h: New file.
-
diff --git a/eth-filter/filter.c~ b/eth-filter/filter.c~
deleted file mode 100644
index d348d860..00000000
--- a/eth-filter/filter.c~
+++ /dev/null
@@ -1,827 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/*
- * This program is a filter translator which sits on the top of the network
- * interface. 
- * It provides two filters: for outgoing packets and for incoming packets.
- * Only one pfinet server are allowed to run on the top of the translator. 
- */
-
-#include <argp.h>
-#include <errno.h>
-#include <error.h>
-#include <stddef.h>
-
-#include <fcntl.h>
-#include <hurd.h>
-#include <mach.h>
-#include <device/device.h>
-#include <hurd/trivfs.h>
-#include <hurd/ports.h>
-#include <hurd/ihash.h>
-
-#include "ourdevice_S.h"
-#include "notify_S.h"
-#include "bpf_impl.h"
-#include "util.h"
-
-struct proxy_user
-{
-  struct port_info pi;
-  struct proxy *proxy;
-};
-
-struct proxy_device
-{
-  struct port_info pi;
-  struct proxy *proxy;
-};
-
-struct proxy
-{
-  struct proxy_device *device;
-  mach_port_t deliver_port;
-  hurd_ihash_locp_t p_deliverport_hashloc;
-  mach_port_t device_port;
-};
-
-int deliver_msg (struct net_rcv_msg *msg, queue_head_t *port_list, 
-		 mach_port_t dest);
-
-static struct hurd_ihash proxy_deliverport_ht
-= HURD_IHASH_INITIALIZER (offsetof (struct proxy, p_deliverport_hashloc));
-
-/* The name of the network interface that the filter translator sits on. */
-static char *device_file;
-const char *argp_program_version = "eth-filter 0.1";
-const char *argp_program_bug_address = "<bug-hurd@gnu.org>";
-static const char doc[] = "Hurd filter translator.";
-static const struct argp_option options[] =
-{
-    {"interface", 'i', "DEVICE", 0,
-      "Network interface to use", 2},
-    {"send-filter", 's', "string", 0,
-      "The filter rule which applies to the outgoing packet", 4},
-    {"receive-filter", 'r', "string", 0,
-      "The filter rule which applies to the ingoing packet", 5},
-    {"send-ip-range", 'S', "IP range", 0,
-      "A range of IP to create the send filter", 6},
-    {"receive-ip-range", 'R', "IP range", 0,
-      "A range of IP to create the receive filter", 7},
-    {0}
-};
-
-/* A filter allows every packet to be sent and be received. */
-static struct bpf_insn default_snd_filter[] = 
-{
-    {NETF_OUT|NETF_BPF, 0, 0, 0},
-    {6, 0, 0, 1500}
-};
-static struct bpf_insn default_rcv_filter[] = 
-{
-    {NETF_IN|NETF_BPF, 0, 0, 0},
-    {6, 0, 0, 1500}
-};
-static struct bpf_insn *snd_filter = NULL;
-static int snd_filter_length;
-static struct bpf_insn *rcv_filter = NULL;
-static int rcv_filter_length;
-
-/* Port bucket we service requests on.  */
-struct port_bucket *port_bucket;
-
-struct port_class *user_portclass;
-struct port_class *device_portclass;
-struct port_class *other_portclass;
-
-/* Trivfs hooks.  */
-int trivfs_fstype = FSTYPE_MISC;
-int trivfs_fsid = 0;
-int trivfs_support_read = 0;
-int trivfs_support_write = 0;
-int trivfs_support_exec = 0;
-int trivfs_allow_open = O_READ | O_WRITE;
-
-struct port_class *trivfs_protid_portclasses[1];
-struct port_class *trivfs_cntl_portclasses[1];
-int trivfs_protid_nportclasses = 1;
-int trivfs_cntl_nportclasses = 1;
-
-/* For getting the notification of ports from the kernel. */
-struct port_info *notify_pi;
-
-error_t
-create_proxy_user (struct proxy *proxy, mach_port_t *port)
-{
-  error_t err;
-  struct proxy_user *user;
-
-  err = ports_create_port (user_portclass, port_bucket, sizeof (*user), &user);
-  if (err)
-      return err;
-  user->proxy = proxy;
-
-  *port = ports_get_right (user);
-  ports_port_deref (user);
-  return 0;
-}
-
-error_t 
-create_proxy_device (struct proxy *proxy, mach_port_t *port)
-{
-  error_t err;
-  struct proxy_device *device;
-
-  err = ports_create_port (device_portclass, port_bucket, sizeof (*device), &device);
-  if (err)
-      return err;
-  device->proxy = proxy;
-  proxy->device = device;
-
-  *port = ports_get_right (device);
-  ports_port_deref (device);
-  return 0;
-}
-
-void
-clean_proxy_user (void *p)
-{
-  struct proxy_user *user = p;
-  struct proxy *proxy = user->proxy;
-
-  if (proxy->p_deliverport_hashloc)
-    hurd_ihash_locp_remove (&proxy_deliverport_ht, proxy->p_deliverport_hashloc);
-
-  if (proxy->deliver_port != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), proxy->deliver_port);
-  if (proxy->device_port != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), proxy->device_port);
-
-  if (proxy->device)
-    ports_destroy_right (proxy->device);
-
-  free (proxy);
-}
-
-void
-clean_proxy_device (void *p)
-{
-  struct proxy_device *device = p;
-  if (device->proxy)
-    device->proxy->device = NULL;
-}
-
-static int
-filter_demuxer (mach_msg_header_t *inp,
-		mach_msg_header_t *outp)
-{
-  extern int device_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern int notify_server (mach_msg_header_t *, mach_msg_header_t *);
-  extern int ethernet_demuxer (mach_msg_header_t *, mach_msg_header_t *);
-  return device_server (inp, outp) || notify_server (inp, outp)
-    || ethernet_demuxer (inp, outp) || trivfs_demuxer (inp, outp);
-}
-
-int
-ethernet_demuxer (mach_msg_header_t *inp,
-		  mach_msg_header_t *outp)
-{
-  struct net_rcv_msg *msg = (struct net_rcv_msg *) inp;
-  struct proxy_device *device;
-  struct proxy *proxy;
-  mach_msg_header_t header;
-
-  if (inp->msgh_id != NET_RCV_MSG_ID)
-    return 0;
-
-  device = ports_lookup_port (port_bucket, inp->msgh_local_port, device_portclass);
-  if (device == NULL)
-    return 0;
-  proxy = device->proxy;
-  ports_port_deref (device);
-
-  if (proxy && proxy->deliver_port != MACH_PORT_NULL)
-    {
-      header = msg->msg_hdr;
-      deliver_msg (msg, &rcv_port_list, proxy->deliver_port);
-      msg->msg_hdr = header;
-    }
-
-  return 1;
-}
-
-/* Implementation of notify interface */
-kern_return_t
-do_mach_notify_port_deleted (mach_port_t notify,
-			     mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_msg_accepted (mach_port_t notify,
-			     mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_port_destroyed (mach_port_t notify,
-			       mach_port_t port)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_no_senders (mach_port_t notify,
-			   mach_port_mscount_t mscount)
-{
-  debug ("do_mach_notify_no_senders is called\n");
-  return ports_do_mach_notify_no_senders (notify, mscount);
-}
-
-kern_return_t
-do_mach_notify_send_once (mach_port_t notify)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_dead_name (mach_port_t notify,
-			  mach_port_t name)
-{
-  struct proxy *proxy;
-
-  debug ("do_mach_notify_dead_name is called\n");
-  mach_port_deallocate (mach_task_self (), name);
-  proxy = hurd_ihash_find (&proxy_deliverport_ht, name);
-  if (proxy)
-    {
-      proxy->deliver_port = MACH_PORT_NULL;
-      return 0;
-    }
-  return EINVAL;
-}
-
-/* Implementation of device interface */
-kern_return_t 
-ds_xxx_device_set_status (device_t device, dev_flavor_t flavor,
-			  dev_status_t status, size_t statu_cnt)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_get_status (device_t device, dev_flavor_t flavor,
-			  dev_status_t status, size_t *statuscnt)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_set_filter (device_t device, mach_port_t rec,
-			  int pri, filter_array_t filt, size_t len)
-{
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_open (mach_port_t master_port, mach_port_t reply_port,
-		mach_msg_type_name_t reply_portPoly,
-		dev_mode_t mode, dev_name_t name, mach_port_t *device, 
-		mach_msg_type_name_t *devicetype)
-{
-  kern_return_t err;
-  mach_port_t master_device;
-  mach_port_t user_port;
-  int file_open_mode = 0;
-  struct proxy *proxy;
-
-  if (device_file == NULL)
-    return D_NO_SUCH_DEVICE;
-
-  if (mode | D_WRITE)
-    file_open_mode |= O_WRITE;
-  if (mode | D_READ)
-    file_open_mode |= O_READ;
-  master_device = file_name_lookup (device_file, file_open_mode, 0);
-  if (master_device == MACH_PORT_NULL)
-    return errno;
-
-  proxy = (struct proxy *)calloc (1, sizeof (*proxy));
-  if (proxy == NULL)
-    {
-      mach_port_deallocate (mach_task_self (), master_device);
-      return D_NO_MEMORY;
-    }
-
-  err = device_open (master_device, mode, name, &proxy->device_port);
-  mach_port_deallocate (mach_task_self (), master_device);
-  if (err != KERN_SUCCESS)
-    {
-      free (proxy);
-      return err;
-    }
-
-  err = create_proxy_user (proxy, &user_port);
-  if (err)
-    {
-      mach_port_deallocate (mach_task_self (), master_device);
-      free (proxy);
-      return err;
-    }
-
-  *device = user_port;
-  *devicetype = MACH_MSG_TYPE_MAKE_SEND;
-
-  return 0;
-}
-
-kern_return_t
-ds_device_close (device_t device)
-{
-  return 0;
-}
-
-kern_return_t
-ds_device_write (device_t device, mach_port_t reply_port,
-		 mach_msg_type_name_t reply_type, dev_mode_t mode,
-		 recnum_t recnum, io_buf_ptr_t data, size_t datalen,
-		 int *bytes_written)
-{
-  int ret_count = 0;
-  int has_filter = 0;
-  net_hash_entry_t entp, *hash_headp;
-  net_rcv_port_t infp, nextfp;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    {
-      vm_deallocate (mach_task_self (), data, datalen);
-      return D_INVALID_OPERATION;
-    }
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  /* The packet can be sent as long as it passes one filter,
-   * even thought there is usually only one filter in the list. */
-  FILTER_ITERATE (&snd_port_list, infp, nextfp, &infp->chain) 
-    {
-      has_filter = 1;
-      ret_count = mach_bpf_do_filter (infp,
-				      data + sizeof (struct ethhdr),
-				      datalen - sizeof (struct ethhdr),
-				      data, sizeof (struct ethhdr),
-				      &hash_headp, &entp);
-      if (ret_count)
-	break;
-    }
-  FILTER_ITERATE_END
-
-  error_t err;
-  if (ret_count || !has_filter) 
-    {
-      print_pack (data, datalen);
-      debug ("before writing a packet from the device.\n");
-      err = device_write (proxy->device_port, mode , recnum ,
-			  data, datalen, bytes_written);
-      debug ("after writing a packet from the device.\n");
-    }
-  else 
-    {
-      *bytes_written = datalen;
-      err = 0;
-    }
-  vm_deallocate (mach_task_self (), data, datalen);
-  return err;
-}
-
-kern_return_t
-ds_device_write_inband (device_t device, mach_port_t reply_port,
-			mach_msg_type_name_t reply_type, dev_mode_t mode,
-			recnum_t recnum, io_buf_ptr_inband_t data,
-			size_t datalen, int *bytes_written)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_write_inband (proxy->device_port, mode, recnum, data,
-			     datalen, bytes_written);
-  return ret;
-}
-
-kern_return_t
-ds_device_read (device_t device, mach_port_t reply_port,
-		mach_msg_type_name_t reply_type, dev_mode_t mode,
-		recnum_t recnum, int bytes_wanted,
-		io_buf_ptr_t *data, size_t *datalen)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_read (proxy->device_port, mode, recnum,
-		     bytes_wanted, data, datalen);
-  return ret;
-}
-
-kern_return_t
-ds_device_read_inband (device_t device, mach_port_t reply_port,
-		       mach_msg_type_name_t reply_type, dev_mode_t mode,
-		       recnum_t recnum, int bytes_wanted,
-		       io_buf_ptr_inband_t data, size_t *datalen)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_read_inband (proxy->device_port, mode, recnum, 
-			    bytes_wanted, data, datalen);
-  return ret;
-}
-
-kern_return_t
-ds_device_map (device_t device, vm_prot_t prot, vm_offset_t offset,
-	       vm_size_t size, memory_object_t *pager, int unmap)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_map (proxy->device_port, prot, offset,
-		    size, pager, unmap);
-  return ret;
-}
-
-kern_return_t
-ds_device_set_status (device_t device, dev_flavor_t flavor,
-		      dev_status_t status, size_t statuslen)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_set_status (proxy->device_port, flavor,
-			   status, statuslen);
-  return ret;
-}
-
-kern_return_t
-ds_device_get_status (device_t device, dev_flavor_t flavor,
-		      dev_status_t status, size_t *statuslen)
-{
-  kern_return_t ret;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  ret = device_get_status (proxy->device_port, flavor, status, statuslen);
-  return ret;
-}
-
-kern_return_t
-ds_device_set_filter (device_t device, mach_port_t receive_port,
-		      int priority, filter_array_t filter, size_t filterlen)
-{
-  mach_port_t tmp;
-  kern_return_t err;
-  mach_port_t device_receive_port;
-  struct proxy_user *user;
-  struct proxy *proxy;
-
-  user = ports_lookup_port (port_bucket, device, user_portclass);
-  if (user == NULL)
-    return D_INVALID_OPERATION;
-  proxy = user->proxy;
-  ports_port_deref (user);
-
-  if (proxy->device == NULL)
-    {
-      error_t err;
-      err = create_proxy_device (proxy, &device_receive_port);
-      if (err)
-	return err;
-    }
-  else
-    device_receive_port = ports_get_right (proxy->device);
-
-  /* Set the filter from pfinet into the interface,
-   * but the packet will be delivered to the translator,
-   * so the translator has the chance to filter some packets. */
-  err = device_set_filter (proxy->device_port,
-			   device_receive_port,
-			   MACH_MSG_TYPE_MAKE_SEND, priority,
-			   filter, filterlen);
-  if (err)
-    return err;
-
-  proxy->deliver_port = receive_port;
-  hurd_ihash_add (&proxy_deliverport_ht, receive_port, proxy);
-
-  err = mach_port_request_notification (mach_task_self (), receive_port, 
-					MACH_NOTIFY_DEAD_NAME, 0,
-					ports_get_right (notify_pi), 
-					MACH_MSG_TYPE_MAKE_SEND_ONCE, &tmp);
-  if (tmp != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), tmp);
-
-  return err;
-}
-
-void
-trivfs_modify_stat (struct trivfs_protid *cred, io_statbuf_t *stat)
-{
-}
-
-error_t
-trivfs_goaway (struct trivfs_control *fsys, int flags)
-{
-  int count;
-
-  /* Stop new requests.  */
-  ports_inhibit_class_rpcs (trivfs_cntl_portclasses[0]);
-  ports_inhibit_class_rpcs (trivfs_protid_portclasses[0]);
-
-  count = ports_count_class (user_portclass);
-  debug ("the number of ports alive: %d\n", count);
-
-  if (count && !(flags & FSYS_GOAWAY_FORCE)) 
-    {
-      /* We won't go away, so start things going again...  */
-      ports_enable_class (trivfs_protid_portclasses[0]);
-      ports_resume_class_rpcs (trivfs_cntl_portclasses[0]);
-      ports_resume_class_rpcs (trivfs_protid_portclasses[0]); 
-      return EBUSY;
-    } 
-
-  debug ("the translator is gone away\n");
-  exit (0);
-}
-
-/* Convert the network address input by the user into
- * a form that is accepted by libpcap. */
-int
-correct_net_addr (char *orig, char *result, int result_len)
-{
-  char *ptr;
-  int netmask_len;
-  int remain_bits;
-  int remain_bytes;
-  char netmask;
-  char addr[4];
-  char buf[INET_ADDRSTRLEN];
-  int i;
-
-  ptr = strstr (orig, "/");
-  if (ptr == NULL)
-    {
-      strncpy (result, orig, result_len);
-      return 0;
-    }
-
-  *ptr = 0;
-  ptr++;
-  netmask_len = atoi (ptr);
-  if (inet_pton (AF_INET, orig, addr) < 0)
-    {
-      perror ("inet_pton");
-      return -1;
-    }
-  remain_bits = netmask_len % 8;
-  netmask = ~0;
-  netmask >>= 8 - remain_bits;
-  netmask <<= 8 - remain_bits;
-  remain_bytes = netmask_len / 8;
-  addr[remain_bytes] &= netmask;
-  for (i=remain_bytes+1 ; i < 4 ; i++)
-    addr[i] = 0;
-
-  snprintf (result, result_len, "%s/%s",
-	    inet_ntop (AF_INET, addr, buf, INET_ADDRSTRLEN), ptr);
-  return 0;
-}
-
-static error_t
-parse_opt (int opt, char *arg, struct argp_state *state)
-{
-  struct bpf_insn *trans_filter_program (char *str, int send,
-					 int *filter_len);
-  char buf[1024];
-  char addr[INET_ADDRSTRLEN+4];
-
-  switch (opt)
-    {
-    case 'i':
-      device_file = arg;
-      break;
-    case 's':
-      if (snd_filter) 
-	free (snd_filter);
-      snd_filter = trans_filter_program (arg, 1, &snd_filter_length);
-      break;
-    case 'r':
-      if (rcv_filter)
-	free (rcv_filter);
-      rcv_filter = trans_filter_program (arg, 0, &rcv_filter_length);
-      break;
-    case 'S':
-      if (correct_net_addr (arg, addr, INET_ADDRSTRLEN+4) < 0)
-	return 0;
-      snprintf (buf, sizeof (buf), "arp or (ip and src net %s)", addr);
-      if (snd_filter) 
-	free (snd_filter);
-      snd_filter = trans_filter_program (buf, 1, &snd_filter_length);
-      break;
-    case 'R':
-      if (correct_net_addr (arg, addr, INET_ADDRSTRLEN+4) < 0)
-	return 0;
-      snprintf (buf, sizeof (buf), "arp or (ip and dst net %s)", addr);
-      if (rcv_filter) 
-	free (rcv_filter);
-      rcv_filter = trans_filter_program (buf, 0, &rcv_filter_length);
-      break;
-    case ARGP_KEY_ERROR:
-    case ARGP_KEY_SUCCESS:
-    case ARGP_KEY_INIT:
-      break;
-    default:
-      return ARGP_ERR_UNKNOWN;
-    }
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  error_t err;
-  mach_port_t bootstrap;
-  struct trivfs_control *fsys;
-  const struct argp argp = { options, parse_opt, 0, doc };
-
-  port_bucket = ports_create_bucket ();
-  user_portclass = ports_create_class (clean_proxy_user, 0);
-  device_portclass = ports_create_class (clean_proxy_device, 0);
-  other_portclass = ports_create_class (0, 0);
-  trivfs_cntl_portclasses[0] = ports_create_class (trivfs_clean_cntl, 0);
-  trivfs_protid_portclasses[0] = ports_create_class (trivfs_clean_protid, 0);
-
-  argp_parse (&argp, argc, argv, 0, 0, 0);
-
-  /* Prepare the filter. */
-  if (snd_filter == NULL) 
-    {
-      snd_filter = default_snd_filter;
-      snd_filter_length = sizeof (default_snd_filter) / sizeof (short);
-    }
-  if (rcv_filter == NULL) 
-    {
-      rcv_filter = default_rcv_filter;
-      rcv_filter_length = sizeof (default_rcv_filter) / sizeof (short);
-    }
-
-  task_get_bootstrap_port (mach_task_self (), &bootstrap);
-  if (bootstrap == MACH_PORT_NULL)
-    error (1, 0, "must be started as a translator");
-
-  err = ports_create_port (other_portclass, port_bucket, 
-			   sizeof (struct port_info), &notify_pi);
-  if (err)
-    error (1, err, "ports_create_port for notification");
-
-  /* Reply to our parent.  */
-  err = trivfs_startup (bootstrap, 0,
-			trivfs_cntl_portclasses[0], port_bucket,
-			trivfs_protid_portclasses[0], port_bucket, &fsys);
-  mach_port_deallocate (mach_task_self (), bootstrap);
-  if (err)
-    error (1, err, "Contacting parent");
-
-  /* Initialize the bpf, and set the filter for outgoing packets.
-   * MACH_PORT_DEAD is used because we don't need a receiving port. */
-  bpf_init ();
-  err = net_set_filter (MACH_PORT_DEAD, 0, (filter_t *) snd_filter,
-			snd_filter_length);
-  if (err)
-    error (1, err, "set the sending filter");
-  /* Set the filter translator's own rule. */
-  err = net_set_filter (MACH_PORT_DEAD, 0, (filter_t *) rcv_filter,
-			rcv_filter_length);
-  if (err)
-    error (1, err, "set the receiving filter");
-
-  /* Launch.  */
-  do 
-    {
-      ports_manage_port_operations_one_thread (port_bucket, 
-					       filter_demuxer, 0);
-    } while (trivfs_goaway (fsys, 0)); 
-  return 0;
-}
-
-int
-deliver_msg (struct net_rcv_msg *msg, queue_head_t *port_list, 
-	     mach_port_t dest)
-{
-  int ret_count = 0;
-  int has_filter = 0;
-  mach_msg_return_t err;
-  net_rcv_port_t infp, nextfp;
-
-  msg->msg_hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_COPY_SEND, 0);
-  msg->msg_hdr.msgh_local_port = MACH_PORT_NULL;
-  msg->msg_hdr.msgh_kind = MACH_MSGH_KIND_NORMAL;
-
-  /* Deliver the packet to the right pfinet,
-   * actually there should be only one filter in the list. */
-  FILTER_ITERATE (port_list, infp, nextfp, &infp->chain) 
-    {
-      net_hash_entry_t entp, *hash_headp;
-
-      entp = (net_hash_entry_t) 0;
-      ret_count = mach_bpf_do_filter (infp,
-				      msg->packet + sizeof (struct packet_header),
-				      msg->net_rcv_msg_packet_count,
-				      msg->header,
-				      sizeof (struct ethhdr),
-				      &hash_headp, &entp);
-
-      if (ret_count) 
-	break;
-    }
-  FILTER_ITERATE_END
-    
-    if (ret_count || !has_filter)
-      {
-	msg->msg_hdr.msgh_remote_port = dest;
-	debug ("before delivering the message\n");
-	err = mach_msg ((mach_msg_header_t *)msg,
-			MACH_SEND_MSG|MACH_SEND_TIMEOUT,
-			msg->msg_hdr.msgh_size, 0, MACH_PORT_NULL,
-			0, MACH_PORT_NULL);
-	if (err != MACH_MSG_SUCCESS)
-	  {
-	    fprintf (stderr, "deliver msg: mach_msg: %s\n",
-		     strerror (err));
-	    return -1;
-	  }
-	debug ("after delivering the message\n");
-      }
-
-    return 0;
-}
diff --git a/eth-multiplexer/ChangeLog~ b/eth-multiplexer/ChangeLog~
deleted file mode 100644
index dded432e..00000000
--- a/eth-multiplexer/ChangeLog~
+++ /dev/null
@@ -1,341 +0,0 @@
-2009-04-18  Zheng Da  <zhengda1936@gmail.com>
-
-	* device_impl.c (ds_device_open): Create a virtual device if it
-					  doesn't exist.
-
-	* netfs_impl.c (new_node): Test if the lnode structure exists
-				   before setting its field.
-	(lookup): Copy the device name and don't create the virtual device.
-	(netfs_validate_stat): Set the status with the one of the underlying
-			       node if the node has no lnode structure.
-	(netfs_attempt_chmod): chmod isn't supported if the node has no lnode
-			       structure.
-	(netfs_node_norefs): Free the name in netnode.
-
-	* netfs_impl.h (net_node): Add new field 'name'.
-
-2009-04-18  Zheng Da  <zhengda1936@gmail.com>
-
-	* device_impl.c (ds_device_open): Check the mode for opening the file.
-
-	* multiplexer.c
-	(underlying_node_stat): New variable.
-	(main): Get the mapped time from Mach and set the time of the underlying
-		node of the translator.
-
-	* netfs_impl.c (lookup): Set the new created node with the same permission
-				 as the underlying node of the translator and its time.
-	(netfs_check_open_permissions): Check the open permission of a node
-					in the same way.
-	(netfs_attempt_unlink): Change the return value.
-	(netfs_attempt_rename): Likewise.
-	(netfs_attempt_mkdir): Likewise.
-	(netfs_attempt_rmdir): Likewise.
-	(netfs_attempt_chown): Likewise.
-	(netfs_attempt_chauthor): Likewise.
-	(netfs_attempt_mksymlink): Likewise.
-	(netfs_attempt_mkdev): Likewise.
-	(netfs_set_translator): Likewise.
-	(netfs_attempt_chflags): Likewise.
-	(netfs_attempt_set_size): Likewise.
-	(netfs_attempt_link): Likewise.
-	(netfs_attempt_mkfile): Likewise.
-	(netfs_attempt_write): Likewise.
-	(netfs_attempt_chmod): Write the code to support the change of the mode.
-
-	* netfs_impl.h (multiplexer_maptime): Add the declaration.
-
-2009-01-03  Zheng Da  <zhengda1936@gmail.com>
-
-	* device_impl.c (ds_device_write): Deallocate the out-of-line data.
-
-2008-12-12  Zheng Da  <zhengda1936@gmail.com>
-
-	* multiplexer.c (main): Initialize the file status of the root node.
-	
-	* netfs_impl.c (netfs_validate_stat): Set the file status of the node
-					      with the one in the light node.
-
-	* vdev.h (dev_act_func): Define a new type.
-	(foreach_dev_do): Declare the function.
-
-2008-11-18  Zheng Da  <zhengda1936@gmail.com>
-
-	* netfs_impl.c (netfs_get_dirents): Use foreach_dev_do.
-
-	* vdev.c (dev_head, dev_num): Hide in the file.
-	(dev_list_lock): New variable.
-	(get_dev_num): New function.
-	(lookup_dev_by_name): Use lock.
-	(foreach_dev_do): New function.
-	(remove_dead_port_from_dev): Use lock.
-	(broadcast_pack, broadcast_msg): Use foreach_dev_do.
-
-	* vdev.h (dev_num): Remove declaration. 
-	(get_dev_num): Add declaration.
-
-2008-11-13  Zheng Da  <zhengda1936@gmail.com>
-
-	* device_impl.c (ds_device_open): Use dev_port, dereference pi.
-
-	* util.h (print_backtrace): New macro.
-
-	* vdev.c (add_vdev): Set dev_port.
-
-	* vdev.h (vether_device): Add dev_port.
-
-2008-11-12  Zheng Da  <zhengda1936@gmail.com>
-
-	* Makefile (SRCS): Updated.
-
-	* demuxer.c: New file.
-
-	* device_impl.c (ds_device_open): Use netfs_port_bucket.
-
-	* make-protid.c: Deleted.
-
-2008-11-02  Zheng Da  <zhengda1936@gmail.com>
-
-	* Makefile (CFLAGS): Add a macro.
-	(SRCS): Add new C files.
-	(LCLHDRS): Add new H files.
-	(HURDLIBS): Change libraries.
-	
-	* demuxer.c: New file.
-
-	* device_impl.c: New file.
-
-	* make-protid.c: New file.
-
-	* netfs_impl.c: New file.
-
-	* netfs_impl.h: New file.
-
-	* notify_impl.c: New file.
-
-	* multiplexer.c: Remove the trivfs variables. Move the implementation of
-	notify interface. Move the implementation of device interface.
-	(multiplexer_thread): New functions.
-	(main): Run the libnetfs translator.
-
-	* util.h (debug): Update.
-
-	* vdev.c (lookup_dev_by_name): Use strncmp.
-	(add_vdev): Change its interface.
-
-2008-10-27  Zheng Da  <zhengda1936@gmail.com>
-
-	* README: Update.
-
-	* bpf_impl.c (destroy_filters): New function.
-	
-	* multiplexer.c (nb_dev): Deleted.
-	(options): Remove the option '-v'.
-	(do_mach_notify_no_senders): Remove all port_info in the same way.
-	(ds_device_open): Create new devices if they don't exist, and decrease
-			  their reference counts.
-	(ds_device_set_filter): Fix a bug.
-	(trivfs_goaway): Use has_vdev() to test.
-	(parse_opt): Remove the code of handling '-v'.
-	(main): Remove the code of creating virtual devices.
-
-	* util.h (ETH_P_IP): New macro.
-	
-	* vdev.c (all_dev_close): Deleted.
-	(add_vdev): Link virtual device.
-	(destroy_vdev): New function.
-
-	* vdev.h (vether_device): Changed.
-	
-
-2008-10-03  Zheng Da  <zhengda1936@gmail.com>
-
-	* Makefile (CFLAGS): Remove the include paths from pfinet.
-
-	* util.h: Remove the line of including linux/if_ether.h.
-	(ETH_ALEN): New macro.
-	(ethhdr): New structure.
-
-	* vdev.c (ETH_HLEN): New macro.
-
-	* vdev.h: Remove the line of including linux/etherdevice.h and include util.h
-
-2008-10-03  Zheng Da  <zhengda1936@gmail.com>
-
-	* multiplexer.c (parse_opt): Don't create the virtual devices in case 'v'.
-	(main): Create the virtual devices.
-
-	* README: Update.
-
-2008-10-03  Zheng Da  <zhengda1936@gmail.com>
-
-	* multiplexer.c (ds_device_write): Don't call device_write when ether_port is NULL.
-	(ds_device_get_status): Call dev_getstat when ether_port is NULL.
-	(main): If device_file isn't specified, don't open the underlying device.
-
-2008-09-26  Zheng Da  <zhengda1936@gmail.com>
-
-	* vdev.c (deliver_msg): Use non-block send.
-
-2008-09-21  Zheng Da  <zhengda1936@gmail.com>
-
-	* README: Update.
-
-2008-09-02  Zheng Da  <zhengda1936@gmail.com>
-
-	* ethernet.c (ether_filter): Use the original NPF filter.
-
-2008-9-01  Zheng Da  <zhengda1936@gmail.com>
-
-	* multiplexer.c (ds_device_write): Reverse the calling of functions.
-	(ds_device_get_status): Call device_get_status.
-
-	* vdev.c (broadcast_pack): Change its function prototype. Broadcast to
-	all other interface.
-	(deliver_pack): Don't set the message header.
-	(broadcast_msg): Save the original message header and restore it.
-	(deliver_msg): Deallocate the port if mach_msg fails.
-
-	* vdev.h (broadcast_pack): Change its function prototype.
-
-2008-8-29  Zheng Da <zhengda1936@gmail.com>
-
-	* ethernet.c (ethernet_open): Use error instead of assert_perror.
-
-	* multiplexer.c (ds_device_set_filter): Return the error.
-
-2008-8-28 Zheng Da <zhengda1936@gmail.com>
-
-	* ethernet.c (NET_FLAGS): New macro.
-
-2008-8-22 Zheng Da <zhengda1936@gmail.com>
-
-	* README: Update.
-
-	* Makefile: Remove list.h.
-
-	* multiplexer.c (do_mach_notify_no_senders): Get vether_device object
-	with ports_lookup_port().
-	(ds_xxx_device_set_status): Likewise.
-	(ds_xxx_device_get_status): Likewise.
-	(ds_xxx_device_set_filter): Likewise.
-	(ds_device_write): Likewise.
-	(ds_device_write_inband): Likewise.
-	(ds_device_read): Likewise.
-	(ds_device_read_inband): Likewise.
-	(ds_device_map): Likewise.
-	(ds_device_set_status): Likewise.
-	(ds_device_get_status): Likewise.
-	(ds_device_set_filter): Likewise.
-	(do_mach_notify_dead_name): Deallocate the port.
-	(ds_device_open): Get the name directly from the vether_device object.
-	(ds_device_close): Return 0 immediately.
-
-	* vdev.c (dev_head): Point to the head of the device list.
-	(print_eth_addr): Removed.
-	(lookup_dev_by_devport): Likewise.
-	(lookup_dev_by_name): Use the for loop to replace list_for_each_entry.
-	(remove_dead_port_from_dev): Likewise.
-	(all_dev_close): Likewise.
-	(broadcast_pack): Likewise.
-	(broadcast_msg): Likewise.
-	(add_vdev): Create the vether_device object with ports_create_port.
-	(has_vdev): Test if the device list is empty.
-
-	* vdev.h: Don't include list.h.
-	(vether_device): Include the port_info object instead of its pointer.
-	(next): Replace dev_list.
-
-	* list.h: Removed.
-
-2008-8-20 Zheng Da <zhengda1936@gmail.com>
-
-	* README: Update.
-
-	* multiplexer.c (options): Update.
-
-2008-8-20 Zheng Da <zhengda1936@gmail.com>
-
-	* multiplexer.c (main): Test device_file before using it.
-
-2008-8-20 Zheng Da <zhengda1936@gmail.com>
-
-	* multiplexer.c (device_file): Rename a variable.
-	(main): Use device_file directly.
-
-2008-8-19 Zheng Da <zhengda1936@gmail.com>
-
-	* multiplexer.c (main): Generate the device file name, and use it
-	to open the device.
-
-2008-8-18 Zheng Da <zhengda1936@gmail.com>
-
-	* README: New file.
-
-	* multiplexer.c (options): Change the meaning of '-v' option.
-	(parse_opt): Change the way of handling '-v' option.
-	
-	* vdev.c (has_vdev): New function.
-
-	* vdev.h (has_vdev): New declaration. 
-
-2008-8-17 Zheng Da <zhengda1936@gmail.com>
-
-	* ethernet.c (ethernet_open): Use a hard coded string for the device name.
-
-	* multiplexer.c: Remove the option '-M'.
-	(parse_opt): Remove the code of handling '-M' option.
-	(main): Get the master device port from the device file.
-
-2008-8-14 Zheng Da <zhengda1936@gmail.com>
-
-	* ChangeLog: New file.
-
-	* multiplexer.c (vdev_portclass, other_portclass):
-	New variables.
-	(do_mach_notify_no_senders): Mark the device unused when there are no
-	senders for the device.
-	(do_mach_notify_dead_name): Return 0.
-	(ds_device_open): Mark the device used.
-	(ds_device_close): Remove the code of decreasing the count of the device.
-	(trivfs_goaway): Only test if all devices aren't used, and delete the code
-	of closing the device.
-	(parse_opt): Use vdev_portclass to create the virtual device.
-	(main): Create vdev_portclass and other_portclass, open the ethernet
-	device with other_portclass and create notify_pi with other_portclass.
-
-	* vdev.c (all_dev_close): Change the way of testing if all devices are
-	closed.
-	
-	* vdev.h (vether_device): Replace count field with used.
-
-2008-8-13 Zheng Da <zhengda1936@gmail.com>
-
-	* bpf_impl.c: New file.
-
-	* bpf_impl.h: New file.
-
-	* dev_stat.c: New file.
-
-	* ethernet.c: New file.
-
-	* ethernet.h: New file.
-
-	* list.h: New file.
-
-	* Makefile: New file.
-
-	* multiplexer.c: New file.
-
-	* queue.c: New file.
-
-	* queue.h: New file.
-
-	* test.c: New file.
-
-	* util.h: New file.
-
-	* vdev.c: New file.
-
-	* vdev.h: New file.
-
diff --git a/eth-multiplexer/Makefile~ b/eth-multiplexer/Makefile~
deleted file mode 100644
index 237bf3a3..00000000
--- a/eth-multiplexer/Makefile~
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 2008 Free Software Foundation, Inc.
-# This file is part of the GNU Hurd.
-#
-# The GNU Hurd is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# The GNU Hurd is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the GNU Hurd; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-dir := eth-multiplexer
-makemode := server
-target = eth-multiplexer
-
-CFLAGS += -DDEBUG
-SRCS = ethernet.c vdev.c multiplexer.c bpf_impl.c queue.c dev_stat.c netfs_impl.c notify_impl.c device_impl.c demuxer.c
-MIGSTUBS = ourdeviceServer.o notifyServer.o
-OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
-LCLHDRS = bpf_impl.h ethernet.h queue.h util.h vdev.h netfs_impl.h
-DIST_FILES = ourdevice.defs notify.defs
-HURDLIBS=ports fshelp shouldbeinlibc netfs
-
-include ../Makeconf
-
-ourdevice.defs: device.defs
-	$(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[ 	]*device[ 	]*:[ 	]*device_t/s/device_t/mach_port_send_t/' > $@
-
diff --git a/eth-multiplexer/device_impl.c~ b/eth-multiplexer/device_impl.c~
deleted file mode 100644
index 8deee668..00000000
--- a/eth-multiplexer/device_impl.c~
+++ /dev/null
@@ -1,282 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#include <fcntl.h>
-#include <mach.h>
-#include <hurd.h>
-#include <hurd/ports.h>
-#include <hurd/netfs.h>
-#include <device/device.h>
-
-#include "ethernet.h"
-#include "vdev.h"
-#include "ourdevice_S.h"
-#include "notify_S.h"
-#include "bpf_impl.h"
-#include "netfs_impl.h"
-#include "util.h"
-
-extern struct port_bucket *port_bucket;
-extern struct port_class *vdev_portclass;
-extern struct port_class *other_portclass;
-extern struct port_info *notify_pi;
-
-/* Implementation of device interface */
-kern_return_t
-ds_xxx_device_set_status (device_t device, dev_flavor_t flavor,
-			  dev_status_t status, size_t statu_cnt)
-{
-  struct vether_device *vdev = ports_lookup_port (port_bucket, device,
-						  vdev_portclass);
-  if (vdev == NULL)
-    return D_NO_SUCH_DEVICE;
-  ports_port_deref (vdev);
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_get_status (device_t device, dev_flavor_t flavor,
-			  dev_status_t status, size_t *statuscnt)
-{
-  struct vether_device *vdev = ports_lookup_port (port_bucket, device,
-						  vdev_portclass);
-  if (vdev == NULL)
-    return D_NO_SUCH_DEVICE;
-  ports_port_deref (vdev);
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_xxx_device_set_filter (device_t device, mach_port_t rec,
-			  int pri, filter_array_t filt, size_t len)
-{
-  struct vether_device *vdev = ports_lookup_port (port_bucket, device,
-						  vdev_portclass);
-  if (vdev == NULL)
-    return D_NO_SUCH_DEVICE;
-  ports_port_deref (vdev);
-  return D_INVALID_OPERATION;
-}
-
-/*
- * This function is currently running in the multithread environment,
- * it should be protected by locks.
- */
-kern_return_t
-ds_device_open (mach_port_t master_port, mach_port_t reply_port,
-		mach_msg_type_name_t reply_portPoly,
-		dev_mode_t mode, dev_name_t name, mach_port_t *device, 
-	 	mach_msg_type_name_t *devicetype)
-{
-  struct vether_device *dev;
-  int openstat; 
-  int right_mode = 1;
-  struct protid *pi = ports_lookup_port (netfs_port_bucket, master_port, 0);
-  if (pi == NULL)
-    return D_NO_SUCH_DEVICE;
-
-  /* If the virtual device hasn't been created yet,
-   * create it now. */
-  if (pi->po->np->nn->ln == NULL)
-    {
-      extern struct port_bucket *port_bucket;
-      extern struct port_class *vdev_portclass;
-      extern struct stat underlying_node_stat;
-      static int ino_count = 0;
-      /* Create a new light node (virtual device). */
-      struct lnode *ln = (struct lnode *) add_vdev (pi->po->np->nn->name,
-						    sizeof (*ln),
-						    vdev_portclass,
-						    port_bucket);
-      if (ln == NULL)
-	{
-	  ports_port_deref (pi);
-	  return D_NO_MEMORY;
-	}
-      memset (&ln->st, 0, sizeof (ln->st));
-      ln->st.st_ino = ++ino_count;
-      ln->st.st_mode = S_IFCHR | (underlying_node_stat.st_mode & ~S_IFMT);
-      ln->st.st_ctime = ln->st.st_mtime = ln->st.st_atime = time (NULL);
-      fshelp_touch (&ln->st, TOUCH_ATIME|TOUCH_MTIME|TOUCH_CTIME,
-		    multiplexer_maptime);
-    }
-
-  dev = (struct vether_device *) pi->po->np->nn->ln;
-  /* check the mode */
-  openstat = pi->po->openstat;
-  if (mode & D_READ && !(openstat & O_READ))
-    right_mode = 0;
-  if (mode & D_WRITE && !(openstat & O_WRITE))
-    right_mode = 0;
-  ports_port_deref (pi);
-
-  if (dev)
-    {
-      if (!right_mode)
-	return EBADF;
-      *device = dev->dev_port;
-      *devicetype = MACH_MSG_TYPE_MAKE_SEND;
-      return 0;
-    }
-  return D_NO_SUCH_DEVICE;
-}
-
-kern_return_t
-ds_device_close (device_t device)
-{
-  return 0;
-}
-
-kern_return_t
-ds_device_write (device_t device, mach_port_t reply_port,
-		 mach_msg_type_name_t reply_type, dev_mode_t mode,
-		 recnum_t recnum, io_buf_ptr_t data, size_t datalen,
-		 int *bytes_written)
-{
-  kern_return_t ret = 0;
-  struct vether_device *vdev = ports_lookup_port (port_bucket, device,
-						  vdev_portclass);
-  if (vdev == NULL)
-    {
-      vm_deallocate (mach_task_self (), data, datalen);
-      return D_NO_SUCH_DEVICE;
-    }
-  /* The packet is forwarded to all virtual interfaces and
-   * the interface which the multiplexer connects to. */
-  broadcast_pack (data, datalen, vdev);
-  *bytes_written = datalen;
-  if(ether_port != MACH_PORT_NULL)
-    ret = device_write (ether_port, mode , recnum ,
-			data, datalen, bytes_written);
-  /* The data in device_write() is transmifered out of line,
-   * so the server-side function has to deallocate it. */
-  vm_deallocate (mach_task_self (), data, datalen);
-  ports_port_deref (vdev);
-  return ret;
-}
-
-kern_return_t
-ds_device_write_inband (device_t device, mach_port_t reply_port,
-			mach_msg_type_name_t reply_type, dev_mode_t mode,
-			recnum_t recnum, io_buf_ptr_inband_t data,
-			size_t datalen, int *bytes_written)
-{
-  struct vether_device *vdev = ports_lookup_port (port_bucket, device,
-						  vdev_portclass);
-  if (vdev == NULL)
-    return D_NO_SUCH_DEVICE;
-  ports_port_deref (vdev);
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_read (device_t device, mach_port_t reply_port,
-		mach_msg_type_name_t reply_type, dev_mode_t mode,
-		recnum_t recnum, int bytes_wanted,
-		io_buf_ptr_t *data, size_t *datalen)
-{
-  struct vether_device *vdev = ports_lookup_port (port_bucket, device,
-						  vdev_portclass);
-  if (vdev == NULL)
-    return D_NO_SUCH_DEVICE;
-  ports_port_deref (vdev);
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_read_inband (device_t device, mach_port_t reply_port,
-		       mach_msg_type_name_t reply_type, dev_mode_t mode,
-		       recnum_t recnum, int bytes_wanted,
-		       io_buf_ptr_inband_t data, size_t *datalen)
-{
-  struct vether_device *vdev = ports_lookup_port (port_bucket, device,
-						  vdev_portclass);
-  if (vdev == NULL)
-    return D_NO_SUCH_DEVICE;
-  ports_port_deref (vdev);
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_map (device_t device, vm_prot_t prot, vm_offset_t offset,
-	       vm_size_t size, memory_object_t *pager, int unmap)
-{
-  struct vether_device *vdev = ports_lookup_port (port_bucket, device,
-						  vdev_portclass);
-  if (vdev == NULL)
-    return D_NO_SUCH_DEVICE;
-  ports_port_deref (vdev);
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_set_status (device_t device, dev_flavor_t flavor,
-		      dev_status_t status, size_t statuslen)
-{
-  struct vether_device *vdev = ports_lookup_port (port_bucket, device,
-						  vdev_portclass);
-  if (vdev == NULL)
-    return D_NO_SUCH_DEVICE;
-  ports_port_deref (vdev);
-  return D_INVALID_OPERATION;
-}
-
-kern_return_t
-ds_device_get_status (device_t device, dev_flavor_t flavor,
-		      dev_status_t status, size_t *statuslen)
-{
-  extern io_return_t dev_getstat (struct vether_device *, dev_flavor_t,
-				  dev_status_t, natural_t *);
-  kern_return_t ret = 0;
-  struct vether_device *vdev = ports_lookup_port (port_bucket, device,
-						  vdev_portclass);
-  if (vdev == NULL)
-    return D_NO_SUCH_DEVICE;
-  if(ether_port != MACH_PORT_NULL)
-    ret = device_get_status (ether_port, flavor, status, statuslen);
-  else 
-    ret = dev_getstat (vdev, flavor, status, statuslen);
-  ports_port_deref (vdev);
-  return ret;
-}
-
-kern_return_t
-ds_device_set_filter (device_t device, mach_port_t receive_port,
-		      int priority, filter_array_t filter, size_t filterlen)
-{
-  mach_port_t tmp;
-  kern_return_t err;
-  struct vether_device *vdev = ports_lookup_port (port_bucket, device,
-						  vdev_portclass);
-  if (vdev == NULL)
-    return D_NO_SUCH_DEVICE;
-  err = mach_port_request_notification (mach_task_self (), receive_port, 
-					MACH_NOTIFY_DEAD_NAME, 0,
-					ports_get_right (notify_pi), 
-					MACH_MSG_TYPE_MAKE_SEND_ONCE, &tmp);
-  if (err != KERN_SUCCESS)
-    goto out;
-  if (tmp != MACH_PORT_NULL)
-    mach_port_deallocate (mach_task_self (), tmp);
-  err = net_set_filter (vdev, receive_port, priority, filter, filterlen);
-out:
-  ports_port_deref (vdev);
-  return err;
-}
diff --git a/eth-multiplexer/ethernet.c~ b/eth-multiplexer/ethernet.c~
deleted file mode 100644
index ea774a19..00000000
--- a/eth-multiplexer/ethernet.c~
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-   Copyright (C) 1995, 1996, 1998, 1999, 2000, 2002, 2007, 2008
-   Free Software Foundation, Inc.
-
-   Written by Zheng Da 
-
-   Based on pfinet/ethernet.c, written by Michael I. Bushnell, p/BSG.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
-
-#include <string.h>
-#include <error.h>
-#include <assert.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
-
-#include <hurd/ports.h>
-#include <device/device.h>
-#include <device/net_status.h>
-
-#include "ethernet.h"
-#include "vdev.h"
-#include "util.h"
-
-#define ETH_HLEN 14
-
-static struct port_info *readpt;
-
-/* Port for writing message to the real network interface. */
-mach_port_t ether_port;
-/* Port for receiving messages from the interface. */
-static mach_port_t readptname;
-
-/* Accept ARP and IP packets. */
-static short ether_filter[] =
-{
-#ifdef NETF_IN
-  /* We have to tell the packet filtering code that we're interested in
-     incoming packets.  */
-  NETF_IN, /* Header.  */
-#endif
-  NETF_PUSHLIT | NETF_NOP,
-  1
-};
-static int ether_filter_len = sizeof (ether_filter) / sizeof (short);
-
-int ethernet_demuxer (mach_msg_header_t *inp,
-		      mach_msg_header_t *outp)
-{
-  struct net_rcv_msg *msg = (struct net_rcv_msg *) inp;
-
-  if (inp->msgh_id != NET_RCV_MSG_ID)
-    return 0;
-
-  broadcast_msg (msg);
-  return 1;
-}
-
-int set_promisc (char *dev_name, mach_port_t ether_port, int is_promisc)
-{
-#ifndef NET_FLAGS
-#define NET_FLAGS (('n'<<16) + 4)
-#endif
-  short flags;
-  int ret;
-  size_t count;
-
-  debug ("set_promisc is called, is_promisc: %d\n", is_promisc);
-  count = sizeof (flags);
-  ret = device_get_status (ether_port, NET_FLAGS, (dev_status_t) &flags, 
-                           &count);
-  if (ret) 
-    {
-      error (0, ret, "device_get_status");  
-      return -1;
-    }  
-  if (is_promisc)
-    flags |= IFF_PROMISC;
-  else
-    flags &= ~IFF_PROMISC;
-  ret = device_set_status(ether_port, NET_FLAGS, (dev_status_t) &flags,
-                          sizeof (flags));
-  if (ret) 
-    {
-      error (0, ret, "device_set_status");
-      return -1;
-    }  
-  return 0;  
-} 
-
-int ethernet_open (char *dev_name, device_t master_device, 
-		   struct port_bucket *etherport_bucket,
-		   struct port_class *etherreadclass)
-{
-  error_t err;
-
-  assert (ether_port == MACH_PORT_NULL);
-
-  err = ports_create_port (etherreadclass, etherport_bucket,
-			   sizeof (struct port_info), &readpt);
-  if (err)
-    error (2, err, "ports_create_port");
-  readptname = ports_get_right (readpt);
-  mach_port_insert_right (mach_task_self (), readptname, readptname,
-			  MACH_MSG_TYPE_MAKE_SEND);
-
-  mach_port_set_qlimit (mach_task_self (), readptname, MACH_PORT_QLIMIT_MAX);
-
-  err = device_open (master_device, D_WRITE | D_READ, "eth", &ether_port);
-  mach_port_deallocate (mach_task_self (), master_device);
-  if (err)
-    error (2, err, "device_open: %s", dev_name);
-
-  err = device_set_filter (ether_port, ports_get_right (readpt),
-			   MACH_MSG_TYPE_MAKE_SEND, 0,
-			   (unsigned short *)ether_filter, ether_filter_len);
-  if (err)
-    error (2, err, "device_set_filter: %s", dev_name);
-
-  set_promisc (dev_name, ether_port, 1);
-  return 0;
-}
-
-int ethernet_close (char *dev_name)
-{
-  set_promisc (dev_name, ether_port, 0);
-  return 0;
-}
-
diff --git a/eth-multiplexer/multiplexer.c~ b/eth-multiplexer/multiplexer.c~
deleted file mode 100644
index d3724602..00000000
--- a/eth-multiplexer/multiplexer.c~
+++ /dev/null
@@ -1,190 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-/*
- * The multiplexer server provides the virtual network interface.
- * When it gets a packet, it forwards it to every other network interface,
- * the ones that are created by itself or that it connects to.
- * BPF is ported to the multiplexer to help deliver packets
- * to the right pfinet.
- */
-
-#include <argp.h>
-#include <errno.h>
-#include <error.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-#include <hurd.h>
-#include <mach.h>
-#include <version.h>
-#include <device/device.h>
-#include <hurd/ports.h>
-#include <hurd/netfs.h>
-
-#include "ethernet.h"
-#include "vdev.h"
-#include "ourdevice_S.h"
-#include "notify_S.h"
-#include "bpf_impl.h"
-#include "netfs_impl.h"
-#include "util.h"
-
-/* 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>";
-static const char doc[] = "Hurd multiplexer server.";
-static const struct argp_option options[] =
-{
-    {"interface", 'i', "DEVICE", 0,
-      "Network interface to use", 2},
-    {0}
-};
-
-/* Port bucket we service requests on.  */
-struct port_bucket *port_bucket;
-struct port_class *other_portclass;
-struct port_class *vdev_portclass;
-struct port_info *notify_pi;
-
-int netfs_maxsymlinks = 12;
-char *netfs_server_name = "multiplexer";
-char *netfs_server_version = HURD_VERSION;
-file_t root_file;
-struct lnode root;
-struct stat underlying_node_stat;
-
-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));
-}
-
-static any_t
-multiplexer_thread (any_t arg)
-{
-  ports_manage_port_operations_one_thread (port_bucket,
-					   multiplexer_demuxer,
-					   0);
-  return 0;
-}
-
-static error_t
-parse_opt (int opt, char *arg, struct argp_state *state)
-{
-  switch (opt)
-    {
-    case 'i':
-      device_file = arg;
-      break;
-    case ARGP_KEY_ERROR:
-    case ARGP_KEY_SUCCESS:
-    case ARGP_KEY_INIT:
-      break;
-    default:
-      return ARGP_ERR_UNKNOWN;
-    }
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  error_t err;
-  mach_port_t bootstrap;
-  mach_port_t master_device;
-  const struct argp argp = { options, parse_opt, 0, doc };
-
-  port_bucket = ports_create_bucket ();
-  other_portclass = ports_create_class (0, 0);
-  vdev_portclass = ports_create_class (destroy_vdev, 0);
-
-  argp_parse (&argp, argc, argv, 0, 0, 0);
-
-  /* Open the network interface. */
-  if (device_file)
-    {
-      master_device = file_name_lookup (device_file, 0, 0);
-      if (master_device == MACH_PORT_NULL)
-	error (1, errno, "file_name_lookup");
-
-      ethernet_open (device_file, master_device, port_bucket,
-		     other_portclass);
-    }
-
-  /* Prepare for the notification. */
-  err = ports_create_port (other_portclass, port_bucket, 
-			   sizeof (struct port_info), &notify_pi);
-  if (err)
-    error (1, err, "ports_create_port for notification");
-
-  task_get_bootstrap_port (mach_task_self (), &bootstrap);
-  if (bootstrap == MACH_PORT_NULL)
-    error (1, 0, "must be started as a translator");
-
-  /* Run the multiplexer server in another thread. */
-  cthread_detach (cthread_fork (multiplexer_thread, 0));
-
-  err = maptime_map (0, 0, &multiplexer_maptime);
-  if (err)
-    error (4, err, "Cannot map time");
-
-  /* Initialize netfs and start the translator. */
-  netfs_init ();
-
-  root_file = netfs_startup (bootstrap, O_READ);
-  err = new_node (&root, &netfs_root_node);
-  if (err)
-    error (5, err, "Cannot create root node");
-
-  err = io_stat (root_file, &underlying_node_stat);
-  if (err) 
-    error (6, err, "Cannot stat underlying node");
-
-  struct stat stat = underlying_node_stat;
-  /* If the underlying node is not a directory, increase its permissions */
-  if(!S_ISDIR(stat.st_mode))
-    {
-      if(stat.st_mode & S_IRUSR)
-	stat.st_mode |= S_IXUSR;
-      if(stat.st_mode & S_IRGRP)
-	stat.st_mode |= S_IXGRP;
-      if(stat.st_mode & S_IROTH)
-	stat.st_mode |= S_IXOTH;
-    }
-
-  stat.st_mode &= ~(S_ITRANS | S_IFMT);
-  stat.st_mode |= S_IFDIR;
-  fprintf (stderr, "set it as a dir\n");
-  netfs_root_node->nn->ln->st = stat;
-  fshelp_touch (&netfs_root_node->nn_stat, TOUCH_ATIME|TOUCH_MTIME|TOUCH_CTIME,
-		multiplexer_maptime);
-
-  netfs_server_loop ();         /* Never returns.  */
-  return 0;
-}
diff --git a/eth-multiplexer/netfs_impl.c~ b/eth-multiplexer/netfs_impl.c~
deleted file mode 100644
index 40faf7a0..00000000
--- a/eth-multiplexer/netfs_impl.c~
+++ /dev/null
@@ -1,510 +0,0 @@
-/* 
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#include <fcntl.h>
-#include <dirent.h>
-#include <stddef.h>
-#include <sys/mman.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <hurd/netfs.h>
-
-#include "netfs_impl.h"
-#include "vdev.h"
-#include "util.h"
-
-#define DIRENTS_CHUNK_SIZE      (8*1024)
-/* Returned directory entries are aligned to blocks this many bytes long.
- * Must be a power of two.  */
-#define DIRENT_ALIGN 4
-#define DIRENT_NAME_OFFS offsetof (struct dirent, d_name)
-
-/* Length is structure before the name + the name + '\0', all
- *    padded to a four-byte alignment.  */
-#define DIRENT_LEN(name_len)                                                  \
-  ((DIRENT_NAME_OFFS + (name_len) + 1 + (DIRENT_ALIGN - 1))                   \
-   & ~(DIRENT_ALIGN - 1))
-
-extern struct stat underlying_node_stat;
-
-int 
-is_num (char *str)
-{
-  for (; *str; str++)
-    {
-      if (!isdigit (*str))
-	return 0;
-    }
-  return 1;
-}
-
-/* Make a new virtual node.  Always consumes the ports.  */
-error_t
-new_node (struct lnode *ln, struct node **np)
-{
-  error_t err = 0;
-  struct netnode *nn = calloc (1, sizeof *nn);
-  struct node *node;
-
-  if (nn == 0)
-    return ENOMEM;
-  node = netfs_make_node (nn);
-  if (node == 0)
-    {
-      free (nn);
-      *np = NULL;
-      return ENOMEM;
-    }
-  if (ln)
-    ln->n = node;
-  nn->ln = ln;
-  *np = node;
-  return err;
-}
-
-struct node *
-lookup (char *name)
-{
-  struct lnode *ln = (struct lnode *) lookup_dev_by_name (name);
-
-  char *copied_name = malloc (strlen (name) + 1);
-  strcpy (copied_name, name);
-  if (ln)
-    {
-      new_node (ln, &ln->n);
-      ln->n->nn->name = copied_name;
-      return ln->n;
-    }
-  else
-    {
-      struct node *n;
-      new_node (ln, &n);
-      n->nn->name = copied_name;
-      return n;
-    }
-}
-
-/* Attempt to create a file named NAME in DIR for USER with MODE.  Set *NODE
-   to the new node upon return.  On any error, clear *NODE.  *NODE should be
-   locked on success; no matter what, unlock DIR before returning.  */
-error_t
-netfs_attempt_create_file (struct iouser *user, struct node *dir,
-			   char *name, mode_t mode, struct node **node)
-{
-  debug("");
-  *node = 0;
-  mutex_unlock (&dir->lock);
-  return EOPNOTSUPP;
-}
-
-/* Node NODE is being opened by USER, with FLAGS.  NEWNODE is nonzero if we
-   just created this node.  Return an error if we should not permit the open
-   to complete because of a permission restriction. */
-error_t
-netfs_check_open_permissions (struct iouser *user, struct node *node,
-			      int flags, int newnode)
-{
-  error_t err = 0;
-
-  /*Cheks user's permissions*/
-  if(flags & O_READ)
-    err = fshelp_access(&node->nn_stat, S_IREAD, user);
-  if(!err && (flags & O_WRITE))
-    err = fshelp_access(&node->nn_stat, S_IWRITE, user);
-  if(!err && (flags & O_EXEC))
-    err = fshelp_access(&node->nn_stat, S_IEXEC, user);
-
-  debug("the mode of node: %o, return result: %d",
-	(node->nn_stat.st_mode & ~S_IFMT), err);
-  /*Return the result of the check*/
-  return err;
-}
-
-/* This should attempt a utimes call for the user specified by CRED on node
-   NODE, to change the atime to ATIME and the mtime to MTIME. */
-error_t
-netfs_attempt_utimes (struct iouser *cred, struct node *node,
-		      struct timespec *atime, struct timespec *mtime)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* Return the valid access types (bitwise OR of O_READ, O_WRITE, and O_EXEC)
-   in *TYPES for file NODE and user CRED.  */
-error_t
-netfs_report_access (struct iouser *cred, struct node *node, int *types)
-{
-  debug("");
-  *types = 0;
-  return 0;
-}
-
-/* Make sure that NP->nn_stat is filled with current information.  CRED
-   identifies the user responsible for the operation.  */
-error_t
-netfs_validate_stat (struct node *node, struct iouser *cred)
-{
-  struct stat st;
-  
-  if (node->nn->ln)
-    st = node->nn->ln->st;
-  else
-    {
-      st = underlying_node_stat;
-    }
-  
-  debug("node: %p", node);
-  node->nn_translated = S_ISLNK (st.st_mode) ? S_IFLNK : 0;
-  node->nn_stat = st;
-  return 0;
-}
-
-/* This should sync the file NODE completely to disk, for the user CRED.  If
-   WAIT is set, return only after sync is completely finished.  */
-error_t
-netfs_attempt_sync (struct iouser *cred, struct node *node, int wait)
-{
-  debug("");
-  return 0;
-}
-
-error_t
-netfs_get_dirents (struct iouser *cred, struct node *dir,
-		   int first_entry, int max_entries, char **data,
-		   mach_msg_type_number_t *data_len,
-		   vm_size_t max_data_len, int *data_entries)
-{
-  error_t err;
-  int count = 0;
-  char *data_p;
-  size_t size = (max_data_len == 0 || max_data_len > DIRENTS_CHUNK_SIZE
-     ? DIRENTS_CHUNK_SIZE : max_data_len);
-  debug ("");
-  int
-    add_dirent (const char * name, ino_t ino, int type)
-      {
-	/*If the required number of dirents has not been listed yet*/
-	if((max_entries == -1) || (count < max_entries))
-	  {
-	    struct dirent hdr;
-	    size_t name_len = strlen(name);
-	    size_t sz = DIRENT_LEN(name_len);
-
-	    /*If there is no room for this dirent*/
-	    if ((data_p - *data) + sz > size)
-	      {
-		if (max_data_len > 0)
-		  return 1;
-		else
-		  /* Try to grow our return buffer.  */
-		  {
-		    error_t err;
-		    vm_address_t extension = (vm_address_t)(*data + size);
-		    err = vm_allocate (mach_task_self (), &extension,
-				       DIRENTS_CHUNK_SIZE, 0);
-		    if (err)
-		      {
-			munmap (*data, size);
-			return 1;
-		      }
-		    size += DIRENTS_CHUNK_SIZE;
-		  }
-	      }
-
-	    /*setup the dirent*/
-	    hdr.d_ino = ino;
-	    hdr.d_reclen = sz;
-	    hdr.d_type = type;
-	    hdr.d_namlen = name_len;
-	    memcpy(data_p, &hdr, DIRENT_NAME_OFFS);
-	    strcpy(data_p + DIRENT_NAME_OFFS, name);
-	    data_p += sz;
-
-	    /*count the new dirent*/
-	    ++count;
-	  }
-	return 0;
-      }
-  int add_each_dev (struct vether_device *dev)
-    {
-      struct lnode *ln = (struct lnode *) dev;
-      add_dirent (ln->vdev.name, ln->st.st_ino, DT_CHR);
-      return 0;
-    }
-  if (dir != netfs_root_node)
-    return ENOTDIR;
-
-  *data = mmap (0, size, PROT_READ | PROT_WRITE, MAP_ANON, 0, 0);
-  err = ((void *) *data == (void *) -1) ? errno : 0;
-  if (!err)
-    {
-      data_p = *data;
-      if (first_entry < 2 + get_dev_num ())
-	{
-	  add_dirent (".", 2, DT_DIR);
-	  add_dirent ("..", 2, DT_DIR);
-	  foreach_dev_do (add_each_dev);
-	}
-
-      vm_address_t alloc_end = (vm_address_t)(*data + size);
-      vm_address_t real_end = round_page (data_p);
-      if (alloc_end > real_end)
-	munmap ((caddr_t) real_end, alloc_end - real_end);
-      *data_entries = count;
-      debug ("first_entry is %d, count is %d", first_entry, count);
-      *data_len = data_p - *data;
-    }
-  return err;
-}
-
-/* Lookup NAME in DIR for USER; set *NODE to the found name upon return.  If
-   the name was not found, then return ENOENT.  On any error, clear *NODE.
-   (*NODE, if found, should be locked, this call should unlock DIR no matter
-   what.) */
-error_t netfs_attempt_lookup (struct iouser *user, struct node *dir,
-			      char *name, struct node **node)
-{
-  error_t err = 0;
-
-  debug ("dir: %p, file name: %s", dir, name);
-
-  if (strcmp(name, ".") == 0)
-    {
-      netfs_nref(dir);
-      *node = dir;
-      return 0;
-    }
-  else if (strcmp(name, "..") == 0)
-    {
-      /*The supplied node is always root*/
-      err = ENOENT;
-      *node = NULL;
-
-      /*unlock the directory*/
-      mutex_unlock (&dir->lock);
-
-      /*stop here*/
-      return err;
-    }
-
-  *node = lookup (name);
-  mutex_lock (&(*node)->lock);
-  mutex_unlock (&dir->lock);
-  return 0;
-}
-
-/* Delete NAME in DIR for USER. */
-error_t netfs_attempt_unlink (struct iouser *user, struct node *dir,
-			      char *name)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* Note that in this one call, neither of the specific nodes are locked. */
-error_t netfs_attempt_rename (struct iouser *user, struct node *fromdir,
-			      char *fromname, struct node *todir,
-			      char *toname, int excl)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* Attempt to create a new directory named NAME in DIR for USER with mode
-   MODE.  */
-error_t netfs_attempt_mkdir (struct iouser *user, struct node *dir,
-			     char *name, mode_t mode)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* Attempt to remove directory named NAME in DIR for USER. */
-error_t netfs_attempt_rmdir (struct iouser *user,
-			     struct node *dir, char *name)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* This should attempt a chmod call for the user specified by CRED on node
-   NODE, to change the owner to UID and the group to GID. */
-error_t netfs_attempt_chown (struct iouser *cred, struct node *node,
-			     uid_t uid, uid_t gid)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* This should attempt a chauthor call for the user specified by CRED on node
-   NODE, to change the author to AUTHOR. */
-error_t netfs_attempt_chauthor (struct iouser *cred, struct node *node,
-				uid_t author)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* This should attempt a chmod call for the user specified by CRED on node
-   NODE, to change the mode to MODE.  Unlike the normal Unix and Hurd meaning
-   of chmod, this function is also used to attempt to change files into other
-   types.  If such a transition is attempted which is impossible, then return
-   EOPNOTSUPP.  */
-error_t netfs_attempt_chmod (struct iouser *cred, struct node *node,
-			     mode_t mode)
-{
-  error_t err = 0;
-  debug("");
-  if (node->nn->ln == NULL)
-    return EOPNOTSUPP;
-
-  mode &= ~S_ITRANS;
-  err = fshelp_isowner (&node->nn->ln->st, cred);
-  if (err)
-    return err;
-  mode |= node->nn->ln->st.st_mode & S_IFMT;
-  node->nn->ln->st.st_mode = mode;
-  fshelp_touch (&node->nn_stat, TOUCH_CTIME, multiplexer_maptime);
-  return err;
-}
-
-/* Attempt to turn NODE (user CRED) into a symlink with target NAME. */
-error_t netfs_attempt_mksymlink (struct iouser *cred, struct node *node,
-				 char *name)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* Attempt to turn NODE (user CRED) into a device.  TYPE is either S_IFBLK or
-   S_IFCHR. */
-error_t netfs_attempt_mkdev (struct iouser *cred, struct node *node,
-			     mode_t type, dev_t indexes)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* Attempt to set the passive translator record for FILE to ARGZ (of length
-   ARGZLEN) for user CRED. */
-error_t netfs_set_translator (struct iouser *cred, struct node *node,
-			      char *argz, size_t argzlen)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* This should attempt a chflags call for the user specified by CRED on node
-   NODE, to change the flags to FLAGS. */
-error_t netfs_attempt_chflags (struct iouser *cred, struct node *node,
-			       int flags)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* This should attempt to set the size of the file NODE (for user CRED) to
-   SIZE bytes long. */
-error_t netfs_attempt_set_size (struct iouser *cred, struct node *node,
-				off_t size)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/*Fetches the filesystem status information*/
-error_t
-netfs_attempt_statfs (struct iouser *cred, struct node *node,
-		      struct statfs *st)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* This should sync the entire remote filesystem.  If WAIT is set, return
-   only after sync is completely finished.  */
-error_t netfs_attempt_syncfs (struct iouser *cred, int wait)
-{
-  debug("");
-  return 0;
-}
-
-/* Create a link in DIR with name NAME to FILE for USER.  Note that neither
-   DIR nor FILE are locked.  If EXCL is set, do not delete the target, but
-   return EEXIST if NAME is already found in DIR.  */
-error_t netfs_attempt_link (struct iouser *user, struct node *dir,
-			    struct node *file, char *name, int excl)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* Attempt to create an anonymous file related to DIR for USER with MODE.
-   Set *NODE to the returned file upon success.  No matter what, unlock DIR. */
-error_t netfs_attempt_mkfile (struct iouser *user, struct node *dir,
-			      mode_t mode, struct node **node)
-{
-  debug("");
-  *node = 0;
-  mutex_unlock (&dir->lock);
-  return EOPNOTSUPP;
-}
-
-/* Read the contents of NODE (a symlink), for USER, into BUF. */
-error_t netfs_attempt_readlink (struct iouser *user, struct node *node, char *buf)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* Read from the file NODE for user CRED starting at OFFSET and continuing for
-   up to *LEN bytes.  Put the data at DATA.  Set *LEN to the amount
-   successfully read upon return.  */
-error_t netfs_attempt_read (struct iouser *cred, struct node *node,
-			    off_t offset, size_t *len, void *data)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* Write to the file NODE for user CRED starting at OFSET and continuing for up
-   to *LEN bytes from DATA.  Set *LEN to the amount seccessfully written upon
-   return. */
-error_t netfs_attempt_write (struct iouser *cred, struct node *node,
-			     off_t offset, size_t *len, void *data)
-{
-  debug("");
-  return EOPNOTSUPP;
-}
-
-/* Node NP is all done; free all its associated storage. */
-void
-netfs_node_norefs (struct node *node)
-{
-  debug("node: %p", node);
-  if (node->nn->ln)
-    node->nn->ln->n = NULL;
-  free (node->nn->name);
-  free (node->nn);
-  free (node);
-}
-
diff --git a/eth-multiplexer/netfs_impl.h~ b/eth-multiplexer/netfs_impl.h~
deleted file mode 100644
index c2651eb6..00000000
--- a/eth-multiplexer/netfs_impl.h~
+++ /dev/null
@@ -1,46 +0,0 @@
-/* 
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef NETFS_IMPL
-#define NETFS_IMPL
-
-#include <hurd.h>
-#include <mach.h>
-
-#include "vdev.h"
-
-struct netnode
-{
-  struct lnode *ln;
-};
-
-struct lnode
-{
-  struct vether_device vdev;
-  struct stat st;
-  struct node *n;
-};
-
-extern file_t root_file;
-volatile struct mapped_time_value *multiplexer_maptime;
-
-error_t new_node (struct lnode *ln, struct node **np);
-
-#endif
diff --git a/eth-multiplexer/notify_impl.c~ b/eth-multiplexer/notify_impl.c~
deleted file mode 100644
index 4d31c061..00000000
--- a/eth-multiplexer/notify_impl.c~
+++ /dev/null
@@ -1,70 +0,0 @@
-/* 
-   Copyright (C) 2008 Free Software Foundation, Inc.
-   Written by Zheng Da.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the GNU Hurd; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#include <hurd.h>
-#include <mach.h>
-
-#include "vdev.h"
-
-/* Implementation of notify interface */
-kern_return_t
-do_mach_notify_port_deleted (mach_port_t notify,
-			     mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_msg_accepted (mach_port_t notify,
-			     mach_port_t name)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_port_destroyed (mach_port_t notify,
-			       mach_port_t port)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_no_senders (mach_port_t notify,
-			   mach_port_mscount_t mscount)
-{
-  debug ("no senders notification");
-  return ports_do_mach_notify_no_senders (notify, mscount);
-}
-
-kern_return_t
-do_mach_notify_send_once (mach_port_t notify)
-{
-  return EOPNOTSUPP;
-}
-
-kern_return_t
-do_mach_notify_dead_name (mach_port_t notify,
-			  mach_port_t name)
-{
-  debug ("do_mach_notify_dead_name is called\n");
-  mach_port_deallocate (mach_task_self (), name);
-  remove_dead_port_from_dev (name);
-  return 0;
-}
diff --git a/netfs-sample/._node.c~ b/netfs-sample/._node.c~
deleted file mode 100644
index f63df45b..00000000
--- a/netfs-sample/._node.c~
+++ /dev/null
diff --git a/netfs-sample/filterfs.c~ b/netfs-sample/filterfs.c~
deleted file mode 100644
index 5aaacf75..00000000
--- a/netfs-sample/filterfs.c~
+++ /dev/null
@@ -1,1236 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/*filter.c*/
-/*----------------------------------------------------------------------------*/
-/*The filtering translator*/
-/*----------------------------------------------------------------------------*/
-/*Based on the code of unionfs translator.*/
-/*----------------------------------------------------------------------------*/
-/*Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
-  Written by Sergiu Ivanov <unlimitedscolobb@gmail.com>.
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or * (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.*/
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-#define _GNU_SOURCE 1
-/*----------------------------------------------------------------------------*/
-#include "filterfs.h"
-/*----------------------------------------------------------------------------*/
-#include <error.h>
-#include <argp.h>
-#include <argz.h>
-#include <hurd/netfs.h>
-#include <fcntl.h>
-/*----------------------------------------------------------------------------*/
-#include "debug.h"
-#include "options.h"
-#include "ncache.h"
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*--------Macros--------------------------------------------------------------*/
-/*The state modes use in open*/
-#define OPENONLY_STATE_MODES (O_CREAT | O_EXCL | O_NOLINK | O_NOTRANS \
-	| O_NONBLOCK)
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*--------Global Variables----------------------------------------------------*/
-/*The name of the server*/
-char * netfs_server_name = "filterfs";
-/*----------------------------------------------------------------------------*/
-/*The version of the server*/
-char * netfs_server_version = "0.0";
-/*----------------------------------------------------------------------------*/
-/*The maximal length of a chain of symbolic links*/
-int netfs_maxsymlinks = 12;
-/*----------------------------------------------------------------------------*/
-/*A port to the underlying node*/
-mach_port_t underlying_node;
-/*----------------------------------------------------------------------------*/
-/*Status information for the underlying node*/
-io_statbuf_t underlying_node_stat;
-/*----------------------------------------------------------------------------*/
-/*Mapped time used for updating node information*/
-volatile struct mapped_time_value * maptime;
-/*----------------------------------------------------------------------------*/
-/*The filesystem ID*/
-pid_t fsid;
-/*----------------------------------------------------------------------------*/
-/*The file to print debug messages to*/
-FILE * filterfs_dbg;
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*--------Functions-----------------------------------------------------------*/
-/*Attempts to create a file named `name` in `dir` for `user` with mode `mode`*/
-error_t
-netfs_attempt_create_file
-	(
-	struct iouser * user,
-	struct node * dir,
-	char * name,
-	mode_t mode,
-	struct node ** node
-	)
-	{
-	LOG_MSG("netfs_attempt_create_file");
-
-	/*Unlock `dir` and say that we can do nothing else here*/
-	mutex_unlock(&dir->lock);
-	return EOPNOTSUPP;
-	}/*netfs_attempt_create_file*/
-/*----------------------------------------------------------------------------*/
-/*Return an error if the process of opening a file should not be allowed
-	to complete because of insufficient permissions*/
-error_t
-netfs_check_open_permissions
-	(
-	struct iouser * user,
-	struct node * np,
-	int flags,
-	int newnode
-	)
-	{
-	LOG_MSG("netfs_check_open_permissions: '%s'", np->nn->lnode->name);
-
-	error_t err = 0;
-	
-	/*Cheks user's permissions*/
-	if(flags & O_READ)
-		err = fshelp_access(&np->nn_stat, S_IREAD, user);
-	if(!err && (flags & O_WRITE))
-		err = fshelp_access(&np->nn_stat, S_IWRITE, user);
-	if(!err && (flags & O_EXEC))
-		err = fshelp_access(&np->nn_stat, S_IEXEC, user);
-		
-	/*Return the result of the check*/
-	return err;
-	}/*netfs_check_open_permissions*/
-/*----------------------------------------------------------------------------*/
-/*Attempts an utimes call for the user `cred` on node `node`*/
-error_t
-netfs_attempt_utimes
-	(
-	struct iouser * cred,
-	struct node * node,
-	struct timespec * atime,
-	struct timespec * mtime
-	)
-	{
-	LOG_MSG("netfs_attempt_utimes");
-
-	error_t err = 0;
-	
-	/*See what information is to be updated*/
-	int flags = TOUCH_CTIME;
-	
-	/*Check if the user is indeed the owner of the node*/
-	err = fshelp_isowner(&node->nn_stat, cred);
-	
-	/*If the user is allowed to do utimes*/
-	if(!err)
-		{
-		/*If atime is to be updated*/
-		if(atime)
-			/*update the atime*/
-			node->nn_stat.st_atim = *atime;
-		else
-			/*the current time will be set as the atime*/
-			flags |= TOUCH_ATIME;
-		
-		/*If mtime is to be updated*/
-		if(mtime)
-			/*update the mtime*/
-			node->nn_stat.st_mtim = *mtime;
-		else
-			/*the current time will be set as mtime*/
-			flags |= TOUCH_MTIME;
-		
-		/*touch the file*/
-		fshelp_touch(&node->nn_stat, flags, maptime);
-		}
-	
-	/*Return the result of operations*/
-	return err;
-	}/*netfs_attempt_utimes*/
-/*----------------------------------------------------------------------------*/
-/*Returns the valid access types for file `node` and user `cred`*/
-error_t
-netfs_report_access
-	(
-	struct iouser * cred,
-	struct node * np,
-	int * types
-	)
-	{
-	LOG_MSG("netfs_report_access");
-
-	/*No access at first*/
-	*types = 0;
-	
-	/*Check the access and set the required bits*/
-	if(fshelp_access(&np->nn_stat, S_IREAD,  cred) == 0)
-		*types |= O_READ;
-	if(fshelp_access(&np->nn_stat, S_IWRITE, cred) == 0)
-		*types |= O_WRITE;
-	if(fshelp_access(&np->nn_stat, S_IEXEC,  cred) == 0)
-		*types |= O_EXEC;
-
-	/*Everything OK*/
-	return 0;
-	}/*netfs_report_access*/
-/*----------------------------------------------------------------------------*/
-/*Validates the stat data for the node*/
-error_t
-netfs_validate_stat
-	(
-	struct node * np,
-	struct iouser * cred
-	)
-	{
-	LOG_MSG("netfs_validate_stat: '%s'", np->nn->lnode->name);
-
-	error_t err = 0;
-	
-	/*If we are not at the root*/
-	if(np != netfs_root_node)
-		{
-		/*If the node is not surely up-to-date*/
-		if(!(np->nn->flags & FLAG_NODE_ULFS_UPTODATE))
-			{
-			/*update it*/
-			err = node_update(np);
-			}
-		
-		/*If no errors have yet occurred*/
-		if(!err)
-			{
-			/*If the port to the file corresponding to `np` is valid*/
-			if(np->nn->port != MACH_PORT_NULL)
-				{
-				/*We have a directory here (normally, only they maintain an open port).
-					Generally, our only concern is to maintain an open port in this case*/
-				
-				/*attempt to stat this file*/
-				err = io_stat(np->nn->port, &np->nn_stat);
-
-				/*If stat information has been successfully obtained for the file*/
-				if(!err)
-					/*duplicate the st_mode field of stat structure*/
-					np->nn_translated = np->nn_stat.st_mode;
-				}
-			else
-				{
-				/*We, most probably, have something which is not a directory. Therefore
-					we will open the port and close it after the stat, so that additional
-					resources are not consumed.*/
-				
-				/*the parent node of the current node*/
-				node_t * dnp;
-
-				/*obtain the parent node of the the current node*/
-				err = ncache_node_lookup(np->nn->lnode->dir, &dnp);
-				
-				/*the lookup should never fail here*/
-				assert(!err);
-				
-				/*open a port to the file we are interested in*/
-				mach_port_t p = file_name_lookup_under
-					(dnp->nn->port, np->nn->lnode->name, 0, 0);
-	
-				/*put `dnp` back, since we don't need it any more*/
-				netfs_nput(dnp);
-
-				if(!p)
-					return EBADF;
-				
-				/*try to stat the node*/
-				err = io_stat(p, &np->nn_stat);
-				
-				/*deallocate the port*/
-				PORT_DEALLOC(p);
-				}
-			}
-		}
-	/*If we are at the root*/
-	else
-		/*put the size of the node into the stat structure belonging to `np`*/
-		node_get_size(np, (OFFSET_T *)&np->nn_stat.st_size);
-
-	/*Return the result of operations*/
-	return err;
-	}/*netfs_validate_stat*/
-/*----------------------------------------------------------------------------*/
-/*Syncs `node` completely to disk*/
-error_t
-netfs_attempt_sync
-	(
-	struct iouser * cred,
-	struct node * node,
-	int wait
-	)
-	{
-	LOG_MSG("netfs_attempt_sync");
-
-	/*Operation is not supported*/
-	return EOPNOTSUPP;
-	}/*netfs_attempt_sync*/
-/*----------------------------------------------------------------------------*/
-/*Fetches a directory*/
-error_t
-netfs_get_dirents
-	(
-	struct iouser * cred,
-	struct node * dir,
-	int first_entry,
-	int num_entries,
-	char ** data,
-	mach_msg_type_number_t * data_len,
-	vm_size_t max_data_len,
-	int * data_entries
-	)
-	{
-	LOG_MSG("netfs_get_dirents: '%s'", dir->nn->lnode->name);
-
-	error_t err;
-
-	/*Two pointers required for processing the list of dirents*/
-	node_dirent_t * dirent_start, * dirent_current;
-	
-	/*The pointer to the beginning of the list of dirents*/
-	node_dirent_t * dirent_list = NULL;
-	
-	/*The size of the current dirent*/
-	size_t size = 0;
-	
-	/*The number of dirents added*/
-	int count = 0;
-	
-	/*The dereferenced value of parameter `data`*/
-	char * data_p;
-	
-	/*Takes into account the size of the given dirent*/
-	int
-	bump_size
-		(
-		const char * name
-		)
-		{
-		/*If the required number of entries has not been listed yet*/
-		if((num_entries == -1) || (count < num_entries))
-			{
-			/*take the current size and take into account the length of the name*/
-			size_t new_size = size + DIRENT_LEN(strlen(name));
-			
-			/*If there is a limit for the received size and it has been exceeded*/
-			if((max_data_len > 0) && (new_size > max_data_len))
-				/*a new dirent cannot be added*/
-				return 0;
-				
-			/*memorize the new size*/
-			size = new_size;
-			
-			/*increase the number of dirents added*/
-			++count;
-			
-			/*everything is OK*/
-			return 1;
-			}
-		else
-			{
-			/*dirents cannot be added*/
-			return 0;
-			}
-		}/*bump_size*/
-		
-	/*Adds a dirent to the list of dirents*/
-	int
-	add_dirent
-		(
-		const char * name,
-		ino_t ino,
-		int type
-		)
-		{
-		/*If the required number of dirents has not been listed yet*/
-		if((num_entries == -1) || (count < num_entries))
-			{
-			/*create a new dirent*/
-			struct dirent hdr;
-
-			/*obtain the length of the name*/
-			size_t name_len = strlen(name);
-			
-			/*compute the full size of the dirent*/
-			size_t sz = DIRENT_LEN(name_len);
-			
-			/*If there is no room for this dirent*/
-			if(sz > size)
-				/*stop*/
-				return 0;
-			else
-				/*take into account the fact that a new dirent has just been added*/
-				size -= sz;
-				
-			/*setup the dirent*/
-			hdr.d_ino 	 = ino;
-			hdr.d_reclen = sz;
-			hdr.d_type   = type;
-			hdr.d_namlen = name_len;
-			
-			/*The following two lines of code reflect the old layout of
-				dirents in the memory. Now libnetfs expects the layout
-				identical to the layout provided by dir_readdir (see dir_entries_get)*/
-
-			/*copy the header of the dirent into the final block of dirents*/
-			memcpy(data_p, &hdr, DIRENT_NAME_OFFS);
-			
-			/*copy the name of the dirent into the block of dirents*/
-			strcpy(data_p + DIRENT_NAME_OFFS, name);
-			
-			/*This line is commented for the same reason as the two specifically
-				commented lines above.*/
-			/*move the current pointer in the block of dirents*/
-			data_p += sz;
-			
-			/*count the new dirent*/
-			++count;
-			
-			/*everything was OK, so say it*/
-			return 1;
-			}
-		else
-			/*no [new] dirents allowed*/
-			return 0;
-		}/*add_dirent*/
-	
-	/*List the dirents for node `dir`*/
-	err = node_entries_get(dir, &dirent_list);
-	
-	/*If listing was successful*/
-	if(!err)
-		{
-		/*find the entry whose number is `first_entry`*/
-		for
-			(
-			dirent_start = dirent_list, count = 2;
-			dirent_start && (count < first_entry);
-			dirent_start = dirent_start->next, ++count
-			);
-			
-		/*reset number of dirents added so far*/
-		count = 0;
-		
-		/*make space for entries '.' and '..', if required*/
-		if(first_entry == 0)
-			bump_size(".");
-		if(first_entry <= 1)
-			bump_size("..");
-			
-		/*Go through all dirents*/
-		for
-			(
-			dirent_current = dirent_start;
-			dirent_current;
-			dirent_current = dirent_current->next
-			)
-			/*If another dirent cannot be added succesfully*/
-			if(bump_size(dirent_current->dirent->d_name) == 0)
-				/*stop here*/
-				break;
-				
-		/*allocate the required space for dirents*/
-		*data = mmap(0, size, PROT_READ | PROT_WRITE, MAP_ANON, 0, 0);
-		
-		/*check if any error occurred*/
-		err = ((void *)*data == MAP_FAILED) ? (errno) : (0);
-		}
-		
-	/*If no errors have occurred so far*/
-	if(!err)
-		{
-		/*obtain the pointer to the beginning of the block of dirents*/
-		data_p = *data;
-
-		/*fill the parameters with useful values*/
-		*data_len = size;
-		*data_entries = count;
-		
-		/*reset the number of dirents added*/
-		count = 0;
-
-		/*add entries '.' and '..', if required*/
-		if(first_entry == 0)
-			add_dirent(".", 2, DT_DIR);
-		if(first_entry <= 1)
-			add_dirent("..", 2, DT_DIR);
-
-		/*Follow the list of dirents beginning with dirents_start*/
-		for
-			(
-			dirent_current = dirent_start; dirent_current;
-			dirent_current = dirent_current->next
-			)
-			/*If the addition of the current dirent fails*/
-			if
-				(
-				add_dirent
-					(dirent_current->dirent->d_name, dirent_current->dirent->d_fileno,
-					dirent_current->dirent->d_type) == 0
-				)
-				/*stop adding dirents*/
-				break;
-		}
-		
-	/*If the list of dirents has been allocated, free it*/
-	if(dirent_list)
-		node_entries_free(dirent_list);
-		
-	/*The directory has been read right now, modify the access time*/
-	fshelp_touch(&dir->nn_stat, TOUCH_ATIME, maptime);
-	
-	/*Return the result of listing the dirents*/
-	return err;
-	}/*netfs_get_dirents*/
-/*----------------------------------------------------------------------------*/
-/*Looks up `name` under `dir` for `user`*/
-error_t
-netfs_attempt_lookup
-	(
-	struct iouser * user,
-	struct node * dir,
-	char * name,
-	struct node ** node
-	)
-	{
-	LOG_MSG("netfs_attempt_lookup: '%s'", name);
-
-	error_t err = 0;
-
-	/*If we are asked to fetch the current directory*/
-	if(strcmp(name, ".") == 0)
-		{
-		/*add a reference to `dir` and put it into `node`*/
-		netfs_nref(dir);
-		*node = dir;
-		
-		/*everything is OK*/
-		return 0;
-		}
-	/*If we are asked to fetch the parent directory*/
-	else if(strcmp(name, "..") == 0)
-		{
-		/*If the supplied node is not root*/
-		if(dir->nn->lnode->dir)
-			{
-			/*The node corresponding to the parent directory must exist here*/
-			assert(dir->nn->lnode->dir->node);
-			
-			/*put the parent node of `dir` into the result*/
-			err = ncache_node_lookup(dir->nn->lnode->dir, node);
-			}
-		/*The supplied node is root*/
-		else
-			{
-			/*this node is not included into our filesystem*/
-			err = ENOENT;
-			*node = NULL;
-			}
-			
-		/*unlock the directory*/
-		mutex_unlock(&dir->lock);
-		
-		/*stop here*/
-		return err;
-		}
-
-	/*Checks whether the given name satisfied the required property*/
-	int
-	check_property
-		(
-		const char * name
-		)
-		{
-		/*If there is no property*/
-		if(!property)
-			/*no filtering will be applied, any name is OK*/
-			return 0;
-		
-		/*The number of occurrences of PROPERTY_PARAM in the property*/
-		int param_entries_count = 0;
-
-		/*The pointer to the current occurrence of PROPERTY_PARAM*/
-		char * occurrence = strstr(property, PROPERTY_PARAM);
-		
-		/*Count the number of occurrences*/
-		for(; occurrence;
-			occurrence = strstr(occurrence + 1, PROPERTY_PARAM),
-			++param_entries_count);
-		
-		/*Compute the length of the property param*/
-		size_t property_param_len = strlen(PROPERTY_PARAM);
-		
-		/*The length of the property*/
-		size_t property_len = (property) ? (strlen(property)) : (0);
-	
-		/*Everything OK at first*/
-		err = 0;
-		
-		/*Compute the length of the full name once*/
-		size_t full_name_len = strlen(dir->nn->lnode->path) + 1 + strlen(name) + 1;
-		
-		/*Try to allocate the required space*/
-		char * full_name = malloc(full_name_len);
-		if(!full_name)
-			{
-			err = ENOMEM;
-			return 0;
-			}
-		
-		/*Initialize `full_name` as a valid string*/
-		full_name[0] = 0;
-		
-		/*Construct the full name*/
-		strcpy(full_name, dir->nn->lnode->path);
-		strcat(full_name, "/");
-		strcat(full_name, name);
-		
-		LOG_MSG("netfs_attempt_lookup: Applying filter to %s...", full_name);
-		
-		/*Compute the space required for the final filtering command*/
-		size_t sz = property_len + (strlen(full_name) - property_param_len)
-			* param_entries_count;
-		
-		/*Try to allocate the space for the command*/
-		char * cmd = malloc(sz);
-		if(!cmd)
-			{
-			free(full_name);
-			err = ENOMEM;
-			return 0;
-			}
-		
-		/*Initialize `cmd` as a valid string*/
-		cmd[0] = 0;
-			
-		/*The current occurence of PROPERTY_PARAM in property*/
-		char * p = strstr(property, PROPERTY_PARAM);
-		
-		/*The pointer to the current position in the property*/
-		char * propp = property;
-		
-		/*While the command has not been constructed*/
-		for(; p; p = strstr(propp, PROPERTY_PARAM))
-			{
-			/*add the new part of the property to the command*/
-			strncat(cmd, propp, p - propp);
-			
-			/*add the filename to the command*/
-			strcat(cmd, full_name);
-			
-			/*LOG_MSG("\tcmd = '%s'", cmd);*/
-
-			/*advance the pointer in the property*/
-			propp = p + property_param_len;
-
-			/*LOG_MSG("\tpropp points at '%s'", propp);*/
-			}
-		
-		/*Copy the rest of the property to the command*/
-		strcat(cmd, propp);
-		
-		/*LOG_MSG("node_entries_get: The filtering command: '%s'.", cmd);*/
-
-		/*Execute the command*/
-		int xcode = WEXITSTATUS(system(cmd));
-		
-		/*Return the exit code of the command*/
-		return xcode;
-		}/*check_property*/
-
-	/*If the given name does not satisfy the property*/
-	if(check_property(name) != 0)
-		{
-		/*unlock the directory*/
-		mutex_unlock(&dir->lock);
-
-		/*no such file in the directory*/
-		return ENOENT;
-		}
-
-	/*Try to lookup the given file in the underlying directory*/
-	mach_port_t p = file_name_lookup_under(dir->nn->port, name, 0, 0);
-	
-	/*If the lookup failed*/
-	if(p == MACH_PORT_NULL)
-		{
-		/*unlock the directory*/
-		mutex_unlock(&dir->lock);
-
-		/*no such entry*/
-		return ENOENT;
-		}
-
-	/*Obtain the stat information about the file*/
-	io_statbuf_t stat;
-	err = io_stat(p, &stat);
-	
-	/*Deallocate the obtained port*/
-	PORT_DEALLOC(p);
-
-	/*If this file is not a directory*/
-	if(err || !S_ISDIR(stat.st_mode))
-		{
-		/*do not set the port*/
-		p = MACH_PORT_NULL;
-		}
-	else
-		{
-		/*lookup the port with the right to read the contents of the directory*/
-		p = file_name_lookup_under(dir->nn->port, name, O_READ | O_DIRECTORY, 0);
-		if(p == MACH_PORT_NULL)
-			{
-			return EBADF; /*not enough rights?*/
-			}
-		}
-
-	/*The lnode corresponding to the entry we are supposed to fetch*/
-	lnode_t * lnode;
-	
-	/*Finalizes the execution of this function*/
-	void
-	finalize(void)
-		{
-		/*If some errors have occurred*/
-		if(err)
-			{
-			/*the user should receive nothing*/
-			*node = NULL;
-			
-			/*If there is some port, free it*/
-			if(p != MACH_PORT_NULL)
-				PORT_DEALLOC(p);
-			}
-		/*If there is a node to return*/
-		if(*node)
-			{
-			/*unlock the node*/
-			mutex_unlock(&(*node)->lock);
-			
-			/*add the node to the cache*/
-			ncache_node_add(*node);
-			}
-		
-		/*Unlock the mutexes in `dir`*/
-		mutex_unlock(&dir->nn->lnode->lock);
-		mutex_unlock(&dir->lock);
-		}/*finalize*/
-
-	/*Try to find an lnode called `name` under the lnode corresponding to `dir`*/
-	err = lnode_get(dir->nn->lnode, name, &lnode);
-	
-	/*If such an entry does not exist*/
-	if(err == ENOENT)
-		{
-		/*create a new lnode with the supplied name*/
-		err = lnode_create(name, &lnode);
-		if(err)
-			{
-			finalize();
-			return err;
-			}
-		
-		/*install the new lnode into the directory*/
-		lnode_install(dir->nn->lnode, lnode);
-		}
-	
-	/*Obtain the node corresponding to this lnode*/
-	err = ncache_node_lookup(lnode, node);
-	
-	/*Remove an extra reference from the lnode*/
-	lnode_ref_remove(lnode);
-	
-	/*If the lookup in the cache failed*/
-	if(err)
-		{
-		/*stop*/
-		finalize();
-		return err;
-		}
-
-	/*Store the port in the node*/
-	(*node)->nn->port = p;
-
-	/*Construct the full path to the node*/
-	err = lnode_path_construct(lnode, NULL);
-	if(err)
-		{
-		finalize();
-		return err;
-		}
-	
-	/*Now the node is up-to-date*/
-	(*node)->nn->flags = FLAG_NODE_ULFS_UPTODATE;
-
-	/*Return the result of performing the operations*/
-	finalize();
-	return err;
-	}/*netfs_attempt_lookup*/
-/*----------------------------------------------------------------------------*/
-/*Deletes `name` in `dir` for `user`*/
-error_t
-netfs_attempt_unlink
-	(
-	struct iouser * user,
-	struct node * dir,
-	char * name
-	)
-	{
-	LOG_MSG("netfs_attempt_unlink");
-
-	return 0;
-	}/*netfs_attempt_unlink*/
-/*----------------------------------------------------------------------------*/
-/*Attempts to rename `fromdir`/`fromname` to `todir`/`toname`*/
-error_t
-netfs_attempt_rename
-	(
-	struct iouser * user,
-	struct node * fromdir,
-	char * fromname,
-	struct node * todir,
-	char * toname,
-	int excl
-	)
-	{
-	LOG_MSG("netfs_attempt_rename");
-
-	/*Operation not supported*/
-	return EOPNOTSUPP;
-	}/*netfs_attempt_rename*/
-/*----------------------------------------------------------------------------*/
-/*Attempts to create a new directory*/
-error_t
-netfs_attempt_mkdir
-	(
-	struct iouser * user,
-	struct node * dir,
-	char * name,
-	mode_t mode
-	)
-	{
-	LOG_MSG("netfs_attempt_mkdir");
-
-	return 0;
-	}/*netfs_attempt_mkdir*/
-/*----------------------------------------------------------------------------*/
-/*Attempts to remove directory `name` in `dir` for `user`*/
-error_t
-netfs_attempt_rmdir
-	(
-	struct iouser * user,
-	struct node * dir,
-	char * name
-	)
-	{
-	LOG_MSG("netfs_attempt_rmdir");
-
-	return 0;
-	}/*netfs_attempt_rmdir*/
-/*----------------------------------------------------------------------------*/
-/*Attempts to change the mode of `node` for user `cred` to `uid`:`gid`*/
-error_t
-netfs_attempt_chown
-	(
-	struct iouser * cred,
-	struct node * node,
-	uid_t uid,
-	uid_t gid
-	)
-	{
-	LOG_MSG("netfs_attempt_chown");
-
-	/*Operation is not supported*/
-	return EOPNOTSUPP;
-	}/*netfs_attempt_chown*/
-/*----------------------------------------------------------------------------*/
-/*Attempts to change the author of `node` to `author`*/
-error_t
-netfs_attempt_chauthor
-	(
-	struct iouser * cred,
-	struct node * node,
-	uid_t author
-	)
-	{
-	LOG_MSG("netfs_attempt_chauthor");
-
-	/*Operation is not supported*/
-	return EOPNOTSUPP;
-	}/*netfs_attempt_chauthor*/
-/*----------------------------------------------------------------------------*/
-/*Attempts to change the mode of `node` to `mode` for `cred`*/
-error_t
-netfs_attempt_chmod
-	(
-	struct iouser * user,
-	struct node * node,
-	mode_t mode
-	)
-	{
-	LOG_MSG("netfs_attempt_chmod");
-
-	/*Operation is not supported*/
-	return EOPNOTSUPP;
-	}/*netfs_attempt_chmod*/
-/*----------------------------------------------------------------------------*/
-/*Attempts to turn `node` into a symlink targetting `name`*/
-error_t
-netfs_attempt_mksymlink
-	(
-	struct iouser * cred,
-	struct node * node,
-	char * name
-	)
-	{
-	LOG_MSG("netfs_attempt_mksymlink");
-
-	/*Operation is not supported*/
-	return EOPNOTSUPP;
-	}/*netfs_attempt_mksymlink*/
-/*----------------------------------------------------------------------------*/
-/*Attempts to turn `node` into a device; type can be either S_IFBLK or S_IFCHR*/
-error_t
-netfs_attempt_mkdev
-	(
-	struct iouser * cred,
-	struct node * node,
-	mode_t type,
-	dev_t indexes
-	)
-	{
-	LOG_MSG("netfs_attempt_mkdev");
-
-	/*Operation is not supported*/
-	return EOPNOTSUPP;
-	}/*netfs_attempt_mkdev*/
-/*----------------------------------------------------------------------------*/
-/*Attempts to set the passive translator record for `file` passing `argz`*/
-error_t
-netfs_set_translator
-	(
-	struct iouser * cred,
-	struct node * node,
-	char * argz,
-	size_t arglen
-	)
-	{
-	LOG_MSG("netfs_set_translator");
-
-	/*Operation is not supported*/
-	return EOPNOTSUPP;
-	}/*netfs_set_translator	*/
-/*----------------------------------------------------------------------------*/
-/*Attempts to call chflags for `node`*/
-error_t
-netfs_attempt_chflags
-	(
-	struct iouser * cred,
-	struct node * node,
-	int flags
-	)
-	{
-	LOG_MSG("netfs_attempt_chflags");
-
-	/*Operation is not supported*/
-	return EOPNOTSUPP;
-	}/*netfs_attempt_chflags*/
-/*----------------------------------------------------------------------------*/
-/*Attempts to set the size of file `node`*/
-error_t
-netfs_attempt_set_size
-	(
-	struct iouser * cred,
-	struct node * node,
-	loff_t size
-	)
-	{
-	LOG_MSG("netfs_attempt_set_size");
-
-	/*Operation is not supported*/
-	return EOPNOTSUPP;
-	}/*netfs_attempt_set_size*/
-/*----------------------------------------------------------------------------*/
-/*Fetches the filesystem status information*/
-error_t
-netfs_attempt_statfs
-	(
-	struct iouser * cred,
-	struct node * node,
-	fsys_statfsbuf_t * st
-	)
-	{
-	LOG_MSG("netfs_attempt_statfs");
-
-	/*Operation is not supported*/
-	return EOPNOTSUPP;
-	}/*netfs_attempt_statfs*/
-/*----------------------------------------------------------------------------*/
-/*Syncs the filesystem*/
-error_t
-netfs_attempt_syncfs
-	(
-	struct iouser * cred,
-	int wait
-	)
-	{
-	LOG_MSG("netfs_attempt_syncfs");
-
-	/*Everythin OK*/
-	return 0;
-	}/*netfs_attempt_syncfs*/
-/*----------------------------------------------------------------------------*/
-/*Creates a link in `dir` with `name` to `file`*/
-error_t
-netfs_attempt_link
-	(
-	struct iouser * user,
-	struct node * dir,
-	struct node * file,
-	char * name,
-	int excl
-	)
-	{
-	LOG_MSG("netfs_attempt_link");
-
-	/*Operation not supported*/
-	return EOPNOTSUPP;
-	}/*netfs_attempt_link*/
-/*----------------------------------------------------------------------------*/
-/*Attempts to create an anonymous file related to `dir` with `mode`*/
-error_t
-netfs_attempt_mkfile
-	(
-	struct iouser * user,
-	struct node * dir,
-	mode_t mode,
-	struct node ** node
-	)
-	{
-	LOG_MSG("netfs_attempt_mkfile");
-
-	/*Unlock the directory*/
-	mutex_unlock(&dir->lock);
-
-	/*Operation not supported*/
-	return EOPNOTSUPP;
-	}/*netfs_attempt_mkfile*/
-/*----------------------------------------------------------------------------*/
-/*Reads the contents of symlink `node` into `buf`*/
-error_t
-netfs_attempt_readlink
-	(
-	struct iouser * user,
-	struct node * node,
-	char * buf
-	)
-	{
-	LOG_MSG("netfs_attempt_readlink");
-
-	/*Operation not supported (why?..)*/
-	return EOPNOTSUPP;
-	}/*netfs_attempt_readlink*/
-/*----------------------------------------------------------------------------*/
-/*Reads from file `node` up to `len` bytes from `offset` into `data`*/
-error_t
-netfs_attempt_read
-	(
-	struct iouser * cred,
-	struct node * np,
-	loff_t offset,
-	size_t * len,
-	void * data
-	)
-	{
-	LOG_MSG("netfs_attempt_read");
-
-	error_t err = 0;
-
-	/*If there is no port open for the current node*/
-	if(np->nn->port == MACH_PORT_NULL)
-		{
-		/*the parent node of the current node*/
-		node_t * dnp;
-
-		/*obtain the parent node of the the current node*/
-		err = ncache_node_lookup(np->nn->lnode->dir, &dnp);
-		
-		/*the lookup should never fail here*/
-		assert(!err);
-		
-		/*open a port to the file we are interested in*/
-		mach_port_t p = file_name_lookup_under
-			(dnp->nn->port, np->nn->lnode->name, O_READ, 0);
-
-		/*put `dnp` back, since we don't need it any more*/
-		netfs_nput(dnp);
-
-		if(!p)
-			return EBADF;
-			
-		/*store the port in the node*/
-		np->nn->port = p;
-		}
-		
-	/*Read the required data from the file*/
-	err = io_read(np->nn->port, (char **)&data, len, offset, *len);
-
-	/*Return the result of reading*/
-	return err;
-	}/*netfs_attempt_read*/
-/*----------------------------------------------------------------------------*/
-/*Writes to file `node` up to `len` bytes from offset from `data`*/
-error_t
-netfs_attempt_write
-	(
-	struct iouser * cred,
-	struct node * node,
-	loff_t offset,
-	size_t * len,
-	void * data
-	)
-	{
-	LOG_MSG("netfs_attempt_write");
-
-	return 0;
-	}/*netfs_attempt_write*/
-/*----------------------------------------------------------------------------*/
-/*Frees all storage associated with the node*/
-void
-netfs_node_norefs
-	(
-	struct node * np
-	)
-	{
-	/*Destroy the node*/
-	node_destroy(np);
-	}/*netfs_node_norefs*/
-/*----------------------------------------------------------------------------*/
-/*Entry point*/
-int
-main
-	(
-	int argc,
-	char ** argv
-	)
-	{
-	/*Start logging*/
-	INIT_LOG();
-	LOG_MSG(">> Starting initialization...");
-
-	/*The port on which this translator will be set upon*/
-	mach_port_t bootstrap_port;
-	
-	error_t err = 0;
-	
-	/*Parse the command line arguments*/
-	argp_parse(&argp_startup, argc, argv, ARGP_IN_ORDER, 0, 0);
-	LOG_MSG("Command line arguments parsed.");
-	
-	/*Try to create the root node*/
-	err = node_create_root(&netfs_root_node);
-	if(err)
-		error(EXIT_FAILURE, err, "Failed to create the root node");
-	LOG_MSG("Root node created.");
-
-	/*Obtain the bootstrap port*/
-	task_get_bootstrap_port(mach_task_self(), &bootstrap_port);
-
-	/*Initialize the translator*/
-	netfs_init();
-
-	/*Obtain a port to the underlying node*/
-	underlying_node = netfs_startup(bootstrap_port, O_READ);
-	LOG_MSG("netfs initialization complete.");
-
-	/*Initialize the root node*/
-	err = node_init_root(netfs_root_node);
-	if(err)
-		error(EXIT_FAILURE, err, "Failed to initialize the root node");
-	LOG_MSG("Root node initialized.");
-	LOG_MSG("\tRoot node address: 0x%lX", (unsigned long)netfs_root_node);
-	
-	/*Map the time for updating node information*/
-	err = maptime_map(0, 0, &maptime);
-	if(err)
-		error(EXIT_FAILURE, err, "Failed to map the time");
-	LOG_MSG("Time mapped.");
-		
-	/*Initialize the cache with the required number of nodes*/
-	ncache_init(ncache_size);
-	LOG_MSG("Cache initialized.");
-	
-	/*Obtain stat information about the underlying node*/
-	err = io_stat(underlying_node, &underlying_node_stat);
-	if(err)
-		error(EXIT_FAILURE, err,
-			"Cannot obtain stat information about the underlying node");
-	LOG_MSG("Stat information for undelying node obtained.");
-		
-	/*Obtain the ID of the current process*/
-	fsid = getpid();
-
-	/*Setup the stat information for the root node*/
-	netfs_root_node->nn_stat = underlying_node_stat;
-
-	netfs_root_node->nn_stat.st_ino 	= FILTERFS_ROOT_INODE;
-	netfs_root_node->nn_stat.st_fsid	= fsid;
-	netfs_root_node->nn_stat.st_mode = S_IFDIR | (underlying_node_stat.st_mode
-		& ~S_IFMT & ~S_ITRANS); /*we are providing a translated directory*/
-		
-	netfs_root_node->nn_translated = netfs_root_node->nn_stat.st_mode;
-	
-	/*If the underlying node is not a directory, enhance the permissions
-		of the root node of filterfs*/
-	if(!S_ISDIR(underlying_node_stat.st_mode))
-		{
-		/*can be read by owner*/
-		if(underlying_node_stat.st_mode & S_IRUSR)
-			/*allow execution by the owner*/
-			netfs_root_node->nn_stat.st_mode |= S_IXUSR;
-		/*can be read by group*/
-		if(underlying_node_stat.st_mode & S_IRGRP)
-			/*allow execution by the group*/
-			netfs_root_node->nn_stat.st_mode |= S_IXGRP;
-		/*can be read by others*/
-		if(underlying_node_stat.st_mode & S_IROTH)
-			/*allow execution by the others*/
-			netfs_root_node->nn_stat.st_mode |= S_IXOTH;
-		}
-		
-	/*Update the timestamps of the root node*/
-	fshelp_touch
-		(&netfs_root_node->nn_stat, TOUCH_ATIME | TOUCH_MTIME | TOUCH_CTIME,
-		maptime);
-
-	LOG_MSG(">> Initialization complete. Entering netfs server loop...");
-	
-	/*Start serving clients*/
-	for(;;)
-		netfs_server_loop();
-	}/*main*/
-/*----------------------------------------------------------------------------*/
diff --git a/netfs-sample/node.c~ b/netfs-sample/node.c~
deleted file mode 100644
index ec83b41b..00000000
--- a/netfs-sample/node.c~
+++ /dev/null
@@ -1,803 +0,0 @@
-/*----------------------------------------------------------------------------*/
-/*node.c*/
-/*----------------------------------------------------------------------------*/
-/*Implementation of node management strategies*/
-/*----------------------------------------------------------------------------*/
-/*Based on the code of unionfs translator.*/
-/*----------------------------------------------------------------------------*/
-/*Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
-  Written by Sergiu Ivanov <unlimitedscolobb@gmail.com>.
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of the GNU General Public License as
-  published by the Free Software Foundation; either version 2 of the
-  License, or * (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.*/
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-#define _GNU_SOURCE 1
-/*----------------------------------------------------------------------------*/
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <stdio.h>
-/*----------------------------------------------------------------------------*/
-#include "debug.h"
-#include "node.h"
-#include "options.h"
-#include "lib.h"
-#include "filterfs.h"
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*--------Global Variables----------------------------------------------------*/
-/*The lock protecting the underlying filesystem*/
-struct mutex ulfs_lock = MUTEX_INITIALIZER;
-/*----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/*--------Functions-----------------------------------------------------------*/
-/*Derives a new node from `lnode` and adds a reference to `lnode`*/
-error_t
-node_create
-	(
-	lnode_t * lnode,
-	node_t ** node	/*store the result here*/
-	)
-	{
-	error_t err = 0;
-
-	/*Create a new netnode*/
-	netnode_t * netnode_new = malloc(sizeof(netnode_t));
-	
-	/*If the memory could not be allocated*/
-	if(netnode_new == NULL)
-		err = ENOMEM;
-	else
-		{
-		/*create a new node from the netnode*/
-		node_t * node_new = netfs_make_node(netnode_new);
-		
-		/*If the creation failed*/
-		if(node_new == NULL)
-			{
-			/*set the error code*/
-			err = ENOMEM;
-
-			/*destroy the netnode created above*/
-			free(netnode_new);
-			
-			/*stop*/
-			return err;
-			}
-			
-		/*link the lnode to the new node*/
-		lnode->node = node_new;
-		lnode_ref_add(lnode);
-		
-		/*setup the references in the newly created node*/
-		node_new->nn->lnode = lnode;
-		node_new->nn->flags = 0;
-		node_new->nn->ncache_next = node_new->nn->ncache_prev = NULL;
-		
-		/*store the result of creation in the second parameter*/
-		*node = node_new;
-		}
-		
-	/*Return the result of operations*/
-	return err;
-	}/*node_create*/
-/*----------------------------------------------------------------------------*/
-/*Destroys the specified node and removes a light reference from the
-	associated light node*/
-void
-node_destroy
-	(
-	node_t * np
-	)
-	{
-	/*Die if the node does not belong to node cache*/
-	assert(!np->nn->ncache_next || !np->nn->ncache_prev);
-	
-	/*Destroy the port to the underlying filesystem allocated to the node*/
-	PORT_DEALLOC(np->nn->port);
-	
-	/*Lock the lnode corresponding to the current node*/
-	mutex_lock(&np->nn->lnode->lock);
-	
-	/*Orphan the light node*/
-	np->nn->lnode->node = NULL;
-	
-	/*Remove a reference from the lnode*/
-	lnode_ref_remove(np->nn->lnode);
-	
-	/*Free the netnode and the node itself*/
-	free(np->nn);
-	free(np);
-	}/*node_destroy*/
-/*----------------------------------------------------------------------------*/
-/*Creates the root node and the corresponding lnode*/
-error_t
-node_create_root
-	(
-	node_t ** root_node	/*store the result here*/
-	)
-	{
-	/*Try to create a new lnode*/
-	lnode_t * lnode;
-	error_t err = lnode_create(NULL, &lnode);
-	
-	/*Stop, if the creation failed*/
-	if(err)
-		return err;
-		
-	/*Try to derive the node corresponding to `lnode`*/
-	node_t * node;
-	err = node_create(lnode, &node);
-	
-	/*If the operation failed*/
-	if(err)
-		{
-		/*destroy the created lnode*/
-		lnode_destroy(lnode);
-		
-		/*stop*/
-		return err;
-		}
-		
-	/*Release the lock on the lnode*/
-	mutex_unlock(&lnode->lock);
-	
-	/*Store the result in the parameter*/
-	*root_node = node;
-	
-	/*Return the result*/
-	return err;
-	}/*node_create_root*/
-/*----------------------------------------------------------------------------*/
-/*Initializes the port to the underlying filesystem for the root node*/
-error_t
-node_init_root
-	(
-	node_t * node	/*the root node*/
-	)
-	{
-	error_t err = 0;
-
-	/*Acquire a lock for operations on the underlying filesystem*/
-	mutex_lock(&ulfs_lock);
-	
-	/*Open the port to the directory specified in `dir`*/
-	node->nn->port = file_name_lookup(dir, O_READ | O_DIRECTORY, 0);
-	
-	/*If the directory could not be opened*/
-	if(node->nn->port == MACH_PORT_NULL)
-		{
-		/*set the error code accordingly*/
-		err = errno;
-		LOG_MSG("node_init_root: Could not open the port for %s.", dir);
-		
-		/*release the lock and stop*/
-		mutex_unlock(&ulfs_lock);
-		return err;
-		}
-
-	LOG_MSG("node_init_root: Port for %s opened successfully.", dir);
-	LOG_MSG("\tPort: 0x%lX", (unsigned long)node->nn->port);
-	
-	/*Stat the root node*/
-	err = io_stat(node->nn->port, &node->nn_stat);
-	if(err)
-		{
-		/*deallocate the port*/
-		PORT_DEALLOC(node->nn->port);
-		
-		LOG_MSG("node_init_root: Could not stat the root node.");
-		
-		/*unlock the mutex and exit*/
-		mutex_unlock(&ulfs_lock);
-		return err;
-		}
-	
-	/*Set the path to the corresponding lnode to `dir`*/
-	node->nn->lnode->path = strdup(dir);
-	if(!node->nn->lnode->path)
-		{
-		/*deallocate the port*/
-		PORT_DEALLOC(node->nn->port);
-
-		/*unlock the mutex*/
-		mutex_unlock(&ulfs_lock);
-
-		LOG_MSG("node_init_root: Could not strdup the directory.");
-		return ENOMEM;
-		}
-	
-	/*The current position in dir*/
-	char * p = dir + strlen(dir);
-	
-	/*Go through the path from end to beginning*/
-	for(; p >= dir; --p)
-		{
-		/*If the current character is a '/'*/
-		if(*p == '/')
-			{
-			/*If p is not the first character*/
-			if(p > dir)
-				{
-				/*if this slash is escaped, skip it*/
-				if(*(p - 1) == '\\')
-					continue;
-				}
-			
-			/*advance the pointer to the first character after the slash*/
-			++p;
-
-			/*stop*/
-			break;
-			}
-		}
-		
-	LOG_MSG("node_init_root: The name of root node is %s.", p);
-	
-	/*Set the name of the lnode to the last element in the path to dir*/
-	node->nn->lnode->name = strdup(p);
-	/*If the name of the node could not be duplicated*/
-	if(!node->nn->lnode->name)
-		{
-		/*free the name of the path to the node and deallocate teh port*/
-		free(node->nn->lnode->path);
-		PORT_DEALLOC(node->nn->port);
-		
-		/*unlock the mutex*/
-		mutex_unlock(&ulfs_lock);
-
-		LOG_MSG("node_init_root: Could not strdup the name of the root node.");
-		return ENOMEM;
-		}
-	
-	/*Compute the length of the name of the root node*/
-	node->nn->lnode->name_len = strlen(p);
-
-	/*Release the lock for operations on the undelying filesystem*/
-	mutex_unlock(&ulfs_lock);
-	
-	/*Return the result of operations*/
-	return err;
-	}/*node_init_root*/
-/*----------------------------------------------------------------------------*/
-/*Frees a list of dirents*/
-void
-node_entries_free
-	(
-	node_dirent_t * dirents	/*free this*/
-	)
-	{
-	/*The current and the next elements*/
-	node_dirent_t * dirent, * dirent_next;
-	
-	/*Go through all elements of the list*/
-	for(dirent = dirents; dirent; dirent = dirent_next)
-		{
-		/*store the next element*/
-		dirent_next = dirent->next;
-		
-		/*free the dirent stored in the current element of the list*/
-		free(dirent->dirent);
-		
-		/*free the current element*/
-		free(dirent);
-		}
-	}/*node_entries_free*/
-/*----------------------------------------------------------------------------*/
-/*Reads the directory entries from `node`, which must be locked*/
-error_t
-node_entries_get
-	(
-	node_t * node,
-	node_dirent_t ** dirents /*store the result here*/
-	)
-	{
-	error_t err = 0;
-
-	/*Obtain the path to the current node*/
-	char * path_to_node = node->nn->lnode->path;
-	
-	/*The number of PROPERTY_PARAMs in the property*/
-	int param_entries_count = 0;
-	
-	/*The length of the property*/
-	size_t property_len = (property) ? (strlen(property)) : (0);
-	
-	/*The length of PROPERTY_PARAM*/
-	size_t property_param_len = strlen(PROPERTY_PARAM);
-
-	/*The full name and the filtering command*/
-	char * full_name = NULL, * cmd = NULL;
-
-	/*The lengths of the full name and the filtering command in chunks*/
-	size_t full_name_size = 1, cmd_size = 1;
-
-	/*If some property was indeed specified*/
-	if(property_len != 0)
-		{
-		/*the pointer to the current occurrence of PROPERTY_PARAM*/
-		char * occurrence = strstr(property, PROPERTY_PARAM);
-		
-		/*count the number of occurrences*/
-		for(; occurrence;
-			occurrence = strstr(occurrence + 1, PROPERTY_PARAM),
-			++param_entries_count);
-
-		/*try allocate the memory for the fullname and the filtering command*/
-		full_name = malloc(full_name_size * STRING_CHUNK);
-		if(!full_name)
-			return ENOMEM;
-
-		cmd = malloc(cmd_size * STRING_CHUNK);
-		if(!cmd)
-			{
-			free(full_name);
-			return ENOMEM;
-			}
-		}
-
-	/*Obtain the length of the path*/
-	size_t pathlen = strlen(path_to_node);
-
-	/*Checks if the given file satisfies the property. Zero value means that
-		the entry must be filtered out*/
-	int
-	check_property
-		(
-		const char * name	/*the name of the file*/
-		)
-		{
-		/*If there is no property*/
-		if(!property)
-			/*no filtering will be applied, any name is OK*/
-			return 0;
-		
-		/*Everything OK at first*/
-		err = 0;
-		
-		/*Compute the length of the full name once*/
-		size_t full_name_len = pathlen + 1 + strlen(name) + 1;
-
-		/*See how much space (in chunks) is required for the full name*/
-		int chunks = full_name_size;
-		for(; full_name_len > chunks * STRING_CHUNK; ++chunks);
-		
-		/*If more memory is requied*/
-		if(chunks > full_name_size)
-			{
-			/*free the old full name*/
-			free(full_name);
-
-			/*try to allocate the new memory*/
-			full_name = malloc(chunks * STRING_CHUNK);
-			if(!full_name)
-				{
-				err = ENOMEM;
-				free(cmd); /*the string for the command is definitely allocated here*/
-				return 0;
-				}
-			
-			/*store the new size*/
-			full_name_size = chunks;
-			}
-		
-		/*Initialize `full_name` as a valid string*/
-		full_name[0] = 0;
-		
-		/*Construct the full name*/
-		strcpy(full_name, path_to_node);
-		strcat(full_name, "/");
-		strcat(full_name, name);
-		
-		/*LOG_MSG("node_entries_get: Applying filter to %s...", full_name);*/
-		
-		/*Compute the space required for the final filtering command*/
-		size_t sz = property_len + (strlen(full_name) - property_param_len)
-			* param_entries_count;
-		
-		/*See how much space (in chunks) is required for the command*/
-		for(chunks = cmd_size; sz > chunks * STRING_CHUNK; ++chunks);
-		
-		/*If more memory is requied*/
-		if(chunks > cmd_size)
-			{
-			/*free the old command*/
-			free(cmd);
-
-			/*try to allocate the new memory*/
-			cmd = malloc(chunks * STRING_CHUNK);
-			if(!cmd)
-				{
-				err = ENOMEM;
-				free(full_name);	/*the string for the full name is
-														definitely allocated here*/
-				return 0;
-				}
-			
-			/*store the new size*/
-			cmd_size = chunks;
-			}
-
-		/*Initialize `cmd` as a valid string*/
-		cmd[0] = 0;
-			
-		/*The current occurence of PROPERTY_PARAM in property*/
-		char * p = strstr(property, PROPERTY_PARAM);
-		
-		/*The pointer to the current position in the property*/
-		char * propp = property;
-		
-		/*While the command has not been constructed*/
-		for(; p; p = strstr(propp, PROPERTY_PARAM))
-			{
-			/*add the new part of the property to the command*/
-			strncat(cmd, propp, p - propp);
-			
-			/*add the filename to the command*/
-			strcat(cmd, full_name);
-			
-			/*LOG_MSG("\tcmd = '%s'", cmd);*/
-
-			/*advance the pointer in the property*/
-			propp = p + property_param_len;
-
-			/*LOG_MSG("\tpropp points at '%s'", propp);*/
-			}
-		
-		/*Copy the rest of the property to the command*/
-		strcat(cmd, propp);
-		
-		/*LOG_MSG("node_entries_get: The filtering command: '%s'.", cmd);*/
-
-		/*Execute the command*/
-		int xcode = WEXITSTATUS(system(cmd));
-		
-		/*Return the exit code of the command*/
-		return xcode;
-		}/*check_property*/
-
-	/*The list of dirents*/
-	struct dirent ** dirent_list, **dirent;
-	
-	/*The head of the list of dirents*/
-	node_dirent_t * node_dirent_list = NULL;
-	
-	/*The size of the array of pointers to dirent*/
-	size_t dirent_data_size;
-	
-	/*The array of dirents*/
-	char * dirent_data;
-
-	/*Obtain the directory entries for the given node*/
-	err = dir_entries_get
-		(node->nn->port, &dirent_data, &dirent_data_size, &dirent_list);
-	if(err)
-		{
-		return err;
-		}
-		
-	/*The new entry in the list*/
-	node_dirent_t * node_dirent_new;
-	
-	/*The new dirent*/
-	struct dirent * dirent_new;
-	
-	/*LOG_MSG("node_entries_get: Getting entries for %p", node);*/
-
-	/*The name of the current dirent*/
-	char * name;
-
-	/*The length of the current name*/
-	size_t name_len;
-	
-	/*The size of the current dirent*/
-	size_t size;
-	
-	/*The exit code of property*/
-	int good;
-	
-	/*Go through all elements of the list of pointers to dirent*/
-	for(dirent = dirent_list; *dirent; ++dirent)
-		{
-		/*obtain the name of the current dirent*/
-		name = &((*dirent)->d_name[0]);
-		
-		/*If the current dirent is either '.' or '..', skip it*/
-		if((strcmp(name, ".") == 0) ||	(strcmp(name, "..") == 0))
-			continue;
-		
-		/*check if the current dirent has the property*/
-		good = check_property(name);
-		if(err)
-			break;
- 		
-		/*If the current entry is not good, skip it*/
-		if(good != 0)
-			continue;
-		
-		/*obtain the length of the current name*/
-		name_len = strlen(name);
-		
-		/*obtain the length of the current dirent*/
-		size = DIRENT_LEN(name_len);
-		
-		/*create a new list element*/
-		node_dirent_new = malloc(sizeof(node_dirent_t));
-		if(!node_dirent_new)
-			{
-			err = ENOMEM;
-			break;
-			}
-			
-		/*create a new dirent*/
-		dirent_new = malloc(size);
-		if(!dirent_new)
-			{
-			free(node_dirent_new);
-			err = ENOMEM;
-			break;
-			}
-			
-		/*fill the dirent with information*/
-		dirent_new->d_ino			= (*dirent)->d_ino;
-		dirent_new->d_type 		= (*dirent)->d_type;
-		dirent_new->d_reclen	= size;
-		strcpy((char *)dirent_new + DIRENT_NAME_OFFS, name);
-		
-		/*add the dirent to the list*/
-		node_dirent_new->dirent = dirent_new;
-		node_dirent_new->next = node_dirent_list;
-		node_dirent_list = node_dirent_new;
-		}
-	
-	/*If something went wrong in the loop*/
-	if(err)
-		/*free the list of dirents*/
-		node_entries_free(node_dirent_list);
-	else
-		/*store the list of dirents in the second parameter*/
-		*dirents = node_dirent_list;
-	
-	/*Free the list of pointers to dirent*/
-	free(dirent_list);
-	
-	/*Free the results of listing the dirents*/
-	munmap(dirent_data, dirent_data_size);
-
-	/*Free the full name and the command (if these are present at all)*/
-	if(full_name)
-		free(full_name);
-	if(cmd)
-		free(cmd);
-	
-	/*Return the result of operations*/
-	return err;
-	}/*node_entries_get*/
-/*----------------------------------------------------------------------------*/
-/*Makes sure that all ports to the underlying filesystem of `node` are up to
-	date*/
-error_t
-node_update
-	(
-	node_t * node
-	)
-	{
-	error_t err = 0;
-
-	/*The full path to this node*/
-	char * path;
-	
-	/*Stat information for `node`*/
-	io_statbuf_t stat;
-	
-	/*The port to the file corresponding to `node`*/
-	file_t port;
-
-	/*If the specified node is the root node or if it must not be updated*/
-	if(NODE_IS_ROOT(node) || (node->nn->flags & FLAG_NODE_ULFS_FIXED))
-		/*do nothing*/
-		return err; /*return 0; actually*/
-		
-	/*Gain exclusive access to the root node of the filesystem*/
-	mutex_lock(&netfs_root_node->lock);
-	
-	/*Construct the full path to `node`*/
-	err = lnode_path_construct(node->nn->lnode, &path);
-	if(err)
-		{
-		mutex_unlock(&netfs_root_node->lock);
-		return err;
-		}
-		
-	/*Deallocate `node`'s port to the underlying filesystem*/
-	if(node->nn->port)
-		PORT_DEALLOC(node->nn->port);
-		
-	/*Try to lookup the file for `node` in its untranslated version*/
-	err = file_lookup
-		(
-		netfs_root_node->nn->port, path, O_READ | O_NOTRANS, O_NOTRANS,
-		0, &port, &stat
-		);
-	if(err)
-		{
-		node->nn->port = MACH_PORT_NULL;
-		err = 0; /*failure (?)*/
-		return err;
-		}
-	
-	/*If the node looked up is actually the root node of filterfs filesystem*/
-	if
-		(
-		(stat.st_ino == underlying_node_stat.st_ino)
-		&& (stat.st_fsid == underlying_node_stat.st_fsid)
-		)
-		/*set `err` accordingly*/
-		err = ELOOP;
-	else
-		{
-		/*deallocate the obtained port*/
-		PORT_DEALLOC(port);
-		
-		/*obtain the translated version of the required node*/
-		err = file_lookup
-			(netfs_root_node->nn->port, path, O_READ, 0, 0, &port, &stat);
-		}
-		
-	/*If there have been errors*/
-	if(err)
-		/*reset the port*/
-		port = MACH_PORT_NULL;
-		
-	/*Store the port in the node*/
-	node->nn->port = port;
-	
-	/*Remove the flag about the invalidity of the current node and set the
-		flag that the node is up-to-date*/
-	node->nn->flags &= ~FLAG_NODE_INVALIDATE;
-	node->nn->flags |= FLAG_NODE_ULFS_UPTODATE;
-	
-	/*Release the lock on the root node of filterfs filesystem*/
-	mutex_unlock(&netfs_root_node->lock);
-	
-	/*Return the result of operations*/
-	return err;
-	}/*node_update*/
-/*----------------------------------------------------------------------------*/
-/*Computes the size of the given directory*/
-error_t
-node_get_size
-	(
-	node_t * dir,
-	OFFSET_T * off
-	)
-	{
-	error_t err = 0;
-
-	/*The final size*/
-	size_t size = 0;
-	
-	/*The number of directory entries*/
-	/*int count = 0;*/
-	
-	/*The the node in the directory entries list from which we start counting*/
-	/*node_dirent_t * dirent_start = NULL;*/
-	
-	/*The currently analyzed dirent*/
-	node_dirent_t * dirent_current = NULL;
-	
-	/*The pointer to the beginning of the list of dirents*/
-	node_dirent_t * dirent_list = NULL;
-	
-	/*The first entry we have to analyze*/
-	/*int first_entry = 2;*/
-	
-	/*Takes into consideration the name of the current dirent*/
-	void
-	bump_size
-		(
-		const char * name
-		)
-		{
-		/*Increment the current size by the size of the current dirent*/
-		size += DIRENT_LEN(strlen(name));
-		
-		/*Count the current dirent*/
-		/*++count;*/
-		}/*bump_size*/
-		
-	/*Obtain the list of entries in the current directory*/
-	err = node_entries_get(dir, &dirent_list);
-	if(err)
-		return err;
-	
-	/*Obtain the pointer to the dirent which has the number first_entry*/
-	/*Actually, the first element of the list*/
-	/*This code is included in unionfs, but it's completely useless here*/
-	/*for
-		(
-		dirent_start = dirent_list, count = 2;
-		dirent_start && count < first_entry;
-		dirent_start = dirent_start->next, ++count
-		);*/
-	
-	/*Reset the count*/
-	/*count = 0;*/
-	
-	/*Make space for '.' and '..' entries*/
-	/*This code is included in unionfs, but it's completely useless here*/
-	/*if(first_entry == 0)
-		bump_size(".");
-	if(first_entry <= 1)
-		bump_size("..");*/
-	
-	/*See how much space is required for the node*/
-	for
-		(
-		dirent_current = dirent_list/*dirent_start*/; dirent_current;
-		dirent_current = dirent_current->next
-		)
-		bump_size(dirent_current->dirent->d_name);
-		
-	/*Free the list of dirents*/
-	node_entries_free(dirent_list);
-	
-	/*Return the size*/
-	*off = size;
-	return 0;
-	}/*node_get_size*/
-/*----------------------------------------------------------------------------*/
-/*Remove the file called `name` under `dir`*/
-error_t
-node_unlink_file
-	(
-	node_t * dir,
-	char * name
-	)
-	{
-	error_t err = 0;
-
-	/*The port to the file which will be unlinked*/
-	mach_port_t p;
-	
-	/*Stat information about the file which will be unlinked*/
-	io_statbuf_t stat;
-	
-	/*If port corresponding to `dir` is invalid*/
-	if(dir->nn->port == MACH_PORT_NULL)
-		/*stop with an error*/
-		return ENOENT; /*FIXME: Is the return value indeed meaningful here?*/
-	
-	/*Attempt to lookup the specified file*/
-	err = file_lookup(dir->nn->port, name, O_NOTRANS, O_NOTRANS, 0, &p, &stat);
-	if(err)
-		return err;
-	
-	/*Deallocate the obtained port*/
-	PORT_DEALLOC(p);
-	
-	/*Unlink file `name` under `dir`*/
-	err = dir_unlink(dir->nn->port, name);
-	if(err)
-		return err;
-	
-	return err;
-	}/*node_unlink_file*/
-/*----------------------------------------------------------------------------*/
diff --git a/pfinet.old/ethernet.c~ b/pfinet.old/ethernet.c~
deleted file mode 100644
index 24adcc87..00000000
--- a/pfinet.old/ethernet.c~
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
-   Copyright (C) 1995, 1996, 1998, 1999, 2000, 2002, 2007
-     Free Software Foundation, Inc.
-
-   Written by Michael I. Bushnell, p/BSG.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
-
-#include "pfinet.h"
-
-#include <device/device.h>
-#include <device/net_status.h>
-#include <netinet/in.h>
-#include <string.h>
-#define _HACK_ERRNO_H
-#include <errno.h>
-#include <error.h>
-
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/if_arp.h>
-#include <device/bpf.h>
-
-
-struct port_class *etherreadclass;
-
-struct ether_device
-{
-  struct ether_device *next;
-  device_t ether_port;
-  struct port_info *readpt;
-  mach_port_t readptname;
-  struct device dev;
-};
-
-/* Linked list of all ethernet devices.  */
-struct ether_device *ether_dev;
-
-struct enet_statistics retbuf;
-
-
-/* Mach doesn't provide this.  DAMN. */
-struct enet_statistics *
-ethernet_get_stats (struct device *dev)
-{
-  return &retbuf;
-}
-
-int
-ethernet_stop (struct device *dev)
-{
-  return 0;
-}
-
-void
-ethernet_set_multi (struct device *dev)
-{
-}
-
-/* The BPF instruction allows IP and ARP packets */
-static struct bpf_insn ether_filter[] =
-{
-    {NETF_IN|NETF_BPF, /* Header. */ 0, 0, 0},
-    {40, 0, 0, 12},
-    {21, 1, 0, 2054},
-    {21, 0, 1, 2048},
-    {6, 0, 0, 1500},
-    {6, 0, 0, 0}
-};
-static int ether_filter_len = sizeof (ether_filter) / sizeof (short);
-
-static struct port_bucket *etherport_bucket;
-
-
-static any_t
-ethernet_thread (any_t arg)
-{
-  ports_manage_port_operations_one_thread (etherport_bucket,
-					   ethernet_demuxer,
-					   0);
-  return 0;
-}
-
-int
-ethernet_demuxer (mach_msg_header_t *inp,
-		  mach_msg_header_t *outp)
-{
-  static int count = 0;
-  struct net_rcv_msg *msg = (struct net_rcv_msg *) inp;
-  struct sk_buff *skb;
-  int datalen;
-  struct ether_device *edev;
-  struct device *dev = 0;
-
-  if (inp->msgh_id != NET_RCV_MSG_ID)
-    return 0;
-
-  for (edev = ether_dev; edev; edev = edev->next)
-    if (inp->msgh_local_port == edev->readptname)
-      dev = &edev->dev;
-
-  if (! dev)
-    {
-      if (inp->msgh_remote_port != MACH_PORT_NULL)
-	mach_port_deallocate (mach_task_self (), inp->msgh_remote_port);
-      return 1;
-    }
-
-  fprintf (stderr, "pfinet receives the %dst packet.\n", ++count);
-  fflush (stderr);
-
-  datalen = ETH_HLEN
-    + msg->packet_type.msgt_number - sizeof (struct packet_header);
-
-  __mutex_lock (&net_bh_lock);
-  skb = alloc_skb (datalen, GFP_ATOMIC);
-  skb_put (skb, datalen);
-  skb->dev = dev;
-
-  char *str = "pfinet enters net_bh_lock.\n";
-  write (fileno (stderr), str, strlen (str) + 1);
-  fflush (stderr);
-
-  /* Copy the two parts of the frame into the buffer. */
-  bcopy (msg->header, skb->data, ETH_HLEN);
-  bcopy (msg->packet + sizeof (struct packet_header),
-	 skb->data + ETH_HLEN,
-	 datalen - ETH_HLEN);
-
-  /* Drop it on the queue. */
-  skb->protocol = eth_type_trans (skb, dev);
-  netif_rx (skb);
-  __mutex_unlock (&net_bh_lock);
-
-  fprintf (stderr, "pfinet delivered the packet.\n");
-  fflush (stderr);
-
-  return 1;
-}
-
-
-void
-ethernet_initialize (void)
-{
-  etherport_bucket = ports_create_bucket ();
-  etherreadclass = ports_create_class (0, 0);
-
-  cthread_detach (cthread_fork (ethernet_thread, 0));
-}
-
-int
-ethernet_open (struct device *dev)
-{
-  error_t err;
-  device_t master_device;
-  struct ether_device *edev = (struct ether_device *) dev->priv;
-
-  assert (edev->ether_port == MACH_PORT_NULL);
-
-  err = ports_create_port (etherreadclass, etherport_bucket,
-			   sizeof (struct port_info), &edev->readpt);
-  assert_perror (err);
-  edev->readptname = ports_get_right (edev->readpt);
-  mach_port_insert_right (mach_task_self (), edev->readptname, edev->readptname,
-			  MACH_MSG_TYPE_MAKE_SEND);
-
-  mach_port_set_qlimit (mach_task_self (), edev->readptname, MACH_PORT_QLIMIT_MAX);
-
-  /* The device name here is the path of a device file.  */
-  master_device = file_name_lookup (dev->name, 0, 0);
-  if (master_device == MACH_PORT_NULL)
-    error (2, errno, "file_name_lookup %s", dev->name);
-
-  err = device_open (master_device, D_WRITE | D_READ, "eth", &edev->ether_port);
-  mach_port_deallocate (mach_task_self (), master_device);
-  if (err)
-    error (2, err, "%s", dev->name);
-
-  err = device_set_filter (edev->ether_port, ports_get_right (edev->readpt),
-			   MACH_MSG_TYPE_MAKE_SEND, 0,
-			   ether_filter, ether_filter_len);
-  if (err)
-    error (2, err, "%s", dev->name);
-  return 0;
-}
-
-
-/* Transmit an ethernet frame */
-int
-ethernet_xmit (struct sk_buff *skb, struct device *dev)
-{
-  error_t err;
-  struct ether_device *edev = (struct ether_device *) dev->priv;
-  u_int count;
-  char *str1 = "pfinet: ethernet_xmit check point 1.\n";
-  char *str2 = "pfinet: ethernet_xmit check point 2.\n";
-  int stderr_fd = fileno (stderr);
-
-  write (stderr_fd, str1, strlen (str1) + 1);
-  fflush (stderr);
-  err = device_write (edev->ether_port, D_NOWAIT, 0, skb->data, skb->len, &count);
-  write (stderr_fd, str2, strlen (str1) + 1);
-  fflush (stderr);
-  assert_perror (err);
-  assert (count == skb->len);
-  dev_kfree_skb (skb);
-  return 0;
-}
-
-void
-setup_ethernet_device (char *name, struct device **device)
-{
-  struct net_status netstat;
-  size_t count;
-  int net_address[2];
-  error_t err;
-  struct ether_device *edev;
-  struct device *dev;
-
-  edev = calloc (1, sizeof (struct ether_device));
-  if (!edev)
-    error (2, ENOMEM, "%s", name);
-  edev->next = ether_dev;
-  ether_dev = edev;
-
-  *device = dev = &edev->dev;
-
-  dev->name = strdup (name);
-  /* Functions.  These ones are the true "hardware layer" in Linux.  */
-  dev->open = 0;		/* We set up before calling dev_open.  */
-  dev->stop = ethernet_stop;
-  dev->hard_start_xmit = ethernet_xmit;
-  dev->get_stats = ethernet_get_stats;
-  dev->set_multicast_list = ethernet_set_multi;
-
-  /* These are the ones set by drivers/net/net_init.c::ether_setup.  */
-  dev->hard_header = eth_header;
-  dev->rebuild_header = eth_rebuild_header;
-  dev->hard_header_cache = eth_header_cache;
-  dev->header_cache_update = eth_header_cache_update;
-  dev->hard_header_parse = eth_header_parse;
-  /* We can't do these two (and we never try anyway).  */
-  /* dev->change_mtu = eth_change_mtu; */
-  /* dev->set_mac_address = eth_mac_addr; */
-
-  /* Some more fields */
-  dev->priv = edev;         /* For reverse lookup.  */
-  dev->type = ARPHRD_ETHER;
-  dev->hard_header_len = ETH_HLEN;
-  dev->addr_len = ETH_ALEN;
-  memset (dev->broadcast, 0xff, ETH_ALEN);
-  dev->flags = IFF_BROADCAST | IFF_MULTICAST;
-  dev_init_buffers (dev);
-
-  ethernet_open (dev);
-
-  /* Fetch hardware information */
-  count = NET_STATUS_COUNT;
-  err = device_get_status (edev->ether_port, NET_STATUS,
-			   (dev_status_t) &netstat, &count);
-  if (err)
-    error (2, err, "%s: Cannot get device status", name);
-  dev->mtu = netstat.max_packet_size - dev->hard_header_len;
-  assert (netstat.header_format == HDR_ETHERNET);
-  assert (netstat.header_size == ETH_HLEN);
-  assert (netstat.address_size == ETH_ALEN);
-
-  count = 2;
-  assert (count * sizeof (int) >= ETH_ALEN);
-  err = device_get_status (edev->ether_port, NET_ADDRESS, net_address, &count);
-  if (err)
-    error (2, err, "%s: Cannot get hardware Ethernet address", name);
-  net_address[0] = ntohl (net_address[0]);
-  net_address[1] = ntohl (net_address[1]);
-  bcopy (net_address, dev->dev_addr, ETH_ALEN);
-
-  /* That should be enough.  */
-
-  /* This call adds the device to the `dev_base' chain,
-     initializes its `ifindex' member (which matters!),
-     and tells the protocol stacks about the device.  */
-  err = - register_netdevice (dev);
-  assert_perror (err);
-}
diff --git a/pfinet.old/io-ops.c~ b/pfinet.old/io-ops.c~
deleted file mode 100644
index 4653097c..00000000
--- a/pfinet.old/io-ops.c~
+++ /dev/null
@@ -1,616 +0,0 @@
-/*
-   Copyright (C) 1995,96,97,98,99,2000,02 Free Software Foundation, Inc.
-   Written by Michael I. Bushnell, p/BSG.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
-
-#include "pfinet.h"
-
-#include <linux/wait.h>
-#include <linux/socket.h>
-#include <linux/net.h>
-#include <net/sock.h>
-
-#include "io_S.h"
-#include <netinet/in.h>
-#include <fcntl.h>
-#include <string.h>
-#include <unistd.h>
-#include <mach/notify.h>
-#include <sys/mman.h>
-
-error_t
-S_io_write (struct sock_user *user,
-	    char *data,
-	    size_t datalen,
-	    off_t offset,
-	    mach_msg_type_number_t *amount)
-{
-  error_t err;
-  struct iovec iov = { data, datalen };
-  struct msghdr m = { msg_name: 0, msg_namelen: 0, msg_flags: 0,
-		      msg_controllen: 0, msg_iov: &iov, msg_iovlen: 1 };
-  char *str1 = "pfinet io_write check point 1.\n";
-  int stderr_fd = fileno (stderr);
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  fprintf (stderr, "pfinet io_write before locking global_lock.\n");
-  fflush (stderr);
-
-  __mutex_lock (&global_lock);
-  become_task (user);
-  if (user->sock->flags & O_NONBLOCK)
-    m.msg_flags |= MSG_DONTWAIT;
-  err = (*user->sock->ops->sendmsg) (user->sock, &m, datalen, 0);
-  __mutex_unlock (&global_lock);
-
-  fprintf (stderr, "pfinet io_write after unlocking global_lock.\n");
-  fflush (stderr);
-
-  if (err < 0)
-    err = -err;
-  else
-    {
-      *amount = err;
-      err = 0;
-    }
-
-  return err;
-}
-
-error_t
-S_io_read (struct sock_user *user,
-	   char **data,
-	   size_t *datalen,
-	   off_t offset,
-	   mach_msg_type_number_t amount)
-{
-  error_t err;
-  int alloced = 0;
-  struct iovec iov;
-  struct msghdr m = { msg_name: 0, msg_namelen: 0, msg_flags: 0,
-		      msg_controllen: 0, msg_iov: &iov, msg_iovlen: 1 };
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  /* Instead of this, we should peek and the socket and only
-     allocate as much as necessary. */
-  if (amount > *datalen)
-    {
-      *data = mmap (0, amount, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-      alloced = 1;
-    }
-
-  iov.iov_base = *data;
-  iov.iov_len = amount;
-
-  __mutex_lock (&global_lock);
-  become_task (user);
-  err = (*user->sock->ops->recvmsg) (user->sock, &m, amount,
-				     ((user->sock->flags & O_NONBLOCK)
-    				      ? MSG_DONTWAIT : 0),
-				     0);
-  __mutex_unlock (&global_lock);
-
-  if (err < 0)
-    err = -err;
-  else
-    {
-      *datalen = err;
-      if (alloced && round_page (*datalen) < round_page (amount))
-	munmap (*data + round_page (*datalen),
-		round_page (amount) - round_page (*datalen));
-      err = 0;
-    }
-  return err;
-}
-
-error_t
-S_io_seek (struct sock_user *user,
-	   off_t offset,
-	   int whence,
-	   off_t *newp)
-{
-  return user ? ESPIPE : EOPNOTSUPP;
-}
-
-error_t
-S_io_readable (struct sock_user *user,
-	       mach_msg_type_number_t *amount)
-{
-  struct sock *sk;
-  error_t err;
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-  become_task (user);
-
-  /* We need to avoid calling the Linux ioctl routines,
-     so here is a rather ugly break of modularity. */
-
-  sk = user->sock->sk;
-  err = 0;
-
-  /* Linux's af_inet.c ioctl routine just calls the protocol-specific
-     ioctl routine; it's those routines that we need to simulate.  So
-     this switch corresponds to the initialization of SK->prot in
-     af_inet.c:inet_create. */
-  switch (user->sock->type)
-    {
-    case SOCK_STREAM:
-    case SOCK_SEQPACKET:
-      err = tcp_tiocinq (sk, amount);
-      break;
-
-    case SOCK_DGRAM:
-      /* These guts are copied from udp.c:udp_ioctl (TIOCINQ). */
-      if (sk->state == TCP_LISTEN)
-	err = EINVAL;
-      else
-	/* Boy, I really love the C language. */
-	*amount = (skb_peek (&sk->receive_queue)
-		   ? : &((struct sk_buff){}))->len;
-      break;
-
-    case SOCK_RAW:
-    default:
-      err = EOPNOTSUPP;
-      break;
-    }
-
-  __mutex_unlock (&global_lock);
-  return err;
-}
-
-error_t
-S_io_set_all_openmodes (struct sock_user *user,
-			int bits)
-{
-  if (!user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-  if (bits & O_NONBLOCK)
-    user->sock->flags |= O_NONBLOCK;
-  else
-    user->sock->flags &= ~O_NONBLOCK;
-  __mutex_unlock (&global_lock);
-  return 0;
-}
-
-error_t
-S_io_get_openmodes (struct sock_user *user,
-		    int *bits)
-{
-  struct sock *sk;
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-  sk = user->sock->sk;
-
-  *bits = 0;
-  if (!(sk->shutdown & SEND_SHUTDOWN))
-    *bits |= O_WRITE;
-  if (!(sk->shutdown & RCV_SHUTDOWN))
-    *bits |= O_READ;
-  if (user->sock->flags & O_NONBLOCK)
-    *bits |= O_NONBLOCK;
-
-  __mutex_unlock (&global_lock);
-  return 0;
-}
-
-error_t
-S_io_set_some_openmodes (struct sock_user *user,
-			 int bits)
-{
-  if (!user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-  if (bits & O_NONBLOCK)
-    user->sock->flags |= O_NONBLOCK;
-  __mutex_unlock (&global_lock);
-  return 0;
-}
-
-error_t
-S_io_clear_some_openmodes (struct sock_user *user,
-			   int bits)
-{
-  if (!user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-  if (bits & O_NONBLOCK)
-    user->sock->flags &= ~O_NONBLOCK;
-  __mutex_unlock (&global_lock);
-  return 0;
-}
-
-error_t
-S_io_select (struct sock_user *user,
-	     mach_port_t reply,
-	     mach_msg_type_name_t reply_type,
-	     int *select_type)
-{
-  const int want = *select_type;
-  int avail;
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-  become_task (user);
-
-  /* In Linux, this means (supposedly) that I/O will never be possible.
-     That's a lose, so prevent it from happening.  */
-  assert (user->sock->ops->poll);
-
-  avail = (*user->sock->ops->poll) ((void *) 0xdeadbeef,
-				    user->sock,
-				    (void *) 0xdeadbead);
-  if ((avail & want) == 0)
-    {
-      ports_interrupt_self_on_notification (user, reply,
-					    MACH_NOTIFY_DEAD_NAME);
-
-      do
-	{
-	  /* Block until we are woken or cancelled.  */
-	  interruptible_sleep_on (user->sock->sk->sleep);
-	  if (signal_pending (current)) /* This means we were cancelled.  */
-	    {
-	      __mutex_unlock (&global_lock);
-	      return EINTR;
-	    }
-	  avail = (*user->sock->ops->poll) ((void *) 0xdeadbeef,
-					    user->sock,
-					    (void *) 0xdeadbead);
-	}
-      while ((avail & want) == 0);
-    }
-
-  /* We got something.  */
-  *select_type = avail;
-
-  __mutex_unlock (&global_lock);
-
-  return 0;
-}
-
-error_t
-S_io_stat (struct sock_user *user,
-	   struct stat *st)
-{
-  if (!user)
-    return EOPNOTSUPP;
-
-  bzero (st, sizeof (struct stat));
-
-  st->st_fstype = FSTYPE_SOCKET;
-  st->st_fsid = getpid ();
-  st->st_ino = user->sock->st_ino;
-
-  st->st_mode = S_IFSOCK | ACCESSPERMS;
-  st->st_blksize = 512;		/* ???? */
-
-  return 0;
-}
-
-error_t
-S_io_reauthenticate (struct sock_user *user,
-		     mach_port_t rend)
-{
-  struct sock_user *newuser;
-  uid_t gubuf[20], ggbuf[20], aubuf[20], agbuf[20];
-  uid_t *gen_uids, *gen_gids, *aux_uids, *aux_gids;
-  size_t genuidlen, gengidlen, auxuidlen, auxgidlen;
-  error_t err;
-  size_t i, j;
-  auth_t auth;
-  mach_port_t newright;
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  genuidlen = gengidlen = auxuidlen = auxgidlen = 20;
-  gen_uids = gubuf;
-  gen_gids = ggbuf;
-  aux_uids = aubuf;
-  aux_gids = agbuf;
-
-  __mutex_lock (&global_lock);
-  newuser = make_sock_user (user->sock, 0, 1, 0);
-
-  auth = getauth ();
-  newright = ports_get_send_right (newuser);
-  assert (newright != MACH_PORT_NULL);
-  do
-    err = auth_server_authenticate (auth,
-				    rend,
-				    MACH_MSG_TYPE_COPY_SEND,
-				    newright,
-				    MACH_MSG_TYPE_COPY_SEND,
-				    &gen_uids, &genuidlen,
-				    &aux_uids, &auxuidlen,
-				    &gen_gids, &gengidlen,
-				    &aux_gids, &auxgidlen);
-  while (err == EINTR);
-  mach_port_deallocate (mach_task_self (), rend);
-  mach_port_deallocate (mach_task_self (), newright);
-  mach_port_deallocate (mach_task_self (), auth);
-
-  if (err)
-    newuser->isroot = 0;
-  else
-    /* Check permission as fshelp_isowner would do.  */
-    for (i = 0; i < genuidlen; i++)
-      {
-	if (gen_uids[i] == 0 || gen_uids[i] == pfinet_owner)
-	  newuser->isroot = 1;
-	if (gen_uids[i] == pfinet_group)
-	  for (j = 0; j < gengidlen; j++)
-	    if (gen_gids[j] == pfinet_group)
-	      newuser->isroot = 1;
-      }
-
-  mach_port_move_member (mach_task_self (), newuser->pi.port_right,
-			 pfinet_bucket->portset);
-
-  __mutex_unlock (&global_lock);
-
-  ports_port_deref (newuser);
-
-  if (gubuf != gen_uids)
-    munmap (gen_uids, genuidlen * sizeof (uid_t));
-  if (ggbuf != gen_gids)
-    munmap (gen_gids, gengidlen * sizeof (uid_t));
-  if (aubuf != aux_uids)
-    munmap (aux_uids, auxuidlen * sizeof (uid_t));
-  if (agbuf != aux_gids)
-    munmap (aux_gids, auxgidlen * sizeof (uid_t));
-
-  return 0;
-}
-
-error_t
-S_io_restrict_auth (struct sock_user *user,
-		    mach_port_t *newobject,
-		    mach_msg_type_name_t *newobject_type,
-		    uid_t *uids, size_t uidslen,
-		    uid_t *gids, size_t gidslen)
-{
-  struct sock_user *newuser;
-  int i, j;
-  int isroot;
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-
-  isroot = 0;
-  if (user->isroot)
-    /* Check permission as fshelp_isowner would do.  */
-    for (i = 0; i < uidslen; i++)
-      {
-	if (uids[i] == 0 || uids[i] == pfinet_owner)
-	  isroot = 1;
-	if (uids[i] == pfinet_group)
-	  for (j = 0; j < gidslen; j++)
-	    if (gids[j] == pfinet_group)
-	      isroot = 1;
-      }
-
-  newuser = make_sock_user (user->sock, isroot, 0, 0);
-  *newobject = ports_get_right (newuser);
-  *newobject_type = MACH_MSG_TYPE_MAKE_SEND;
-  ports_port_deref (newuser);
-  __mutex_unlock (&global_lock);
-  return 0;
-}
-
-error_t
-S_io_duplicate (struct sock_user *user,
-		mach_port_t *newobject,
-		mach_msg_type_name_t *newobject_type)
-{
-  struct sock_user *newuser;
-  if (!user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-  newuser = make_sock_user (user->sock, user->isroot, 0, 0);
-  *newobject = ports_get_right (newuser);
-  *newobject_type = MACH_MSG_TYPE_MAKE_SEND;
-  ports_port_deref (newuser);
-  __mutex_unlock (&global_lock);
-  return 0;
-}
-
-error_t
-S_io_identity (struct sock_user *user,
-	       mach_port_t *id,
-	       mach_msg_type_name_t *idtype,
-	       mach_port_t *fsys,
-	       mach_msg_type_name_t *fsystype,
-	       ino_t *fileno)
-{
-  error_t err;
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-  if (user->sock->identity == MACH_PORT_NULL)
-    {
-      err = mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE,
-				&user->sock->identity);
-      if (err)
-	{
-	  __mutex_unlock (&global_lock);
-	  return err;
-	}
-    }
-
-  *id = user->sock->identity;
-  *idtype = MACH_MSG_TYPE_MAKE_SEND;
-  *fsys = fsys_identity;
-  *fsystype = MACH_MSG_TYPE_MAKE_SEND;
-  *fileno = user->sock->st_ino;
-
-  __mutex_unlock (&global_lock);
-  return 0;
-}
-
-error_t
-S_io_revoke (struct sock_user *user)
-{
-  /* XXX maybe we should try */
-  return EOPNOTSUPP;
-}
-
-
-
-error_t
-S_io_async (struct sock_user *user,
-	    mach_port_t notify,
-	    mach_port_t *id,
-	    mach_msg_type_name_t *idtype)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_mod_owner (struct sock_user *user,
-		pid_t owner)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_get_owner (struct sock_user *user,
-		pid_t *owner)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_get_icky_async_id (struct sock_user *user,
-			mach_port_t *id,
-			mach_msg_type_name_t *idtype)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_server_version (struct sock_user *user,
-		     char *name,
-		     int *major,
-		     int *minor,
-		     int *edit)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_pathconf (struct sock_user *user,
-	       int name,
-	       int *value)
-{
-  return EOPNOTSUPP;
-}
-
-
-
-error_t
-S_io_map (struct sock_user *user,
-	  mach_port_t *rdobj,
-	  mach_msg_type_name_t *rdobj_type,
-	  mach_port_t *wrobj,
-	  mach_msg_type_name_t *wrobj_type)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_map_cntl (struct sock_user *user,
-	       mach_port_t *obj,
-	       mach_msg_type_name_t *obj_type)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_get_conch (struct sock_user *user)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_release_conch (struct sock_user *user)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_eofnotify (struct sock_user *user)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_prenotify (struct sock_user *user,
-		vm_offset_t start,
-		vm_offset_t end)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_postnotify (struct sock_user *user,
-		 vm_offset_t start,
-		 vm_offset_t end)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_readnotify (struct sock_user *user)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_readsleep (struct sock_user *user)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_io_sigio (struct sock_user *user)
-{
-  return EOPNOTSUPP;
-}
diff --git a/pfinet.old/linux-src/net/core/dev.c~ b/pfinet.old/linux-src/net/core/dev.c~
deleted file mode 100644
index 7d0658c5..00000000
--- a/pfinet.old/linux-src/net/core/dev.c~
+++ /dev/null
@@ -1,2092 +0,0 @@
-/*
- * 	NET3	Protocol independent device support routines.
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- *
- *	Derived from the non IP parts of dev.c 1.0.19
- * 		Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
- *				Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *				Mark Evans, <evansmp@uhura.aston.ac.uk>
- *
- *	Additional Authors:
- *		Florian la Roche <rzsfl@rz.uni-sb.de>
- *		Alan Cox <gw4pts@gw4pts.ampr.org>
- *		David Hinds <dhinds@allegro.stanford.edu>
- *		Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
- *		Adam Sulmicki <adam@cfar.umd.edu>
- *
- *	Changes:
- *		Marcelo Tosatti <marcelo@conectiva.com.br> : dont accept mtu 0 or <
- *		Alan Cox	:	device private ioctl copies fields back.
- *		Alan Cox	:	Transmit queue code does relevant stunts to
- *					keep the queue safe.
- *		Alan Cox	:	Fixed double lock.
- *		Alan Cox	:	Fixed promisc NULL pointer trap
- *		????????	:	Support the full private ioctl range
- *		Alan Cox	:	Moved ioctl permission check into drivers
- *		Tim Kordas	:	SIOCADDMULTI/SIOCDELMULTI
- *		Alan Cox	:	100 backlog just doesn't cut it when
- *					you start doing multicast video 8)
- *		Alan Cox	:	Rewrote net_bh and list manager.
- *		Alan Cox	: 	Fix ETH_P_ALL echoback lengths.
- *		Alan Cox	:	Took out transmit every packet pass
- *					Saved a few bytes in the ioctl handler
- *		Alan Cox	:	Network driver sets packet type before calling netif_rx. Saves
- *					a function call a packet.
- *		Alan Cox	:	Hashed net_bh()
- *		Richard Kooijman:	Timestamp fixes.
- *		Alan Cox	:	Wrong field in SIOCGIFDSTADDR
- *		Alan Cox	:	Device lock protection.
- *		Alan Cox	: 	Fixed nasty side effect of device close changes.
- *		Rudi Cilibrasi	:	Pass the right thing to set_mac_address()
- *		Dave Miller	:	32bit quantity for the device lock to make it work out
- *					on a Sparc.
- *		Bjorn Ekwall	:	Added KERNELD hack.
- *		Alan Cox	:	Cleaned up the backlog initialise.
- *		Craig Metz	:	SIOCGIFCONF fix if space for under
- *					1 device.
- *	    Thomas Bogendoerfer :	Return ENODEV for dev_open, if there
- *					is no device open function.
- *		Andi Kleen	:	Fix error reporting for SIOCGIFCONF
- *	    Michael Chastain	:	Fix signed/unsigned for SIOCGIFCONF
- *		Cyrus Durgin	:	Cleaned for KMOD
- *		Adam Sulmicki   :	Bug Fix : Network Device Unload
- *					A network device unload needs to purge
- *					the backlog queue.
- *	Paul Rusty Russel	:	SIOCSIFNAME
- *	Andrea Arcangeli	:	dev_clear_backlog() needs the
- *					skb_queue_lock held.
- */
-
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/bitops.h>
-#include <linux/config.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/socket.h>
-#include <linux/sockios.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/if_ether.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/notifier.h>
-#include <linux/skbuff.h>
-#include <net/sock.h>
-#include <linux/rtnetlink.h>
-#include <net/slhc.h>
-#include <linux/proc_fs.h>
-#include <linux/stat.h>
-#include <net/br.h>
-#include <net/dst.h>
-#include <net/pkt_sched.h>
-#include <net/profile.h>
-#include <linux/init.h>
-#include <linux/kmod.h>
-#ifdef CONFIG_NET_RADIO
-#include <linux/wireless.h>
-#endif	/* CONFIG_NET_RADIO */
-#ifdef CONFIG_PLIP
-extern int plip_init(void);
-#endif
-
-NET_PROFILE_DEFINE(dev_queue_xmit)
-NET_PROFILE_DEFINE(net_bh)
-NET_PROFILE_DEFINE(net_bh_skb)
-
-
-const char *if_port_text[] = {
-  "unknown",
-  "BNC",
-  "10baseT",
-  "AUI",
-  "100baseT",
-  "100baseTX",
-  "100baseFX"
-};
-
-/*
- *	The list of packet types we will receive (as opposed to discard)
- *	and the routines to invoke.
- *
- *	Why 16. Because with 16 the only overlap we get on a hash of the
- *	low nibble of the protocol value is RARP/SNAP/X.25.
- *
- *		0800	IP
- *		0001	802.3
- *		0002	AX.25
- *		0004	802.2
- *		8035	RARP
- *		0005	SNAP
- *		0805	X.25
- *		0806	ARP
- *		8137	IPX
- *		0009	Localtalk
- *		86DD	IPv6
- */
-
-struct packet_type *ptype_base[16];		/* 16 way hashed list */
-struct packet_type *ptype_all = NULL;		/* Taps */
-
-/*
- *	Device list lock. Setting it provides that interface
- *	will not disappear unexpectedly while kernel sleeps.
- */
-
-atomic_t dev_lockct = ATOMIC_INIT(0);
-
-/*
- *	Our notifier list
- */
-
-#ifdef _HURD_
-struct notifier_block *netdev_chain=NULL;
-#else
-static struct notifier_block *netdev_chain=NULL;
-#endif
-
-/*
- *	Device drivers call our routines to queue packets here. We empty the
- *	queue in the bottom half handler.
- */
-
-static struct sk_buff_head backlog;
-
-#ifdef CONFIG_NET_FASTROUTE
-int netdev_fastroute;
-int netdev_fastroute_obstacles;
-struct net_fastroute_stats dev_fastroute_stat;
-#endif
-
-static void dev_clear_backlog(struct device *dev);
-
-
-/******************************************************************************************
-
-		Protocol management and registration routines
-
-*******************************************************************************************/
-
-/*
- *	For efficiency
- */
-
-int netdev_nit=0;
-
-/*
- *	Add a protocol ID to the list. Now that the input handler is
- *	smarter we can dispense with all the messy stuff that used to be
- *	here.
- *
- *	BEWARE!!! Protocol handlers, mangling input packets,
- *	MUST BE last in hash buckets and checking protocol handlers
- *	MUST start from promiscous ptype_all chain in net_bh.
- *	It is true now, do not change it.
- *	Explantion follows: if protocol handler, mangling packet, will
- *	be the first on list, it is not able to sense, that packet
- *	is cloned and should be copied-on-write, so that it will
- *	change it and subsequent readers will get broken packet.
- *							--ANK (980803)
- */
-
-void dev_add_pack(struct packet_type *pt)
-{
-	int hash;
-#ifdef CONFIG_NET_FASTROUTE
-	/* Hack to detect packet socket */
-	if (pt->data) {
-		netdev_fastroute_obstacles++;
-		dev_clear_fastroute(pt->dev);
-	}
-#endif
-	if(pt->type==htons(ETH_P_ALL))
-	{
-		netdev_nit++;
-		pt->next=ptype_all;
-		ptype_all=pt;
-	}
-	else
-	{
-		hash=ntohs(pt->type)&15;
-		pt->next = ptype_base[hash];
-		ptype_base[hash] = pt;
-	}
-}
-
-
-/*
- *	Remove a protocol ID from the list.
- */
-
-void dev_remove_pack(struct packet_type *pt)
-{
-	struct packet_type **pt1;
-	if(pt->type==htons(ETH_P_ALL))
-	{
-		netdev_nit--;
-		pt1=&ptype_all;
-	}
-	else
-		pt1=&ptype_base[ntohs(pt->type)&15];
-	for(; (*pt1)!=NULL; pt1=&((*pt1)->next))
-	{
-		if(pt==(*pt1))
-		{
-			*pt1=pt->next;
-			synchronize_bh();
-#ifdef CONFIG_NET_FASTROUTE
-			if (pt->data)
-				netdev_fastroute_obstacles--;
-#endif
-			return;
-		}
-	}
-	printk(KERN_WARNING "dev_remove_pack: %p not found.\n", pt);
-}
-
-/*****************************************************************************************
-
-			    Device Interface Subroutines
-
-******************************************************************************************/
-
-/*
- *	Find an interface by name.
- */
-
-struct device *dev_get(const char *name)
-{
-	struct device *dev;
-
-	for (dev = dev_base; dev != NULL; dev = dev->next)
-	{
-		if (strcmp(dev->name, name) == 0)
-			return(dev);
-	}
-	return NULL;
-}
-
-struct device * dev_get_by_index(int ifindex)
-{
-	struct device *dev;
-
-	for (dev = dev_base; dev != NULL; dev = dev->next)
-	{
-		if (dev->ifindex == ifindex)
-			return(dev);
-	}
-	return NULL;
-}
-
-struct device *dev_getbyhwaddr(unsigned short type, char *ha)
-{
-	struct device *dev;
-
-	for (dev = dev_base; dev != NULL; dev = dev->next)
-	{
-		if (dev->type == type &&
-		    memcmp(dev->dev_addr, ha, dev->addr_len) == 0)
-			return(dev);
-	}
-	return(NULL);
-}
-
-/*
- *	Passed a format string - eg "lt%d" it will try and find a suitable
- *	id. Not efficient for many devices, not called a lot..
- */
-
-int dev_alloc_name(struct device *dev, const char *name)
-{
-	int i;
-	/*
-	 *	If you need over 100 please also fix the algorithm...
-	 */
-	for(i=0;i<100;i++)
-	{
-		sprintf(dev->name,name,i);
-		if(dev_get(dev->name)==NULL)
-			return i;
-	}
-	return -ENFILE;	/* Over 100 of the things .. bail out! */
-}
-
-struct device *dev_alloc(const char *name, int *err)
-{
-	struct device *dev=kmalloc(sizeof(struct device)+16, GFP_KERNEL);
-	if(dev==NULL)
-	{
-		*err=-ENOBUFS;
-		return NULL;
-	}
-	dev->name=(char *)(dev+1);	/* Name string space */
-	*err=dev_alloc_name(dev,name);
-	if(*err<0)
-	{
-		kfree(dev);
-		return NULL;
-	}
-	return dev;
-}
-
-void netdev_state_change(struct device *dev)
-{
-	if (dev->flags&IFF_UP)
-		notifier_call_chain(&netdev_chain, NETDEV_CHANGE, dev);
-}
-
-
-/*
- *	Find and possibly load an interface.
- */
-
-#ifdef CONFIG_KMOD
-
-void dev_load(const char *name)
-{
-	if(!dev_get(name) && capable(CAP_SYS_MODULE))
-		request_module(name);
-}
-
-#else
-
-extern inline void dev_load(const char *unused){;}
-
-#endif
-
-static int default_rebuild_header(struct sk_buff *skb)
-{
-	printk(KERN_DEBUG "%s: default_rebuild_header called -- BUG!\n", skb->dev ? skb->dev->name : "NULL!!!");
-	kfree_skb(skb);
-	return 1;
-}
-
-/*
- *	Prepare an interface for use.
- */
-
-int dev_open(struct device *dev)
-{
-	int ret = 0;
-
-	/*
-	 *	Is it already up?
-	 */
-
-	if (dev->flags&IFF_UP)
-		return 0;
-
-	/*
-	 *	Call device private open method
-	 */
-
-	if (dev->open)
-  		ret = dev->open(dev);
-
-	/*
-	 *	If it went open OK then:
-	 */
-
-	if (ret == 0)
-	{
-		/*
-		 *	nil rebuild_header routine,
-		 *	that should be never called and used as just bug trap.
-		 */
-
-		if (dev->rebuild_header == NULL)
-			dev->rebuild_header = default_rebuild_header;
-
-		/*
-		 *	Set the flags.
-		 */
-		dev->flags |= (IFF_UP | IFF_RUNNING);
-
-		/*
-		 *	Initialize multicasting status
-		 */
-		dev_mc_upload(dev);
-
-		/*
-		 *	Wakeup transmit queue engine
-		 */
-		dev_activate(dev);
-
-		/*
-		 *	... and announce new interface.
-		 */
-		notifier_call_chain(&netdev_chain, NETDEV_UP, dev);
-
-	}
-	return(ret);
-}
-
-#ifdef CONFIG_NET_FASTROUTE
-
-static __inline__ void dev_do_clear_fastroute(struct device *dev)
-{
-	if (dev->accept_fastpath) {
-		int i;
-
-		for (i=0; i<=NETDEV_FASTROUTE_HMASK; i++)
-			dst_release_irqwait(xchg(dev->fastpath+i, NULL));
-	}
-}
-
-void dev_clear_fastroute(struct device *dev)
-{
-	if (dev) {
-		dev_do_clear_fastroute(dev);
-	} else {
-		for (dev = dev_base; dev; dev = dev->next)
-			dev_do_clear_fastroute(dev);
-	}
-}
-#endif
-
-/*
- *	Completely shutdown an interface.
- */
-
-int dev_close(struct device *dev)
-{
-	if (!(dev->flags&IFF_UP))
-		return 0;
-
-	dev_deactivate(dev);
-
-	dev_lock_wait();
-
-	/*
-	 *	Call the device specific close. This cannot fail.
-	 *	Only if device is UP
-	 */
-
-	if (dev->stop)
-		dev->stop(dev);
-
-	if (dev->start)
-		printk("dev_close: bug %s still running\n", dev->name);
-
-	/*
-	 *	Device is now down.
-	 */
-	dev_clear_backlog(dev);
-
-	dev->flags&=~(IFF_UP|IFF_RUNNING);
-#ifdef CONFIG_NET_FASTROUTE
-	dev_clear_fastroute(dev);
-#endif
-
-	/*
-	 *	Tell people we are going down
-	 */
-	notifier_call_chain(&netdev_chain, NETDEV_DOWN, dev);
-
-	return(0);
-}
-
-
-/*
- *	Device change register/unregister. These are not inline or static
- *	as we export them to the world.
- */
-
-int register_netdevice_notifier(struct notifier_block *nb)
-{
-	return notifier_chain_register(&netdev_chain, nb);
-}
-
-int unregister_netdevice_notifier(struct notifier_block *nb)
-{
-	return notifier_chain_unregister(&netdev_chain,nb);
-}
-
-/*
- *	Support routine. Sends outgoing frames to any network
- *	taps currently in use.
- */
-
-void dev_queue_xmit_nit(struct sk_buff *skb, struct device *dev)
-{
-	struct packet_type *ptype;
-	get_fast_time(&skb->stamp);
-
-	for (ptype = ptype_all; ptype!=NULL; ptype = ptype->next)
-	{
-		/* Never send packets back to the socket
-		 * they originated from - MvS (miquels@drinkel.ow.org)
-		 */
-		if ((ptype->dev == dev || !ptype->dev) &&
-			((struct sock *)ptype->data != skb->sk))
-		{
-			struct sk_buff *skb2;
-			if ((skb2 = skb_clone(skb, GFP_ATOMIC)) == NULL)
-				break;
-
-			/* Code, following below is wrong.
-
-			   The only reason, why it does work is that
-			   ONLY packet sockets receive outgoing
-			   packets. If such a packet will be (occasionally)
-			   received by normal packet handler, which expects
-			   that mac header is pulled...
-			 */
-
-			/* More sensible variant. skb->nh should be correctly
-			   set by sender, so that the second statement is
-			   just protection against buggy protocols.
-			 */
-			skb2->mac.raw = skb2->data;
-
-			if (skb2->nh.raw < skb2->data || skb2->nh.raw >= skb2->tail) {
-				if (net_ratelimit())
-					printk(KERN_DEBUG "protocol %04x is buggy, dev %s\n", skb2->protocol, dev->name);
-				skb2->nh.raw = skb2->data;
-				if (dev->hard_header)
-					skb2->nh.raw += dev->hard_header_len;
-			}
-
-			skb2->h.raw = skb2->nh.raw;
-			skb2->pkt_type = PACKET_OUTGOING;
-			ptype->func(skb2, skb->dev, ptype);
-		}
-	}
-}
-
-/*
- *	Fast path for loopback frames.
- */
-
-void dev_loopback_xmit(struct sk_buff *skb)
-{
-	struct sk_buff *newskb=skb_clone(skb, GFP_ATOMIC);
-	if (newskb==NULL)
-		return;
-
-	newskb->mac.raw = newskb->data;
-	skb_pull(newskb, newskb->nh.raw - newskb->data);
-	newskb->pkt_type = PACKET_LOOPBACK;
-	newskb->ip_summed = CHECKSUM_UNNECESSARY;
-	if (newskb->dst==NULL)
-		printk(KERN_DEBUG "BUG: packet without dst looped back 1\n");
-	netif_rx(newskb);
-}
-
-int dev_queue_xmit(struct sk_buff *skb)
-{
-	struct device *dev = skb->dev;
-	struct Qdisc  *q;
-	char *str1 = "pfinet: dev_queue_xmit check point 1.\n";
-	char *str2 = "pfinet: dev_queue_xmit check point 2.\n";
-	char *str3 = "pfinet: dev_queue_xmit check point 3.\n";
-	char *str4 = "pfinet: dev_queue_xmit check point 4.\n";
-	int stderr_fd = fileno (stderr);
-
-	write (stderr_fd, str1, strlen (str1) + 1);
-	fflush (stderr);
-
-#ifdef CONFIG_NET_PROFILE
-	start_bh_atomic();
-	NET_PROFILE_ENTER(dev_queue_xmit);
-#endif
-
-	start_bh_atomic();
-	q = dev->qdisc;
-	write (stderr_fd, str2, strlen (str2) + 1);
-	fflush (stderr);
-	if (q->enqueue) {
-		q->enqueue(skb, q);
-		qdisc_wakeup(dev);
-		end_bh_atomic();
-
-#ifdef CONFIG_NET_PROFILE
-	        NET_PROFILE_LEAVE(dev_queue_xmit);
-		end_bh_atomic();
-#endif
-
-		return 0;
-	}
-	write (stderr_fd, str3, strlen (str3) + 1);
-	fflush (stderr);
-
-	/* The device has no queue. Common case for software devices:
-	   loopback, all the sorts of tunnels...
-
-	   Really, it is unlikely that bh protection is necessary here:
-	   virtual devices do not generate EOI events.
-	   However, it is possible, that they rely on bh protection
-	   made by us here.
-	 */
-	if (dev->flags&IFF_UP) {
-		write (stderr_fd, str4, strlen (str4) + 1);
-		fflush (stderr);
-		if (netdev_nit)
-			dev_queue_xmit_nit(skb,dev);
-		write (stderr_fd, str5, strlen (str5) + 1);
-		fflush (stderr);
-		if (dev->hard_start_xmit(skb, dev) == 0) {
-			end_bh_atomic();
-
-#ifdef CONFIG_NET_PROFILE
-			NET_PROFILE_LEAVE(dev_queue_xmit);
-			end_bh_atomic();
-#endif
-			write (stderr_fd, str6, strlen (str6) + 1);
-			fflush (stderr);
-
-			return 0;
-		}
-		if (net_ratelimit())
-			printk(KERN_DEBUG "Virtual device %s asks to queue packet!\n", dev->name);
-	}
-	end_bh_atomic();
-	write (stderr_fd, str6, strlen (str6) + 1);
-	fflush (stderr);
-
-	kfree_skb(skb);
-
-#ifdef CONFIG_NET_PROFILE
-	NET_PROFILE_LEAVE(dev_queue_xmit);
-	end_bh_atomic();
-#endif
-
-	return 0;
-}
-
-
-/*=======================================================================
-			Receiver rotutines
-  =======================================================================*/
-
-int netdev_dropping = 0;
-int netdev_max_backlog = 300;
-atomic_t netdev_rx_dropped;
-#ifdef CONFIG_CPU_IS_SLOW
-int net_cpu_congestion;
-#endif
-
-#ifdef CONFIG_NET_HW_FLOWCONTROL
-int netdev_throttle_events;
-static unsigned long netdev_fc_mask = 1;
-unsigned long netdev_fc_xoff = 0;
-
-static struct
-{
-	void (*stimul)(struct device *);
-	struct device *dev;
-} netdev_fc_slots[32];
-
-int netdev_register_fc(struct device *dev, void (*stimul)(struct device *dev))
-{
-	int bit = 0;
-	unsigned long flags;
-
-	save_flags(flags);
-	cli();
-	if (netdev_fc_mask != ~0UL) {
-		bit = ffz(netdev_fc_mask);
-		netdev_fc_slots[bit].stimul = stimul;
-		netdev_fc_slots[bit].dev = dev;
-		set_bit(bit, &netdev_fc_mask);
-		clear_bit(bit, &netdev_fc_xoff);
-	}
-	restore_flags(flags);
-	return bit;
-}
-
-void netdev_unregister_fc(int bit)
-{
-	unsigned long flags;
-
-	save_flags(flags);
-	cli();
-	if (bit > 0) {
-		netdev_fc_slots[bit].stimul = NULL;
-		netdev_fc_slots[bit].dev = NULL;
-		clear_bit(bit, &netdev_fc_mask);
-		clear_bit(bit, &netdev_fc_xoff);
-	}
-	restore_flags(flags);
-}
-
-static void netdev_wakeup(void)
-{
-	unsigned long xoff;
-
-	cli();
-	xoff = netdev_fc_xoff;
-	netdev_fc_xoff = 0;
-	netdev_dropping = 0;
-	netdev_throttle_events++;
-	while (xoff) {
-		int i = ffz(~xoff);
-		xoff &= ~(1<<i);
-		netdev_fc_slots[i].stimul(netdev_fc_slots[i].dev);
-	}
-	sti();
-}
-#endif
-
-static void dev_clear_backlog(struct device *dev)
-{
-	struct sk_buff *curr;
-	unsigned long flags;
-
-	/*
-	 *
-	 *  Let now clear backlog queue. -AS
-	 *
-	 *  We are competing here both with netif_rx() and net_bh().
-	 *  We don't want either of those to mess with skb ptrs
-	 *  while we work on them, thus we must grab the
-	 *  skb_queue_lock.
-	 */
-
-	if (backlog.qlen) {
-	repeat:
-		spin_lock_irqsave(&skb_queue_lock, flags);
-		for (curr = backlog.next;
-		     curr != (struct sk_buff *)(&backlog);
-		     curr = curr->next)
-			if (curr->dev == dev)
-			{
-				__skb_unlink(curr, &backlog);
-				spin_unlock_irqrestore(&skb_queue_lock, flags);
-				kfree_skb(curr);
-				goto repeat;
-			}
-		spin_unlock_irqrestore(&skb_queue_lock, flags);
-#ifdef CONFIG_NET_HW_FLOWCONTROL
-		if (netdev_dropping)
-			netdev_wakeup();
-#else
-		netdev_dropping = 0;
-#endif
-	}
-}
-
-/*
- *	Receive a packet from a device driver and queue it for the upper
- *	(protocol) levels.  It always succeeds.
- */
-
-void netif_rx(struct sk_buff *skb)
-{
-#ifndef CONFIG_CPU_IS_SLOW
-	if(skb->stamp.tv_sec==0)
-		get_fast_time(&skb->stamp);
-#else
-	skb->stamp = xtime;
-#endif
-
-	/* The code is rearranged so that the path is the most
-	   short when CPU is congested, but is still operating.
-	 */
-
-	if (backlog.qlen <= netdev_max_backlog) {
-		if (backlog.qlen) {
-			if (netdev_dropping == 0) {
-				skb_queue_tail(&backlog,skb);
-				mark_bh(NET_BH);
-				return;
-			}
-			atomic_inc(&netdev_rx_dropped);
-			kfree_skb(skb);
-			return;
-		}
-#ifdef CONFIG_NET_HW_FLOWCONTROL
-		if (netdev_dropping)
-			netdev_wakeup();
-#else
-		netdev_dropping = 0;
-#endif
-		skb_queue_tail(&backlog,skb);
-		mark_bh(NET_BH);
-		return;
-	}
-	netdev_dropping = 1;
-	atomic_inc(&netdev_rx_dropped);
-	kfree_skb(skb);
-}
-
-#ifdef CONFIG_BRIDGE
-static inline void handle_bridge(struct sk_buff *skb, unsigned short type)
-{
-	/*
-	 * The br_stats.flags is checked here to save the expense of a
-	 * function call.
-	 */
-	if ((br_stats.flags & BR_UP) && br_call_bridge(skb, type))
-	{
-		/*
-		 *	We pass the bridge a complete frame. This means
-		 *	recovering the MAC header first.
-		 */
-
-		int offset;
-
-		skb=skb_clone(skb, GFP_ATOMIC);
-		if(skb==NULL)
-			return;
-
-		offset=skb->data-skb->mac.raw;
-		skb_push(skb,offset);	/* Put header back on for bridge */
-
-		if(br_receive_frame(skb))
-			return;
-		kfree_skb(skb);
-	}
-	return;
-}
-#endif
-
-/*
- *	When we are called the queue is ready to grab, the interrupts are
- *	on and hardware can interrupt and queue to the receive queue as we
- *	run with no problems.
- *	This is run as a bottom half after an interrupt handler that does
- *	mark_bh(NET_BH);
- */
-
-void net_bh(void)
-{
-	struct packet_type *ptype;
-	struct packet_type *pt_prev;
-	unsigned short type;
-#ifndef _HURD_
-	unsigned long start_time = jiffies;
-#ifdef CONFIG_CPU_IS_SLOW
-	static unsigned long start_busy = 0;
-	static unsigned long ave_busy = 0;
-
-	if (start_busy == 0)
-		start_busy = start_time;
-	net_cpu_congestion = ave_busy>>8;
-#endif
-#endif
-
-	NET_PROFILE_ENTER(net_bh);
-	/*
-	 *	Can we send anything now? We want to clear the
-	 *	decks for any more sends that get done as we
-	 *	process the input. This also minimises the
-	 *	latency on a transmit interrupt bh.
-	 */
-
-	if (qdisc_head.forw != &qdisc_head)
-		qdisc_run_queues();
-
-	/*
-	 *	Any data left to process. This may occur because a
-	 *	mark_bh() is done after we empty the queue including
-	 *	that from the device which does a mark_bh() just after
-	 */
-
-	/*
-	 *	While the queue is not empty..
-	 *
-	 *	Note that the queue never shrinks due to
-	 *	an interrupt, so we can do this test without
-	 *	disabling interrupts.
-	 */
-
-	while (!skb_queue_empty(&backlog))
-	{
-		struct sk_buff * skb;
-
-#ifndef _HURD_
-		/* Give chance to other bottom halves to run */
-		if (jiffies - start_time > 1)
-			goto net_bh_break;
-#endif
-
-		/*
-		 *	We have a packet. Therefore the queue has shrunk
-		 */
-		skb = skb_dequeue(&backlog);
-
-#ifndef _HURD_
-#ifdef CONFIG_CPU_IS_SLOW
-		if (ave_busy > 128*16) {
-			kfree_skb(skb);
-			while ((skb = skb_dequeue(&backlog)) != NULL)
-				kfree_skb(skb);
-			break;
-		}
-#endif
-#endif
-
-
-#if 0
-		NET_PROFILE_SKB_PASSED(skb, net_bh_skb);
-#endif
-#ifdef CONFIG_NET_FASTROUTE
-		if (skb->pkt_type == PACKET_FASTROUTE) {
-			dev_queue_xmit(skb);
-			continue;
-		}
-#endif
-
-		/*
-	 	 *	Bump the pointer to the next structure.
-		 *
-		 *	On entry to the protocol layer. skb->data and
-		 *	skb->nh.raw point to the MAC and encapsulated data
-		 */
-
-		/* XXX until we figure out every place to modify.. */
-		skb->h.raw = skb->nh.raw = skb->data;
-
-		if (skb->mac.raw < skb->head || skb->mac.raw > skb->data) {
-			printk(KERN_CRIT "%s: wrong mac.raw ptr, proto=%04x\n", skb->dev->name, skb->protocol);
-			kfree_skb(skb);
-			continue;
-		}
-
-		/*
-		 * 	Fetch the packet protocol ID.
-		 */
-
-		type = skb->protocol;
-
-#ifdef CONFIG_BRIDGE
-		/*
-		 *	If we are bridging then pass the frame up to the
-		 *	bridging code (if this protocol is to be bridged).
-		 *      If it is bridged then move on
-		 */
-		handle_bridge(skb, type);
-#endif
-
-		/*
-		 *	We got a packet ID.  Now loop over the "known protocols"
-		 * 	list. There are two lists. The ptype_all list of taps (normally empty)
-		 *	and the main protocol list which is hashed perfectly for normal protocols.
-		 */
-
-		pt_prev = NULL;
-		for (ptype = ptype_all; ptype!=NULL; ptype=ptype->next)
-		{
-			if (!ptype->dev || ptype->dev == skb->dev) {
-				if(pt_prev)
-				{
-					struct sk_buff *skb2=skb_clone(skb, GFP_ATOMIC);
-					if(skb2)
-						pt_prev->func(skb2,skb->dev, pt_prev);
-				}
-				pt_prev=ptype;
-			}
-		}
-
-		for (ptype = ptype_base[ntohs(type)&15]; ptype != NULL; ptype = ptype->next)
-		{
-			if (ptype->type == type && (!ptype->dev || ptype->dev==skb->dev))
-			{
-				/*
-				 *	We already have a match queued. Deliver
-				 *	to it and then remember the new match
-				 */
-				if(pt_prev)
-				{
-					struct sk_buff *skb2;
-
-					skb2=skb_clone(skb, GFP_ATOMIC);
-
-					/*
-					 *	Kick the protocol handler. This should be fast
-					 *	and efficient code.
-					 */
-
-					if(skb2)
-						pt_prev->func(skb2, skb->dev, pt_prev);
-				}
-				/* Remember the current last to do */
-				pt_prev=ptype;
-			}
-		} /* End of protocol list loop */
-
-		/*
-		 *	Is there a last item to send to ?
-		 */
-
-		if(pt_prev) {
-			pt_prev->func(skb, skb->dev, pt_prev);
-		}
-		/*
-		 * 	Has an unknown packet has been received ?
-		 */
-
-		else {
-			kfree_skb(skb);
-		}
-  	}	/* End of queue loop */
-
-  	/*
-  	 *	We have emptied the queue
-  	 */
-
-	/*
-	 *	One last output flush.
-	 */
-
-	if (qdisc_head.forw != &qdisc_head)
-		qdisc_run_queues();
-
-#ifndef _HURD_
-#ifdef  CONFIG_CPU_IS_SLOW
-        if (1) {
-		unsigned long start_idle = jiffies;
-		ave_busy += ((start_idle - start_busy)<<3) - (ave_busy>>4);
-		start_busy = 0;
-	}
-#endif
-#endif
-#ifdef CONFIG_NET_HW_FLOWCONTROL
-	if (netdev_dropping)
-		netdev_wakeup();
-#else
-	netdev_dropping = 0;
-#endif
-	NET_PROFILE_LEAVE(net_bh);
-	return;
-
-#ifndef _HURD_
-net_bh_break:
-	mark_bh(NET_BH);
-	NET_PROFILE_LEAVE(net_bh);
-	return;
-#endif
-}
-
-/* Protocol dependent address dumping routines */
-
-static gifconf_func_t * gifconf_list [NPROTO];
-
-int register_gifconf(unsigned int family, gifconf_func_t * gifconf)
-{
-	if (family>=NPROTO)
-		return -EINVAL;
-	gifconf_list[family] = gifconf;
-	return 0;
-}
-
-
-/*
- *	Map an interface index to its name (SIOCGIFNAME)
- */
-
-/*
- *	This call is useful, but I'd remove it too.
- *
- *	The reason is purely aestetical, it is the only call
- *	from SIOC* family using struct ifreq in reversed manner.
- *	Besides that, it is pretty silly to put "drawing" facility
- *	to kernel, it is useful only to print ifindices
- *	in readable form, is not it? --ANK
- *
- *	We need this ioctl for efficient implementation of the
- *	if_indextoname() function required by the IPv6 API.  Without
- *	it, we would have to search all the interfaces to find a
- *	match.  --pb
- */
-
-static int dev_ifname(struct ifreq *arg)
-{
-	struct device *dev;
-	struct ifreq ifr;
-	int err;
-
-	/*
-	 *	Fetch the caller's info block.
-	 */
-
-	err = copy_from_user(&ifr, arg, sizeof(struct ifreq));
-	if (err)
-		return -EFAULT;
-
-	dev = dev_get_by_index(ifr.ifr_ifindex);
-	if (!dev)
-		return -ENODEV;
-
-	strcpy(ifr.ifr_name, dev->name);
-
-	err = copy_to_user(arg, &ifr, sizeof(struct ifreq));
-	return (err)?-EFAULT:0;
-}
-
-/*
- *	Perform a SIOCGIFCONF call. This structure will change
- *	size eventually, and there is nothing I can do about it.
- *	Thus we will need a 'compatibility mode'.
- */
-
-#ifdef _HURD_
-int dev_ifconf(char *arg)
-#else
-static int dev_ifconf(char *arg)
-#endif
-{
-	struct ifconf ifc;
-	struct device *dev;
-	char *pos;
-	int len;
-	int total;
-	int i;
-
-	/*
-	 *	Fetch the caller's info block.
-	 */
-
-	if (copy_from_user(&ifc, arg, sizeof(struct ifconf)))
-		return -EFAULT;
-
-	pos = ifc.ifc_buf;
-	len = ifc.ifc_len;
-
-	/*
-	 *	Loop over the interfaces, and write an info block for each.
-	 */
-
-	total = 0;
-	for (dev = dev_base; dev != NULL; dev = dev->next) {
-		for (i=0; i<NPROTO; i++) {
-			if (gifconf_list[i]) {
-				int done;
-				if (pos==NULL) {
-					done = gifconf_list[i](dev, NULL, 0);
-				} else {
-					done = gifconf_list[i](dev, pos+total, len-total);
-				}
-				if (done<0)
-					return -EFAULT;
-				total += done;
-			}
-		}
-  	}
-
-	/*
-	 *	All done.  Write the updated control block back to the caller.
-	 */
-	ifc.ifc_len = total;
-
-	if (copy_to_user(arg, &ifc, sizeof(struct ifconf)))
-		return -EFAULT;
-
-	/*
-	 * 	Both BSD and Solaris return 0 here, so we do too.
-	 */
-	return 0;
-}
-
-/*
- *	This is invoked by the /proc filesystem handler to display a device
- *	in detail.
- */
-
-#ifdef CONFIG_PROC_FS
-static int sprintf_stats(char *buffer, struct device *dev)
-{
-	struct net_device_stats *stats = (dev->get_stats ? dev->get_stats(dev): NULL);
-	int size;
-
-	if (stats)
-		size = sprintf(buffer, "%6s:%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu %8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n",
- 		   dev->name,
-		   stats->rx_bytes,
-		   stats->rx_packets, stats->rx_errors,
-		   stats->rx_dropped + stats->rx_missed_errors,
-		   stats->rx_fifo_errors,
-		   stats->rx_length_errors + stats->rx_over_errors
-		   + stats->rx_crc_errors + stats->rx_frame_errors,
-		   stats->rx_compressed, stats->multicast,
-		   stats->tx_bytes,
-		   stats->tx_packets, stats->tx_errors, stats->tx_dropped,
-		   stats->tx_fifo_errors, stats->collisions,
-		   stats->tx_carrier_errors + stats->tx_aborted_errors
-		   + stats->tx_window_errors + stats->tx_heartbeat_errors,
-		   stats->tx_compressed);
-	else
-		size = sprintf(buffer, "%6s: No statistics available.\n", dev->name);
-
-	return size;
-}
-
-/*
- *	Called from the PROCfs module. This now uses the new arbitrary sized /proc/net interface
- *	to create /proc/net/dev
- */
-
-int dev_get_info(char *buffer, char **start, off_t offset, int length, int dummy)
-{
-	int len=0;
-	off_t begin=0;
-	off_t pos=0;
-	int size;
-
-	struct device *dev;
-
-
-	size = sprintf(buffer,
-		"Inter-|   Receive                                                |  Transmit\n"
-		" face |bytes    packets errs drop fifo frame compressed multicast|bytes    packets errs drop fifo colls carrier compressed\n");
-
-	pos+=size;
-	len+=size;
-
-
-	for (dev = dev_base; dev != NULL; dev = dev->next)
-	{
-		size = sprintf_stats(buffer+len, dev);
-		len+=size;
-		pos=begin+len;
-
-		if(pos<offset)
-		{
-			len=0;
-			begin=pos;
-		}
-		if(pos>offset+length)
-			break;
-	}
-
-	*start=buffer+(offset-begin);	/* Start of wanted data */
-	len-=(offset-begin);		/* Start slop */
-	if(len>length)
-		len=length;		/* Ending slop */
-	return len;
-}
-
-static int dev_proc_stats(char *buffer, char **start, off_t offset,
-			  int length, int *eof, void *data)
-{
-	int len;
-
-	len = sprintf(buffer, "%08x %08x %08x %08x %08x\n",
-		      atomic_read(&netdev_rx_dropped),
-#ifdef CONFIG_NET_HW_FLOWCONTROL
-		      netdev_throttle_events,
-#else
-		      0,
-#endif
-#ifdef CONFIG_NET_FASTROUTE
-		      dev_fastroute_stat.hits,
-		      dev_fastroute_stat.succeed,
-		      dev_fastroute_stat.deferred
-#else
-		      0, 0, 0
-#endif
-		      );
-
-	len -= offset;
-
-	if (len > length)
-		len = length;
-	if(len < 0)
-		len = 0;
-
-	*start = buffer + offset;
-	*eof = 1;
-
-	return len;
-}
-
-#endif	/* CONFIG_PROC_FS */
-
-
-#ifdef CONFIG_NET_RADIO
-#ifdef CONFIG_PROC_FS
-
-/*
- * Print one entry of /proc/net/wireless
- * This is a clone of /proc/net/dev (just above)
- */
-static int sprintf_wireless_stats(char *buffer, struct device *dev)
-{
-	/* Get stats from the driver */
-	struct iw_statistics *stats = (dev->get_wireless_stats ?
-				       dev->get_wireless_stats(dev) :
-				       (struct iw_statistics *) NULL);
-	int size;
-
-	if(stats != (struct iw_statistics *) NULL)
-	{
-		size = sprintf(buffer,
-			       "%6s: %04x  %3d%c  %3d%c  %3d%c  %6d %6d %6d\n",
-			       dev->name,
-			       stats->status,
-			       stats->qual.qual,
-			       stats->qual.updated & 1 ? '.' : ' ',
-			       stats->qual.level,
-			       stats->qual.updated & 2 ? '.' : ' ',
-			       stats->qual.noise,
-			       stats->qual.updated & 4 ? '.' : ' ',
-			       stats->discard.nwid,
-			       stats->discard.code,
-			       stats->discard.misc);
-		stats->qual.updated = 0;
-	}
-	else
-		size = 0;
-
-	return size;
-}
-
-/*
- * Print info for /proc/net/wireless (print all entries)
- * This is a clone of /proc/net/dev (just above)
- */
-int dev_get_wireless_info(char * buffer, char **start, off_t offset,
-			  int length, int dummy)
-{
-	int		len = 0;
-	off_t		begin = 0;
-	off_t		pos = 0;
-	int		size;
-
-	struct device *	dev;
-
-	size = sprintf(buffer,
-		       "Inter-| sta-|   Quality        |   Discarded packets\n"
-		       " face | tus | link level noise |  nwid  crypt   misc\n"
-			);
-
-	pos+=size;
-	len+=size;
-
-	for(dev = dev_base; dev != NULL; dev = dev->next)
-	{
-		size = sprintf_wireless_stats(buffer+len, dev);
-		len+=size;
-		pos=begin+len;
-
-		if(pos < offset)
-		{
-			len=0;
-			begin=pos;
-		}
-		if(pos > offset + length)
-			break;
-	}
-
-	*start = buffer + (offset - begin);	/* Start of wanted data */
-	len -= (offset - begin);		/* Start slop */
-	if(len > length)
-		len = length;		/* Ending slop */
-
-	return len;
-}
-#endif	/* CONFIG_PROC_FS */
-#endif	/* CONFIG_NET_RADIO */
-
-void dev_set_promiscuity(struct device *dev, int inc)
-{
-	unsigned short old_flags = dev->flags;
-
-	dev->flags |= IFF_PROMISC;
-	if ((dev->promiscuity += inc) == 0)
-		dev->flags &= ~IFF_PROMISC;
-	if (dev->flags^old_flags) {
-#ifdef CONFIG_NET_FASTROUTE
-		if (dev->flags&IFF_PROMISC) {
-			netdev_fastroute_obstacles++;
-			dev_clear_fastroute(dev);
-		} else
-			netdev_fastroute_obstacles--;
-#endif
-		dev_mc_upload(dev);
-		printk(KERN_INFO "device %s %s promiscuous mode\n",
-		       dev->name, (dev->flags&IFF_PROMISC) ? "entered" : "left");
-	}
-}
-
-void dev_set_allmulti(struct device *dev, int inc)
-{
-	unsigned short old_flags = dev->flags;
-
-	dev->flags |= IFF_ALLMULTI;
-	if ((dev->allmulti += inc) == 0)
-		dev->flags &= ~IFF_ALLMULTI;
-	if (dev->flags^old_flags)
-		dev_mc_upload(dev);
-}
-
-int dev_change_flags(struct device *dev, unsigned flags)
-{
-	int ret;
-	int old_flags = dev->flags;
-
-	/*
-	 *	Set the flags on our device.
-	 */
-
-	dev->flags = (flags & (IFF_DEBUG|IFF_NOTRAILERS|IFF_RUNNING|IFF_NOARP|
-			       IFF_SLAVE|IFF_MASTER|IFF_DYNAMIC|
-			       IFF_MULTICAST|IFF_PORTSEL|IFF_AUTOMEDIA)) |
-				       (dev->flags & (IFF_UP|IFF_VOLATILE|IFF_PROMISC|IFF_ALLMULTI));
-
-	/*
-	 *	Load in the correct multicast list now the flags have changed.
-	 */
-
-	dev_mc_upload(dev);
-
-	/*
-	 *	Have we downed the interface. We handle IFF_UP ourselves
-	 *	according to user attempts to set it, rather than blindly
-	 *	setting it.
-	 */
-
-	ret = 0;
-	if ((old_flags^flags)&IFF_UP)	/* Bit is different  ? */
-	{
-		ret = ((old_flags & IFF_UP) ? dev_close : dev_open)(dev);
-
-		if (ret == 0)
-			dev_mc_upload(dev);
-	}
-
-	if (dev->flags&IFF_UP &&
-	    ((old_flags^dev->flags)&~(IFF_UP|IFF_RUNNING|IFF_PROMISC|IFF_ALLMULTI|IFF_VOLATILE)))
-		notifier_call_chain(&netdev_chain, NETDEV_CHANGE, dev);
-
-	if ((flags^dev->gflags)&IFF_PROMISC) {
-		int inc = (flags&IFF_PROMISC) ? +1 : -1;
-		dev->gflags ^= IFF_PROMISC;
-		dev_set_promiscuity(dev, inc);
-	}
-
-	/* NOTE: order of synchronization of IFF_PROMISC and IFF_ALLMULTI
-	   is important. Some (broken) drivers set IFF_PROMISC, when
-	   IFF_ALLMULTI is requested not asking us and not reporting.
-	 */
-	if ((flags^dev->gflags)&IFF_ALLMULTI) {
-		int inc = (flags&IFF_ALLMULTI) ? +1 : -1;
-		dev->gflags ^= IFF_ALLMULTI;
-		dev_set_allmulti(dev, inc);
-	}
-
-	return ret;
-}
-
-#ifdef _HURD_
-
-#define dev_ioctl 0
-
-#else
-
-/*
- *	Perform the SIOCxIFxxx calls.
- */
-
-static int dev_ifsioc(struct ifreq *ifr, unsigned int cmd)
-{
-	struct device *dev;
-	int err;
-
-	if ((dev = dev_get(ifr->ifr_name)) == NULL)
-		return -ENODEV;
-
-	switch(cmd)
-	{
-		case SIOCGIFFLAGS:	/* Get interface flags */
-			ifr->ifr_flags = (dev->flags&~(IFF_PROMISC|IFF_ALLMULTI))
-				|(dev->gflags&(IFF_PROMISC|IFF_ALLMULTI));
-			return 0;
-
-		case SIOCSIFFLAGS:	/* Set interface flags */
-			return dev_change_flags(dev, ifr->ifr_flags);
-
-		case SIOCGIFMETRIC:	/* Get the metric on the interface (currently unused) */
-			ifr->ifr_metric = 0;
-			return 0;
-
-		case SIOCSIFMETRIC:	/* Set the metric on the interface (currently unused) */
-			return -EOPNOTSUPP;
-
-		case SIOCGIFMTU:	/* Get the MTU of a device */
-			ifr->ifr_mtu = dev->mtu;
-			return 0;
-
-		case SIOCSIFMTU:	/* Set the MTU of a device */
-			if (ifr->ifr_mtu == dev->mtu)
-				return 0;
-
-			/*
-			 *	MTU must be positive.
-			 */
-
-			if (ifr->ifr_mtu<=0)
-				return -EINVAL;
-
-			if (dev->change_mtu)
-				err = dev->change_mtu(dev, ifr->ifr_mtu);
-			else {
-				dev->mtu = ifr->ifr_mtu;
-				err = 0;
-			}
-			if (!err && dev->flags&IFF_UP)
-				notifier_call_chain(&netdev_chain, NETDEV_CHANGEMTU, dev);
-			return err;
-
-		case SIOCGIFHWADDR:
-			memcpy(ifr->ifr_hwaddr.sa_data,dev->dev_addr, MAX_ADDR_LEN);
-			ifr->ifr_hwaddr.sa_family=dev->type;
-			return 0;
-
-		case SIOCSIFHWADDR:
-			if(dev->set_mac_address==NULL)
-				return -EOPNOTSUPP;
-			if(ifr->ifr_hwaddr.sa_family!=dev->type)
-				return -EINVAL;
-			err=dev->set_mac_address(dev,&ifr->ifr_hwaddr);
-			if (!err)
-				notifier_call_chain(&netdev_chain, NETDEV_CHANGEADDR, dev);
-			return err;
-
-		case SIOCSIFHWBROADCAST:
-			if(ifr->ifr_hwaddr.sa_family!=dev->type)
-				return -EINVAL;
-			memcpy(dev->broadcast, ifr->ifr_hwaddr.sa_data, MAX_ADDR_LEN);
-			notifier_call_chain(&netdev_chain, NETDEV_CHANGEADDR, dev);
-			return 0;
-
-		case SIOCGIFMAP:
-			ifr->ifr_map.mem_start=dev->mem_start;
-			ifr->ifr_map.mem_end=dev->mem_end;
-			ifr->ifr_map.base_addr=dev->base_addr;
-			ifr->ifr_map.irq=dev->irq;
-			ifr->ifr_map.dma=dev->dma;
-			ifr->ifr_map.port=dev->if_port;
-			return 0;
-
-		case SIOCSIFMAP:
-			if (dev->set_config)
-				return dev->set_config(dev,&ifr->ifr_map);
-			return -EOPNOTSUPP;
-
-		case SIOCADDMULTI:
-			if(dev->set_multicast_list==NULL ||
-			   ifr->ifr_hwaddr.sa_family!=AF_UNSPEC)
-				return -EINVAL;
-			dev_mc_add(dev,ifr->ifr_hwaddr.sa_data, dev->addr_len, 1);
-			return 0;
-
-		case SIOCDELMULTI:
-			if(dev->set_multicast_list==NULL ||
-			   ifr->ifr_hwaddr.sa_family!=AF_UNSPEC)
-				return -EINVAL;
-			dev_mc_delete(dev,ifr->ifr_hwaddr.sa_data,dev->addr_len, 1);
-			return 0;
-
-		case SIOCGIFINDEX:
-			ifr->ifr_ifindex = dev->ifindex;
-			return 0;
-
-		case SIOCGIFTXQLEN:
-			ifr->ifr_qlen = dev->tx_queue_len;
-			return 0;
-
-		case SIOCSIFTXQLEN:
-			if(ifr->ifr_qlen<0)
-				return -EINVAL;
-			dev->tx_queue_len = ifr->ifr_qlen;
-			return 0;
-
-		case SIOCSIFNAME:
-			if (dev->flags&IFF_UP)
-				return -EBUSY;
-			if (dev_get(ifr->ifr_newname))
-				return -EEXIST;
-			memcpy(dev->name, ifr->ifr_newname, IFNAMSIZ);
-			dev->name[IFNAMSIZ-1] = 0;
-			notifier_call_chain(&netdev_chain, NETDEV_CHANGENAME, dev);
-			return 0;
-
-		/*
-		 *	Unknown or private ioctl
-		 */
-
-		default:
-			if(cmd >= SIOCDEVPRIVATE &&
-			   cmd <= SIOCDEVPRIVATE + 15) {
-				if (dev->do_ioctl)
-					return dev->do_ioctl(dev, ifr, cmd);
-				return -EOPNOTSUPP;
-			}
-
-#ifdef CONFIG_NET_RADIO
-			if(cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) {
-				if (dev->do_ioctl)
-					return dev->do_ioctl(dev, ifr, cmd);
-				return -EOPNOTSUPP;
-			}
-#endif	/* CONFIG_NET_RADIO */
-
-	}
-	return -EINVAL;
-}
-
-
-/*
- *	This function handles all "interface"-type I/O control requests. The actual
- *	'doing' part of this is dev_ifsioc above.
- */
-
-int dev_ioctl(unsigned int cmd, void *arg)
-{
-	struct ifreq ifr;
-	int ret;
-	char *colon;
-
-	/* One special case: SIOCGIFCONF takes ifconf argument
-	   and requires shared lock, because it sleeps writing
-	   to user space.
-	 */
-
-	if (cmd == SIOCGIFCONF) {
-		rtnl_shlock();
-		ret = dev_ifconf((char *) arg);
-		rtnl_shunlock();
-		return ret;
-	}
-	if (cmd == SIOCGIFNAME) {
-		return dev_ifname((struct ifreq *)arg);
-	}
-
-	if (copy_from_user(&ifr, arg, sizeof(struct ifreq)))
-		return -EFAULT;
-
-	ifr.ifr_name[IFNAMSIZ-1] = 0;
-
-	colon = strchr(ifr.ifr_name, ':');
-	if (colon)
-		*colon = 0;
-
-	/*
-	 *	See which interface the caller is talking about.
-	 */
-
-	switch(cmd)
-	{
-		/*
-		 *	These ioctl calls:
-		 *	- can be done by all.
-		 *	- atomic and do not require locking.
-		 *	- return a value
-		 */
-
-		case SIOCGIFFLAGS:
-		case SIOCGIFMETRIC:
-		case SIOCGIFMTU:
-		case SIOCGIFHWADDR:
-		case SIOCGIFSLAVE:
-		case SIOCGIFMAP:
-		case SIOCGIFINDEX:
-		case SIOCGIFTXQLEN:
-			dev_load(ifr.ifr_name);
-			ret = dev_ifsioc(&ifr, cmd);
-			if (!ret) {
-				if (colon)
-					*colon = ':';
-				if (copy_to_user(arg, &ifr, sizeof(struct ifreq)))
-					return -EFAULT;
-			}
-			return ret;
-
-		/*
-		 *	These ioctl calls:
-		 *	- require superuser power.
-		 *	- require strict serialization.
-		 *	- do not return a value
-		 */
-
-		case SIOCSIFFLAGS:
-		case SIOCSIFMETRIC:
-		case SIOCSIFMTU:
-		case SIOCSIFMAP:
-		case SIOCSIFHWADDR:
-		case SIOCSIFSLAVE:
-		case SIOCADDMULTI:
-		case SIOCDELMULTI:
-		case SIOCSIFHWBROADCAST:
-		case SIOCSIFTXQLEN:
-		case SIOCSIFNAME:
-			if (!capable(CAP_NET_ADMIN))
-				return -EPERM;
-			dev_load(ifr.ifr_name);
-			rtnl_lock();
-			ret = dev_ifsioc(&ifr, cmd);
-			rtnl_unlock();
-			return ret;
-
-		case SIOCGIFMEM:
-			/* Get the per device memory space. We can add this but currently
-			   do not support it */
-		case SIOCSIFMEM:
-			/* Set the per device memory buffer space. Not applicable in our case */
-		case SIOCSIFLINK:
-			return -EINVAL;
-
-		/*
-		 *	Unknown or private ioctl.
-		 */
-
-		default:
-			if (cmd >= SIOCDEVPRIVATE &&
-			    cmd <= SIOCDEVPRIVATE + 15) {
-				dev_load(ifr.ifr_name);
-				rtnl_lock();
-				ret = dev_ifsioc(&ifr, cmd);
-				rtnl_unlock();
-				if (!ret && copy_to_user(arg, &ifr, sizeof(struct ifreq)))
-					return -EFAULT;
-				return ret;
-			}
-#ifdef CONFIG_NET_RADIO
-			if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) {
-				dev_load(ifr.ifr_name);
-				if (IW_IS_SET(cmd)) {
-					if (!suser())
-						return -EPERM;
-					rtnl_lock();
-				}
-				ret = dev_ifsioc(&ifr, cmd);
-				if (IW_IS_SET(cmd))
-					rtnl_unlock();
-				if (!ret && IW_IS_GET(cmd) &&
-				    copy_to_user(arg, &ifr, sizeof(struct ifreq)))
-					return -EFAULT;
-				return ret;
-			}
-#endif	/* CONFIG_NET_RADIO */
-			return -EINVAL;
-	}
-}
-
-#endif
-
-int dev_new_index(void)
-{
-	static int ifindex;
-	for (;;) {
-		if (++ifindex <= 0)
-			ifindex=1;
-		if (dev_get_by_index(ifindex) == NULL)
-			return ifindex;
-	}
-}
-
-static int dev_boot_phase = 1;
-
-
-int register_netdevice(struct device *dev)
-{
-	struct device *d, **dp;
-
-	if (dev_boot_phase) {
-		/* This is NOT bug, but I am not sure, that all the
-		   devices, initialized before netdev module is started
-		   are sane.
-
-		   Now they are chained to device boot list
-		   and probed later. If a module is initialized
-		   before netdev, but assumes that dev->init
-		   is really called by register_netdev(), it will fail.
-
-		   So that this message should be printed for a while.
-		 */
-		printk(KERN_INFO "early initialization of device %s is deferred\n", dev->name);
-
-		/* Check for existence, and append to tail of chain */
-		for (dp=&dev_base; (d=*dp) != NULL; dp=&d->next) {
-			if (d == dev || strcmp(d->name, dev->name) == 0)
-				return -EEXIST;
-		}
-		dev->next = NULL;
-		*dp = dev;
-		return 0;
-	}
-
-	dev->iflink = -1;
-
-	/* Init, if this function is available */
-	if (dev->init && dev->init(dev) != 0)
-		return -EIO;
-
-	/* Check for existence, and append to tail of chain */
-	for (dp=&dev_base; (d=*dp) != NULL; dp=&d->next) {
-		if (d == dev || strcmp(d->name, dev->name) == 0)
-			return -EEXIST;
-	}
-	dev->next = NULL;
-	dev_init_scheduler(dev);
-	dev->ifindex = dev_new_index();
-	if (dev->iflink == -1)
-		dev->iflink = dev->ifindex;
-	*dp = dev;
-
-	/* Notify protocols, that a new device appeared. */
-	notifier_call_chain(&netdev_chain, NETDEV_REGISTER, dev);
-
-	return 0;
-}
-
-int unregister_netdevice(struct device *dev)
-{
-	struct device *d, **dp;
-
-	if (dev_boot_phase == 0) {
-		/* If device is running, close it.
-		   It is very bad idea, really we should
-		   complain loudly here, but random hackery
-		   in linux/drivers/net likes it.
-		 */
-		if (dev->flags & IFF_UP)
-			dev_close(dev);
-
-#ifdef CONFIG_NET_FASTROUTE
-		dev_clear_fastroute(dev);
-#endif
-
-		/* Shutdown queueing discipline. */
-		dev_shutdown(dev);
-
-		/* Notify protocols, that we are about to destroy
-		   this device. They should clean all the things.
-		 */
-		notifier_call_chain(&netdev_chain, NETDEV_UNREGISTER, dev);
-
-		/*
-		 *	Flush the multicast chain
-		 */
-		dev_mc_discard(dev);
-
-		/* To avoid pointers looking to nowhere,
-		   we wait for end of critical section */
-		dev_lock_wait();
-	}
-
-	/* And unlink it from device chain. */
-	for (dp = &dev_base; (d=*dp) != NULL; dp=&d->next) {
-		if (d == dev) {
-			*dp = d->next;
-			synchronize_bh();
-			d->next = NULL;
-
-			if (dev->destructor)
-				dev->destructor(dev);
-			return 0;
-		}
-	}
-	return -ENODEV;
-}
-
-
-/*
- *	Initialize the DEV module. At boot time this walks the device list and
- *	unhooks any devices that fail to initialise (normally hardware not
- *	present) and leaves us with a valid list of present and active devices.
- *
- */
-extern int lance_init(void);
-extern int bpq_init(void);
-extern int scc_init(void);
-extern void sdla_setup(void);
-extern void sdla_c_setup(void);
-extern void dlci_setup(void);
-extern int dmascc_init(void);
-extern int sm_init(void);
-
-extern int baycom_ser_fdx_init(void);
-extern int baycom_ser_hdx_init(void);
-extern int baycom_par_init(void);
-
-extern int lapbeth_init(void);
-extern int comx_init(void);
-extern void arcnet_init(void);
-extern void ip_auto_config(void);
-#ifdef CONFIG_8xx
-extern int cpm_enet_init(void);
-#endif /* CONFIG_8xx */
-
-#ifdef CONFIG_PROC_FS
-static struct proc_dir_entry proc_net_dev = {
-	PROC_NET_DEV, 3, "dev",
-	S_IFREG | S_IRUGO, 1, 0, 0,
-	0, &proc_net_inode_operations,
-	dev_get_info
-};
-#endif
-
-#ifdef CONFIG_NET_RADIO
-#ifdef CONFIG_PROC_FS
-static struct proc_dir_entry proc_net_wireless = {
-	PROC_NET_WIRELESS, 8, "wireless",
-	S_IFREG | S_IRUGO, 1, 0, 0,
-	0, &proc_net_inode_operations,
-	dev_get_wireless_info
-};
-#endif	/* CONFIG_PROC_FS */
-#endif	/* CONFIG_NET_RADIO */
-
-__initfunc(int net_dev_init(void))
-{
-	struct device *dev, **dp;
-
-#ifdef CONFIG_NET_SCHED
-	pktsched_init();
-#endif
-
-	/*
-	 *	Initialise the packet receive queue.
-	 */
-
-	skb_queue_head_init(&backlog);
-
-	/*
-	 *	The bridge has to be up before the devices
-	 */
-
-#ifdef CONFIG_BRIDGE
-	br_init();
-#endif
-
-	/*
-	 * This is Very Ugly(tm).
-	 *
-	 * Some devices want to be initialized early..
-	 */
-
-#if defined(CONFIG_SCC)
-	scc_init();
-#endif
-#if defined(CONFIG_DMASCC)
-	dmascc_init();
-#endif
-#if defined(CONFIG_BPQETHER)
-	bpq_init();
-#endif
-#if defined(CONFIG_DLCI)
-	dlci_setup();
-#endif
-#if defined(CONFIG_SDLA)
-	sdla_c_setup();
-#endif
-#if defined(CONFIG_BAYCOM_PAR)
-	baycom_par_init();
-#endif
-#if defined(CONFIG_BAYCOM_SER_FDX)
-	baycom_ser_fdx_init();
-#endif
-#if defined(CONFIG_BAYCOM_SER_HDX)
-	baycom_ser_hdx_init();
-#endif
-#if defined(CONFIG_SOUNDMODEM)
-	sm_init();
-#endif
-#if defined(CONFIG_LAPBETHER)
-	lapbeth_init();
-#endif
-#if defined(CONFIG_PLIP)
-	plip_init();
-#endif
-#if defined(CONFIG_ARCNET)
-	arcnet_init();
-#endif
-#if defined(CONFIG_8xx)
-        cpm_enet_init();
-#endif
-#if defined(CONFIG_COMX)
-	comx_init();
-#endif
-	/*
-	 *	SLHC if present needs attaching so other people see it
-	 *	even if not opened.
-	 */
-
-#ifdef CONFIG_INET
-#if (defined(CONFIG_SLIP) && defined(CONFIG_SLIP_COMPRESSED)) \
-	 || defined(CONFIG_PPP) \
-    || (defined(CONFIG_ISDN) && defined(CONFIG_ISDN_PPP))
-	slhc_install();
-#endif
-#endif
-
-#ifdef CONFIG_NET_PROFILE
-	net_profile_init();
-	NET_PROFILE_REGISTER(dev_queue_xmit);
-	NET_PROFILE_REGISTER(net_bh);
-#if 0
-	NET_PROFILE_REGISTER(net_bh_skb);
-#endif
-#endif
-	/*
-	 *	Add the devices.
-	 *	If the call to dev->init fails, the dev is removed
-	 *	from the chain disconnecting the device until the
-	 *	next reboot.
-	 */
-
-	dp = &dev_base;
-	while ((dev = *dp) != NULL)
-	{
-		dev->iflink = -1;
-		if (dev->init && dev->init(dev))
-		{
-			/*
-			 *	It failed to come up. Unhook it.
-			 */
-			*dp = dev->next;
-			synchronize_bh();
-		}
-		else
-		{
-			dp = &dev->next;
-			dev->ifindex = dev_new_index();
-			if (dev->iflink == -1)
-				dev->iflink = dev->ifindex;
-			dev_init_scheduler(dev);
-		}
-	}
-
-#ifdef CONFIG_PROC_FS
-	proc_net_register(&proc_net_dev);
-	{
-		struct proc_dir_entry *ent = create_proc_entry("net/dev_stat", 0, 0);
-		ent->read_proc = dev_proc_stats;
-	}
-#endif
-
-#ifdef CONFIG_NET_RADIO
-#ifdef CONFIG_PROC_FS
-	proc_net_register(&proc_net_wireless);
-#endif	/* CONFIG_PROC_FS */
-#endif	/* CONFIG_NET_RADIO */
-
-	init_bh(NET_BH, net_bh);
-
-	dev_boot_phase = 0;
-
-	dev_mcast_init();
-
-#ifdef CONFIG_BRIDGE
-	/*
-	 * Register any statically linked ethernet devices with the bridge
-	 */
-	br_spacedevice_register();
-#endif
-
-#ifdef CONFIG_IP_PNP
-	ip_auto_config();
-#endif
-
-	return 0;
-}
diff --git a/pfinet.old/linux-src/net/ipv4/ip_output.c~ b/pfinet.old/linux-src/net/ipv4/ip_output.c~
deleted file mode 100644
index 89272d6b..00000000
--- a/pfinet.old/linux-src/net/ipv4/ip_output.c~
+++ /dev/null
@@ -1,1000 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		The Internet Protocol (IP) output module.
- *
- * Version:	$Id: ip_output.c,v 1.67.2.1 1999/09/07 02:25:23 davem Exp $
- *
- * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
- *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *		Donald Becker, <becker@super.org>
- *		Alan Cox, <Alan.Cox@linux.org>
- *		Richard Underwood
- *		Stefan Becker, <stefanb@yello.ping.de>
- *		Jorge Cwik, <jorge@laser.satlink.net>
- *		Arnt Gulbrandsen, <agulbra@nvg.unit.no>
- *
- *	See ip_input.c for original log
- *
- *	Fixes:
- *		Alan Cox	:	Missing nonblock feature in ip_build_xmit.
- *		Mike Kilburn	:	htons() missing in ip_build_xmit.
- *		Bradford Johnson:	Fix faulty handling of some frames when 
- *					no route is found.
- *		Alexander Demenshin:	Missing sk/skb free in ip_queue_xmit
- *					(in case if packet not accepted by
- *					output firewall rules)
- *		Mike McLagan	:	Routing by source
- *		Alexey Kuznetsov:	use new route cache
- *		Andi Kleen:		Fix broken PMTU recovery and remove
- *					some redundant tests.
- *	Vitaly E. Lavrov	:	Transparent proxy revived after year coma.
- *		Andi Kleen	: 	Replace ip_reply with ip_send_reply.
- *		Andi Kleen	:	Split fast and slow ip_build_xmit path 
- *					for decreased register pressure on x86 
- *					and more readibility. 
- *		Marc Boucher	:	When call_out_firewall returns FW_QUEUE,
- *					silently drop skb instead of failing with -EPERM.
- */
-
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/config.h>
-
-#include <linux/socket.h>
-#include <linux/sockios.h>
-#include <linux/in.h>
-#include <linux/inet.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/proc_fs.h>
-#include <linux/stat.h>
-#include <linux/init.h>
-
-#include <net/snmp.h>
-#include <net/ip.h>
-#include <net/protocol.h>
-#include <net/route.h>
-#include <net/tcp.h>
-#include <net/udp.h>
-#include <linux/skbuff.h>
-#include <net/sock.h>
-#include <net/arp.h>
-#include <net/icmp.h>
-#include <net/raw.h>
-#include <net/checksum.h>
-#include <linux/igmp.h>
-#include <linux/ip_fw.h>
-#include <linux/firewall.h>
-#include <linux/mroute.h>
-#include <linux/netlink.h>
-
-/*
- *      Shall we try to damage output packets if routing dev changes?
- */
-
-int sysctl_ip_dynaddr = 0;
-
-
-int ip_id_count = 0;
-
-/* Generate a checksum for an outgoing IP datagram. */
-__inline__ void ip_send_check(struct iphdr *iph)
-{
-	iph->check = 0;
-	iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
-}
-
-/* 
- *		Add an ip header to a skbuff and send it out.
- */
-void ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk,
-			   u32 saddr, u32 daddr, struct ip_options *opt)
-{
-	struct rtable *rt = (struct rtable *)skb->dst;
-	struct iphdr *iph;
-	struct device *dev;
-	
-	/* Build the IP header. */
-	if (opt)
-		iph=(struct iphdr *)skb_push(skb,sizeof(struct iphdr) + opt->optlen);
-	else
-		iph=(struct iphdr *)skb_push(skb,sizeof(struct iphdr));
-
-	iph->version  = 4;
-	iph->ihl      = 5;
-	iph->tos      = sk->ip_tos;
-	iph->frag_off = 0;
-	if (ip_dont_fragment(sk, &rt->u.dst))
-		iph->frag_off |= htons(IP_DF);
-	iph->ttl      = sk->ip_ttl;
-	iph->daddr    = rt->rt_dst;
-	iph->saddr    = rt->rt_src;
-	iph->protocol = sk->protocol;
-	iph->tot_len  = htons(skb->len);
-	iph->id       = htons(ip_id_count++);
-	skb->nh.iph   = iph;
-
-	if (opt && opt->optlen) {
-		iph->ihl += opt->optlen>>2;
-		ip_options_build(skb, opt, daddr, rt, 0);
-	}
-
-	dev = rt->u.dst.dev;
-
-#ifdef CONFIG_FIREWALL
-	/* Now we have no better mechanism to notify about error. */
-	switch (call_out_firewall(PF_INET, dev, iph, NULL, &skb)) {
-	case FW_REJECT:
-		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
-		/* Fall thru... */
-	case FW_BLOCK:
-	case FW_QUEUE:
-		kfree_skb(skb);
-		return;
-	}
-#endif
-
-	ip_send_check(iph);
-
-	/* Send it out. */
-	skb->dst->output(skb);
-	return;
-}
-
-int __ip_finish_output(struct sk_buff *skb)
-{
-	return ip_finish_output(skb);
-}
-
-int ip_mc_output(struct sk_buff *skb)
-{
-	struct sock *sk = skb->sk;
-	struct rtable *rt = (struct rtable*)skb->dst;
-	struct device *dev = rt->u.dst.dev;
-
-	/*
-	 *	If the indicated interface is up and running, send the packet.
-	 */
-	 
-	ip_statistics.IpOutRequests++;
-#ifdef CONFIG_IP_ROUTE_NAT
-	if (rt->rt_flags & RTCF_NAT)
-		ip_do_nat(skb);
-#endif
-
-	skb->dev = dev;
-	skb->protocol = __constant_htons(ETH_P_IP);
-
-	/*
-	 *	Multicasts are looped back for other local users
-	 */
-
-	if (rt->rt_flags&RTCF_MULTICAST && (!sk || sk->ip_mc_loop)) {
-#ifdef CONFIG_IP_MROUTE
-		/* Small optimization: do not loopback not local frames,
-		   which returned after forwarding; they will be  dropped
-		   by ip_mr_input in any case.
-		   Note, that local frames are looped back to be delivered
-		   to local recipients.
-
-		   This check is duplicated in ip_mr_input at the moment.
-		 */
-		if ((rt->rt_flags&RTCF_LOCAL) || !(IPCB(skb)->flags&IPSKB_FORWARDED))
-#endif
-		dev_loopback_xmit(skb);
-
-		/* Multicasts with ttl 0 must not go beyond the host */
-
-		if (skb->nh.iph->ttl == 0) {
-			kfree_skb(skb);
-			return 0;
-		}
-	}
-
-	if (rt->rt_flags&RTCF_BROADCAST)
-		dev_loopback_xmit(skb);
-
-	return ip_finish_output(skb);
-}
-
-int ip_output(struct sk_buff *skb)
-{
-	char *str1 = "pfinet ip_output check point 1\n";
-	char *str2 = "pfinet ip_output check point 2\n";
-	int stderr_fd = fileno (stderr);
-	int ret;
-
-#ifdef CONFIG_IP_ROUTE_NAT
-	struct rtable *rt = (struct rtable*)skb->dst;
-#endif
-
-	ip_statistics.IpOutRequests++;
-
-#ifdef CONFIG_IP_ROUTE_NAT
-	if (rt->rt_flags&RTCF_NAT)
-		ip_do_nat(skb);
-#endif
-
-	write (stderr_fd, str1, strlen (str1) + 1);
-	fflush (stderr);
-	ret = ip_finish_output(skb);
-	return ret;
-}
-
-/* Queues a packet to be sent, and starts the transmitter if necessary.  
- * This routine also needs to put in the total length and compute the 
- * checksum.  We use to do this in two stages, ip_build_header() then
- * this, but that scheme created a mess when routes disappeared etc.
- * So we do it all here, and the TCP send engine has been changed to
- * match. (No more unroutable FIN disasters, etc. wheee...)  This will
- * most likely make other reliable transport layers above IP easier
- * to implement under Linux.
- */
-void ip_queue_xmit(struct sk_buff *skb)
-{
-	struct sock *sk = skb->sk;
-	struct ip_options *opt = sk->opt;
-	struct rtable *rt;
-	struct device *dev;
-	struct iphdr *iph;
-	unsigned int tot_len;
-
-	/* Make sure we can route this packet. */
-	rt = (struct rtable *) sk->dst_cache;
-	if(rt == NULL || rt->u.dst.obsolete) {
-		u32 daddr;
-
-		sk->dst_cache = NULL;
-		ip_rt_put(rt);
-
-		/* Use correct destination address if we have options. */
-		daddr = sk->daddr;
-		if(opt && opt->srr)
-			daddr = opt->faddr;
-
-		/* If this fails, retransmit mechanism of transport layer will
-		 * keep trying until route appears or the connection times itself
-		 * out.
-		 */
-		if(ip_route_output(&rt, daddr, sk->saddr,
-				   RT_TOS(sk->ip_tos) | RTO_CONN | sk->localroute,
-				   sk->bound_dev_if))
-			goto drop;
-		sk->dst_cache = &rt->u.dst;
-	}
-	if(opt && opt->is_strictroute && rt->rt_dst != rt->rt_gateway)
-		goto no_route;
-
-	/* We have a route, so grab a reference. */
-	skb->dst = dst_clone(sk->dst_cache);
-
-	/* OK, we know where to send it, allocate and build IP header. */
-	iph = (struct iphdr *) skb_push(skb, sizeof(struct iphdr) + (opt ? opt->optlen : 0));
-	iph->version  = 4;
-	iph->ihl      = 5;
-	iph->tos      = sk->ip_tos;
-	iph->frag_off = 0;
-	iph->ttl      = sk->ip_ttl;
-	iph->daddr    = rt->rt_dst;
-	iph->saddr    = rt->rt_src;
-	iph->protocol = sk->protocol;
-	skb->nh.iph   = iph;
-	/* Transport layer set skb->h.foo itself. */
-
-	if(opt && opt->optlen) {
-		iph->ihl += opt->optlen >> 2;
-		ip_options_build(skb, opt, sk->daddr, rt, 0);
-	}
-
-	tot_len = skb->len;
-	iph->tot_len = htons(tot_len);
-	iph->id = htons(ip_id_count++);
-
-	dev = rt->u.dst.dev;
-
-#ifdef CONFIG_FIREWALL
-	/* Now we have no better mechanism to notify about error. */
-	switch (call_out_firewall(PF_INET, dev, iph, NULL, &skb)) {
-	case FW_REJECT:
-		start_bh_atomic();
-		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
-		end_bh_atomic();
-		/* Fall thru... */
-	case FW_BLOCK:
-	case FW_QUEUE:
- 		goto drop;
-	}
-#endif
-
-	/* This can happen when the transport layer has segments queued
-	 * with a cached route, and by the time we get here things are
-	 * re-routed to a device with a different MTU than the original
-	 * device.  Sick, but we must cover it.
-	 */
-	if (skb_headroom(skb) < dev->hard_header_len && dev->hard_header) {
-		struct sk_buff *skb2;
-
-		skb2 = skb_realloc_headroom(skb, (dev->hard_header_len + 15) & ~15);
-		kfree_skb(skb);
-		if (skb2 == NULL)
-			return;
-		if (sk)
-			skb_set_owner_w(skb2, sk);
-		skb = skb2;
-		iph = skb->nh.iph;
-	}
-
-	/* Do we need to fragment.  Again this is inefficient.  We
-	 * need to somehow lock the original buffer and use bits of it.
-	 */
-	if (tot_len > rt->u.dst.pmtu)
-		goto fragment;
-
-	if (ip_dont_fragment(sk, &rt->u.dst))
-		iph->frag_off |= __constant_htons(IP_DF);
-
-	/* Add an IP checksum. */
-	ip_send_check(iph);
-
-	skb->priority = sk->priority;
-	skb->dst->output(skb);
-	return;
-
-fragment:
-	if (ip_dont_fragment(sk, &rt->u.dst) &&
-	    tot_len > (iph->ihl<<2) + sizeof(struct tcphdr)+16) {
-		/* Reject packet ONLY if TCP might fragment
-		   it itself, if were careful enough.
-		   Test is not precise (f.e. it does not take sacks
-		   into account). Actually, tcp should make it. --ANK (980801)
-		 */
-		iph->frag_off |= __constant_htons(IP_DF);
-		NETDEBUG(printk(KERN_DEBUG "sending pkt_too_big to self\n"));
-
-		/* icmp_send is not reenterable, so that bh_atomic... --ANK */
-		start_bh_atomic();
-		icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
-			  htonl(rt->u.dst.pmtu));
-		end_bh_atomic();
-		goto drop;
-	}
-	ip_fragment(skb, skb->dst->output);
-	return;
-
-no_route:
-	sk->dst_cache = NULL;
-	ip_rt_put(rt);
-	ip_statistics.IpOutNoRoutes++;
-	/* Fall through... */
-drop:
-	kfree_skb(skb);
-}
-
-/*
- *	Build and send a packet, with as little as one copy
- *
- *	Doesn't care much about ip options... option length can be
- *	different for fragment at 0 and other fragments.
- *
- *	Note that the fragment at the highest offset is sent first,
- *	so the getfrag routine can fill in the TCP/UDP checksum header
- *	field in the last fragment it sends... actually it also helps
- * 	the reassemblers, they can put most packets in at the head of
- *	the fragment queue, and they know the total size in advance. This
- *	last feature will measurably improve the Linux fragment handler one
- *	day.
- *
- *	The callback has five args, an arbitrary pointer (copy of frag),
- *	the source IP address (may depend on the routing table), the 
- *	destination address (char *), the offset to copy from, and the
- *	length to be copied.
- */
-
-int ip_build_xmit_slow(struct sock *sk,
-		  int getfrag (const void *,
-			       char *,
-			       unsigned int,	
-			       unsigned int),
-		  const void *frag,
-		  unsigned length,
-		  struct ipcm_cookie *ipc,
-		  struct rtable *rt,
-		  int flags)
-{
-	unsigned int fraglen, maxfraglen, fragheaderlen;
-	int err;
-	int offset, mf;
-	int mtu;
-	unsigned short id;
-
-	int hh_len = (rt->u.dst.dev->hard_header_len + 15)&~15;
-	int nfrags=0;
-	struct ip_options *opt = ipc->opt;
-	int df = 0;
-
-	mtu = rt->u.dst.pmtu;
-	if (ip_dont_fragment(sk, &rt->u.dst))
-		df = htons(IP_DF);
-  
-	length -= sizeof(struct iphdr);
-
-	if (opt) {
-		fragheaderlen = sizeof(struct iphdr) + opt->optlen;
-		maxfraglen = ((mtu-sizeof(struct iphdr)-opt->optlen) & ~7) + fragheaderlen;
-	} else {
-		fragheaderlen = sizeof(struct iphdr);
-		
-		/*
-		 *	Fragheaderlen is the size of 'overhead' on each buffer. Now work
-		 *	out the size of the frames to send.
-		 */
-	 
-		maxfraglen = ((mtu-sizeof(struct iphdr)) & ~7) + fragheaderlen;
-	}
-
-	if (length + fragheaderlen > 0xFFFF) {
-		ip_local_error(sk, EMSGSIZE, rt->rt_dst, sk->dport, mtu);
-		return -EMSGSIZE;
-	}
-
-	/*
-	 *	Start at the end of the frame by handling the remainder.
-	 */
-	 
-	offset = length - (length % (maxfraglen - fragheaderlen));
-	
-	/*
-	 *	Amount of memory to allocate for final fragment.
-	 */
-	 
-	fraglen = length - offset + fragheaderlen;
-	
-	if (length-offset==0) {
-		fraglen = maxfraglen;
-		offset -= maxfraglen-fragheaderlen;
-	}
-	
-	
-	/*
-	 *	The last fragment will not have MF (more fragments) set.
-	 */
-	 
-	mf = 0;
-
-	/*
-	 *	Don't fragment packets for path mtu discovery.
-	 */
-	 
-	if (offset > 0 && df) { 
-		ip_local_error(sk, EMSGSIZE, rt->rt_dst, sk->dport, mtu);
- 		return(-EMSGSIZE);
-	}
-
-	/*
-	 *	Lock the device lists.
-	 */
-
-	dev_lock_list();
-	
-	/*
-	 *	Get an identifier
-	 */
-	 
-	id = htons(ip_id_count++);
-
-	/*
-	 *	Begin outputting the bytes.
-	 */
-	 
-	do {
-		char *data;
-		struct sk_buff * skb;
-
-		/*
-		 *	Get the memory we require with some space left for alignment.
-		 */
-
-		skb = sock_alloc_send_skb(sk, fraglen+hh_len+15, 0, flags&MSG_DONTWAIT, &err);
-		if (skb == NULL)
-			goto error;
-
-		/*
-		 *	Fill in the control structures
-		 */
-		 
-		skb->priority = sk->priority;
-		skb->dst = dst_clone(&rt->u.dst);
-		skb_reserve(skb, hh_len);
-
-		/*
-		 *	Find where to start putting bytes.
-		 */
-		 
-		data = skb_put(skb, fraglen);
-		skb->nh.iph = (struct iphdr *)data;
-
-		/*
-		 *	Only write IP header onto non-raw packets 
-		 */
-		 
-		{
-			struct iphdr *iph = (struct iphdr *)data;
-
-			iph->version = 4;
-			iph->ihl = 5;
-			if (opt) {
-				iph->ihl += opt->optlen>>2;
-				ip_options_build(skb, opt,
-						 ipc->addr, rt, offset);
-			}
-			iph->tos = sk->ip_tos;
-			iph->tot_len = htons(fraglen - fragheaderlen + iph->ihl*4);
-			iph->id = id;
-			iph->frag_off = htons(offset>>3);
-			iph->frag_off |= mf|df;
-			if (rt->rt_type == RTN_MULTICAST)
-				iph->ttl = sk->ip_mc_ttl;
-			else
-				iph->ttl = sk->ip_ttl;
-			iph->protocol = sk->protocol;
-			iph->check = 0;
-			iph->saddr = rt->rt_src;
-			iph->daddr = rt->rt_dst;
-			iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
-			data += iph->ihl*4;
-			
-			/*
-			 *	Any further fragments will have MF set.
-			 */
-			 
-			mf = htons(IP_MF);
-		}
-		
-		/*
-		 *	User data callback
-		 */
-
-		if (getfrag(frag, data, offset, fraglen-fragheaderlen)) {
-			err = -EFAULT;
-			kfree_skb(skb);
-			goto error;
-		}
-
-		offset -= (maxfraglen-fragheaderlen);
-		fraglen = maxfraglen;
-
-		nfrags++;
-
-#ifdef CONFIG_FIREWALL
-		switch (call_out_firewall(PF_INET, rt->u.dst.dev, skb->nh.iph, NULL, &skb)) {
-		case FW_QUEUE:
-			kfree_skb(skb);
-			continue;
-		case FW_BLOCK:
-		case FW_REJECT:
-			kfree_skb(skb);
-			err = -EPERM;
-			goto error;
-		}
-#endif
-
-		err = -ENETDOWN;
-		if (rt->u.dst.output(skb))
-			goto error;
-	} while (offset >= 0);
-
-	if (nfrags>1)
-		ip_statistics.IpFragCreates += nfrags;
-	dev_unlock_list();
-	return 0;
-
-error:
-	ip_statistics.IpOutDiscards++;
-	if (nfrags>1)
-		ip_statistics.IpFragCreates += nfrags;
-	dev_unlock_list();
-	return err; 
-}
-
-
-/*
- *	Fast path for unfragmented packets.
- */
-int ip_build_xmit(struct sock *sk, 
-		  int getfrag (const void *,
-			       char *,
-			       unsigned int,	
-			       unsigned int),
-		  const void *frag,
-		  unsigned length,
-		  struct ipcm_cookie *ipc,
-		  struct rtable *rt,
-		  int flags)
-{
-	int err;
-	struct sk_buff *skb;
-	int df;
-	struct iphdr *iph;
-
-	/*
-	 *	Try the simple case first. This leaves fragmented frames, and by
-	 *	choice RAW frames within 20 bytes of maximum size(rare) to the long path
-	 */
-
-	if (!sk->ip_hdrincl) {
-		length += sizeof(struct iphdr);
-
-		/*
-		 * 	Check for slow path.
-		 */
-		if (length > rt->u.dst.pmtu || ipc->opt != NULL)  
-			return ip_build_xmit_slow(sk,getfrag,frag,length,ipc,rt,flags); 
-	} else {
-		if (length > rt->u.dst.dev->mtu) {
-			ip_local_error(sk, EMSGSIZE, rt->rt_dst, sk->dport, rt->u.dst.dev->mtu);
-			return -EMSGSIZE;
-		}
-	}
-
-	/*
-	 *	Do path mtu discovery if needed.
-	 */
-	df = 0;
-	if (ip_dont_fragment(sk, &rt->u.dst))
-		df = htons(IP_DF);
-
-	/* 
-	 *	Fast path for unfragmented frames without options. 
-	 */ 
-	{
-	int hh_len = (rt->u.dst.dev->hard_header_len + 15)&~15;
-
-	skb = sock_alloc_send_skb(sk, length+hh_len+15,
-				  0, flags&MSG_DONTWAIT, &err);
-	if(skb==NULL)
-		goto error; 
-	skb_reserve(skb, hh_len);
-	}
-	
-	skb->priority = sk->priority;
-	skb->dst = dst_clone(&rt->u.dst);
-
-	skb->nh.iph = iph = (struct iphdr *)skb_put(skb, length);
-	
-	dev_lock_list();
-	
-	if(!sk->ip_hdrincl) {
-		iph->version=4;
-		iph->ihl=5;
-		iph->tos=sk->ip_tos;
-		iph->tot_len = htons(length);
-		iph->id=htons(ip_id_count++);
-		iph->frag_off = df;
-		iph->ttl=sk->ip_mc_ttl;
-		if (rt->rt_type != RTN_MULTICAST)
-			iph->ttl=sk->ip_ttl;
-		iph->protocol=sk->protocol;
-		iph->saddr=rt->rt_src;
-		iph->daddr=rt->rt_dst;
-		iph->check=0;
-		iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
-		err = getfrag(frag, ((char *)iph)+iph->ihl*4,0, length-iph->ihl*4);
-	}
-	else
-		err = getfrag(frag, (void *)iph, 0, length);
-
-	dev_unlock_list();
-
-	if (err)
-		goto error_fault;
-
-#ifdef CONFIG_FIREWALL
-	switch (call_out_firewall(PF_INET, rt->u.dst.dev, iph, NULL, &skb)) {
-	case FW_QUEUE:
-		kfree_skb(skb);
-		return 0;
-	case FW_BLOCK:
-	case FW_REJECT:
-		kfree_skb(skb);
-		err = -EPERM;
-		goto error;
-	}
-#endif
-
-	return rt->u.dst.output(skb);
-
-error_fault:
-	err = -EFAULT;
-	kfree_skb(skb);
-error:
-	ip_statistics.IpOutDiscards++;
-	return err; 
-}
-		       
-
-
-/*
- *	This IP datagram is too large to be sent in one piece.  Break it up into
- *	smaller pieces (each of size equal to IP header plus
- *	a block of the data of the original IP data part) that will yet fit in a
- *	single device frame, and queue such a frame for sending.
- *
- *	Yes this is inefficient, feel free to submit a quicker one.
- */
-
-void ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
-{
-	struct iphdr *iph;
-	unsigned char *raw;
-	unsigned char *ptr;
-	struct device *dev;
-	struct sk_buff *skb2;
-	unsigned int mtu, hlen, left, len; 
-	int offset;
-	int not_last_frag;
-	struct rtable *rt = (struct rtable*)skb->dst;
-
-	dev = rt->u.dst.dev;
-
-	/*
-	 *	Point into the IP datagram header.
-	 */
-
-	raw = skb->nh.raw;
-	iph = (struct iphdr*)raw;
-
-	/*
-	 *	Setup starting values.
-	 */
-
-	hlen = iph->ihl * 4;
-	left = ntohs(iph->tot_len) - hlen;	/* Space per frame */
-	mtu = rt->u.dst.pmtu - hlen;	/* Size of data space */
-	ptr = raw + hlen;			/* Where to start from */
-
-	/*
-	 *	The protocol doesn't seem to say what to do in the case that the
-	 *	frame + options doesn't fit the mtu. As it used to fall down dead
-	 *	in this case we were fortunate it didn't happen
-	 *
-	 *	It is impossible, because mtu>=68. --ANK (980801)
-	 */
-
-#ifdef CONFIG_NET_PARANOIA
-	if (mtu<8) 
-		goto fail;
-#endif
-
-	/*
-	 *	Fragment the datagram.
-	 */
-
-	offset = (ntohs(iph->frag_off) & IP_OFFSET) << 3;
-	not_last_frag = iph->frag_off & htons(IP_MF);
-
-	/*
-	 *	Keep copying data until we run out.
-	 */
-
-	while(left > 0)	{
-		len = left;
-		/* IF: it doesn't fit, use 'mtu' - the data space left */
-		if (len > mtu)
-			len = mtu;
-		/* IF: we are not sending upto and including the packet end
-		   then align the next start on an eight byte boundary */
-		if (len < left)	{
-			len &= ~7;
-		}
-		/*
-		 *	Allocate buffer.
-		 */
-
-		if ((skb2 = alloc_skb(len+hlen+dev->hard_header_len+15,GFP_ATOMIC)) == NULL) {
-			NETDEBUG(printk(KERN_INFO "IP: frag: no memory for new fragment!\n"));
-			goto fail;
-		}
-
-		/*
-		 *	Set up data on packet
-		 */
-
-		skb2->pkt_type = skb->pkt_type;
-		skb2->priority = skb->priority;
-		skb_reserve(skb2, (dev->hard_header_len+15)&~15);
-		skb_put(skb2, len + hlen);
-		skb2->nh.raw = skb2->data;
-		skb2->h.raw = skb2->data + hlen;
-
-		/*
-		 *	Charge the memory for the fragment to any owner
-		 *	it might possess
-		 */
-
-		if (skb->sk)
-			skb_set_owner_w(skb2, skb->sk);
-		skb2->dst = dst_clone(skb->dst);
-
-		/*
-		 *	Copy the packet header into the new buffer.
-		 */
-
-		memcpy(skb2->nh.raw, raw, hlen);
-
-		/*
-		 *	Copy a block of the IP datagram.
-		 */
-		memcpy(skb2->h.raw, ptr, len);
-		left -= len;
-
-		/*
-		 *	Fill in the new header fields.
-		 */
-		iph = skb2->nh.iph;
-		iph->frag_off = htons((offset >> 3));
-
-		/* ANK: dirty, but effective trick. Upgrade options only if
-		 * the segment to be fragmented was THE FIRST (otherwise,
-		 * options are already fixed) and make it ONCE
-		 * on the initial skb, so that all the following fragments
-		 * will inherit fixed options.
-		 */
-		if (offset == 0)
-			ip_options_fragment(skb);
-
-		/*
-		 *	Added AC : If we are fragmenting a fragment that's not the
-		 *		   last fragment then keep MF on each bit
-		 */
-		if (left > 0 || not_last_frag)
-			iph->frag_off |= htons(IP_MF);
-		ptr += len;
-		offset += len;
-
-		/*
-		 *	Put this fragment into the sending queue.
-		 */
-
-		ip_statistics.IpFragCreates++;
-
-		iph->tot_len = htons(len + hlen);
-
-		ip_send_check(iph);
-
-		output(skb2);
-	}
-	kfree_skb(skb);
-	ip_statistics.IpFragOKs++;
-	return;
-	
-fail:
-	kfree_skb(skb); 
-	ip_statistics.IpFragFails++; 
-}
-
-/*
- *	Fetch data from kernel space and fill in checksum if needed.
- */
-static int ip_reply_glue_bits(const void *dptr, char *to, unsigned int offset, 
-			      unsigned int fraglen)
-{
-        struct ip_reply_arg *dp = (struct ip_reply_arg*)dptr;
-	u16 *pktp = (u16 *)to;
-	struct iovec *iov; 
-	int len; 
-	int hdrflag = 1; 
-
-	iov = &dp->iov[0]; 
-	if (offset >= iov->iov_len) { 
-		offset -= iov->iov_len;
-		iov++; 
-		hdrflag = 0; 
-	}
-	len = iov->iov_len - offset;
-	if (fraglen > len) { /* overlapping. */ 
-		dp->csum = csum_partial_copy_nocheck(iov->iov_base+offset, to, len,
-					     dp->csum);
-		offset = 0;
-		fraglen -= len; 
-		to += len; 
-		iov++;
-	}
-
-	dp->csum = csum_partial_copy_nocheck(iov->iov_base+offset, to, fraglen, 
-					     dp->csum); 
-
-	if (hdrflag && dp->csumoffset)
-		*(pktp + dp->csumoffset) = csum_fold(dp->csum); /* fill in checksum */
-	return 0;	       
-}
-
-/* 
- *	Generic function to send a packet as reply to another packet.
- *	Used to send TCP resets so far. ICMP should use this function too.
- *
- *	Should run single threaded per socket because it uses the sock 
- *     	structure to pass arguments.
- */
-void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg,
-		   unsigned int len)
-{
-	struct {
-		struct ip_options	opt;
-		char			data[40];
-	} replyopts;
-	struct ipcm_cookie ipc;
-	u32 daddr;
-	struct rtable *rt = (struct rtable*)skb->dst;
-	
-	if (ip_options_echo(&replyopts.opt, skb))
-		return;
-	
-	sk->ip_tos = skb->nh.iph->tos;
-	sk->priority = skb->priority;
-	sk->protocol = skb->nh.iph->protocol;
-
-	daddr = ipc.addr = rt->rt_src;
-	ipc.opt = &replyopts.opt;
-	
-	if (ipc.opt->srr)
-		daddr = replyopts.opt.faddr;
-	if (ip_route_output(&rt, daddr, rt->rt_spec_dst, RT_TOS(skb->nh.iph->tos), 0))
-		return;
-
-	/* And let IP do all the hard work. */
-	ip_build_xmit(sk, ip_reply_glue_bits, arg, len, &ipc, rt, MSG_DONTWAIT);
-	ip_rt_put(rt);
-}
-
-/*
- *	IP protocol layer initialiser
- */
-
-static struct packet_type ip_packet_type =
-{
-	__constant_htons(ETH_P_IP),
-	NULL,	/* All devices */
-	ip_rcv,
-	NULL,
-	NULL,
-};
-
-
-
-#ifdef CONFIG_PROC_FS
-#ifdef CONFIG_IP_MULTICAST
-static struct proc_dir_entry proc_net_igmp = {
-	PROC_NET_IGMP, 4, "igmp",
-	S_IFREG | S_IRUGO, 1, 0, 0,
-	0, &proc_net_inode_operations,
-	ip_mc_procinfo
-};
-#endif
-#endif	
-
-/*
- *	IP registers the packet type and then calls the subprotocol initialisers
- */
-
-__initfunc(void ip_init(void))
-{
-	dev_add_pack(&ip_packet_type);
-
-	ip_rt_init();
-
-#ifdef CONFIG_PROC_FS
-#ifdef CONFIG_IP_MULTICAST
-	proc_net_register(&proc_net_igmp);
-#endif
-#endif	
-}
-
diff --git a/pfinet.old/linux-src/net/ipv4/tcp_input.c~ b/pfinet.old/linux-src/net/ipv4/tcp_input.c~
deleted file mode 100644
index c5095624..00000000
--- a/pfinet.old/linux-src/net/ipv4/tcp_input.c~
+++ /dev/null
@@ -1,2449 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Implementation of the Transmission Control Protocol(TCP).
- *
- * Version:	$Id: tcp_input.c,v 1.164.2.8 1999/09/23 19:21:23 davem Exp $
- *
- * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
- *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *		Mark Evans, <evansmp@uhura.aston.ac.uk>
- *		Corey Minyard <wf-rch!minyard@relay.EU.net>
- *		Florian La Roche, <flla@stud.uni-sb.de>
- *		Charles Hedrick, <hedrick@klinzhai.rutgers.edu>
- *		Linus Torvalds, <torvalds@cs.helsinki.fi>
- *		Alan Cox, <gw4pts@gw4pts.ampr.org>
- *		Matthew Dillon, <dillon@apollo.west.oic.com>
- *		Arnt Gulbrandsen, <agulbra@nvg.unit.no>
- *		Jorge Cwik, <jorge@laser.satlink.net>
- */
-
-/*
- * Changes:
- *		Pedro Roque	:	Fast Retransmit/Recovery.
- *					Two receive queues.
- *					Retransmit queue handled by TCP.
- *					Better retransmit timer handling.
- *					New congestion avoidance.
- *					Header prediction.
- *					Variable renaming.
- *
- *		Eric		:	Fast Retransmit.
- *		Randy Scott	:	MSS option defines.
- *		Eric Schenk	:	Fixes to slow start algorithm.
- *		Eric Schenk	:	Yet another double ACK bug.
- *		Eric Schenk	:	Delayed ACK bug fixes.
- *		Eric Schenk	:	Floyd style fast retrans war avoidance.
- *		David S. Miller	:	Don't allow zero congestion window.
- *		Eric Schenk	:	Fix retransmitter so that it sends
- *					next packet on ack of previous packet.
- *		Andi Kleen	:	Moved open_request checking here
- *					and process RSTs for open_requests.
- *		Andi Kleen	:	Better prune_queue, and other fixes.
- *		Andrey Savochkin:	Fix RTT measurements in the presnce of
- *					timestamps.
- *		Andrey Savochkin:	Check sequence numbers correctly when
- *					removing SACKs due to in sequence incoming
- *					data segments.
- *		Andi Kleen:		Make sure we never ack data there is not
- *					enough room for. Also make this condition
- *					a fatal error if it might still happen.
- *		Andi Kleen:		Add tcp_measure_rcv_mss to make 
- *					connections with MSS<min(MTU,ann. MSS)
- *					work without delayed acks. 
- *		Andi Kleen:		Process packets with PSH set in the
- *					fast path.
- */
-
-#include <linux/config.h>
-#include <linux/mm.h>
-#include <linux/sysctl.h>
-#include <net/tcp.h>
-#include <linux/ipsec.h>
-
-#ifdef CONFIG_SYSCTL
-#define SYNC_INIT 0 /* let the user enable it */
-#else
-#define SYNC_INIT 1
-#endif
-
-extern int sysctl_tcp_fin_timeout;
-
-/* These are on by default so the code paths get tested.
- * For the final 2.2 this may be undone at our discretion. -DaveM
- */
-int sysctl_tcp_timestamps = 1;
-int sysctl_tcp_window_scaling = 1;
-int sysctl_tcp_sack = 1;
-
-int sysctl_tcp_syncookies = SYNC_INIT; 
-int sysctl_tcp_stdurg;
-int sysctl_tcp_rfc1337;
-
-static int prune_queue(struct sock *sk);
-
-/* There is something which you must keep in mind when you analyze the
- * behavior of the tp->ato delayed ack timeout interval.  When a
- * connection starts up, we want to ack as quickly as possible.  The
- * problem is that "good" TCP's do slow start at the beginning of data
- * transmission.  The means that until we send the first few ACK's the
- * sender will sit on his end and only queue most of his data, because
- * he can only send snd_cwnd unacked packets at any given time.  For
- * each ACK we send, he increments snd_cwnd and transmits more of his
- * queue.  -DaveM
- */
-static void tcp_delack_estimator(struct tcp_opt *tp)
-{
-	if(tp->ato == 0) {
-		tp->lrcvtime = tcp_time_stamp;
-
-		/* Help sender leave slow start quickly,
-		 * and also makes sure we do not take this
-		 * branch ever again for this connection.
-		 */
-		tp->ato = 1;
-		tcp_enter_quickack_mode(tp);
-	} else {
-		int m = tcp_time_stamp - tp->lrcvtime;
-
-		tp->lrcvtime = tcp_time_stamp;
-		if(m <= 0)
-			m = 1;
-		if(m > tp->rto)
-			tp->ato = tp->rto;
-		else {
-			/* This funny shift makes sure we
-			 * clear the "quick ack mode" bit.
-			 */
-			tp->ato = ((tp->ato << 1) >> 2) + m;
-		}
-	}
-}
-
-/* 
- * Remember to send an ACK later.
- */
-static __inline__ void tcp_remember_ack(struct tcp_opt *tp, struct tcphdr *th, 
-					struct sk_buff *skb)
-{
-	tp->delayed_acks++; 
-
-	/* Tiny-grams with PSH set artifically deflate our
-	 * ato measurement, but with a lower bound.
-	 */
-	if(th->psh && (skb->len < (tp->mss_cache >> 1))) {
-		/* Preserve the quickack state. */
-		if((tp->ato & 0x7fffffff) > HZ/50)
-			tp->ato = ((tp->ato & 0x80000000) |
-				   (HZ/50));
-	}
-} 
-
-/* Called to compute a smoothed rtt estimate. The data fed to this
- * routine either comes from timestamps, or from segments that were
- * known _not_ to have been retransmitted [see Karn/Partridge
- * Proceedings SIGCOMM 87]. The algorithm is from the SIGCOMM 88
- * piece by Van Jacobson.
- * NOTE: the next three routines used to be one big routine.
- * To save cycles in the RFC 1323 implementation it was better to break
- * it up into three procedures. -- erics
- */
-
-static __inline__ void tcp_rtt_estimator(struct tcp_opt *tp, __u32 mrtt)
-{
-	long m = mrtt; /* RTT */
-
-	/*	The following amusing code comes from Jacobson's
-	 *	article in SIGCOMM '88.  Note that rtt and mdev
-	 *	are scaled versions of rtt and mean deviation.
-	 *	This is designed to be as fast as possible 
-	 *	m stands for "measurement".
-	 *
-	 *	On a 1990 paper the rto value is changed to:
-	 *	RTO = rtt + 4 * mdev
-	 */
-	if(m == 0)
-		m = 1;
-	if (tp->srtt != 0) {
-		m -= (tp->srtt >> 3);	/* m is now error in rtt est */
-		tp->srtt += m;		/* rtt = 7/8 rtt + 1/8 new */
-		if (m < 0)
-			m = -m;		/* m is now abs(error) */
-		m -= (tp->mdev >> 2);   /* similar update on mdev */
-		tp->mdev += m;	    	/* mdev = 3/4 mdev + 1/4 new */
-	} else {
-		/* no previous measure. */
-		tp->srtt = m<<3;	/* take the measured time to be rtt */
-		tp->mdev = m<<2;	/* make sure rto = 3*rtt */
-	}
-}
-
-/* Calculate rto without backoff.  This is the second half of Van Jacobson's
- * routine referred to above.
- */
-
-static __inline__ void tcp_set_rto(struct tcp_opt *tp)
-{
-	tp->rto = (tp->srtt >> 3) + tp->mdev;
-	tp->rto += (tp->rto >> 2) + (tp->rto >> (tp->snd_cwnd-1));
-}
- 
-
-/* Keep the rto between HZ/5 and 120*HZ. 120*HZ is the upper bound
- * on packet lifetime in the internet. We need the HZ/5 lower
- * bound to behave correctly against BSD stacks with a fixed
- * delayed ack.
- * FIXME: It's not entirely clear this lower bound is the best
- * way to avoid the problem. Is it possible to drop the lower
- * bound and still avoid trouble with BSD stacks? Perhaps
- * some modification to the RTO calculation that takes delayed
- * ack bias into account? This needs serious thought. -- erics
- */
-static __inline__ void tcp_bound_rto(struct tcp_opt *tp)
-{
-	if (tp->rto > 120*HZ)
-		tp->rto = 120*HZ;
-	if (tp->rto < HZ/5)
-		tp->rto = HZ/5;
-}
-
-/* WARNING: this must not be called if tp->saw_timestamp was false. */
-extern __inline__ void tcp_replace_ts_recent(struct sock *sk, struct tcp_opt *tp,
-					     __u32 start_seq, __u32 end_seq)
-{
-	/* It is start_seq <= last_ack_seq combined
-	   with in window check. If start_seq<=last_ack_seq<=rcv_nxt,
-	   then segment is in window if end_seq>=rcv_nxt.
-	 */
-	if (!after(start_seq, tp->last_ack_sent) &&
-	    !before(end_seq, tp->rcv_nxt)) {
-		/* PAWS bug workaround wrt. ACK frames, the PAWS discard
-		 * extra check below makes sure this can only happen
-		 * for pure ACK frames.  -DaveM
-		 *
-		 * Plus: expired timestamps.
-		 *
-		 * Plus: resets failing PAWS.
-		 */
-		if((s32)(tp->rcv_tsval - tp->ts_recent) >= 0) {
-			tp->ts_recent = tp->rcv_tsval;
-			tp->ts_recent_stamp = tcp_time_stamp;
-		}
-	}
-}
-
-#define PAWS_24DAYS	(HZ * 60 * 60 * 24 * 24)
-
-extern __inline__ int tcp_paws_discard(struct tcp_opt *tp, struct tcphdr *th, unsigned len)
-{
-	return ((s32)(tp->rcv_tsval - tp->ts_recent) < 0 &&
-		(s32)(tcp_time_stamp - tp->ts_recent_stamp) < PAWS_24DAYS &&
-		/* Sorry, PAWS as specified is broken wrt. pure-ACKs -DaveM */
-		len != (th->doff * 4));
-}
-
-
-static int __tcp_sequence(struct tcp_opt *tp, u32 seq, u32 end_seq)
-{
-	u32 end_window = tp->rcv_wup + tp->rcv_wnd;
-
-	if (tp->rcv_wnd &&
-	    after(end_seq, tp->rcv_nxt) &&
-	    before(seq, end_window))
-		return 1;
-	if (seq != end_window)
-		return 0;
-	return (seq == end_seq);
-}
-
-/* This functions checks to see if the tcp header is actually acceptable. */
-extern __inline__ int tcp_sequence(struct tcp_opt *tp, u32 seq, u32 end_seq)
-{
-	if (seq == tp->rcv_nxt)
-		return (tp->rcv_wnd || (end_seq == seq));
-
-	return __tcp_sequence(tp, seq, end_seq);
-}
-
-/* When we get a reset we do this. */
-static void tcp_reset(struct sock *sk)
-{
-	sk->zapped = 1;
-
-	/* We want the right error as BSD sees it (and indeed as we do). */
-	switch (sk->state) {
-		case TCP_SYN_SENT:
-			sk->err = ECONNREFUSED;
-			break;
-		case TCP_CLOSE_WAIT:
-			sk->err = EPIPE;
-			break;
-		default:
-			sk->err = ECONNRESET;
-	};
-	tcp_set_state(sk, TCP_CLOSE);
-	sk->shutdown = SHUTDOWN_MASK;
-	if (!sk->dead) 
-		sk->state_change(sk);
-}
-
-/* This tags the retransmission queue when SACKs arrive. */
-static void tcp_sacktag_write_queue(struct sock *sk, struct tcp_sack_block *sp, int nsacks)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	int i = nsacks;
-
-	while(i--) {
-		struct sk_buff *skb = skb_peek(&sk->write_queue);
-		__u32 start_seq = ntohl(sp->start_seq);
-		__u32 end_seq = ntohl(sp->end_seq);
-		int fack_count = 0;
-
-		while((skb != NULL) &&
-		      (skb != tp->send_head) &&
-		      (skb != (struct sk_buff *)&sk->write_queue)) {
-			/* The retransmission queue is always in order, so
-			 * we can short-circuit the walk early.
-			 */
-			if(after(TCP_SKB_CB(skb)->seq, end_seq))
-				break;
-
-			/* We play conservative, we don't allow SACKS to partially
-			 * tag a sequence space.
-			 */
-			fack_count++;
-			if(!after(start_seq, TCP_SKB_CB(skb)->seq) &&
-			   !before(end_seq, TCP_SKB_CB(skb)->end_seq)) {
-				/* If this was a retransmitted frame, account for it. */
-				if((TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_RETRANS) &&
-				   tp->retrans_out)
-					tp->retrans_out--;
-				TCP_SKB_CB(skb)->sacked |= TCPCB_SACKED_ACKED;
-
-				/* RULE: All new SACKs will either decrease retrans_out
-				 *       or advance fackets_out.
-				 */
-				if(fack_count > tp->fackets_out)
-					tp->fackets_out = fack_count;
-			}
-			skb = skb->next;
-		}
-		sp++; /* Move on to the next SACK block. */
-	}
-}
-
-/* Look for tcp options. Normally only called on SYN and SYNACK packets.
- * But, this can also be called on packets in the established flow when
- * the fast version below fails.
- */
-void tcp_parse_options(struct sock *sk, struct tcphdr *th, struct tcp_opt *tp, int no_fancy)
-{
-	unsigned char *ptr;
-	int length=(th->doff*4)-sizeof(struct tcphdr);
-	int saw_mss = 0;
-
-	ptr = (unsigned char *)(th + 1);
-	tp->saw_tstamp = 0;
-
-	while(length>0) {
-	  	int opcode=*ptr++;
-		int opsize;
-
-		switch (opcode) {
-			case TCPOPT_EOL:
-				return;
-			case TCPOPT_NOP:	/* Ref: RFC 793 section 3.1 */
-				length--;
-				continue;
-			default:
-				opsize=*ptr++;
-				if (opsize < 2) /* "silly options" */
-					return;
-				if (opsize > length)
-					break;	/* don't parse partial options */
-	  			switch(opcode) {
-				case TCPOPT_MSS:
-					if(opsize==TCPOLEN_MSS && th->syn) {
-						u16 in_mss = ntohs(*(__u16 *)ptr);
-						if (in_mss == 0)
-							in_mss = 536;
-						if (tp->mss_clamp > in_mss)
-							tp->mss_clamp = in_mss;
-						saw_mss = 1;
-					}
-					break;
-				case TCPOPT_WINDOW:
-					if(opsize==TCPOLEN_WINDOW && th->syn)
-						if (!no_fancy && sysctl_tcp_window_scaling) {
-							tp->wscale_ok = 1;
-							tp->snd_wscale = *(__u8 *)ptr;
-							if(tp->snd_wscale > 14) {
-								if(net_ratelimit())
-									printk("tcp_parse_options: Illegal window "
-									       "scaling value %d >14 received.",
-									       tp->snd_wscale);
-								tp->snd_wscale = 14;
-							}
-						}
-					break;
-				case TCPOPT_TIMESTAMP:
-					if(opsize==TCPOLEN_TIMESTAMP) {
-						if (sysctl_tcp_timestamps && !no_fancy) {
-							tp->tstamp_ok = 1;
-							tp->saw_tstamp = 1;
-							tp->rcv_tsval = ntohl(*(__u32 *)ptr);
-							tp->rcv_tsecr = ntohl(*(__u32 *)(ptr+4));
-						}
-					}
-					break;
-				case TCPOPT_SACK_PERM:
-					if(opsize==TCPOLEN_SACK_PERM && th->syn) {
-						if (sysctl_tcp_sack && !no_fancy) {
-							tp->sack_ok = 1;
-							tp->num_sacks = 0;
-						}
-					}
-					break;
-
-				case TCPOPT_SACK:
-					if((opsize >= (TCPOLEN_SACK_BASE + TCPOLEN_SACK_PERBLOCK)) &&
-					   sysctl_tcp_sack && (sk != NULL) && !th->syn) {
-						int sack_bytes = opsize - TCPOLEN_SACK_BASE;
-
-						if(!(sack_bytes % TCPOLEN_SACK_PERBLOCK)) {
-							int num_sacks = sack_bytes >> 3;
-							struct tcp_sack_block *sackp;
-
-							sackp = (struct tcp_sack_block *)ptr;
-							tcp_sacktag_write_queue(sk, sackp, num_sacks);
-						}
-					}
-	  			};
-	  			ptr+=opsize-2;
-	  			length-=opsize;
-	  	};
-	}
-	if(th->syn && saw_mss == 0)
-		tp->mss_clamp = 536;
-}
-
-/* Fast parse options. This hopes to only see timestamps.
- * If it is wrong it falls back on tcp_parse_options().
- */
-static __inline__ int tcp_fast_parse_options(struct sock *sk, struct tcphdr *th, struct tcp_opt *tp)
-{
-	/* If we didn't send out any options ignore them all. */
-	if (tp->tcp_header_len == sizeof(struct tcphdr))
-		return 0;
-	if (th->doff == sizeof(struct tcphdr)>>2) {
-		tp->saw_tstamp = 0;
-		return 0;
-	} else if (th->doff == (sizeof(struct tcphdr)>>2)+(TCPOLEN_TSTAMP_ALIGNED>>2)) {
-		__u32 *ptr = (__u32 *)(th + 1);
-		if (*ptr == __constant_ntohl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16)
-					     | (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)) {
-			tp->saw_tstamp = 1;
-			tp->rcv_tsval = ntohl(*++ptr);
-			tp->rcv_tsecr = ntohl(*++ptr);
-			return 1;
-		}
-	}
-	tcp_parse_options(sk, th, tp, 0);
-	return 1;
-}
-
-#define FLAG_DATA		0x01 /* Incoming frame contained data.		*/
-#define FLAG_WIN_UPDATE		0x02 /* Incoming ACK was a window update.	*/
-#define FLAG_DATA_ACKED		0x04 /* This ACK acknowledged new data.		*/
-#define FLAG_RETRANS_DATA_ACKED	0x08 /* "" "" some of which was retransmitted.	*/
-
-static __inline__ void clear_fast_retransmit(struct tcp_opt *tp)
-{
-	if (tp->dup_acks > 3)
-		tp->snd_cwnd = (tp->snd_ssthresh);
-
-	tp->dup_acks = 0;
-}
-
-/* NOTE: This code assumes that tp->dup_acks gets cleared when a
- * retransmit timer fires.
- */
-static void tcp_fast_retrans(struct sock *sk, u32 ack, int not_dup)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-
-	/* Note: If not_dup is set this implies we got a
-	 * data carrying packet or a window update.
-	 * This carries no new information about possible
-	 * lost packets, so we have to ignore it for the purposes
-	 * of counting duplicate acks. Ideally this does not imply we
-	 * should stop our fast retransmit phase, more acks may come
-	 * later without data to help us. Unfortunately this would make
-	 * the code below much more complex. For now if I see such
-	 * a packet I clear the fast retransmit phase.
-	 */
-	if (ack == tp->snd_una && tp->packets_out && (not_dup == 0)) {
-		/* This is the standard reno style fast retransmit branch. */
-
-                /* 1. When the third duplicate ack is received, set ssthresh 
-                 * to one half the current congestion window, but no less 
-                 * than two segments. Retransmit the missing segment.
-                 */
-		if (tp->high_seq == 0 || after(ack, tp->high_seq)) {
-			tp->dup_acks++;
-			if ((tp->fackets_out > 3) || (tp->dup_acks == 3)) {
-                                tp->snd_ssthresh = tcp_recalc_ssthresh(tp);
-                                tp->snd_cwnd = (tp->snd_ssthresh + 3);
-				tp->high_seq = tp->snd_nxt;
-				if(!tp->fackets_out)
-					tcp_retransmit_skb(sk,
-							   skb_peek(&sk->write_queue));
-				else
-					tcp_fack_retransmit(sk);
-                                tcp_reset_xmit_timer(sk, TIME_RETRANS, tp->rto);
-			}
-		} else if (++tp->dup_acks > 3) {
-			/* 2. Each time another duplicate ACK arrives, increment 
-			 * cwnd by the segment size. [...] Transmit a packet...
-			 *
-			 * Packet transmission will be done on normal flow processing
-			 * since we're not in "retransmit mode".  We do not use
-			 * duplicate ACKs to artificially inflate the congestion
-			 * window when doing FACK.
-			 */
-			if(!tp->fackets_out) {
-				tp->snd_cwnd++;
-			} else {
-				/* Fill any further holes which may have
-				 * appeared.
-				 *
-				 * We may want to change this to run every
-				 * further multiple-of-3 dup ack increments,
-				 * to be more robust against out-of-order
-				 * packet delivery.  -DaveM
-				 */
-				tcp_fack_retransmit(sk);
-			}
-		}
-	} else if (tp->high_seq != 0) {
-		/* In this branch we deal with clearing the Floyd style
-		 * block on duplicate fast retransmits, and if requested
-		 * we do Hoe style secondary fast retransmits.
-		 */
-		if (!before(ack, tp->high_seq) || (not_dup & FLAG_DATA) != 0) {
-			/* Once we have acked all the packets up to high_seq
-			 * we are done this fast retransmit phase.
-			 * Alternatively data arrived. In this case we
-			 * Have to abort the fast retransmit attempt.
-			 * Note that we do want to accept a window
-			 * update since this is expected with Hoe's algorithm.
-			 */
-			clear_fast_retransmit(tp);
-
-			/* After we have cleared up to high_seq we can
-			 * clear the Floyd style block.
-			 */
-			if (!before(ack, tp->high_seq)) {
-				tp->high_seq = 0;
-				tp->fackets_out = 0;
-			}
-		} else if (tp->dup_acks >= 3) {
-			if (!tp->fackets_out) {
-				/* Hoe Style. We didn't ack the whole
-				 * window. Take this as a cue that
-				 * another packet was lost and retransmit it.
-				 * Don't muck with the congestion window here.
-				 * Note that we have to be careful not to
-				 * act if this was a window update and it
-				 * didn't ack new data, since this does
-				 * not indicate a packet left the system.
-				 * We can test this by just checking
-				 * if ack changed from snd_una, since
-				 * the only way to get here without advancing
-				 * from snd_una is if this was a window update.
-				 */
-				if (ack != tp->snd_una && before(ack, tp->high_seq)) {
-                                	tcp_retransmit_skb(sk,
-							   skb_peek(&sk->write_queue));
-                                	tcp_reset_xmit_timer(sk, TIME_RETRANS, tp->rto);
-				}
-			} else {
-				/* FACK style, fill any remaining holes in
-				 * receiver's queue.
-				 */
-				tcp_fack_retransmit(sk);
-			}
-		}
-	}
-}
-
-/* This is Jacobson's slow start and congestion avoidance. 
- * SIGCOMM '88, p. 328.
- */
-static __inline__ void tcp_cong_avoid(struct tcp_opt *tp)
-{
-        if (tp->snd_cwnd <= tp->snd_ssthresh) {
-                /* In "safe" area, increase. */
-                tp->snd_cwnd++;
-	} else {
-                /* In dangerous area, increase slowly.
-		 * In theory this is tp->snd_cwnd += 1 / tp->snd_cwnd
-		 */
-		if (tp->snd_cwnd_cnt >= tp->snd_cwnd) {
-			tp->snd_cwnd++;
-			tp->snd_cwnd_cnt=0;
-		} else
-			tp->snd_cwnd_cnt++;
-        }       
-}
-
-/* Remove acknowledged frames from the retransmission queue. */
-static int tcp_clean_rtx_queue(struct sock *sk, __u32 ack,
-			       __u32 *seq, __u32 *seq_rtt)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	struct sk_buff *skb;
-	__u32 now = tcp_time_stamp;
-	int acked = 0;
-
-	/* If we are retransmitting, and this ACK clears up to
-	 * the retransmit head, or further, then clear our state.
-	 */
-	if (tp->retrans_head != NULL &&
-	    !before(ack, TCP_SKB_CB(tp->retrans_head)->end_seq))
-		tp->retrans_head = NULL;
-
-	while((skb=skb_peek(&sk->write_queue)) && (skb != tp->send_head)) {
-		struct tcp_skb_cb *scb = TCP_SKB_CB(skb); 
-		__u8 sacked = scb->sacked;
-		
-		/* If our packet is before the ack sequence we can
-		 * discard it as it's confirmed to have arrived at
-		 * the other end.
-		 */
-		if (after(scb->end_seq, ack))
-			break;
-
-		/* Initial outgoing SYN's get put onto the write_queue
-		 * just like anything else we transmit.  It is not
-		 * true data, and if we misinform our callers that
-		 * this ACK acks real data, we will erroneously exit
-		 * connection startup slow start one packet too
-		 * quickly.  This is severely frowned upon behavior.
-		 */
-		if((sacked & TCPCB_SACKED_RETRANS) && tp->retrans_out)
-			tp->retrans_out--;
-		if(!(scb->flags & TCPCB_FLAG_SYN)) {
-			acked |= FLAG_DATA_ACKED;
-			if(sacked & TCPCB_SACKED_RETRANS)
-				acked |= FLAG_RETRANS_DATA_ACKED;
-			if(tp->fackets_out)
-				tp->fackets_out--;
-		} else {
-			/* This is pure paranoia. */
-			tp->retrans_head = NULL;
-		}		
-		tp->packets_out--;
-		*seq = scb->seq;
-		*seq_rtt = now - scb->when;
-		__skb_unlink(skb, skb->list);
-		kfree_skb(skb);
-	}
-	return acked;
-}
-
-static void tcp_ack_probe(struct sock *sk, __u32 ack)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	
-	/* Our probe was answered. */
-	tp->probes_out = 0;
-	
-	/* Was it a usable window open? */
-
-	/* should always be non-null */
-	if (tp->send_head != NULL &&
-	    !before (ack + tp->snd_wnd, TCP_SKB_CB(tp->send_head)->end_seq)) {
-		tp->backoff = 0;
-		tp->pending = 0;
-		tcp_clear_xmit_timer(sk, TIME_PROBE0);
-	} else {
-		tcp_reset_xmit_timer(sk, TIME_PROBE0,
-				     min(tp->rto << tp->backoff, 120*HZ));
-	}
-}
- 
-/* Should we open up the congestion window? */
-static __inline__ int should_advance_cwnd(struct tcp_opt *tp, int flag)
-{
-	/* Data must have been acked. */
-	if ((flag & FLAG_DATA_ACKED) == 0)
-		return 0;
-
-	/* Some of the data acked was retransmitted somehow? */
-	if ((flag & FLAG_RETRANS_DATA_ACKED) != 0) {
-		/* We advance in all cases except during
-		 * non-FACK fast retransmit/recovery.
-		 */
-		if (tp->fackets_out != 0 ||
-		    tp->retransmits != 0)
-			return 1;
-
-		/* Non-FACK fast retransmit does it's own
-		 * congestion window management, don't get
-		 * in the way.
-		 */
-		return 0;
-	}
-
-	/* New non-retransmitted data acked, always advance.  */
-	return 1;
-}
-
-/* Read draft-ietf-tcplw-high-performance before mucking
- * with this code. (Superceeds RFC1323)
- */
-static void tcp_ack_saw_tstamp(struct sock *sk, struct tcp_opt *tp,
-			       u32 seq, u32 ack, int flag)
-{
-	__u32 seq_rtt;
-
-	/* RTTM Rule: A TSecr value received in a segment is used to
-	 * update the averaged RTT measurement only if the segment
-	 * acknowledges some new data, i.e., only if it advances the
-	 * left edge of the send window.
-	 *
-	 * See draft-ietf-tcplw-high-performance-00, section 3.3.
-	 * 1998/04/10 Andrey V. Savochkin <saw@msu.ru>
-	 */
-	if (!(flag & FLAG_DATA_ACKED))
-		return;
-
-	seq_rtt = tcp_time_stamp - tp->rcv_tsecr;
-	tcp_rtt_estimator(tp, seq_rtt);
-	if (tp->retransmits) {
-		if (tp->packets_out == 0) {
-			tp->retransmits = 0;
-			tp->fackets_out = 0;
-			tp->retrans_out = 0;
-			tp->backoff = 0;
-			tcp_set_rto(tp);
-		} else {
-			/* Still retransmitting, use backoff */
-			tcp_set_rto(tp);
-			tp->rto = tp->rto << tp->backoff;
-		}
-	} else {
-		tcp_set_rto(tp);
-	}
-
-	tcp_bound_rto(tp);
-}
-
-static __inline__ void tcp_ack_packets_out(struct sock *sk, struct tcp_opt *tp)
-{
-	struct sk_buff *skb = skb_peek(&sk->write_queue);
-
-	/* Some data was ACK'd, if still retransmitting (due to a
-	 * timeout), resend more of the retransmit queue.  The
-	 * congestion window is handled properly by that code.
-	 */
-	if (tp->retransmits) {
-		tcp_xmit_retransmit_queue(sk);
-		tcp_reset_xmit_timer(sk, TIME_RETRANS, tp->rto);
-	} else {
-		__u32 when = tp->rto - (tcp_time_stamp - TCP_SKB_CB(skb)->when);
-		if ((__s32)when < 0)
-			when = 1;
-		tcp_reset_xmit_timer(sk, TIME_RETRANS, when);
-	}
-}
-
-/* This routine deals with incoming acks, but not outgoing ones. */
-static int tcp_ack(struct sock *sk, struct tcphdr *th, 
-		   u32 ack_seq, u32 ack, int len)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	int flag = 0;
-	u32 seq = 0;
-	u32 seq_rtt = 0;
-
-	if(sk->zapped)
-		return(1);	/* Dead, can't ack any more so why bother */
-
-	if (tp->pending == TIME_KEEPOPEN)
-	  	tp->probes_out = 0;
-
-	tp->rcv_tstamp = tcp_time_stamp;
-
-	/* If the ack is newer than sent or older than previous acks
-	 * then we can probably ignore it.
-	 */
-	if (after(ack, tp->snd_nxt) || before(ack, tp->snd_una))
-		goto uninteresting_ack;
-
-	/* If there is data set flag 1 */
-	if (len != th->doff*4) {
-		flag |= FLAG_DATA;
-		tcp_delack_estimator(tp);
-	}
-
-	/* Update our send window. */
-
-	/* This is the window update code as per RFC 793
-	 * snd_wl{1,2} are used to prevent unordered
-	 * segments from shrinking the window 
-	 */
-	if (before(tp->snd_wl1, ack_seq) ||
-	    (tp->snd_wl1 == ack_seq && !after(tp->snd_wl2, ack))) {
-		u32 nwin = ntohs(th->window) << tp->snd_wscale;
-
-		if ((tp->snd_wl2 != ack) || (nwin > tp->snd_wnd)) {
-			flag |= FLAG_WIN_UPDATE;
-			tp->snd_wnd = nwin;
-
-			tp->snd_wl1 = ack_seq;
-			tp->snd_wl2 = ack;
-
-			if (nwin > tp->max_window)
-				tp->max_window = nwin;
-		}
-	}
-
-	/* We passed data and got it acked, remove any soft error
-	 * log. Something worked...
-	 */
-	sk->err_soft = 0;
-
-	/* If this ack opens up a zero window, clear backoff.  It was
-	 * being used to time the probes, and is probably far higher than
-	 * it needs to be for normal retransmission.
-	 */
-	if (tp->pending == TIME_PROBE0)
-		tcp_ack_probe(sk, ack);
-
-	/* See if we can take anything off of the retransmit queue. */
-	flag |= tcp_clean_rtx_queue(sk, ack, &seq, &seq_rtt);
-
-	/* We must do this here, before code below clears out important
-	 * state contained in tp->fackets_out and tp->retransmits.  -DaveM
-	 */
-	if (should_advance_cwnd(tp, flag))
-		tcp_cong_avoid(tp);
-
-	/* If we have a timestamp, we always do rtt estimates. */
-	if (tp->saw_tstamp) {
-		tcp_ack_saw_tstamp(sk, tp, seq, ack, flag);
-	} else {
-		/* If we were retransmiting don't count rtt estimate. */
-		if (tp->retransmits) {
-			if (tp->packets_out == 0) {
-				tp->retransmits = 0;
-				tp->fackets_out = 0;
-				tp->retrans_out = 0;
-			}
-		} else {
-			/* We don't have a timestamp. Can only use
-			 * packets that are not retransmitted to determine
-			 * rtt estimates. Also, we must not reset the
-			 * backoff for rto until we get a non-retransmitted
-			 * packet. This allows us to deal with a situation
-			 * where the network delay has increased suddenly.
-			 * I.e. Karn's algorithm. (SIGCOMM '87, p5.)
-			 */
-			if (flag & FLAG_DATA_ACKED) {
-				if(!(flag & FLAG_RETRANS_DATA_ACKED)) {
-					tp->backoff = 0;
-					tcp_rtt_estimator(tp, seq_rtt);
-					tcp_set_rto(tp);
-					tcp_bound_rto(tp);
-				}
-			}
-		}
-	}
-
-	if (tp->packets_out) {
-		if (flag & FLAG_DATA_ACKED)
-			tcp_ack_packets_out(sk, tp);
-	} else {
-		tcp_clear_xmit_timer(sk, TIME_RETRANS);
-	}
-
-	flag &= (FLAG_DATA | FLAG_WIN_UPDATE);
-	if ((ack == tp->snd_una	&& tp->packets_out && flag == 0) ||
-	    (tp->high_seq != 0)) {
-		tcp_fast_retrans(sk, ack, flag);
-	} else {
-		/* Clear any aborted fast retransmit starts. */
-		tp->dup_acks = 0;
-	}
-	/* It is not a brain fart, I thought a bit now. 8)
-	 *
-	 * Forward progress is indicated, if:
-	 *   1. the ack acknowledges new data.
-	 *   2. or the ack is duplicate, but it is caused by new segment
-	 *      arrival. This case is filtered by:
-	 *      - it contains no data, syn or fin.
-	 *      - it does not update window.
-	 *   3. or new SACK. It is difficult to check, so that we ignore it.
-	 *
-	 * Forward progress is also indicated by arrival new data,
-	 * which was caused by window open from our side. This case is more
-	 * difficult and it is made (alas, incorrectly) in tcp_data_queue().
-	 *                                              --ANK (990513)
-	 */
-	if (ack != tp->snd_una || (flag == 0 && !th->fin))
-		dst_confirm(sk->dst_cache);
-
-	/* Remember the highest ack received. */
-	tp->snd_una = ack;
-	return 1;
-
-uninteresting_ack:
-	SOCK_DEBUG(sk, "Ack ignored %u %u\n", ack, tp->snd_nxt);
-	return 0;
-}
-
-/* New-style handling of TIME_WAIT sockets. */
-extern void tcp_tw_schedule(struct tcp_tw_bucket *tw);
-extern void tcp_tw_reschedule(struct tcp_tw_bucket *tw);
-extern void tcp_tw_deschedule(struct tcp_tw_bucket *tw);
-
-void tcp_timewait_kill(struct tcp_tw_bucket *tw)
-{
-	struct tcp_bind_bucket *tb = tw->tb;
-
-	/* Disassociate with bind bucket. */
-	if(tw->bind_next)
-		tw->bind_next->bind_pprev = tw->bind_pprev;
-	*(tw->bind_pprev) = tw->bind_next;
-	if (tb->owners == NULL) {
-		if (tb->next)
-			tb->next->pprev = tb->pprev;
-		*(tb->pprev) = tb->next;
-		kmem_cache_free(tcp_bucket_cachep, tb);
-	}
-
-	/* Unlink from established hashes. */
-	if(tw->next)
-		tw->next->pprev = tw->pprev;
-	*tw->pprev = tw->next;
-
-	/* We decremented the prot->inuse count when we entered TIME_WAIT
-	 * and the sock from which this came was destroyed.
-	 */
-	tw->sklist_next->sklist_prev = tw->sklist_prev;
-	tw->sklist_prev->sklist_next = tw->sklist_next;
-
-	/* Ok, now free it up. */
-	kmem_cache_free(tcp_timewait_cachep, tw);
-}
-
-/* We come here as a special case from the AF specific TCP input processing,
- * and the SKB has no owner.  Essentially handling this is very simple,
- * we just keep silently eating rx'd packets, acking them if necessary,
- * until none show up for the entire timeout period. 
- *
- * Return 0, TCP_TW_ACK, TCP_TW_RST
- */
-enum tcp_tw_status 
-tcp_timewait_state_process(struct tcp_tw_bucket *tw, struct sk_buff *skb,
-			       struct tcphdr *th, unsigned len)
-{
-	/*	RFC 1122:
-	 *	"When a connection is [...] on TIME-WAIT state [...]
-	 *	[a TCP] MAY accept a new SYN from the remote TCP to
-	 *	reopen the connection directly, if it:
-	 *	
-	 *	(1)  assigns its initial sequence number for the new
-	 *	connection to be larger than the largest sequence
-	 *	number it used on the previous connection incarnation,
-	 *	and
-	 *
-	 *	(2)  returns to TIME-WAIT state if the SYN turns out 
-	 *	to be an old duplicate".
-	 */
-	if(th->syn && !th->rst && after(TCP_SKB_CB(skb)->seq, tw->rcv_nxt)) {
-		struct sock *sk;
-		struct tcp_func *af_specific = tw->af_specific;
-		__u32 isn;
-
-		isn = tw->snd_nxt + 128000;
-		if(isn == 0)
-			isn++;
-		tcp_tw_deschedule(tw);
-		tcp_timewait_kill(tw);
-		sk = af_specific->get_sock(skb, th);
-		if(sk == NULL ||
-		   !ipsec_sk_policy(sk,skb) ||
-		   atomic_read(&sk->sock_readers) != 0)
-			return 0;
-		skb_set_owner_r(skb, sk);
-		af_specific = sk->tp_pinfo.af_tcp.af_specific;
-		if(af_specific->conn_request(sk, skb, isn) < 0)
-			return TCP_TW_RST; /* Toss a reset back. */
-		return 0; /* Discard the frame. */
-	}
-
-	/* Check RST or SYN */
-	if(th->rst || th->syn) {
-		/* This is TIME_WAIT assasination, in two flavors.
-		 * Oh well... nobody has a sufficient solution to this
-		 * protocol bug yet.
-		 */
-		if(sysctl_tcp_rfc1337 == 0) {
-			tcp_tw_deschedule(tw);
-			tcp_timewait_kill(tw);
-		}
-		if(!th->rst)
-			return TCP_TW_RST; /* toss a reset back */
-		return 0;
-	} else {
-		/* In this case we must reset the TIMEWAIT timer. */
-		if(th->ack)
-			tcp_tw_reschedule(tw);
-	}
-	/* Ack old packets if necessary */ 
-	if (!after(TCP_SKB_CB(skb)->end_seq, tw->rcv_nxt) &&
-	    (th->doff * 4) > len)
-		return TCP_TW_ACK; 
-	return 0; 
-}
-
-/* Enter the time wait state.  This is always called from BH
- * context.  Essentially we whip up a timewait bucket, copy the
- * relevant info into it from the SK, and mess with hash chains
- * and list linkage.
- */
-static __inline__ void tcp_tw_hashdance(struct sock *sk, struct tcp_tw_bucket *tw)
-{
-	struct sock **head, *sktw;
-
-	/* Step 1: Remove SK from established hash. */
-	if(sk->next)
-		sk->next->pprev = sk->pprev;
-	*sk->pprev = sk->next;
-	sk->pprev = NULL;
-	tcp_reg_zap(sk);
-
-	/* Step 2: Put TW into bind hash where SK was. */
-	tw->tb = (struct tcp_bind_bucket *)sk->prev;
-	if((tw->bind_next = sk->bind_next) != NULL)
-		sk->bind_next->bind_pprev = &tw->bind_next;
-	tw->bind_pprev = sk->bind_pprev;
-	*sk->bind_pprev = (struct sock *)tw;
-	sk->prev = NULL;
-
-	/* Step 3: Same for the protocol sklist. */
-	(tw->sklist_next = sk->sklist_next)->sklist_prev = (struct sock *)tw;
-	(tw->sklist_prev = sk->sklist_prev)->sklist_next = (struct sock *)tw;
-	sk->sklist_next = NULL;
-	sk->prot->inuse--;
-
-	/* Step 4: Hash TW into TIMEWAIT half of established hash table. */
-	head = &tcp_ehash[sk->hashent + (tcp_ehash_size/2)];
-	sktw = (struct sock *)tw;
-	if((sktw->next = *head) != NULL)
-		(*head)->pprev = &sktw->next;
-	*head = sktw;
-	sktw->pprev = head;
-}
-
-void tcp_time_wait(struct sock *sk)
-{
-	struct tcp_tw_bucket *tw;
-
-	tw = kmem_cache_alloc(tcp_timewait_cachep, SLAB_ATOMIC);
-	if(tw != NULL) {
-		/* Give us an identity. */
-		tw->daddr	= sk->daddr;
-		tw->rcv_saddr	= sk->rcv_saddr;
-		tw->bound_dev_if= sk->bound_dev_if;
-		tw->num		= sk->num;
-		tw->state	= TCP_TIME_WAIT;
-		tw->sport	= sk->sport;
-		tw->dport	= sk->dport;
-		tw->family	= sk->family;
-		tw->reuse	= sk->reuse;
-		tw->rcv_nxt	= sk->tp_pinfo.af_tcp.rcv_nxt;
-		tw->snd_nxt     = sk->tp_pinfo.af_tcp.snd_nxt;
-		tw->window	= tcp_select_window(sk);
-		tw->af_specific	= sk->tp_pinfo.af_tcp.af_specific;
-
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-		if(tw->family == PF_INET6) {
-			memcpy(&tw->v6_daddr,
-			       &sk->net_pinfo.af_inet6.daddr,
-			       sizeof(struct in6_addr));
-			memcpy(&tw->v6_rcv_saddr,
-			       &sk->net_pinfo.af_inet6.rcv_saddr,
-			       sizeof(struct in6_addr));
-		}
-#endif
-		/* Linkage updates. */
-		tcp_tw_hashdance(sk, tw);
-
-		/* Get the TIME_WAIT timeout firing. */
-		tcp_tw_schedule(tw);
-
-		/* CLOSE the SK. */
-		if(sk->state == TCP_ESTABLISHED)
-			tcp_statistics.TcpCurrEstab--;
-		sk->state = TCP_CLOSE;
-		net_reset_timer(sk, TIME_DONE,
-				min(sk->tp_pinfo.af_tcp.srtt * 2, TCP_DONE_TIME));
-	} else {
-		/* Sorry, we're out of memory, just CLOSE this
-		 * socket up.  We've got bigger problems than
-		 * non-graceful socket closings.
-		 */
-		tcp_set_state(sk, TCP_CLOSE);
-	}
-
-	/* Prevent rcvmsg/sndmsg calls, and wake people up. */
-	sk->shutdown = SHUTDOWN_MASK;
-	if(!sk->dead)
-		sk->state_change(sk);
-}
-
-/*
- * 	Process the FIN bit. This now behaves as it is supposed to work
- *	and the FIN takes effect when it is validly part of sequence
- *	space. Not before when we get holes.
- *
- *	If we are ESTABLISHED, a received fin moves us to CLOSE-WAIT
- *	(and thence onto LAST-ACK and finally, CLOSE, we never enter
- *	TIME-WAIT)
- *
- *	If we are in FINWAIT-1, a received FIN indicates simultaneous
- *	close and we go into CLOSING (and later onto TIME-WAIT)
- *
- *	If we are in FINWAIT-2, a received FIN moves us to TIME-WAIT.
- */
- 
-static void tcp_fin(struct sk_buff *skb, struct sock *sk, struct tcphdr *th)
-{
-	sk->tp_pinfo.af_tcp.fin_seq = TCP_SKB_CB(skb)->end_seq;
-
-	tcp_send_ack(sk);
-
-	if (!sk->dead) {
-		sk->state_change(sk);
-		sock_wake_async(sk->socket, 1);
-	}
-
-	switch(sk->state) {
-		case TCP_SYN_RECV:
-		case TCP_ESTABLISHED:
-			/* Move to CLOSE_WAIT */
-			tcp_set_state(sk, TCP_CLOSE_WAIT);
-			if (th->rst)
-				sk->shutdown = SHUTDOWN_MASK;
-			break;
-
-		case TCP_CLOSE_WAIT:
-		case TCP_CLOSING:
-			/* Received a retransmission of the FIN, do
-			 * nothing.
-			 */
-			break;
-		case TCP_LAST_ACK:
-			/* RFC793: Remain in the LAST-ACK state. */
-			break;
-
-		case TCP_FIN_WAIT1:
-			/* This case occurs when a simultaneous close
-			 * happens, we must ack the received FIN and
-			 * enter the CLOSING state.
-			 *
-			 * This causes a WRITE timeout, which will either
-			 * move on to TIME_WAIT when we timeout, or resend
-			 * the FIN properly (maybe we get rid of that annoying
-			 * FIN lost hang). The TIME_WRITE code is already 
-			 * correct for handling this timeout.
-			 */
-			tcp_set_state(sk, TCP_CLOSING);
-			break;
-		case TCP_FIN_WAIT2:
-			/* Received a FIN -- send ACK and enter TIME_WAIT. */
-			tcp_time_wait(sk);
-			break;
-		default:
-			/* Only TCP_LISTEN and TCP_CLOSE are left, in these
-			 * cases we should never reach this piece of code.
-			 */
-			printk("tcp_fin: Impossible, sk->state=%d\n", sk->state);
-			break;
-	};
-}
-
-/* These routines update the SACK block as out-of-order packets arrive or
- * in-order packets close up the sequence space.
- */
-static void tcp_sack_maybe_coalesce(struct tcp_opt *tp, struct tcp_sack_block *sp)
-{
-	int this_sack, num_sacks = tp->num_sacks;
-	struct tcp_sack_block *swalk = &tp->selective_acks[0];
-
-	/* If more than one SACK block, see if the recent change to SP eats into
-	 * or hits the sequence space of other SACK blocks, if so coalesce.
-	 */
-	if(num_sacks != 1) {
-		for(this_sack = 0; this_sack < num_sacks; this_sack++, swalk++) {
-			if(swalk == sp)
-				continue;
-
-			/* First case, bottom of SP moves into top of the
-			 * sequence space of SWALK.
-			 */
-			if(between(sp->start_seq, swalk->start_seq, swalk->end_seq)) {
-				sp->start_seq = swalk->start_seq;
-				goto coalesce;
-			}
-			/* Second case, top of SP moves into bottom of the
-			 * sequence space of SWALK.
-			 */
-			if(between(sp->end_seq, swalk->start_seq, swalk->end_seq)) {
-				sp->end_seq = swalk->end_seq;
-				goto coalesce;
-			}
-		}
-	}
-	/* SP is the only SACK, or no coalescing cases found. */
-	return;
-
-coalesce:
-	/* Zap SWALK, by moving every further SACK up by one slot.
-	 * Decrease num_sacks.
-	 */
-	for(; this_sack < num_sacks-1; this_sack++, swalk++) {
-		struct tcp_sack_block *next = (swalk + 1);
-		swalk->start_seq = next->start_seq;
-		swalk->end_seq = next->end_seq;
-	}
-	tp->num_sacks--;
-}
-
-static __inline__ void tcp_sack_swap(struct tcp_sack_block *sack1, struct tcp_sack_block *sack2)
-{
-	__u32 tmp;
-
-	tmp = sack1->start_seq;
-	sack1->start_seq = sack2->start_seq;
-	sack2->start_seq = tmp;
-
-	tmp = sack1->end_seq;
-	sack1->end_seq = sack2->end_seq;
-	sack2->end_seq = tmp;
-}
-
-static void tcp_sack_new_ofo_skb(struct sock *sk, struct sk_buff *skb)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	struct tcp_sack_block *sp = &tp->selective_acks[0];
-	int cur_sacks = tp->num_sacks;
-
-	if (!cur_sacks)
-		goto new_sack;
-
-	/* Optimize for the common case, new ofo frames arrive
-	 * "in order". ;-)  This also satisfies the requirements
-	 * of RFC2018 about ordering of SACKs.
-	 */
-	if(sp->end_seq == TCP_SKB_CB(skb)->seq) {
-		sp->end_seq = TCP_SKB_CB(skb)->end_seq;
-		tcp_sack_maybe_coalesce(tp, sp);
-	} else if(sp->start_seq == TCP_SKB_CB(skb)->end_seq) {
-		/* Re-ordered arrival, in this case, can be optimized
-		 * as well.
-		 */
-		sp->start_seq = TCP_SKB_CB(skb)->seq;
-		tcp_sack_maybe_coalesce(tp, sp);
-	} else {
-		struct tcp_sack_block *swap = sp + 1;
-		int this_sack, max_sacks = (tp->tstamp_ok ? 3 : 4);
-
-		/* Oh well, we have to move things around.
-		 * Try to find a SACK we can tack this onto.
-		 */
-
-		for(this_sack = 1; this_sack < cur_sacks; this_sack++, swap++) {
-			if((swap->end_seq == TCP_SKB_CB(skb)->seq) ||
-			   (swap->start_seq == TCP_SKB_CB(skb)->end_seq)) {
-				if(swap->end_seq == TCP_SKB_CB(skb)->seq)
-					swap->end_seq = TCP_SKB_CB(skb)->end_seq;
-				else
-					swap->start_seq = TCP_SKB_CB(skb)->seq;
-				tcp_sack_swap(sp, swap);
-				tcp_sack_maybe_coalesce(tp, sp);
-				return;
-			}
-		}
-
-		/* Could not find an adjacent existing SACK, build a new one,
-		 * put it at the front, and shift everyone else down.  We
-		 * always know there is at least one SACK present already here.
-		 *
-		 * If the sack array is full, forget about the last one.
-		 */
-		if (cur_sacks >= max_sacks) {
-			cur_sacks--;
-			tp->num_sacks--;
-		}
-		while(cur_sacks >= 1) {
-			struct tcp_sack_block *this = &tp->selective_acks[cur_sacks];
-			struct tcp_sack_block *prev = (this - 1);
-			this->start_seq = prev->start_seq;
-			this->end_seq = prev->end_seq;
-			cur_sacks--;
-		}
-
-	new_sack:
-		/* Build the new head SACK, and we're done. */
-		sp->start_seq = TCP_SKB_CB(skb)->seq;
-		sp->end_seq = TCP_SKB_CB(skb)->end_seq;
-		tp->num_sacks++;
-	}
-}
-
-static void tcp_sack_remove_skb(struct tcp_opt *tp, struct sk_buff *skb)
-{
-	struct tcp_sack_block *sp = &tp->selective_acks[0];
-	int num_sacks = tp->num_sacks;
-	int this_sack;
-
-	/* This is an in order data segment _or_ an out-of-order SKB being
-	 * moved to the receive queue, so we know this removed SKB will eat
-	 * from the front of a SACK.
-	 */
-	for(this_sack = 0; this_sack < num_sacks; this_sack++, sp++) {
-		/* Check if the start of the sack is covered by skb. */
-		if(!before(sp->start_seq, TCP_SKB_CB(skb)->seq) &&
-		   before(sp->start_seq, TCP_SKB_CB(skb)->end_seq))
-			break;
-	}
-
-	/* This should only happen if so many SACKs get built that some get
-	 * pushed out before we get here, or we eat some in sequence packets
-	 * which are before the first SACK block.
-	 */
-	if(this_sack >= num_sacks)
-		return;
-
-	sp->start_seq = TCP_SKB_CB(skb)->end_seq;
-	if(!before(sp->start_seq, sp->end_seq)) {
-		/* Zap this SACK, by moving forward any other SACKS. */
-		for(this_sack += 1; this_sack < num_sacks; this_sack++, sp++) {
-			struct tcp_sack_block *next = (sp + 1);
-			sp->start_seq = next->start_seq;
-			sp->end_seq = next->end_seq;
-		}
-		tp->num_sacks--;
-	}
-}
-
-static void tcp_sack_extend(struct tcp_opt *tp, struct sk_buff *old_skb, struct sk_buff *new_skb)
-{
-	struct tcp_sack_block *sp = &tp->selective_acks[0];
-	int num_sacks = tp->num_sacks;
-	int this_sack;
-
-	for(this_sack = 0; this_sack < num_sacks; this_sack++, sp++) {
-		if(sp->end_seq == TCP_SKB_CB(old_skb)->end_seq)
-			break;
-	}
-	if(this_sack >= num_sacks)
-		return;
-	sp->end_seq = TCP_SKB_CB(new_skb)->end_seq;
-}
-
-/* This one checks to see if we can put data from the
- * out_of_order queue into the receive_queue.
- */
-static void tcp_ofo_queue(struct sock *sk)
-{
-	struct sk_buff *skb;
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-
-	while ((skb = skb_peek(&tp->out_of_order_queue))) {
-		if (after(TCP_SKB_CB(skb)->seq, tp->rcv_nxt))
-			break;
-
-		if (!after(TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt)) {
-			SOCK_DEBUG(sk, "ofo packet was already received \n");
-			__skb_unlink(skb, skb->list);
-			kfree_skb(skb);
-			continue;
-		}
-		SOCK_DEBUG(sk, "ofo requeuing : rcv_next %X seq %X - %X\n",
-			   tp->rcv_nxt, TCP_SKB_CB(skb)->seq,
-			   TCP_SKB_CB(skb)->end_seq);
-
-		if(tp->sack_ok)
-			tcp_sack_remove_skb(tp, skb);
-		__skb_unlink(skb, skb->list);
-		__skb_queue_tail(&sk->receive_queue, skb);
-		tp->rcv_nxt = TCP_SKB_CB(skb)->end_seq;
-		if(skb->h.th->fin)
-			tcp_fin(skb, sk, skb->h.th);
-	}
-}
-
-static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
-{
-	struct sk_buff *skb1;
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-
-	/*  Queue data for delivery to the user.
-	 *  Packets in sequence go to the receive queue.
-	 *  Out of sequence packets to the out_of_order_queue.
-	 */
-	if (TCP_SKB_CB(skb)->seq == tp->rcv_nxt) {
-		/* Ok. In sequence. */
-	queue_and_out:
-		dst_confirm(sk->dst_cache);
-		__skb_queue_tail(&sk->receive_queue, skb);
-		tp->rcv_nxt = TCP_SKB_CB(skb)->end_seq;
-		if(skb->h.th->fin) {
-			tcp_fin(skb, sk, skb->h.th);
-		} else {
-			tcp_remember_ack(tp, skb->h.th, skb); 
-		}
-		/* This may have eaten into a SACK block. */
-		if(tp->sack_ok && tp->num_sacks)
-			tcp_sack_remove_skb(tp, skb);
-		tcp_ofo_queue(sk);
-
-		/* Turn on fast path. */ 
-		if (skb_queue_len(&tp->out_of_order_queue) == 0)
-			tp->pred_flags = htonl(((tp->tcp_header_len >> 2) << 28) |
-					       (0x10 << 16) |
-					       tp->snd_wnd);
-		return;
-	}
-	
-	/* An old packet, either a retransmit or some packet got lost. */
-	if (!after(TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt)) {
-		/* A retransmit, 2nd most common case.  Force an imediate ack. */
-		SOCK_DEBUG(sk, "retransmit received: seq %X\n", TCP_SKB_CB(skb)->seq);
-		tcp_enter_quickack_mode(tp);
-		kfree_skb(skb);
-		return;
-	}
-
-	if (before(TCP_SKB_CB(skb)->seq, tp->rcv_nxt)) {
-		/* Partial packet, seq < rcv_next < end_seq */
-		SOCK_DEBUG(sk, "partial packet: rcv_next %X seq %X - %X\n",
-			   tp->rcv_nxt, TCP_SKB_CB(skb)->seq,
-			   TCP_SKB_CB(skb)->end_seq);
-
-		goto queue_and_out;
-	}
-
-	/* Ok. This is an out_of_order segment, force an ack. */
-	tp->delayed_acks++;
-	tcp_enter_quickack_mode(tp);
-
-	/* Disable header prediction. */
-	tp->pred_flags = 0;
-
-	SOCK_DEBUG(sk, "out of order segment: rcv_next %X seq %X - %X\n",
-		   tp->rcv_nxt, TCP_SKB_CB(skb)->seq, TCP_SKB_CB(skb)->end_seq);
-
-	if (skb_peek(&tp->out_of_order_queue) == NULL) {
-		/* Initial out of order segment, build 1 SACK. */
-		if(tp->sack_ok) {
-			tp->num_sacks = 1;
-			tp->selective_acks[0].start_seq = TCP_SKB_CB(skb)->seq;
-			tp->selective_acks[0].end_seq = TCP_SKB_CB(skb)->end_seq;
-		}
-		__skb_queue_head(&tp->out_of_order_queue,skb);
-	} else {
-		for(skb1=tp->out_of_order_queue.prev; ; skb1 = skb1->prev) {
-			/* Already there. */
-			if (TCP_SKB_CB(skb)->seq == TCP_SKB_CB(skb1)->seq) {
-				if (skb->len >= skb1->len) {
-					if(tp->sack_ok)
-						tcp_sack_extend(tp, skb1, skb);
-					__skb_append(skb1, skb);
-					__skb_unlink(skb1, skb1->list);
-					kfree_skb(skb1);
-				} else {
-					/* A duplicate, smaller than what is in the
-					 * out-of-order queue right now, toss it.
-					 */
-					kfree_skb(skb);
-				}
-				break;
-			}
-			
-			if (after(TCP_SKB_CB(skb)->seq, TCP_SKB_CB(skb1)->seq)) {
-				__skb_append(skb1, skb);
-				if(tp->sack_ok)
-					tcp_sack_new_ofo_skb(sk, skb);
-				break;
-			}
-
-                        /* See if we've hit the start. If so insert. */
-			if (skb1 == skb_peek(&tp->out_of_order_queue)) {
-				__skb_queue_head(&tp->out_of_order_queue,skb);
-				if(tp->sack_ok)
-					tcp_sack_new_ofo_skb(sk, skb);
-				break;
-			}
-		}
-	}
-}
-
-
-/*
- *	This routine handles the data.  If there is room in the buffer,
- *	it will be have already been moved into it.  If there is no
- *	room, then we will just have to discard the packet.
- */
-
-static int tcp_data(struct sk_buff *skb, struct sock *sk, unsigned int len)
-{
-	struct tcphdr *th;
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	char *str1 = "pfinet: tcp_data check point 1.\n";
-	char *str2 = "pfinet: tcp_data check point 2.\n";
-	char *str3 = "pfinet: tcp_data check point 3.\n";
-	int stderr_fd = fileno (stderr);
-
-	th = skb->h.th;
-	skb_pull(skb, th->doff*4);
-	skb_trim(skb, len - (th->doff*4));
-
-        if (skb->len == 0 && !th->fin)
-		return(0);
-
-	write (stderr_fd, str1, strlen (str1) + 1);
-	fflush (stderr);
-	/* 
-	 *	If our receive queue has grown past its limits shrink it.
-	 *	Make sure to do this before moving snd_nxt, otherwise
-	 *	data might be acked for that we don't have enough room.
-	 */
-	if (atomic_read(&sk->rmem_alloc) > sk->rcvbuf) { 
-		if (prune_queue(sk) < 0) { 
-			/* Still not enough room. That can happen when
-			 * skb->true_size differs significantly from skb->len.
-			 */
-			return 0;
-		}
-	}
-
-	tcp_data_queue(sk, skb);
-
-	write (stderr_fd, str2, strlen (str2) + 1);
-	fflush (stderr);
-	if (before(tp->rcv_nxt, tp->copied_seq)) {
-		printk(KERN_DEBUG "*** tcp.c:tcp_data bug acked < copied\n");
-		tp->rcv_nxt = tp->copied_seq;
-	}
-
-	/* Above, tcp_data_queue() increments delayed_acks appropriately.
-	 * Now tell the user we may have some data.
-	 */
-	if (!sk->dead) {
-		sk->data_ready(sk,0);
-	}
-	write (stderr_fd, str3, strlen (str3) + 1);
-	fflush (stderr);
-	return(1);
-}
-
-static void __tcp_data_snd_check(struct sock *sk, struct sk_buff *skb)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-
-	if (!after(TCP_SKB_CB(skb)->end_seq, tp->snd_una + tp->snd_wnd) &&
-	    tcp_packets_in_flight(tp) < tp->snd_cwnd) {
-		/* Put more data onto the wire. */
-		tcp_write_xmit(sk);
-	} else if (tp->packets_out == 0 && !tp->pending) {
-		/* Start probing the receivers window. */
-		tcp_reset_xmit_timer(sk, TIME_PROBE0, tp->rto);
-	}
-}
-
-static __inline__ void tcp_data_snd_check(struct sock *sk)
-{
-	struct sk_buff *skb = sk->tp_pinfo.af_tcp.send_head;
-
-	if (skb != NULL)
-		__tcp_data_snd_check(sk, skb); 
-}
-
-/* 
- * Adapt the MSS value used to make delayed ack decision to the 
- * real world. 
- */ 
-static __inline__ void tcp_measure_rcv_mss(struct sock *sk, struct sk_buff *skb)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	unsigned int len = skb->len, lss; 
-
-	if (len > tp->rcv_mss) 
-		tp->rcv_mss = len; 
-	lss = tp->last_seg_size; 
-	tp->last_seg_size = 0; 
-	if (len >= 536) {
-		if (len == lss) 
-			tp->rcv_mss = len; 
-		tp->last_seg_size = len; 
-	}
-}
-
-/*
- * Check if sending an ack is needed.
- */
-static __inline__ void __tcp_ack_snd_check(struct sock *sk)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-
-	/* This also takes care of updating the window.
-	 * This if statement needs to be simplified.
-	 *
-	 * Rules for delaying an ack:
-	 *      - delay time <= 0.5 HZ
-	 *      - we don't have a window update to send
-	 *      - must send at least every 2 full sized packets
-	 *	- must send an ACK if we have any out of order data
-	 *
-	 * With an extra heuristic to handle loss of packet
-	 * situations and also helping the sender leave slow
-	 * start in an expediant manner.
-	 */
-
-	    /* Two full frames received or... */
-	if (((tp->rcv_nxt - tp->rcv_wup) >= tp->rcv_mss * MAX_DELAY_ACK) ||
-	    /* We will update the window "significantly" or... */
-	    tcp_raise_window(sk) ||
-	    /* We entered "quick ACK" mode or... */
-	    tcp_in_quickack_mode(tp) ||
-	    /* We have out of order data */
-	    (skb_peek(&tp->out_of_order_queue) != NULL)) {
-		/* Then ack it now */
-		tcp_send_ack(sk);
-	} else {
-		/* Else, send delayed ack. */
-		tcp_send_delayed_ack(tp, HZ/2);
-	}
-}
-
-static __inline__ void tcp_ack_snd_check(struct sock *sk)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	if (tp->delayed_acks == 0) {
-		/* We sent a data segment already. */
-		return;
-	}
-	__tcp_ack_snd_check(sk);
-}
-
-
-/*
- *	This routine is only called when we have urgent data
- *	signalled. Its the 'slow' part of tcp_urg. It could be
- *	moved inline now as tcp_urg is only called from one
- *	place. We handle URGent data wrong. We have to - as
- *	BSD still doesn't use the correction from RFC961.
- *	For 1003.1g we should support a new option TCP_STDURG to permit
- *	either form (or just set the sysctl tcp_stdurg).
- */
- 
-static void tcp_check_urg(struct sock * sk, struct tcphdr * th)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	u32 ptr = ntohs(th->urg_ptr);
-
-	if (ptr && !sysctl_tcp_stdurg)
-		ptr--;
-	ptr += ntohl(th->seq);
-
-	/* Ignore urgent data that we've already seen and read. */
-	if (after(tp->copied_seq, ptr))
-		return;
-
-	/* Do we already have a newer (or duplicate) urgent pointer? */
-	if (tp->urg_data && !after(ptr, tp->urg_seq))
-		return;
-
-	/* Tell the world about our new urgent pointer. */
-	if (sk->proc != 0) {
-		if (sk->proc > 0)
-			kill_proc(sk->proc, SIGURG, 1);
-		else
-			kill_pg(-sk->proc, SIGURG, 1);
-	}
-
-	/* We may be adding urgent data when the last byte read was
-	 * urgent. To do this requires some care. We cannot just ignore
-	 * tp->copied_seq since we would read the last urgent byte again
-	 * as data, nor can we alter copied_seq until this data arrives
-	 * or we break the sematics of SIOCATMARK (and thus sockatmark())
-	 */
-	if (tp->urg_seq == tp->copied_seq)
-		tp->copied_seq++;	/* Move the copied sequence on correctly */
-	tp->urg_data = URG_NOTYET;
-	tp->urg_seq = ptr;
-
-	/* Disable header prediction. */
-	tp->pred_flags = 0;
-}
-
-/* This is the 'fast' part of urgent handling. */
-static inline void tcp_urg(struct sock *sk, struct tcphdr *th, unsigned long len)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-
-	/* Check if we get a new urgent pointer - normally not. */
-	if (th->urg)
-		tcp_check_urg(sk,th);
-
-	/* Do we wait for any urgent data? - normally not... */
-	if (tp->urg_data == URG_NOTYET) {
-		u32 ptr = tp->urg_seq - ntohl(th->seq) + (th->doff*4);
-
-		/* Is the urgent pointer pointing into this packet? */	 
-		if (ptr < len) {
-			tp->urg_data = URG_VALID | *(ptr + (unsigned char *) th);
-			if (!sk->dead)
-				sk->data_ready(sk,0);
-		}
-	}
-}
-
-/* Clean the out_of_order queue if we can, trying to get
- * the socket within its memory limits again.
- *
- * Return less than zero if we should start dropping frames
- * until the socket owning process reads some of the data
- * to stabilize the situation.
- */
-static int prune_queue(struct sock *sk)
-{
-	struct tcp_opt *tp = &sk->tp_pinfo.af_tcp; 
-	struct sk_buff * skb;
-
-	SOCK_DEBUG(sk, "prune_queue: c=%x\n", tp->copied_seq);
-
-	net_statistics.PruneCalled++; 
-
-	/* First, purge the out_of_order queue. */
-	skb = __skb_dequeue_tail(&tp->out_of_order_queue);
-	if(skb != NULL) {
-		/* Free it all. */
-		do {	net_statistics.OfoPruned += skb->len; 
-			kfree_skb(skb);
-			skb = __skb_dequeue_tail(&tp->out_of_order_queue);
-		} while(skb != NULL);
-
-		/* Reset SACK state.  A conforming SACK implementation will
-		 * do the same at a timeout based retransmit.  When a connection
-		 * is in a sad state like this, we care only about integrity
-		 * of the connection not performance.
-		 */
-		if(tp->sack_ok)
-			tp->num_sacks = 0;
-	}
-	
-	/* If we are really being abused, tell the caller to silently
-	 * drop receive data on the floor.  It will get retransmitted
-	 * and hopefully then we'll have sufficient space.
-	 *
-	 * We used to try to purge the in-order packets too, but that
-	 * turns out to be deadly and fraught with races.  Consider:
-	 *
-	 * 1) If we acked the data, we absolutely cannot drop the
-	 *    packet.  This data would then never be retransmitted.
-	 * 2) It is possible, with a proper sequence of events involving
-	 *    delayed acks and backlog queue handling, to have the user
-	 *    read the data before it gets acked.  The previous code
-	 *    here got this wrong, and it lead to data corruption.
-	 * 3) Too much state changes happen when the FIN arrives, so once
-	 *    we've seen that we can't remove any in-order data safely.
-	 *
-	 * The net result is that removing in-order receive data is too
-	 * complex for anyones sanity.  So we don't do it anymore.  But
-	 * if we are really having our buffer space abused we stop accepting
-	 * new receive data.
-	 */
-	if(atomic_read(&sk->rmem_alloc) < (sk->rcvbuf << 1))
-		return 0;
-
-	/* Massive buffer overcommit. */
-	return -1;
-}
-
-/*
- *	TCP receive function for the ESTABLISHED state. 
- *
- *	It is split into a fast path and a slow path. The fast path is 
- * 	disabled when:
- *	- A zero window was announced from us - zero window probing
- *        is only handled properly in the slow path. 
- *      - Out of order segments arrived.
- *	- Urgent data is expected.
- *	- There is no buffer space left
- *	- Unexpected TCP flags/window values/header lengths are received
- *	  (detected by checking the TCP header against pred_flags) 
- *	- Data is sent in both directions. Fast path only supports pure senders
- *	  or pure receivers (this means either the sequence number or the ack
- *	  value must stay constant)
- *
- *	When these conditions are not satisfied it drops into a standard 
- *	receive procedure patterned after RFC793 to handle all cases.
- *	The first three cases are guaranteed by proper pred_flags setting,
- *	the rest is checked inline. Fast processing is turned on in 
- *	tcp_data_queue when everything is OK.
- */
-int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
-			struct tcphdr *th, unsigned len)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	int queued;
-	u32 flg;
-	char *str1 = "pfinet tcp_rcv_established check point 1\n";
-	char *str2 = "pfinet tcp_rcv_established check point 2\n";
-	int stderr_fd = fileno (stderr);
-
-	/*
-	 *	Header prediction.
-	 *	The code follows the one in the famous 
-	 *	"30 instruction TCP receive" Van Jacobson mail.
-	 *	
-	 *	Van's trick is to deposit buffers into socket queue 
-	 *	on a device interrupt, to call tcp_recv function
-	 *	on the receive process context and checksum and copy
-	 *	the buffer to user space. smart...
-	 *
-	 *	Our current scheme is not silly either but we take the 
-	 *	extra cost of the net_bh soft interrupt processing...
-	 *	We do checksum and copy also but from device to kernel.
-	 */
-
-	/*
-	 * RFC1323: H1. Apply PAWS check first.
-	 */
-	if (tcp_fast_parse_options(sk, th, tp)) {
-		if (tp->saw_tstamp) {
-			if (tcp_paws_discard(tp, th, len)) {
-				tcp_statistics.TcpInErrs++;
-				if (!th->rst) {
-					tcp_send_ack(sk);
-					goto discard;
-				}
-			}
-			tcp_replace_ts_recent(sk, tp,
-					      TCP_SKB_CB(skb)->seq,
-					      TCP_SKB_CB(skb)->end_seq);
-		}
-	}
-
-	flg = *(((u32 *)th) + 3) & ~htonl(0xFC8 << 16);
-
-	/*	pred_flags is 0xS?10 << 16 + snd_wnd
-	 *	if header_predition is to be made
-	 *	'S' will always be tp->tcp_header_len >> 2
-	 *	'?' will be 0 else it will be !0
-	 *	(when there are holes in the receive 
-	 *	 space for instance)
-	 *	PSH flag is ignored.
-         */
-
-	if (flg == tp->pred_flags && TCP_SKB_CB(skb)->seq == tp->rcv_nxt) {
-		if (len <= th->doff*4) {
-			/* Bulk data transfer: sender */
-			if (len == th->doff*4) {
-				tcp_ack(sk, th, TCP_SKB_CB(skb)->seq,
-					TCP_SKB_CB(skb)->ack_seq, len); 
-				kfree_skb(skb); 
-				tcp_data_snd_check(sk);
-				return 0;
-			} else { /* Header too small */
-				tcp_statistics.TcpInErrs++;
-				goto discard;
-			}
-		} else if (TCP_SKB_CB(skb)->ack_seq == tp->snd_una &&
-			   atomic_read(&sk->rmem_alloc) <= sk->rcvbuf) {
-			/* Bulk data transfer: receiver */
-			__skb_pull(skb,th->doff*4);
-
-			tcp_measure_rcv_mss(sk, skb); 
-
-			/* DO NOT notify forward progress here.
-			 * It saves dozen of CPU instructions in fast path. --ANK
-			 */
-			__skb_queue_tail(&sk->receive_queue, skb);
-			tp->rcv_nxt = TCP_SKB_CB(skb)->end_seq;
-
-			/* FIN bit check is not done since if FIN is set in
-			 * this frame, the pred_flags won't match up. -DaveM
-			 */
-			sk->data_ready(sk, 0);
-			tcp_delack_estimator(tp);
-
-			tcp_remember_ack(tp, th, skb); 
-
-			__tcp_ack_snd_check(sk);
-			return 0;
-		}
-	}
-
-	/*
-	 *	Standard slow path.
-	 */
-
-	if (!tcp_sequence(tp, TCP_SKB_CB(skb)->seq, TCP_SKB_CB(skb)->end_seq)) {
-		/* RFC793, page 37: "In all states except SYN-SENT, all reset
-		 * (RST) segments are validated by checking their SEQ-fields."
-		 * And page 69: "If an incoming segment is not acceptable,
-		 * an acknowledgment should be sent in reply (unless the RST bit
-		 * is set, if so drop the segment and return)".
-		 */
-		if (th->rst)
-			goto discard;
-		if (after(TCP_SKB_CB(skb)->seq, tp->rcv_nxt)) {
-			SOCK_DEBUG(sk, "seq:%d end:%d wup:%d wnd:%d\n",
-				   TCP_SKB_CB(skb)->seq, TCP_SKB_CB(skb)->end_seq,
-				   tp->rcv_wup, tp->rcv_wnd);
-		}
-		tcp_send_ack(sk);
-		goto discard;
-	}
-
-	if(th->syn && TCP_SKB_CB(skb)->seq != tp->syn_seq) {
-		SOCK_DEBUG(sk, "syn in established state\n");
-		tcp_statistics.TcpInErrs++;
-		tcp_reset(sk);
-		return 1;
-	}
-	
-	if(th->rst) {
-		tcp_reset(sk);
-		goto discard;
-	}
-
-	if(th->ack)
-		tcp_ack(sk, th, TCP_SKB_CB(skb)->seq, TCP_SKB_CB(skb)->ack_seq, len);
-	
-	/* Process urgent data. */
-	tcp_urg(sk, th, len);
-
-	/* step 7: process the segment text */
-	queued = tcp_data(skb, sk, len);
-
-	/* This must be after tcp_data() does the skb_pull() to
-	 * remove the header size from skb->len.
-	 *
-	 * Dave!!! Phrase above (and all about rcv_mss) has 
-	 * nothing to do with reality. rcv_mss must measure TOTAL
-	 * size, including sacks, IP options etc. Hence, measure_rcv_mss
-	 * must occure before pulling etc, otherwise it will flap
-	 * like hell. Even putting it before tcp_data is wrong,
-	 * it should use skb->tail - skb->nh.raw instead.
-	 *					--ANK (980805)
-	 * 
-	 * BTW I broke it. Now all TCP options are handled equally
-	 * in mss_clamp calculations (i.e. ignored, rfc1122),
-	 * and mss_cache does include all of them (i.e. tstamps)
-	 * except for sacks, to calulate effective mss faster.
-	 * 					--ANK (980805)
-	 */
-	tcp_measure_rcv_mss(sk, skb); 
-
-	write (stderr_fd, str1, strlen (str1) + 1);
-	fflush (stderr_fd);
-	/* Be careful, tcp_data() may have put this into TIME_WAIT. */
-	if(sk->state != TCP_CLOSE) {
-		tcp_data_snd_check(sk);
-		tcp_ack_snd_check(sk);
-	}
-	write (stderr_fd, str2, strlen (str2) + 1);
-	fflush (stderr_fd);
-
-	if (!queued) {
-	discard:
-		kfree_skb(skb);
-	}
-
-	return 0;
-}
-
-/* 
- *	Process an incoming SYN or SYN-ACK for SYN_RECV sockets represented
- *	as an open_request. 
- */
-
-struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, 
-			   struct open_request *req)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	u32 flg;
-
-	/*	assumption: the socket is not in use.
-	 *	as we checked the user count on tcp_rcv and we're
-	 *	running from a soft interrupt.
-	 */
-
-	/* Check for syn retransmission */
-	flg = *(((u32 *)skb->h.th) + 3);
-	
-	flg &= __constant_htonl(0x00170000);
-	/* Only SYN set? */
-	if (flg == __constant_htonl(0x00020000)) {
-		if (TCP_SKB_CB(skb)->seq == req->rcv_isn) {
-			/*	retransmited syn.
-			 */
-			req->class->rtx_syn_ack(sk, req); 
-			return NULL;
-		} else {
-			return sk; /* Pass new SYN to the listen socket. */
-		}
-	}
-
-	/* We know it's an ACK here */	
-	if (req->sk) {
-		/*	socket already created but not
-		 *	yet accepted()...
-		 */
-		sk = req->sk;
-	} else {
-		/* In theory the packet could be for a cookie, but
-		 * TIME_WAIT should guard us against this. 
-		 * XXX: Nevertheless check for cookies?
-		 * This sequence number check is done again later,
-		 * but we do it here to prevent syn flood attackers
-		 * from creating big SYN_RECV sockets.
-		 */ 
-		if (!between(TCP_SKB_CB(skb)->ack_seq, req->snt_isn, req->snt_isn+1) ||
-		    !between(TCP_SKB_CB(skb)->seq, req->rcv_isn, 
-			     req->rcv_isn+1+req->rcv_wnd)) {
-			req->class->send_reset(skb);
-			return NULL;
-		}
-	
-		sk = tp->af_specific->syn_recv_sock(sk, skb, req, NULL);
-		tcp_dec_slow_timer(TCP_SLT_SYNACK);
-		if (sk == NULL)
-			return NULL;
-		
-		req->expires = 0UL;
-		req->sk = sk;
-	}
-	skb_orphan(skb); 
-	skb_set_owner_r(skb, sk);
-	return sk; 
-}
-
-/*
- *	This function implements the receiving procedure of RFC 793 for
- *	all states except ESTABLISHED and TIME_WAIT. 
- *	It's called from both tcp_v4_rcv and tcp_v6_rcv and should be
- *	address independent.
- */
-	
-int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
-			  struct tcphdr *th, unsigned len)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	int queued = 0;
-
-	switch (sk->state) {
-	case TCP_CLOSE:
-		/* When state == CLOSED, hash lookup always fails.
-		 *
-		 * But, there is a back door, the backlog queue.
-		 * If we have a sequence of packets in the backlog
-		 * during __release_sock() which have a sequence such
-		 * that:
-		 *	packet X	causes entry to TCP_CLOSE state
-		 *	...
-		 *	packet X + N	has FIN bit set
-		 *
-		 * We report a (luckily) harmless error in this case.
-		 * The issue is that backlog queue processing bypasses
-		 * any hash lookups (we know which socket packets are for).
-		 * The correct behavior here is what 2.0.x did, since
-		 * a TCP_CLOSE socket does not exist.  Drop the frame
-		 * and send a RST back to the other end.
-		 */
-		return 1;
-
-	case TCP_LISTEN:
-		/* These use the socket TOS.. 
-		 * might want to be the received TOS 
-		 */
-		if(th->ack)
-			return 1;
-		
-		if(th->syn) {
-			if(tp->af_specific->conn_request(sk, skb, 0) < 0)
-				return 1;
-
-			/* Now we have several options: In theory there is 
-			 * nothing else in the frame. KA9Q has an option to 
-			 * send data with the syn, BSD accepts data with the
-			 * syn up to the [to be] advertised window and 
-			 * Solaris 2.1 gives you a protocol error. For now 
-			 * we just ignore it, that fits the spec precisely 
-			 * and avoids incompatibilities. It would be nice in
-			 * future to drop through and process the data.
-			 *
-			 * Now that TTCP is starting to be used we ought to 
-			 * queue this data.
-			 * But, this leaves one open to an easy denial of
-		 	 * service attack, and SYN cookies can't defend
-			 * against this problem. So, we drop the data
-			 * in the interest of security over speed.
-			 */
-			goto discard;
-		}
-		
-		goto discard;
-		break;
-
-	case TCP_SYN_SENT:
-		/* SYN sent means we have to look for a suitable ack and 
-		 * either reset for bad matches or go to connected. 
-		 * The SYN_SENT case is unusual and should
-		 * not be in line code. [AC]
-		 */
-		if(th->ack) {
-			/* rfc793:
-			 * "If the state is SYN-SENT then
-			 *    first check the ACK bit
-			 *      If the ACK bit is set
-			 *	  If SEG.ACK =< ISS, or SEG.ACK > SND.NXT, send
-			 *        a reset (unless the RST bit is set, if so drop
-			 *        the segment and return)"
-			 *
-			 *  I cite this place to emphasize one essential
-			 *  detail, this check is different of one
-			 *  in established state: SND.UNA <= SEG.ACK <= SND.NXT.
-			 *  SEG_ACK == SND.UNA == ISS is invalid in SYN-SENT,
-			 *  because we have no previous data sent before SYN.
-			 *                                        --ANK(990513)
-			 *
-			 *  We do not send data with SYN, so that RFC-correct
-			 *  test reduces to:
-			 */
-			if (sk->zapped ||
-			    TCP_SKB_CB(skb)->ack_seq != tp->snd_nxt)
-				return 1;
-
-			/* Now ACK is acceptable.
-			 *
-			 * "If the RST bit is set
-			 *    If the ACK was acceptable then signal the user "error:
-			 *    connection reset", drop the segment, enter CLOSED state,
-			 *    delete TCB, and return."
-			 */
-
-			if (th->rst) {
-				tcp_reset(sk);
-				goto discard;
-			}
-
-			/* rfc793:
-			 *   "fifth, if neither of the SYN or RST bits is set then
-			 *    drop the segment and return."
-			 *
-			 *    See note below!
-			 *                                        --ANK(990513)
-		         */
-			
-			if (!th->syn)
-				goto discard;
-
-			/* rfc793:
-			 *   "If the SYN bit is on ...
-			 *    are acceptable then ...
-			 *    (our SYN has been ACKed), change the connection
-			 *    state to ESTABLISHED..."
-			 *
-			 * Do you see? SYN-less ACKs in SYN-SENT state are
-			 * completely ignored.
-			 *
-			 * The bug causing stalled SYN-SENT sockets
-			 * was here: tcp_ack advanced snd_una and canceled
-			 * retransmit timer, so that bare ACK received
-			 * in SYN-SENT state (even with invalid ack==ISS,
-			 * because tcp_ack check is too weak for SYN-SENT)
-			 * causes moving socket to invalid semi-SYN-SENT,
-			 * semi-ESTABLISHED state and connection hangs.
-			 *
-			 * There exist buggy stacks, which really send
-			 * such ACKs: f.e. 202.226.91.94 (okigate.oki.co.jp)
-			 * Actually, if this host did not try to get something
-			 * from ftp.inr.ac.ru I'd never find this bug 8)
-			 *
-			 *                                     --ANK (990514)
-			 */
-
-			tp->snd_wl1 = TCP_SKB_CB(skb)->seq;
-			tcp_ack(sk,th, TCP_SKB_CB(skb)->seq,
-				TCP_SKB_CB(skb)->ack_seq, len);
-
-			/* Ok.. it's good. Set up sequence numbers and
-			 * move to established.
-			 */
-			tp->rcv_nxt = TCP_SKB_CB(skb)->seq+1;
-			tp->rcv_wup = TCP_SKB_CB(skb)->seq+1;
-
-			/* RFC1323: The window in SYN & SYN/ACK segments is
-			 * never scaled.
-			 */
-			tp->snd_wnd = htons(th->window);
-			tp->snd_wl1 = TCP_SKB_CB(skb)->seq;
-			tp->snd_wl2 = TCP_SKB_CB(skb)->ack_seq;
-			tp->fin_seq = TCP_SKB_CB(skb)->seq;
-
-			tcp_set_state(sk, TCP_ESTABLISHED);
-			tcp_parse_options(sk, th, tp, 0);
-
-        		if (tp->wscale_ok == 0) {
-                		tp->snd_wscale = tp->rcv_wscale = 0;
-                		tp->window_clamp = min(tp->window_clamp,65535);
-        		}
-
-			if (tp->tstamp_ok) {
-				tp->tcp_header_len =
-					sizeof(struct tcphdr) + TCPOLEN_TSTAMP_ALIGNED;
-			} else
-				tp->tcp_header_len = sizeof(struct tcphdr);
-			if (tp->saw_tstamp) {
-				tp->ts_recent = tp->rcv_tsval;
-				tp->ts_recent_stamp = tcp_time_stamp;
-			}
-
-			/* Can't be earlier, doff would be wrong. */
-			tcp_send_ack(sk);
-
-			sk->dport = th->source;
-			tp->copied_seq = tp->rcv_nxt;
-
-			if(!sk->dead) {
-				sk->state_change(sk);
-				sock_wake_async(sk->socket, 0);
-			}
-		} else {
-			if(th->syn && !th->rst) {
-				/* The previous version of the code
-				 * checked for "connecting to self"
-				 * here. that check is done now in
-				 * tcp_connect.
-				 */
-				tcp_set_state(sk, TCP_SYN_RECV);
-				tcp_parse_options(sk, th, tp, 0);
-				if (tp->saw_tstamp) {
-					tp->ts_recent = tp->rcv_tsval;
-					tp->ts_recent_stamp = tcp_time_stamp;
-				}
-				
-				tp->rcv_nxt = TCP_SKB_CB(skb)->seq + 1;
-				tp->rcv_wup = TCP_SKB_CB(skb)->seq + 1;
-
-				/* RFC1323: The window in SYN & SYN/ACK segments is
-				 * never scaled.
-				 */
-				tp->snd_wnd = htons(th->window);
-				tp->snd_wl1 = TCP_SKB_CB(skb)->seq;
-				
-				tcp_send_synack(sk);
-			} else
-				break; 
-		}
-
-		/* tp->tcp_header_len and tp->mss_clamp
-		   probably changed, synchronize mss.
-		   */
-		tcp_sync_mss(sk, tp->pmtu_cookie);
-		tp->rcv_mss = tp->mss_cache;
-
-		if (sk->state == TCP_SYN_RECV)
-			goto discard;
-		
-		goto step6; 
-	}
-
-	/*   Parse the tcp_options present on this header.
-	 *   By this point we really only expect timestamps.
-	 *   Note that this really has to be here and not later for PAWS
-	 *   (RFC1323) to work.
-	 */
-	if (tcp_fast_parse_options(sk, th, tp)) {
-		/* NOTE: assumes saw_tstamp is never set if we didn't
-		 * negotiate the option. tcp_fast_parse_options() must
-		 * guarantee this.
-		 */
-		if (tp->saw_tstamp) {
-			if (tcp_paws_discard(tp, th, len)) {
-				tcp_statistics.TcpInErrs++;
-				if (!th->rst) {
-					tcp_send_ack(sk);
-					goto discard;
-				}
-			}
-			tcp_replace_ts_recent(sk, tp,
-					      TCP_SKB_CB(skb)->seq,
-					      TCP_SKB_CB(skb)->end_seq);
-		}
-	}
-
-	/* The silly FIN test here is necessary to see an advancing ACK in
-	 * retransmitted FIN frames properly.  Consider the following sequence:
-	 *
-	 *	host1 --> host2		FIN XSEQ:XSEQ(0) ack YSEQ
-	 *	host2 --> host1		FIN YSEQ:YSEQ(0) ack XSEQ
-	 *	host1 --> host2		XSEQ:XSEQ(0) ack YSEQ+1
-	 *	host2 --> host1		FIN YSEQ:YSEQ(0) ack XSEQ+1	(fails tcp_sequence test)
-	 *
-	 * At this point the connection will deadlock with host1 believing
-	 * that his FIN is never ACK'd, and thus it will retransmit it's FIN
-	 * forever.  The following fix is from Taral (taral@taral.net).
-	 */
-
-	/* step 1: check sequence number */
-	if (!tcp_sequence(tp, TCP_SKB_CB(skb)->seq, TCP_SKB_CB(skb)->end_seq) &&
-	    !(th->fin && TCP_SKB_CB(skb)->end_seq == tp->rcv_nxt)) {
-		if (!th->rst) {
-			tcp_send_ack(sk);
-		}
-		goto discard;
-	}
-
-	/* step 2: check RST bit */
-	if(th->rst) {
-		tcp_reset(sk);
-		goto discard;
-	}
-
-	/* step 3: check security and precedence [ignored] */
-
-	/*	step 4:
-	 *
-	 *	Check for a SYN, and ensure it matches the SYN we were
-	 *	first sent. We have to handle the rather unusual (but valid)
-	 *	sequence that KA9Q derived products may generate of
-	 *
-	 *	SYN
-	 *				SYN|ACK Data
-	 *	ACK	(lost)
-	 *				SYN|ACK Data + More Data
-	 *	.. we must ACK not RST...
-	 *
-	 *	We keep syn_seq as the sequence space occupied by the 
-	 *	original syn. 
-	 */
-
-	if (th->syn && TCP_SKB_CB(skb)->seq != tp->syn_seq) {
-		tcp_reset(sk);
-		return 1;
-	}
-
-	/* step 5: check the ACK field */
-	if (th->ack) {
-		int acceptable = tcp_ack(sk, th, TCP_SKB_CB(skb)->seq,
-					 TCP_SKB_CB(skb)->ack_seq, len);
-		
-		switch(sk->state) {
-		case TCP_SYN_RECV:
-			if (acceptable) {
-				tcp_set_state(sk, TCP_ESTABLISHED);
-				sk->dport = th->source;
-				tp->copied_seq = tp->rcv_nxt;
-
-				if(!sk->dead)
-					sk->state_change(sk);		
-
-				tp->snd_una = TCP_SKB_CB(skb)->ack_seq;
-				tp->snd_wnd = htons(th->window) << tp->snd_wscale;
-				tp->snd_wl1 = TCP_SKB_CB(skb)->seq;
-				tp->snd_wl2 = TCP_SKB_CB(skb)->ack_seq;
-
-			} else {
-				SOCK_DEBUG(sk, "bad ack\n");
-				return 1;
-			}
-			break;
-
-		case TCP_FIN_WAIT1:
-			if (tp->snd_una == tp->write_seq) {
-				sk->shutdown |= SEND_SHUTDOWN;
-				tcp_set_state(sk, TCP_FIN_WAIT2);
-				if (!sk->dead)
-					sk->state_change(sk);
-				else
-					tcp_reset_msl_timer(sk, TIME_CLOSE, sysctl_tcp_fin_timeout);
-			}
-			break;
-
-		case TCP_CLOSING:	
-			if (tp->snd_una == tp->write_seq) {
-				tcp_time_wait(sk);
-				goto discard;
-			}
-			break;
-
-		case TCP_LAST_ACK:
-			if (tp->snd_una == tp->write_seq) {
-				sk->shutdown = SHUTDOWN_MASK;
-				tcp_set_state(sk,TCP_CLOSE);
-				if (!sk->dead)
-					sk->state_change(sk);
-				goto discard;
-			}
-			break;
-		}
-	} else
-		goto discard;
-
-step6:
-	/* step 6: check the URG bit */
-	tcp_urg(sk, th, len);
-
-	/* step 7: process the segment text */
-	switch (sk->state) {
-	case TCP_CLOSE_WAIT:
-	case TCP_CLOSING:
-		if (!before(TCP_SKB_CB(skb)->seq, tp->fin_seq))
-			break;
-	
-	case TCP_FIN_WAIT1:
-	case TCP_FIN_WAIT2:
-		/* RFC 793 says to queue data in these states,
-		 * RFC 1122 says we MUST send a reset. 
-		 * BSD 4.4 also does reset.
-		 */
-		if ((sk->shutdown & RCV_SHUTDOWN) && sk->dead) {
-			if (after(TCP_SKB_CB(skb)->end_seq - th->fin, tp->rcv_nxt)) {
-				tcp_reset(sk);
-				return 1;
-			}
-		}
-		
-	case TCP_ESTABLISHED: 
-		queued = tcp_data(skb, sk, len);
-
-		/* This must be after tcp_data() does the skb_pull() to
-		 * remove the header size from skb->len.
-		 */
-		tcp_measure_rcv_mss(sk, skb); 
-		break;
-	}
-
-	tcp_data_snd_check(sk);
-	tcp_ack_snd_check(sk);
-
-	if (!queued) { 
-discard:
-		kfree_skb(skb);
-	}
-	return 0;
-}
diff --git a/pfinet.old/linux-src/net/ipv4/tcp_output.c~ b/pfinet.old/linux-src/net/ipv4/tcp_output.c~
deleted file mode 100644
index df6d48f2..00000000
--- a/pfinet.old/linux-src/net/ipv4/tcp_output.c~
+++ /dev/null
@@ -1,1150 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Implementation of the Transmission Control Protocol(TCP).
- *
- * Version:	$Id: tcp_output.c,v 1.108.2.1 1999/05/14 23:07:36 davem Exp $
- *
- * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
- *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *		Mark Evans, <evansmp@uhura.aston.ac.uk>
- *		Corey Minyard <wf-rch!minyard@relay.EU.net>
- *		Florian La Roche, <flla@stud.uni-sb.de>
- *		Charles Hedrick, <hedrick@klinzhai.rutgers.edu>
- *		Linus Torvalds, <torvalds@cs.helsinki.fi>
- *		Alan Cox, <gw4pts@gw4pts.ampr.org>
- *		Matthew Dillon, <dillon@apollo.west.oic.com>
- *		Arnt Gulbrandsen, <agulbra@nvg.unit.no>
- *		Jorge Cwik, <jorge@laser.satlink.net>
- */
-
-/*
- * Changes:	Pedro Roque	:	Retransmit queue handled by TCP.
- *				:	Fragmentation on mtu decrease
- *				:	Segment collapse on retransmit
- *				:	AF independence
- *
- *		Linus Torvalds	:	send_delayed_ack
- *		David S. Miller	:	Charge memory using the right skb
- *					during syn/ack processing.
- *		David S. Miller :	Output engine completely rewritten.
- *		Andrea Arcangeli:	SYNACK carry ts_recent in tsecr.
- *
- */
-
-#include <net/tcp.h>
-
-extern int sysctl_tcp_timestamps;
-extern int sysctl_tcp_window_scaling;
-extern int sysctl_tcp_sack;
-
-/* People can turn this off for buggy TCP's found in printers etc. */
-int sysctl_tcp_retrans_collapse = 1;
-
-/* Get rid of any delayed acks, we sent one already.. */
-static __inline__ void clear_delayed_acks(struct sock * sk)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-
-	tp->delayed_acks = 0;
-	if(tcp_in_quickack_mode(tp))
-		tcp_exit_quickack_mode(tp);
-	tcp_clear_xmit_timer(sk, TIME_DACK);
-}
-
-static __inline__ void update_send_head(struct sock *sk)
-{
-	struct tcp_opt *tp = &sk->tp_pinfo.af_tcp;
-	
-	tp->send_head = tp->send_head->next;
-	if (tp->send_head == (struct sk_buff *) &sk->write_queue)
-		tp->send_head = NULL;
-}
-
-/* This routine actually transmits TCP packets queued in by
- * tcp_do_sendmsg().  This is used by both the initial
- * transmission and possible later retransmissions.
- * All SKB's seen here are completely headerless.  It is our
- * job to build the TCP header, and pass the packet down to
- * IP so it can do the same plus pass the packet off to the
- * device.
- *
- * We are working here with either a clone of the original
- * SKB, or a fresh unique copy made by the retransmit engine.
- */
-void tcp_transmit_skb(struct sock *sk, struct sk_buff *skb)
-{
-	if(skb != NULL) {
-		struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-		struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);
-		int tcp_header_size = tp->tcp_header_len;
-		struct tcphdr *th;
-		int sysctl_flags;
-
-#define SYSCTL_FLAG_TSTAMPS	0x1
-#define SYSCTL_FLAG_WSCALE	0x2
-#define SYSCTL_FLAG_SACK	0x4
-
-		sysctl_flags = 0;
-		if(tcb->flags & TCPCB_FLAG_SYN) {
-			tcp_header_size = sizeof(struct tcphdr) + TCPOLEN_MSS;
-			if(sysctl_tcp_timestamps) {
-				tcp_header_size += TCPOLEN_TSTAMP_ALIGNED;
-				sysctl_flags |= SYSCTL_FLAG_TSTAMPS;
-			}
-			if(sysctl_tcp_window_scaling) {
-				tcp_header_size += TCPOLEN_WSCALE_ALIGNED;
-				sysctl_flags |= SYSCTL_FLAG_WSCALE;
-			}
-			if(sysctl_tcp_sack) {
-				sysctl_flags |= SYSCTL_FLAG_SACK;
-				if(!(sysctl_flags & SYSCTL_FLAG_TSTAMPS))
-					tcp_header_size += TCPOLEN_SACKPERM_ALIGNED;
-			}
-		} else if(tp->sack_ok && tp->num_sacks) {
-			/* A SACK is 2 pad bytes, a 2 byte header, plus
-			 * 2 32-bit sequence numbers for each SACK block.
-			 */
-			tcp_header_size += (TCPOLEN_SACK_BASE_ALIGNED +
-					    (tp->num_sacks * TCPOLEN_SACK_PERBLOCK));
-		}
-		th = (struct tcphdr *) skb_push(skb, tcp_header_size);
-		skb->h.th = th;
-		skb_set_owner_w(skb, sk);
-
-		/* Build TCP header and checksum it. */
-		th->source		= sk->sport;
-		th->dest		= sk->dport;
-		th->seq			= htonl(TCP_SKB_CB(skb)->seq);
-		th->ack_seq		= htonl(tp->rcv_nxt);
-		th->doff		= (tcp_header_size >> 2);
-		th->res1		= 0;
-		*(((__u8 *)th) + 13)	= tcb->flags;
-		if(!(tcb->flags & TCPCB_FLAG_SYN))
-			th->window	= htons(tcp_select_window(sk));
-		th->check		= 0;
-		th->urg_ptr		= ntohs(tcb->urg_ptr);
-		if(tcb->flags & TCPCB_FLAG_SYN) {
-			/* RFC1323: The window in SYN & SYN/ACK segments
-			 * is never scaled.
-			 */
-			th->window	= htons(tp->rcv_wnd);
-			tcp_syn_build_options((__u32 *)(th + 1), tp->mss_clamp,
-					      (sysctl_flags & SYSCTL_FLAG_TSTAMPS),
-					      (sysctl_flags & SYSCTL_FLAG_SACK),
-					      (sysctl_flags & SYSCTL_FLAG_WSCALE),
-					      tp->rcv_wscale,
-					      TCP_SKB_CB(skb)->when,
-		      			      tp->ts_recent);
-		} else {
-			tcp_build_and_update_options((__u32 *)(th + 1),
-						     tp, TCP_SKB_CB(skb)->when);
-		}
-		tp->af_specific->send_check(sk, th, skb->len, skb);
-
-		clear_delayed_acks(sk);
-		tp->last_ack_sent = tp->rcv_nxt;
-		tcp_statistics.TcpOutSegs++;
-		tp->af_specific->queue_xmit(skb);
-	}
-#undef SYSCTL_FLAG_TSTAMPS
-#undef SYSCTL_FLAG_WSCALE
-#undef SYSCTL_FLAG_SACK
-}
-
-/* This is the main buffer sending routine. We queue the buffer
- * and decide whether to queue or transmit now.
- */
-void tcp_send_skb(struct sock *sk, struct sk_buff *skb, int force_queue)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-
-	/* Advance write_seq and place onto the write_queue. */
-	tp->write_seq += (TCP_SKB_CB(skb)->end_seq - TCP_SKB_CB(skb)->seq);
-	__skb_queue_tail(&sk->write_queue, skb);
-
-	if (!force_queue && tp->send_head == NULL && tcp_snd_test(sk, skb)) {
-		/* Send it out now. */
-		TCP_SKB_CB(skb)->when = tcp_time_stamp;
-		tp->snd_nxt = TCP_SKB_CB(skb)->end_seq;
-		tp->packets_out++;
-		tcp_transmit_skb(sk, skb_clone(skb, GFP_KERNEL));
-		if(!tcp_timer_is_set(sk, TIME_RETRANS))
-			tcp_reset_xmit_timer(sk, TIME_RETRANS, tp->rto);
-	} else {
-		/* Queue it, remembering where we must start sending. */
-		if (tp->send_head == NULL)
-			tp->send_head = skb;
-		if (!force_queue && tp->packets_out == 0 && !tp->pending) {
-			tp->pending = TIME_PROBE0;
-			tcp_reset_xmit_timer(sk, TIME_PROBE0, tp->rto);
-		}
-	}
-}
-
-/* Function to create two new TCP segments.  Shrinks the given segment
- * to the specified size and appends a new segment with the rest of the
- * packet to the list.  This won't be called frequently, I hope. 
- * Remember, these are still headerless SKBs at this point.
- */
-static int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len)
-{
-	struct sk_buff *buff;
-	int nsize = skb->len - len;
-	u16 flags;
-
-	/* Get a new skb... force flag on. */
-	buff = sock_wmalloc(sk,
-			    (nsize + MAX_HEADER + sk->prot->max_header),
-			    1, GFP_ATOMIC);
-	if (buff == NULL)
-		return -1; /* We'll just try again later. */
-
-	/* Reserve space for headers. */
-	skb_reserve(buff, MAX_HEADER + sk->prot->max_header);
-		
-	/* Correct the sequence numbers. */
-	TCP_SKB_CB(buff)->seq = TCP_SKB_CB(skb)->seq + len;
-	TCP_SKB_CB(buff)->end_seq = TCP_SKB_CB(skb)->end_seq;
-	
-	/* PSH and FIN should only be set in the second packet. */
-	flags = TCP_SKB_CB(skb)->flags;
-	TCP_SKB_CB(skb)->flags = flags & ~(TCPCB_FLAG_FIN | TCPCB_FLAG_PSH);
-	if(flags & TCPCB_FLAG_URG) {
-		u16 old_urg_ptr = TCP_SKB_CB(skb)->urg_ptr;
-
-		/* Urgent data is always a pain in the ass. */
-		if(old_urg_ptr > len) {
-			TCP_SKB_CB(skb)->flags &= ~(TCPCB_FLAG_URG);
-			TCP_SKB_CB(skb)->urg_ptr = 0;
-			TCP_SKB_CB(buff)->urg_ptr = old_urg_ptr - len;
-		} else {
-			flags &= ~(TCPCB_FLAG_URG);
-		}
-	}
-	if(!(flags & TCPCB_FLAG_URG))
-		TCP_SKB_CB(buff)->urg_ptr = 0;
-	TCP_SKB_CB(buff)->flags = flags;
-	TCP_SKB_CB(buff)->sacked = 0;
-
-	/* Copy and checksum data tail into the new buffer. */
-	buff->csum = csum_partial_copy(skb->data + len, skb_put(buff, nsize),
-				       nsize, 0);
-
-	/* This takes care of the FIN sequence number too. */
-	TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(buff)->seq;
-	skb_trim(skb, len);
-
-	/* Rechecksum original buffer. */
-	skb->csum = csum_partial(skb->data, skb->len, 0);
-
-	/* Looks stupid, but our code really uses when of
-	 * skbs, which it never sent before. --ANK
-	 */
-	TCP_SKB_CB(buff)->when = TCP_SKB_CB(skb)->when;
-
-	/* Link BUFF into the send queue. */
-	__skb_append(skb, buff);
-
-	return 0;
-}
-
-/* This function synchronize snd mss to current pmtu/exthdr set.
-
-   tp->user_mss is mss set by user by TCP_MAXSEG. It does NOT counts
-   for TCP options, but includes only bare TCP header.
-
-   tp->mss_clamp is mss negotiated at connection setup.
-   It is minumum of user_mss and mss received with SYN.
-   It also does not include TCP options.
-
-   tp->pmtu_cookie is last pmtu, seen by this function.
-
-   tp->mss_cache is current effective sending mss, including
-   all tcp options except for SACKs. It is evaluated,
-   taking into account current pmtu, but never exceeds
-   tp->mss_clamp.
-
-   NOTE1. rfc1122 clearly states that advertised MSS
-   DOES NOT include either tcp or ip options.
-
-   NOTE2. tp->pmtu_cookie and tp->mss_cache are READ ONLY outside
-   this function.			--ANK (980731)
- */
-
-int tcp_sync_mss(struct sock *sk, u32 pmtu)
-{
-	struct tcp_opt *tp = &sk->tp_pinfo.af_tcp;
-	int mss_now;
-
-	/* Calculate base mss without TCP options:
-	   It is MMS_S - sizeof(tcphdr) of rfc1122
-	*/
-	mss_now = pmtu - tp->af_specific->net_header_len - sizeof(struct tcphdr);
-
-	/* Clamp it (mss_clamp does not include tcp options) */
-	if (mss_now > tp->mss_clamp)
-		mss_now = tp->mss_clamp;
-
-	/* Now subtract TCP options size, not including SACKs */
-	mss_now -= tp->tcp_header_len - sizeof(struct tcphdr);
-
-	/* Now subtract optional transport overhead */
-	mss_now -= tp->ext_header_len;
-
-	/* It we got too small (or even negative) value,
-	   clamp it by 8 from below. Why 8 ?
-	   Well, it could be 1 with the same success,
-	   but if IP accepted segment of length 1,
-	   it would love 8 even more 8)		--ANK (980731)
-	 */
-	if (mss_now < 8)
-		mss_now = 8;
-
-	/* And store cached results */
-	tp->pmtu_cookie = pmtu;
-	tp->mss_cache = mss_now;
-	return mss_now;
-}
-
-
-/* This routine writes packets to the network.  It advances the
- * send_head.  This happens as incoming acks open up the remote
- * window for us.
- */
-void tcp_write_xmit(struct sock *sk)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	unsigned int mss_now;
-
-	/* Account for SACKS, we may need to fragment due to this.
-	 * It is just like the real MSS changing on us midstream.
-	 * We also handle things correctly when the user adds some
-	 * IP options mid-stream.  Silly to do, but cover it.
-	 */
-	mss_now = tcp_current_mss(sk); 
-
-	/* If we are zapped, the bytes will have to remain here.
-	 * In time closedown will empty the write queue and all
-	 * will be happy.
-	 */
-	if(!sk->zapped) {
-		struct sk_buff *skb;
-		int sent_pkts = 0;
-
-		/* Anything on the transmit queue that fits the window can
-		 * be added providing we are:
-		 *
-		 * a) following SWS avoidance [and Nagle algorithm]
-		 * b) not exceeding our congestion window.
-		 * c) not retransmitting [Nagle]
-		 */
-		while((skb = tp->send_head) && tcp_snd_test(sk, skb)) {
-			if (skb->len > mss_now) {
-				if (tcp_fragment(sk, skb, mss_now))
-					break;
-			}
-
-			/* Advance the send_head.  This one is going out. */
-			update_send_head(sk);
-			TCP_SKB_CB(skb)->when = tcp_time_stamp;
-			tp->snd_nxt = TCP_SKB_CB(skb)->end_seq;
-			tp->packets_out++;
-			tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC));
-			sent_pkts = 1;
-		}
-
-		/* If we sent anything, make sure the retransmit
-		 * timer is active.
-		 */
-		if (sent_pkts && !tcp_timer_is_set(sk, TIME_RETRANS))
-			tcp_reset_xmit_timer(sk, TIME_RETRANS, tp->rto);
-	}
-}
-
-/* This function returns the amount that we can raise the
- * usable window based on the following constraints
- *  
- * 1. The window can never be shrunk once it is offered (RFC 793)
- * 2. We limit memory per socket
- *
- * RFC 1122:
- * "the suggested [SWS] avoidance algorithm for the receiver is to keep
- *  RECV.NEXT + RCV.WIN fixed until:
- *  RCV.BUFF - RCV.USER - RCV.WINDOW >= min(1/2 RCV.BUFF, MSS)"
- *
- * i.e. don't raise the right edge of the window until you can raise
- * it at least MSS bytes.
- *
- * Unfortunately, the recommended algorithm breaks header prediction,
- * since header prediction assumes th->window stays fixed.
- *
- * Strictly speaking, keeping th->window fixed violates the receiver
- * side SWS prevention criteria. The problem is that under this rule
- * a stream of single byte packets will cause the right side of the
- * window to always advance by a single byte.
- * 
- * Of course, if the sender implements sender side SWS prevention
- * then this will not be a problem.
- * 
- * BSD seems to make the following compromise:
- * 
- *	If the free space is less than the 1/4 of the maximum
- *	space available and the free space is less than 1/2 mss,
- *	then set the window to 0.
- *	Otherwise, just prevent the window from shrinking
- *	and from being larger than the largest representable value.
- *
- * This prevents incremental opening of the window in the regime
- * where TCP is limited by the speed of the reader side taking
- * data out of the TCP receive queue. It does nothing about
- * those cases where the window is constrained on the sender side
- * because the pipeline is full.
- *
- * BSD also seems to "accidentally" limit itself to windows that are a
- * multiple of MSS, at least until the free space gets quite small.
- * This would appear to be a side effect of the mbuf implementation.
- * Combining these two algorithms results in the observed behavior
- * of having a fixed window size at almost all times.
- *
- * Below we obtain similar behavior by forcing the offered window to
- * a multiple of the mss when it is feasible to do so.
- *
- * Note, we don't "adjust" for TIMESTAMP or SACK option bytes.
- */
-u32 __tcp_select_window(struct sock *sk)
-{
-	struct tcp_opt *tp = &sk->tp_pinfo.af_tcp;
-	unsigned int mss = tp->mss_cache;
-	int free_space;
-	u32 window;
-
-	/* Sometimes free_space can be < 0. */
-	free_space = (sk->rcvbuf - atomic_read(&sk->rmem_alloc)) / 2;
-	if (tp->window_clamp) {
-		if (free_space > ((int) tp->window_clamp))
-			free_space = tp->window_clamp;
-		mss = min(tp->window_clamp, mss);
-	} else {
-		printk("tcp_select_window: tp->window_clamp == 0.\n");
-	}
-
-	if (mss < 1) {
-		mss = 1;
-		printk("tcp_select_window: sk->mss fell to 0.\n");
-	}
-	
-	if ((free_space < (sk->rcvbuf/4)) && (free_space < ((int) (mss/2)))) {
-		window = 0;
-		tp->pred_flags = 0; 
-	} else {
-		/* Get the largest window that is a nice multiple of mss.
-		 * Window clamp already applied above.
-		 * If our current window offering is within 1 mss of the
-		 * free space we just keep it. This prevents the divide
-		 * and multiply from happening most of the time.
-		 * We also don't do any window rounding when the free space
-		 * is too small.
-		 */
-		window = tp->rcv_wnd;
-		if ((((int) window) <= (free_space - ((int) mss))) ||
-				(((int) window) > free_space))
-			window = (((unsigned int) free_space)/mss)*mss;
-	}
-	return window;
-}
-
-/* Attempt to collapse two adjacent SKB's during retransmission. */
-static void tcp_retrans_try_collapse(struct sock *sk, struct sk_buff *skb, int mss_now)
-{
-	struct sk_buff *next_skb = skb->next;
-
-	/* The first test we must make is that neither of these two
-	 * SKB's are still referenced by someone else.
-	 */
-	if(!skb_cloned(skb) && !skb_cloned(next_skb)) {
-		int skb_size = skb->len, next_skb_size = next_skb->len;
-		u16 flags = TCP_SKB_CB(skb)->flags;
-
-		/* Punt if the first SKB has URG set. */
-		if(flags & TCPCB_FLAG_URG)
-			return;
-	
-		/* Also punt if next skb has been SACK'd. */
-		if(TCP_SKB_CB(next_skb)->sacked & TCPCB_SACKED_ACKED)
-			return;
-
-		/* Punt if not enough space exists in the first SKB for
-		 * the data in the second, or the total combined payload
-		 * would exceed the MSS.
-		 */
-		if ((next_skb_size > skb_tailroom(skb)) ||
-		    ((skb_size + next_skb_size) > mss_now))
-			return;
-
-		/* Ok.  We will be able to collapse the packet. */
-		__skb_unlink(next_skb, next_skb->list);
-
-		if(skb->len % 4) {
-			/* Must copy and rechecksum all data. */
-			memcpy(skb_put(skb, next_skb_size), next_skb->data, next_skb_size);
-			skb->csum = csum_partial(skb->data, skb->len, 0);
-		} else {
-			/* Optimize, actually we could also combine next_skb->csum
-			 * to skb->csum using a single add w/carry operation too.
-			 */
-			skb->csum = csum_partial_copy(next_skb->data,
-						      skb_put(skb, next_skb_size),
-						      next_skb_size, skb->csum);
-		}
-	
-		/* Update sequence range on original skb. */
-		TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(next_skb)->end_seq;
-
-		/* Merge over control information. */
-		flags |= TCP_SKB_CB(next_skb)->flags; /* This moves PSH/FIN etc. over */
-		if(flags & TCPCB_FLAG_URG) {
-			u16 urgptr = TCP_SKB_CB(next_skb)->urg_ptr;
-			TCP_SKB_CB(skb)->urg_ptr = urgptr + skb_size;
-		}
-		TCP_SKB_CB(skb)->flags = flags;
-
-		/* All done, get rid of second SKB and account for it so
-		 * packet counting does not break.
-		 */
-		kfree_skb(next_skb);
-		sk->tp_pinfo.af_tcp.packets_out--;
-	}
-}
-
-/* Do a simple retransmit without using the backoff mechanisms in
- * tcp_timer. This is used for path mtu discovery. 
- * The socket is already locked here.
- */ 
-void tcp_simple_retransmit(struct sock *sk)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	struct sk_buff *skb, *old_next_skb;
-	unsigned int mss = tcp_current_mss(sk);
-
- 	/* Don't muck with the congestion window here. */
- 	tp->dup_acks = 0;
- 	tp->high_seq = tp->snd_nxt;
- 	tp->retrans_head = NULL;
-
- 	/* Input control flow will see that this was retransmitted
-	 * and not use it for RTT calculation in the absence of
-	 * the timestamp option.
-	 */
-	for (old_next_skb = skb = skb_peek(&sk->write_queue);
-	     ((skb != tp->send_head) &&
-	      (skb != (struct sk_buff *)&sk->write_queue));
-	     skb = skb->next) {
-		int resend_skb = 0;
-
-		/* Our goal is to push out the packets which we
-		 * sent already, but are being chopped up now to
-		 * account for the PMTU information we have.
-		 *
-		 * As we resend the queue, packets are fragmented
-		 * into two pieces, and when we try to send the
-		 * second piece it may be collapsed together with
-		 * a subsequent packet, and so on.  -DaveM
-		 */
-		if (old_next_skb != skb || skb->len > mss)
-			resend_skb = 1;
-		old_next_skb = skb->next;
-		if (resend_skb != 0)
-			tcp_retransmit_skb(sk, skb);
-	}
-}
-
-static __inline__ void update_retrans_head(struct sock *sk)
-{
-	struct tcp_opt *tp = &sk->tp_pinfo.af_tcp;
-	
-	tp->retrans_head = tp->retrans_head->next;
-	if((tp->retrans_head == tp->send_head) ||
-	   (tp->retrans_head == (struct sk_buff *) &sk->write_queue)) {
-		tp->retrans_head = NULL;
-		tp->rexmt_done = 1;
-	}
-}
-
-/* This retransmits one SKB.  Policy decisions and retransmit queue
- * state updates are done by the caller.  Returns non-zero if an
- * error occurred which prevented the send.
- */
-int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	unsigned int cur_mss = tcp_current_mss(sk);
-
-	if(skb->len > cur_mss) {
-		if(tcp_fragment(sk, skb, cur_mss))
-			return 1; /* We'll try again later. */
-
-		/* New SKB created, account for it. */
-		tp->packets_out++;
-	}
-
-	/* Collapse two adjacent packets if worthwhile and we can. */
-	if(!(TCP_SKB_CB(skb)->flags & TCPCB_FLAG_SYN) &&
-	   (skb->len < (cur_mss >> 1)) &&
-	   (skb->next != tp->send_head) &&
-	   (skb->next != (struct sk_buff *)&sk->write_queue) &&
-	   (sysctl_tcp_retrans_collapse != 0))
-		tcp_retrans_try_collapse(sk, skb, cur_mss);
-
-	if(tp->af_specific->rebuild_header(sk))
-		return 1; /* Routing failure or similar. */
-
-	/* Some Solaris stacks overoptimize and ignore the FIN on a
-	 * retransmit when old data is attached.  So strip it off
-	 * since it is cheap to do so and saves bytes on the network.
-	 */
-	if(skb->len > 0 &&
-	   (TCP_SKB_CB(skb)->flags & TCPCB_FLAG_FIN) &&
-	   tp->snd_una == (TCP_SKB_CB(skb)->end_seq - 1)) {
-		TCP_SKB_CB(skb)->seq = TCP_SKB_CB(skb)->end_seq - 1;
-		skb_trim(skb, 0);
-		skb->csum = 0;
-	}
-
-	/* Ok, we're gonna send it out, update state. */
-	TCP_SKB_CB(skb)->sacked |= TCPCB_SACKED_RETRANS;
-	tp->retrans_out++;
-
-	/* Make a copy, if the first transmission SKB clone we made
-	 * is still in somebody's hands, else make a clone.
-	 */
-	TCP_SKB_CB(skb)->when = tcp_time_stamp;
-	if(skb_cloned(skb))
-		skb = skb_copy(skb, GFP_ATOMIC);
-	else
-		skb = skb_clone(skb, GFP_ATOMIC);
-
-	tcp_transmit_skb(sk, skb);
-
-	/* Update global TCP statistics and return success. */
-	sk->prot->retransmits++;
-	tcp_statistics.TcpRetransSegs++;
-
-	return 0;
-}
-
-/* This gets called after a retransmit timeout, and the initially
- * retransmitted data is acknowledged.  It tries to continue
- * resending the rest of the retransmit queue, until either
- * we've sent it all or the congestion window limit is reached.
- * If doing SACK, the first ACK which comes back for a timeout
- * based retransmit packet might feed us FACK information again.
- * If so, we use it to avoid unnecessarily retransmissions.
- */
-void tcp_xmit_retransmit_queue(struct sock *sk)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	struct sk_buff *skb;
-
-	if (tp->retrans_head == NULL &&
-	    tp->rexmt_done == 0)
-		tp->retrans_head = skb_peek(&sk->write_queue);
-	if (tp->retrans_head == tp->send_head)
-		tp->retrans_head = NULL;
-
-	/* Each time, advance the retrans_head if we got
-	 * a packet out or we skipped one because it was
-	 * SACK'd.  -DaveM
-	 */
-	while ((skb = tp->retrans_head) != NULL) {
-		/* If it has been ack'd by a SACK block, we don't
-		 * retransmit it.
-		 */
-		if(!(TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)) {
-			/* Send it out, punt if error occurred. */
-			if(tcp_retransmit_skb(sk, skb))
-				break;
-
-			update_retrans_head(sk);
-		
-			/* Stop retransmitting if we've hit the congestion
-			 * window limit.
-			 */
-			if (tp->retrans_out >= tp->snd_cwnd)
-				break;
-		} else {
-			update_retrans_head(sk);
-		}
-	}
-}
-
-/* Using FACK information, retransmit all missing frames at the receiver
- * up to the forward most SACK'd packet (tp->fackets_out) if the packet
- * has not been retransmitted already.
- */
-void tcp_fack_retransmit(struct sock *sk)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	struct sk_buff *skb = skb_peek(&sk->write_queue);
-	int packet_cnt = 0;
-
-	while((skb != NULL) &&
-	      (skb != tp->send_head) &&
-	      (skb != (struct sk_buff *)&sk->write_queue)) {
-		__u8 sacked = TCP_SKB_CB(skb)->sacked;
-
-		if(sacked & (TCPCB_SACKED_ACKED | TCPCB_SACKED_RETRANS))
-			goto next_packet;
-
-		/* Ok, retransmit it. */
-		if(tcp_retransmit_skb(sk, skb))
-			break;
-
-		if(tcp_packets_in_flight(tp) >= tp->snd_cwnd)
-			break;
-next_packet:
-		packet_cnt++;
-		if(packet_cnt >= tp->fackets_out)
-			break;
-		skb = skb->next;
-	}
-}
-
-/* Send a fin.  The caller locks the socket for us.  This cannot be
- * allowed to fail queueing a FIN frame under any circumstances.
- */
-void tcp_send_fin(struct sock *sk)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);	
-	struct sk_buff *skb = skb_peek_tail(&sk->write_queue);
-	unsigned int mss_now;
-	
-	/* Optimization, tack on the FIN if we have a queue of
-	 * unsent frames.  But be careful about outgoing SACKS
-	 * and IP options.
-	 */
-	mss_now = tcp_current_mss(sk); 
-
-	if((tp->send_head != NULL) && (skb->len < mss_now)) {
-		/* tcp_write_xmit() takes care of the rest. */
-		TCP_SKB_CB(skb)->flags |= TCPCB_FLAG_FIN;
-		TCP_SKB_CB(skb)->end_seq++;
-		tp->write_seq++;
-
-		/* Special case to avoid Nagle bogosity.  If this
-		 * segment is the last segment, and it was queued
-		 * due to Nagle/SWS-avoidance, send it out now.
-		 */
-		if(tp->send_head == skb &&
-		   !sk->nonagle &&
-		   skb->len < (tp->mss_cache >> 1) &&
-		   tp->packets_out &&
-		   !(TCP_SKB_CB(skb)->flags & TCPCB_FLAG_URG)) {
-			update_send_head(sk);
-			TCP_SKB_CB(skb)->when = tcp_time_stamp;
-			tp->snd_nxt = TCP_SKB_CB(skb)->end_seq;
-			tp->packets_out++;
-			tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC));
-			if(!tcp_timer_is_set(sk, TIME_RETRANS))
-				tcp_reset_xmit_timer(sk, TIME_RETRANS, tp->rto);
-		}
-	} else {
-		/* Socket is locked, keep trying until memory is available. */
-		do {
-			skb = sock_wmalloc(sk,
-					   (MAX_HEADER +
-					    sk->prot->max_header),
-					   1, GFP_KERNEL);
-		} while (skb == NULL);
-
-		/* Reserve space for headers and prepare control bits. */
-		skb_reserve(skb, MAX_HEADER + sk->prot->max_header);
-		skb->csum = 0;
-		TCP_SKB_CB(skb)->flags = (TCPCB_FLAG_ACK | TCPCB_FLAG_FIN);
-		TCP_SKB_CB(skb)->sacked = 0;
-		TCP_SKB_CB(skb)->urg_ptr = 0;
-
-		/* FIN eats a sequence byte, write_seq advanced by tcp_send_skb(). */
-		TCP_SKB_CB(skb)->seq = tp->write_seq;
-		TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq + 1;
-		tcp_send_skb(sk, skb, 0);
-	}
-}
-
-/* We get here when a process closes a file descriptor (either due to
- * an explicit close() or as a byproduct of exit()'ing) and there
- * was unread data in the receive queue.  This behavior is recommended
- * by draft-ietf-tcpimpl-prob-03.txt section 3.10.  -DaveM
- */
-void tcp_send_active_reset(struct sock *sk)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-	struct sk_buff *skb;
-
-	/* NOTE: No TCP options attached and we never retransmit this. */
-	skb = alloc_skb(MAX_HEADER + sk->prot->max_header, GFP_KERNEL);
-	if (!skb)
-		return;
-
-	/* Reserve space for headers and prepare control bits. */
-	skb_reserve(skb, MAX_HEADER + sk->prot->max_header);
-	skb->csum = 0;
-	TCP_SKB_CB(skb)->flags = (TCPCB_FLAG_ACK | TCPCB_FLAG_RST);
-	TCP_SKB_CB(skb)->sacked = 0;
-	TCP_SKB_CB(skb)->urg_ptr = 0;
-
-	/* Send it off. */
-	TCP_SKB_CB(skb)->seq = tp->write_seq;
-	TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq;
-	TCP_SKB_CB(skb)->when = tcp_time_stamp;
-	tcp_transmit_skb(sk, skb);
-}
-
-/* WARNING: This routine must only be called when we have already sent
- * a SYN packet that crossed the incoming SYN that caused this routine
- * to get called. If this assumption fails then the initial rcv_wnd
- * and rcv_wscale values will not be correct.
- */
-int tcp_send_synack(struct sock *sk)
-{
-	struct tcp_opt* tp = &(sk->tp_pinfo.af_tcp);
-	struct sk_buff* skb;	
-	
-	skb = sock_wmalloc(sk, (MAX_HEADER + sk->prot->max_header),
-			   1, GFP_ATOMIC);
-	if (skb == NULL) 
-		return -ENOMEM;
-
-	/* Reserve space for headers and prepare control bits. */
-	skb_reserve(skb, MAX_HEADER + sk->prot->max_header);
-	skb->csum = 0;
-	TCP_SKB_CB(skb)->flags = (TCPCB_FLAG_ACK | TCPCB_FLAG_SYN);
-	TCP_SKB_CB(skb)->sacked = 0;
-	TCP_SKB_CB(skb)->urg_ptr = 0;
-
-	/* SYN eats a sequence byte. */
-	TCP_SKB_CB(skb)->seq = tp->snd_una;
-	TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq + 1;
-	__skb_queue_tail(&sk->write_queue, skb);
-	TCP_SKB_CB(skb)->when = tcp_time_stamp;
-	tp->packets_out++;
-	tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC));
-	return 0;
-}
-
-/*
- * Prepare a SYN-ACK.
- */
-struct sk_buff * tcp_make_synack(struct sock *sk, struct dst_entry *dst,
-				 struct open_request *req, int mss)
-{
-	struct tcphdr *th;
-	int tcp_header_size;
-	struct sk_buff *skb;
-
-	skb = sock_wmalloc(sk, MAX_HEADER + sk->prot->max_header, 1, GFP_ATOMIC);
-	if (skb == NULL)
-		return NULL;
-
-	/* Reserve space for headers. */
-	skb_reserve(skb, MAX_HEADER + sk->prot->max_header);
-
-	skb->dst = dst_clone(dst);
-
-	/* Don't offer more than they did.
-	 * This way we don't have to memorize who said what.
-	 * FIXME: maybe this should be changed for better performance
-	 * with syncookies.
-	 */
-	req->mss = min(mss, req->mss);
-	if (req->mss < 8) {
-		printk(KERN_DEBUG "initial req->mss below 8\n");
-		req->mss = 8;
-	}
-
-	tcp_header_size = (sizeof(struct tcphdr) + TCPOLEN_MSS +
-			   (req->tstamp_ok ? TCPOLEN_TSTAMP_ALIGNED : 0) +
-			   (req->wscale_ok ? TCPOLEN_WSCALE_ALIGNED : 0) +
-			   /* SACK_PERM is in the place of NOP NOP of TS */
-			   ((req->sack_ok && !req->tstamp_ok) ? TCPOLEN_SACKPERM_ALIGNED : 0));
-	skb->h.th = th = (struct tcphdr *) skb_push(skb, tcp_header_size);
-
-	memset(th, 0, sizeof(struct tcphdr));
-	th->syn = 1;
-	th->ack = 1;
-	th->source = sk->sport;
-	th->dest = req->rmt_port;
-	TCP_SKB_CB(skb)->seq = req->snt_isn;
-	TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq + 1;
-	th->seq = htonl(TCP_SKB_CB(skb)->seq);
-	th->ack_seq = htonl(req->rcv_isn + 1);
-	if (req->rcv_wnd == 0) { /* ignored for retransmitted syns */
-		__u8 rcv_wscale; 
-		/* Set this up on the first call only */
-		req->window_clamp = skb->dst->window;
-		tcp_select_initial_window(sock_rspace(sk)/2,req->mss,
-			&req->rcv_wnd,
-			&req->window_clamp,
-			req->wscale_ok,
-			&rcv_wscale);
-		req->rcv_wscale = rcv_wscale; 
-	}
-
-	/* RFC1323: The window in SYN & SYN/ACK segments is never scaled. */
-	th->window = htons(req->rcv_wnd);
-
-	TCP_SKB_CB(skb)->when = tcp_time_stamp;
-	tcp_syn_build_options((__u32 *)(th + 1), req->mss, req->tstamp_ok,
-			      req->sack_ok, req->wscale_ok, req->rcv_wscale,
-			      TCP_SKB_CB(skb)->when,
-			      req->ts_recent);
-
-	skb->csum = 0;
-	th->doff = (tcp_header_size >> 2);
-	tcp_statistics.TcpOutSegs++; 
-	return skb;
-}
-
-void tcp_connect(struct sock *sk, struct sk_buff *buff, int mtu)
-{
-	struct dst_entry *dst = sk->dst_cache;
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-
-	/* Reserve space for headers. */
-	skb_reserve(buff, MAX_HEADER + sk->prot->max_header);
-
-	tp->snd_wnd = 0;
-	tp->snd_wl1 = 0;
-	tp->snd_wl2 = tp->write_seq;
-	tp->snd_una = tp->write_seq;
-	tp->rcv_nxt = 0;
-
-	sk->err = 0;
-	
-	/* We'll fix this up when we get a response from the other end.
-	 * See tcp_input.c:tcp_rcv_state_process case TCP_SYN_SENT.
-	 */
-	tp->tcp_header_len = sizeof(struct tcphdr) +
-		(sysctl_tcp_timestamps ? TCPOLEN_TSTAMP_ALIGNED : 0);
-
-	/* If user gave his TCP_MAXSEG, record it to clamp */
-	if (tp->user_mss)
-		tp->mss_clamp = tp->user_mss;
-	tcp_sync_mss(sk, mtu);
-
-	/* Now unpleasant action: if initial pmtu is too low
-	   set lower clamp. I am not sure that it is good.
-	   To be more exact, I do not think that clamping at value, which
-	   is apparently transient and may improve in future is good idea.
-	   It would be better to wait until peer will returns its MSS
-	   (probably 65535 too) and now advertise something sort of 65535
-	   or at least first hop device mtu. Is it clear, what I mean?
-	   We should tell peer what maximal mss we expect to RECEIVE,
-	   it has nothing to do with pmtu.
-	   I am afraid someone will be confused by such huge value.
-	                                                   --ANK (980731)
-	 */
-	if (tp->mss_cache + tp->tcp_header_len - sizeof(struct tcphdr) < tp->mss_clamp )
-		tp->mss_clamp = tp->mss_cache + tp->tcp_header_len - sizeof(struct tcphdr);
-
-	TCP_SKB_CB(buff)->flags = TCPCB_FLAG_SYN;
-	TCP_SKB_CB(buff)->sacked = 0;
-	TCP_SKB_CB(buff)->urg_ptr = 0;
-	buff->csum = 0;
-	TCP_SKB_CB(buff)->seq = tp->write_seq++;
-	TCP_SKB_CB(buff)->end_seq = tp->write_seq;
-	tp->snd_nxt = TCP_SKB_CB(buff)->end_seq;
-
-	tp->window_clamp = dst->window;
-	tcp_select_initial_window(sock_rspace(sk)/2,tp->mss_clamp,
-		&tp->rcv_wnd,
-		&tp->window_clamp,
-		sysctl_tcp_window_scaling,
-		&tp->rcv_wscale);
-	/* Ok, now lock the socket before we make it visible to
-	 * the incoming packet engine.
-	 */
-	lock_sock(sk);
-
-	/* Socket identity change complete, no longer
-	 * in TCP_CLOSE, so enter ourselves into the
-	 * hash tables.
-	 */
-	tcp_set_state(sk,TCP_SYN_SENT);
-	sk->prot->hash(sk);
-
-	tp->rto = dst->rtt;
-	tcp_init_xmit_timers(sk);
-	tp->retransmits = 0;
-	tp->fackets_out = 0;
-	tp->retrans_out = 0;
-
-	/* Send it off. */
-	__skb_queue_tail(&sk->write_queue, buff);
-	TCP_SKB_CB(buff)->when = tcp_time_stamp;
-	tp->packets_out++;
-	tcp_transmit_skb(sk, skb_clone(buff, GFP_KERNEL));
-	tcp_statistics.TcpActiveOpens++;
-
-	/* Timer for repeating the SYN until an answer. */
-	tcp_reset_xmit_timer(sk, TIME_RETRANS, tp->rto);
-
-	/* Now, it is safe to release the socket. */
-	release_sock(sk);
-}
-
-/* Send out a delayed ack, the caller does the policy checking
- * to see if we should even be here.  See tcp_input.c:tcp_ack_snd_check()
- * for details.
- */
-void tcp_send_delayed_ack(struct tcp_opt *tp, int max_timeout)
-{
-	unsigned long timeout;
-
-	/* Stay within the limit we were given */
-	timeout = tp->ato;
-	if (timeout > max_timeout)
-		timeout = max_timeout;
-	timeout += jiffies;
-
-	/* Use new timeout only if there wasn't a older one earlier. */
-	if (!tp->delack_timer.prev) {
-		tp->delack_timer.expires = timeout;
-		add_timer(&tp->delack_timer);
-        } else {
-		if (time_before(timeout, tp->delack_timer.expires))
-			mod_timer(&tp->delack_timer, timeout);
-	}
-}
-
-/* This routine sends an ack and also updates the window. */
-void tcp_send_ack(struct sock *sk)
-{
-	char *str1 = "pfinet tcp_send_ack check point 1\n";
-	char *str2 = "pfinet tcp_send_ack check point 2\n";
-	int stderr_fd = fileno (stderr);
-	/* If we have been reset, we may not send again. */
-	if(!sk->zapped) {
-		struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-		struct sk_buff *buff;
-
-		/* We are not putting this on the write queue, so
-		 * tcp_transmit_skb() will set the ownership to this
-		 * sock.
-		 */
-		buff = alloc_skb(MAX_HEADER + sk->prot->max_header, GFP_ATOMIC);
-		if (buff == NULL) {
-			/* Force it to send an ack. We don't have to do this
-			 * (ACK is unreliable) but it's much better use of
-			 * bandwidth on slow links to send a spare ack than
-			 * resend packets.
-			 *
-			 * This is the one possible way that we can delay an
-			 * ACK and have tp->ato indicate that we are in
-			 * quick ack mode, so clear it.
-			 */
-			if(tcp_in_quickack_mode(tp))
-				tcp_exit_quickack_mode(tp);
-			tcp_send_delayed_ack(tp, HZ/2);
-			return;
-		}
-
-		/* Reserve space for headers and prepare control bits. */
-		skb_reserve(buff, MAX_HEADER + sk->prot->max_header);
-		buff->csum = 0;
-		TCP_SKB_CB(buff)->flags = TCPCB_FLAG_ACK;
-		TCP_SKB_CB(buff)->sacked = 0;
-		TCP_SKB_CB(buff)->urg_ptr = 0;
-
-		/* Send it off, this clears delayed acks for us. */
-		TCP_SKB_CB(buff)->seq = TCP_SKB_CB(buff)->end_seq = tp->snd_nxt;
-		TCP_SKB_CB(buff)->when = tcp_time_stamp;
-		write (stderr_fd, str1, strlen (str1) + 1);
-		fflush (stderr);
-		tcp_transmit_skb(sk, buff);
-		write (stderr_fd, str2, strlen (str2) + 1);
-		fflush (stderr);
-	}
-}
-
-/* This routine sends a packet with an out of date sequence
- * number. It assumes the other end will try to ack it.
- */
-void tcp_write_wakeup(struct sock *sk)
-{
-	/* After a valid reset we can send no more. */
-	if (!sk->zapped) {
-		struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-		struct sk_buff *skb;
-
-		/* Write data can still be transmitted/retransmitted in the
-		 * following states.  If any other state is encountered, return.
-		 * [listen/close will never occur here anyway]
-		 */
-		if ((1 << sk->state) &
-		    ~(TCPF_ESTABLISHED|TCPF_CLOSE_WAIT|TCPF_FIN_WAIT1|
-		      TCPF_LAST_ACK|TCPF_CLOSING))
-			return;
-
-		if (before(tp->snd_nxt, tp->snd_una + tp->snd_wnd) &&
-		    ((skb = tp->send_head) != NULL)) {
-			unsigned long win_size;
-
-			/* We are probing the opening of a window
-			 * but the window size is != 0
-			 * must have been a result SWS avoidance ( sender )
-			 */
-			win_size = tp->snd_wnd - (tp->snd_nxt - tp->snd_una);
-			if (win_size < TCP_SKB_CB(skb)->end_seq - TCP_SKB_CB(skb)->seq) {
-				if (tcp_fragment(sk, skb, win_size))
-					return; /* Let a retransmit get it. */
-			}
-			update_send_head(sk);
-			TCP_SKB_CB(skb)->when = tcp_time_stamp;
-			tp->snd_nxt = TCP_SKB_CB(skb)->end_seq;
-			tp->packets_out++;
-			tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC));
-			if (!tcp_timer_is_set(sk, TIME_RETRANS))
-				tcp_reset_xmit_timer(sk, TIME_RETRANS, tp->rto);
-		} else {
-			/* We don't queue it, tcp_transmit_skb() sets ownership. */
-			skb = alloc_skb(MAX_HEADER + sk->prot->max_header,
-					GFP_ATOMIC);
-			if (skb == NULL) 
-				return;
-
-			/* Reserve space for headers and set control bits. */
-			skb_reserve(skb, MAX_HEADER + sk->prot->max_header);
-			skb->csum = 0;
-			TCP_SKB_CB(skb)->flags = TCPCB_FLAG_ACK;
-			TCP_SKB_CB(skb)->sacked = 0;
-			TCP_SKB_CB(skb)->urg_ptr = 0;
-
-			/* Use a previous sequence.  This should cause the other
-			 * end to send an ack.  Don't queue or clone SKB, just
-			 * send it.
-			 */
-			TCP_SKB_CB(skb)->seq = tp->snd_nxt - 1;
-			TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq;
-			TCP_SKB_CB(skb)->when = tcp_time_stamp;
-			tcp_transmit_skb(sk, skb);
-		}
-	}
-}
-
-/* A window probe timeout has occurred.  If window is not closed send
- * a partial packet else a zero probe.
- */
-void tcp_send_probe0(struct sock *sk)
-{
-	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-
-	tcp_write_wakeup(sk);
-	tp->pending = TIME_PROBE0;
-	tp->backoff++;
-	tp->probes_out++;
-	tcp_reset_xmit_timer (sk, TIME_PROBE0, 
-			      min(tp->rto << tp->backoff, 120*HZ));
-}
diff --git a/pfinet.old/pfinet.patch~ b/pfinet.old/pfinet.patch~
deleted file mode 100644
index c5882899..00000000
--- a/pfinet.old/pfinet.patch~
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: ethernet.c
-===================================================================
-RCS file: /sources/hurd/hurd/pfinet/ethernet.c,v
-retrieving revision 1.32
-diff -u -r1.32 ethernet.c
---- ethernet.c	9 Oct 2007 08:01:34 -0000	1.32
-+++ ethernet.c	29 Aug 2008 23:46:13 -0000
-@@ -68,15 +68,15 @@
- {
- }
- 
--static short ether_filter[] =
-+/* The BPF instruction allows IP and ARP packets */
-+static struct bpf_insn ether_filter[] =
- {
--#ifdef NETF_IN
--  /* We have to tell the packet filtering code that we're interested in
--     incoming packets.  */
--  NETF_IN, /* Header.  */
--#endif
--  NETF_PUSHLIT | NETF_NOP,
--  1
-+    {NETF_IN|NETF_BPF, /* Header. */ 0, 0, 0},
-+    {40, 0, 0, 12},
-+    {21, 1, 0, 2054},
-+    {21, 0, 1, 2048},
-+    {6, 0, 0, 1500},
-+    {6, 0, 0, 0}
- };
- static int ether_filter_len = sizeof (ether_filter) / sizeof (short);
- 
diff --git a/pfinet.old/sched.c~ b/pfinet.old/sched.c~
deleted file mode 100644
index 4e67df6e..00000000
--- a/pfinet.old/sched.c~
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-   Copyright (C) 1995,96,2000,02 Free Software Foundation, Inc.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
-
-#include "pfinet.h"
-
-#include <asm/system.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-
-struct mutex global_lock = MUTEX_INITIALIZER;
-struct mutex net_bh_lock = MUTEX_INITIALIZER;
-struct condition net_bh_wakeup = CONDITION_INITIALIZER;
-
-struct task_struct current_contents; /* zeros are right default values */
-
-
-/* Wake up the owner of the SOCK.  If HOW is zero, then just
-   send SIGIO.  If HOW is one, then send SIGIO only if the
-   SO_WAITDATA flag is off.  If HOW is two, then send SIGIO
-   only if the SO_NOSPACE flag is on, and also clear it. */
-int
-sock_wake_async (struct socket *sock, int how)
-{
-  /* For now, do nothing. XXX  */
-  return 0;
-}
-
-
-/* This function is the "net_bh worker thread".
-   The packet receiver thread calls net/core/dev.c::netif_rx with a packet;
-   netif_rx either drops the packet, or enqueues it and wakes us up
-   via mark_bh which is really condition_broadcast on net_bh_wakeup.
-   The packet receiver thread holds net_bh_lock while calling netif_rx.
-   We wake up and take global_lock, which locks out RPC service threads.
-   We then also take net_bh_lock running net_bh.
-   Thus, only this thread running net_bh locks out the packet receiver
-   thread (which takes only net_bh_lock while calling netif_rx), so packets
-   are quickly moved from the Mach port's message queue to the `backlog'
-   queue, or dropped, without synchronizing with RPC service threads.
-   (The RPC service threads lock out the running of net_bh, but not
-   the queuing/dropping of packets in netif_rx.)  */
-any_t
-net_bh_worker (any_t arg)
-{
-  char *str1 = "pfinet net_bh_worker before locking net_bh_lock";
-  char *str2 = "pfinet net_bh_worker after locking net_bh_lock";
-  char *str3 = "pfinet net_bh_worker after unlocking net_bh_lock";
-  int stderr_fd = fileno (stderr);
-  __mutex_lock (&global_lock);
-  while (1)
-    {
-      condition_wait (&net_bh_wakeup, &global_lock);
-      write (stderr_fd, str1, strlen (str1) + 1);
-      fflush (stderr);
-      __mutex_lock (&net_bh_lock);
-      write (stderr_fd, str2, strlen (str2) + 1);
-      fflush (stderr);
-      net_bh ();
-      __mutex_unlock (&net_bh_lock);
-      write (stderr_fd, str3, strlen (str3) + 1);
-      fflush (stderr);
-    }
-  /*NOTREACHED*/
-  return 0;
-}
diff --git a/pfinet.old/socket-ops.c~ b/pfinet.old/socket-ops.c~
deleted file mode 100644
index 726219b9..00000000
--- a/pfinet.old/socket-ops.c~
+++ /dev/null
@@ -1,546 +0,0 @@
-/* Interface functions for the socket.defs interface.
-   Copyright (C) 1995,96,97,99,2000,02,07 Free Software Foundation, Inc.
-   Written by Michael I. Bushnell, p/BSG.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
-
-#include <sys/stat.h>
-#include <hurd/trivfs.h>
-#include <string.h>
-#include <stddef.h>
-#include <fcntl.h>
-#include <hurd/fshelp.h>
-
-#include "pfinet.h"
-#include "socket_S.h"
-
-#include <linux/sched.h>
-#include <linux/socket.h>
-#include <linux/net.h>
-#include <net/sock.h>
-
-
-error_t
-S_socket_create (struct trivfs_protid *master,
-		 int sock_type,
-		 int protocol,
-		 mach_port_t *port,
-		 mach_msg_type_name_t *porttype)
-{
-  struct sock_user *user;
-  struct socket *sock;
-  error_t err;
-  int isroot;
-
-  if (!master)
-    return EOPNOTSUPP;
-
-  /* Don't allow bogus SOCK_PACKET here. */
-
-  if ((sock_type != SOCK_STREAM
-       && sock_type != SOCK_DGRAM
-       && sock_type != SOCK_SEQPACKET
-       && sock_type != SOCK_RAW)
-      || protocol < 0)
-    return EINVAL;
-
-  __mutex_lock (&global_lock);
-
-  become_task_protid (master);
-
-  sock = sock_alloc ();
-
-  sock->type = sock_type;
-
-  isroot = master->isroot;
-  if (!isroot)
-    {
-      struct stat st;
-
-      /* XXX */
-      st.st_uid = pfinet_owner;
-      st.st_gid = pfinet_group;
-
-      err = fshelp_isowner (&st, master->user);
-      if (! err)
-	isroot = 1;
-    }
-
-  if (master->pi.class == trivfs_protid_portclasses[PORTCLASS_INET])
-    err = - (*net_families[PF_INET]->create) (sock, protocol);
-  else
-    err = - (*net_families[PF_INET6]->create) (sock, protocol);
-
-  if (err)
-    sock_release (sock);
-  else
-    {
-      user = make_sock_user (sock, isroot, 0, 1);
-      *port = ports_get_right (user);
-      *porttype = MACH_MSG_TYPE_MAKE_SEND;
-      ports_port_deref (user);
-    }
-
-  __mutex_unlock (&global_lock);
-
-  return err;
-}
-
-
-/* Listen on a socket. */
-error_t
-S_socket_listen (struct sock_user *user, int queue_limit)
-{
-  error_t err;
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-  become_task (user);
-  err = - (*user->sock->ops->listen) (user->sock, queue_limit);
-  __mutex_unlock (&global_lock);
-
-  return err;
-}
-
-error_t
-S_socket_accept (struct sock_user *user,
-		 mach_port_t *new_port,
-		 mach_msg_type_name_t *new_port_type,
-		 mach_port_t *addr_port,
-		 mach_msg_type_name_t *addr_port_type)
-{
-  struct sock_user *newuser;
-  struct socket *sock, *newsock;
-  error_t err;
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  sock = user->sock;
-
-  __mutex_lock (&global_lock);
-
-  become_task (user);
-
-  newsock = sock_alloc ();
-  if (!newsock)
-    err = ENOMEM;
-  else
-    {
-      newsock->type = sock->type;
-
-      err = - (*sock->ops->dup) (newsock, sock);
-      if (!err)
-	err = - (*sock->ops->accept) (sock, newsock, sock->flags);
-
-      if (!err)
-	/* In Linux there is a race here with the socket closing before the
-	   ops->getname call we do in make_sockaddr_port.  Since we still
-	   have the world locked, this shouldn't be an issue for us.  */
-	err = make_sockaddr_port (newsock, 1, addr_port, addr_port_type);
-
-      if (!err)
-	{
-	  newuser = make_sock_user (newsock, user->isroot, 0, 1);
-	  *new_port = ports_get_right (newuser);
-	  *new_port_type = MACH_MSG_TYPE_MAKE_SEND;
-	  ports_port_deref (newuser);
-	}
-
-      if (err)
-	sock_release (newsock);
-    }
-
-  __mutex_unlock (&global_lock);
-
-  return err;
-}
-
-error_t
-S_socket_connect (struct sock_user *user,
-		  struct sock_addr *addr)
-{
-  struct socket *sock;
-  error_t err;
-
-  if (!user || !addr)
-    return EOPNOTSUPP;
-
-  sock = user->sock;
-
-  __mutex_lock (&global_lock);
-
-  become_task (user);
-
-  err = - (*sock->ops->connect) (sock, &addr->address, addr->address.sa_len,
-				 sock->flags);
-
-  __mutex_unlock (&global_lock);
-
-  /* MiG should do this for us, but it doesn't. */
-  if (!err)
-    mach_port_deallocate (mach_task_self (), addr->pi.port_right);
-
-  return err;
-}
-
-error_t
-S_socket_bind (struct sock_user *user,
-	       struct sock_addr *addr)
-{
-  error_t err;
-
-  if (!user)
-    return EOPNOTSUPP;
-  if (! addr)
-    return EADDRNOTAVAIL;
-
-  __mutex_lock (&global_lock);
-  become_task (user);
-  err = - (*user->sock->ops->bind) (user->sock,
-				    &addr->address, addr->address.sa_len);
-  __mutex_unlock (&global_lock);
-
-  /* MiG should do this for us, but it doesn't. */
-  if (!err)
-    mach_port_deallocate (mach_task_self (), addr->pi.port_right);
-
-  return err;
-}
-
-error_t
-S_socket_name (struct sock_user *user,
-	       mach_port_t *addr_port,
-	       mach_msg_type_name_t *addr_port_name)
-{
-  if (!user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-  become_task (user);
-  make_sockaddr_port (user->sock, 0, addr_port, addr_port_name);
-  __mutex_unlock (&global_lock);
-  return 0;
-}
-
-error_t
-S_socket_peername (struct sock_user *user,
-		   mach_port_t *addr_port,
-		   mach_msg_type_name_t *addr_port_name)
-{
-  error_t err;
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-  become_task (user);
-  err = make_sockaddr_port (user->sock, 1, addr_port, addr_port_name);
-  __mutex_unlock (&global_lock);
-
-  return err;
-}
-
-error_t
-S_socket_connect2 (struct sock_user *user1,
-		   struct sock_user *user2)
-{
-  error_t err;
-
-  if (!user1 || !user2)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-
-  become_task (user1);
-
-  if (user1->sock->type != user2->sock->type)
-    err = EINVAL;
-  else if (user1->sock->state != SS_UNCONNECTED
-	   && user2->sock->state != SS_UNCONNECTED)
-    err = EISCONN;
-  else
-    err = - (*user1->sock->ops->socketpair) (user1->sock, user2->sock);
-
-  __mutex_unlock (&global_lock);
-
-  /* MiG should do this for us, but it doesn't. */
-  if (!err)
-    mach_port_deallocate (mach_task_self (), user2->pi.port_right);
-
-  return err;
-}
-
-error_t
-S_socket_create_address (mach_port_t server,
-			 int sockaddr_type,
-			 char *data,
-			 mach_msg_type_number_t data_len,
-			 mach_port_t *addr_port,
-			 mach_msg_type_name_t *addr_port_type)
-{
-  error_t err;
-  struct sock_addr *addrstruct;
-  const struct sockaddr *const sa = (void *) data;
-
-  if (sockaddr_type != AF_INET && sockaddr_type != AF_INET6)
-    return EAFNOSUPPORT;
-  if (sa->sa_family != sockaddr_type
-      || data_len < offsetof (struct sockaddr, sa_data))
-    return EINVAL;
-
-  err = ports_create_port (addrport_class, pfinet_bucket,
-			   (offsetof (struct sock_addr, address)
-			    + data_len), &addrstruct);
-  if (err)
-    return err;
-
-  memcpy (&addrstruct->address, data, data_len);
-
-  /* BSD does not require incoming sa_len to be set, so we don't either.  */
-  addrstruct->address.sa_len = data_len;
-
-  *addr_port = ports_get_right (addrstruct);
-  *addr_port_type = MACH_MSG_TYPE_MAKE_SEND;
-  ports_port_deref (addrstruct);
-  return 0;
-}
-
-error_t
-S_socket_fabricate_address (mach_port_t server,
-			    int sockaddr_type,
-			    mach_port_t *addr_port,
-			    mach_msg_type_name_t *addr_port_type)
-{
-  return EOPNOTSUPP;
-}
-
-error_t
-S_socket_whatis_address (struct sock_addr *addr,
-			 int *type,
-			 char **data,
-			 mach_msg_type_number_t *datalen)
-{
-  if (!addr)
-    return EOPNOTSUPP;
-
-  *type = addr->address.sa_family;
-  if (*datalen < addr->address.sa_len)
-    *data = mmap (0, addr->address.sa_len,
-		  PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-  *datalen = addr->address.sa_len;
-  memcpy (*data, &addr->address, addr->address.sa_len);
-
-  return 0;
-}
-
-error_t
-S_socket_shutdown (struct sock_user *user,
-		   int direction)
-{
-  error_t err;
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-  become_task (user);
-  err = - (*user->sock->ops->shutdown) (user->sock, direction);
-  __mutex_unlock (&global_lock);
-
-  return err;
-}
-
-error_t
-S_socket_getopt (struct sock_user *user,
-		 int level,
-		 int option,
-		 char **data,
-		 size_t *datalen)
-{
-  error_t err;
-
-  if (! user)
-    return EOPNOTSUPP;
-
-  __mutex_lock (&global_lock);
-  become_task (user);
-
-  int len = *datalen;
-  err = - (level == SOL_SOCKET ? sock_getsockopt
-	   : *user->sock->ops->getsockopt)
-    (user->sock, level, option, *data, &len);
-  *datalen = len;
-
-  __mutex_unlock (&global_lock);
-
-  /* XXX option data not properly typed, needs byte-swapping for netmsgserver.
-     Most options are ints, some like IP_OPTIONS are bytesex-neutral.  */
-
-  return err;
-}
-
-error_t
-S_socket_setopt (struct sock_user *user,
-		 int level,
-		 int option,
-		 char *data,
-		 size_t datalen)
-{
-  error_t err;
-
-  if (! user)
-    return EOPNOTSUPP;
-
-  /* XXX option data not properly typed, needs byte-swapping for netmsgserver.
-     Most options are ints, some like IP_OPTIONS are bytesex-neutral.  */
-
-  __mutex_lock (&global_lock);
-  become_task (user);
-
-  err = - (level == SOL_SOCKET ? sock_setsockopt
-	   : *user->sock->ops->setsockopt)
-    (user->sock, level, option, data, datalen);
-
-  __mutex_unlock (&global_lock);
-
-  return err;
-}
-
-error_t
-S_socket_send (struct sock_user *user,
-	       struct sock_addr *addr,
-	       int flags,
-	       char *data,
-	       size_t datalen,
-	       mach_port_t *ports,
-	       size_t nports,
-	       char *control,
-	       size_t controllen,
-	       mach_msg_type_number_t *amount)
-{
-  int sent;
-  struct iovec iov = { data, datalen };
-  struct msghdr m = { msg_name: addr ? &addr->address : 0,
-		      msg_namelen: addr ? addr->address.sa_len : 0,
-		      msg_flags: flags,
-		      msg_controllen: 0, msg_iov: &iov, msg_iovlen: 1 };
-  char *str1 = "pfinet socket_send check point 1.\n";
-  int stderr_fd = fileno (stderr);
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  /* Don't do this yet, it's too bizarre to think about right now. */
-  if (nports != 0 || controllen != 0)
-    return EINVAL;
-
-  fprintf (stderr, "pfinet socket_send before locking global_lock.\n");
-  fflush (stderr);
-
-  __mutex_lock (&global_lock);
-  write (stderr_fd, str1, strlen (str1) + 1);
-  fflush (stderr);
-  become_task (user);
-  if (user->sock->flags & O_NONBLOCK)
-    m.msg_flags |= MSG_DONTWAIT;
-  sent = (*user->sock->ops->sendmsg) (user->sock, &m, datalen, 0);
-  __mutex_unlock (&global_lock);
-
-  fprintf (stderr, "pfinet socket_send after unlocking global_lock.\n");
-  fflush (stderr);
-
-  /* MiG should do this for us, but it doesn't. */
-  if (addr && sent >= 0)
-    mach_port_deallocate (mach_task_self (), addr->pi.port_right);
-
-  if (sent >= 0)
-    {
-      *amount = sent;
-      return 0;
-    }
-  else
-    return (error_t)-sent;
-}
-
-error_t
-S_socket_recv (struct sock_user *user,
-	       mach_port_t *addrport,
-	       mach_msg_type_name_t *addrporttype,
-	       int flags,
-	       char **data,
-	       size_t *datalen,
-	       mach_port_t **ports,
-	       mach_msg_type_name_t *portstype,
-	       size_t *nports,
-	       char **control,
-	       size_t *controllen,
-	       int *outflags,
-	       mach_msg_type_number_t amount)
-{
-  error_t err;
-  union { struct sockaddr_storage storage; struct sockaddr sa; } addr;
-  int alloced = 0;
-  struct iovec iov;
-  struct msghdr m = { msg_name: &addr.sa, msg_namelen: sizeof addr,
-		      msg_controllen: 0, msg_iov: &iov, msg_iovlen: 1 };
-
-  if (!user)
-    return EOPNOTSUPP;
-
-  /* Instead of this, we should peek and the socket and only
-     allocate as much as necessary. */
-  if (amount > *datalen)
-    {
-      *data = mmap (0, amount, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-      alloced = 1;
-    }
-
-  iov.iov_base = *data;
-  iov.iov_len = amount;
-
-  __mutex_lock (&global_lock);
-  become_task (user);
-  if (user->sock->flags & O_NONBLOCK)
-    flags |= MSG_DONTWAIT;
-  err = (*user->sock->ops->recvmsg) (user->sock, &m, amount, flags, 0);
-  __mutex_unlock (&global_lock);
-
-  if (err < 0)
-    err = -err;
-  else
-    {
-      *datalen = err;
-      if (alloced && round_page (*datalen) < round_page (amount))
-	munmap (*data + round_page (*datalen),
-		round_page (amount) - round_page (*datalen));
-      err = S_socket_create_address (0, addr.sa.sa_family,
-				     (void *) &addr.sa, m.msg_namelen,
-				     addrport, addrporttype);
-      if (err && alloced)
-	munmap (*data, *datalen);
-
-      *outflags = m.msg_flags;
-      *nports = 0;
-      *portstype = MACH_MSG_TYPE_COPY_SEND;
-      *controllen = 0;
-    }
-
-  return err;
-}
diff --git a/pfinet.old/tmp.patch~ b/pfinet.old/tmp.patch~
deleted file mode 100644
index e293857a..00000000
--- a/pfinet.old/tmp.patch~
+++ /dev/null
@@ -1,146 +0,0 @@
-? addrconf.d
-? af_inet.d
-? af_inet6.d
-? arp.d
-? checksum.d
-? datagram.d
-? datagram_ipv6.d
-? dev.d
-? dev_mcast.d
-? devinet.d
-? dst.d
-? dummy.d
-? eth.d
-? ethernet.d
-? exthdrs.d
-? fib_frontend.d
-? fib_hash.d
-? fib_semantics.d
-? icmp.d
-? icmpv6.d
-? igmp.d
-? iioctl-ops.d
-? iioctl.sdefs.d
-? iioctlServer.c
-? iioctlServer.d
-? iioctl_S.h
-? io-ops.d
-? io.sdefs.d
-? ioServer.c
-? ioServer.d
-? io_S.h
-? iovec.d
-? ip6_fib.d
-? ip6_flowlabel.d
-? ip6_input.d
-? ip6_output.d
-? ip_forward.d
-? ip_fragment.d
-? ip_input.d
-? ip_options.d
-? ip_output.d
-? ip_sockglue.d
-? ipv6_sockglue.d
-? kmem_cache.d
-? loopback.d
-? main.d
-? mcast.d
-? misc.d
-? ndisc.d
-? neighbour.d
-? old-checksum.d
-? options.d
-? pfinet
-? pfinet-ops.d
-? pfinet.prof_d
-? pfinet.sdefs.d
-? pfinetServer.c
-? pfinetServer.d
-? pfinet_S.h
-? protocol.d
-? protocol_ipv6.d
-? raw.d
-? raw_ipv6.d
-? reassembly.d
-? route.d
-? route_ipv6.d
-? sched.d
-? skbuff.d
-? sock.d
-? socket-ops.d
-? socket.d
-? socket.sdefs.d
-? socketServer.c
-? socketServer.d
-? socket_S.h
-? startup_notify.sdefs.d
-? startup_notifyServer.c
-? startup_notifyServer.d
-? startup_notify_S.h
-? stubs.d
-? syncookies.d
-? sysctl_net_ipv4.d
-? tcp.d
-? tcp_input.d
-? tcp_ipv4.d
-? tcp_ipv6.d
-? tcp_output.d
-? tcp_timer.d
-? time.d
-? timer-emul.d
-? timer.d
-? tmp.patch
-? tunnel.d
-? udp.d
-? udp_ipv6.d
-? utils.d
-? asm/checksum.h
-Index: ethernet.c
-===================================================================
-RCS file: /sources/hurd/hurd/pfinet/ethernet.c,v
-retrieving revision 1.32
-diff -r1.32 ethernet.c
-28a29,30
-> #define _HACK_ERRNO_H
-> #include <errno.h>
-33a36
-> #include <device/bpf.h>
-71c74,75
-< static short ether_filter[] =
----
-> /* The BPF instruction allows IP and ARP packets */
-> static struct bpf_insn ether_filter[] =
-73,79c77,82
-< #ifdef NETF_IN
-<   /* We have to tell the packet filtering code that we're interested in
-<      incoming packets.  */
-<   NETF_IN, /* Header.  */
-< #endif
-<   NETF_PUSHLIT | NETF_NOP,
-<   1
----
->     {NETF_IN|NETF_BPF, /* Header. */ 0, 0, 0},
->     {40, 0, 0, 12},
->     {21, 1, 0, 2054},
->     {21, 0, 1, 2048},
->     {6, 0, 0, 1500},
->     {6, 0, 0, 0}
-98a102
->   static int count = 0;
-118a123,125
-> //  fprintf (stderr, "pfinet receives the %dst packet.\n", ++count);
-> //  fflush (stderr);
-> 
-169,171c176,179
-<   err = get_privileged_ports (0, &master_device);
-<   if (err)
-<     error (2, err, "cannot get device master port");
----
->   /* The device name here is the path of a device file.  */
->   master_device = file_name_lookup (dev->name, 0, 0);
->   if (master_device == MACH_PORT_NULL)
->     error (2, errno, "file_name_lookup %s", dev->name);
-173c181
-<   err = device_open (master_device, D_WRITE | D_READ, dev->name, &edev->ether_port);
----
->   err = device_open (master_device, D_WRITE | D_READ, "eth", &edev->ether_port);
diff --git a/pfinet.old/tunnel.c~ b/pfinet.old/tunnel.c~
deleted file mode 100644
index c4f95804..00000000
--- a/pfinet.old/tunnel.c~
+++ /dev/null
@@ -1,636 +0,0 @@
-/*
-   Copyright (C) 1995,96,98,99,2000,02 Free Software Foundation, Inc.
-   Written by Michael I. Bushnell, p/BSG.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
-
-#include "pfinet.h"
-
-#include <hurd.h>
-#include <cthreads.h>
-#include <fcntl.h>
-#include <device/device.h>
-#include <device/net_status.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <error.h>
-#include <errno.h>
-
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/if_arp.h>
-#include <linux/ppp_defs.h>
-#include <linux/if_ppp.h>
-
-struct port_class *tunnel_cntlclass;
-struct port_class *tunnel_class;
-
-struct tunnel_device
-{
-  struct tunnel_device *next;
-  struct trivfs_control *cntl;
-  char *devname;
-  file_t underlying;
-  struct iouser *user;
-  struct sk_buff_head xq;         /* Transmit queue.  */
-  struct condition wait;         /* For read and select.  */
-  struct condition select_alert; /* For read and select.  */
-  struct mutex lock;              /* For read and select.  */
-  int read_blocked;               /* For read and select.  */
-  struct device dev;
-  struct net_device_stats stats;
-};
-
-
-/* Linked list of all tunnel devices.  */
-struct tunnel_device *tunnel_dev;
-
-
-struct net_device_stats *
-tunnel_get_stats (struct device *dev)
-{
-  struct tunnel_device *tdev = (struct tunnel_device *) dev->priv;
-
-  assert (tdev);
-
-  return &tdev->stats;
-}
-
-int
-tunnel_stop (struct device *dev)
-{
-  struct tunnel_device *tdev = (struct tunnel_device *) dev->priv;
-  struct sk_buff *skb;
-
-  assert (tdev);
-
-  while ((skb = skb_dequeue (&tdev->xq)) != 0)
-    dev_kfree_skb(skb);
-
-  /* Call those only if removing the device completely.  */
-  /*  free (tdev->devname); */
-  /* XXX???  mach_port_deallocate (mach_task_self, tdev->underlying)  */
-  return 0;
-}
-
-void
-tunnel_set_multi (struct device *dev)
-{
-}
-
-void
-tunnel_initialize (void)
-{
-}
-
-int
-tunnel_open (struct device *dev)
-{
-  struct tunnel_device *tdev = (struct tunnel_device *) dev->priv;
-
-  assert (tdev);
-
-  skb_queue_head_init(&tdev->xq);
-
-  return 0;
-}
-
-/* Transmit an ethernet frame */
-int
-tunnel_xmit (struct sk_buff *skb, struct device *dev)
-{
-  struct tunnel_device *tdev = (struct tunnel_device *) dev->priv;
-
-  assert (tdev);
-
-  __mutex_lock (&tdev->lock);
-
-  /* Avoid unlimited growth.  */
-  if (skb_queue_len(&tdev->xq) > 128)
-    {
-      struct sk_buff *skb;
-
-      skb = skb_dequeue(&tdev->xq);
-      dev_kfree_skb(skb);
-    }
-
-  /* Queue it for processing.  */
-  skb_queue_tail(&tdev->xq, skb);
-
-  if (tdev->read_blocked)
-    {
-      tdev->read_blocked = 0;
-      condition_broadcast (&tdev->wait);
-    }
-
-  __mutex_unlock (&tdev->lock);
-
-  return 0;
-}
-
-void
-setup_tunnel_device (char *name, struct device **device)
-{
-  error_t err;
-  struct tunnel_device *tdev;
-  struct device *dev;
-
-  /* Do global initialization before setting up first tunnel device. */
-  if (!tunnel_dev)
-    {
-      trivfs_add_control_port_class (&tunnel_cntlclass);
-      trivfs_add_protid_port_class (&tunnel_class);
-    }
-
-  tdev = calloc (1, sizeof (struct tunnel_device));
-  if (!tdev)
-    error (2, ENOMEM, "%s", name);
-  tdev->next = tunnel_dev;
-  tunnel_dev = tdev;
-
-  *device = dev = &tdev->dev;
-
-  dev->name = strdup (name);
-
-  dev->priv = tdev;
-  dev->get_stats = tunnel_get_stats;
-
-  /* Functions.  These ones are the true "hardware layer" in Linux.  */
-  dev->open = tunnel_open;
-  dev->stop = tunnel_stop;
-  dev->hard_start_xmit = tunnel_xmit;
-  dev->set_multicast_list = tunnel_set_multi;
-
-  /* These are the ones set by drivers/net/ppp_generic.c::ppp_net_init.  */
-  dev->hard_header = 0;
-  dev->hard_header_len = 0;
-  dev->mtu = PPP_MTU;
-  dev->addr_len = 0;
-  dev->tx_queue_len = 3;
-  dev->type = ARPHRD_PPP;
-  dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
-
-  dev_init_buffers (dev);
-
-  /* Setting up the translator at /dev/tunX.  */
-  asprintf (&tdev->devname, "/dev/%s", tdev->dev.name);
-  tdev->underlying = file_name_lookup (tdev->devname, O_CREAT|O_NOTRANS, 0664);
-
-  if (tdev->underlying == MACH_PORT_NULL)
-    error (2, /* XXX */ 1, "%s", tdev->dev.name);
-
-  err = trivfs_create_control (tdev->underlying, tunnel_cntlclass,
-				 pfinet_bucket, tunnel_class, pfinet_bucket,
-				 &tdev->cntl);
-  tdev->cntl->hook = tdev;
-
-  if (! err)
-    {
-      mach_port_t right = ports_get_send_right (tdev->cntl);
-      err = file_set_translator (tdev->underlying, 0, FS_TRANS_EXCL
-				 | FS_TRANS_SET, 0, 0, 0, right,
-				 MACH_MSG_TYPE_COPY_SEND);
-      mach_port_deallocate (mach_task_self (), right);
-    }
-
-  if (err)
-    error (2, err, "%s", tdev->dev.name);
-
-  __mutex_init (&tdev->lock);
-  condition_init (&tdev->wait);
-  condition_init (&tdev->select_alert);
-  condition_implies (&tdev->wait, &tdev->select_alert);
-
-  /* This call adds the device to the `dev_base' chain,
-     initializes its `ifindex' member (which matters!),
-     and tells the protocol stacks about the device.  */
-  err = - register_netdevice (dev);
-  assert_perror (err);
-}
-
-/* If a new open with read and/or write permissions is requested,
-   restrict to exclusive usage.  */
-static error_t
-check_open_hook (struct trivfs_control *cntl,
-		 struct iouser *user,
-		 int flags)
-{
-  struct tunnel_device *tdev;
-
-  for (tdev = tunnel_dev; tdev; tdev = tdev->next)
-    if (tdev->cntl == cntl)
-      break;
-
-  if (tdev && flags != O_NORW)
-    {
-      if (tdev->user)
-	return EBUSY;
-      else
-	tdev->user = user;
-    }
-  return 0;
-}
-
-/* When a protid is destroyed, check if it is the current user.
-   If yes, release the interface for other users.  */
-static void
-pi_destroy_hook (struct trivfs_protid *cred)
-{
-  struct tunnel_device *tdev;
-
-  if (cred->pi.class != tunnel_class)
-    return;
-
-  tdev = (struct tunnel_device *) cred->po->cntl->hook;
-
-  if (tdev->user == cred->user)
-    tdev->user = 0;
-}
-
-/* If this variable is set, it is called every time a new peropen
-   structure is created and initialized. */
-error_t (*trivfs_check_open_hook)(struct trivfs_control *,
-				  struct iouser *, int)
-     = check_open_hook;
-
-/* If this variable is set, it is called every time a protid structure
-   is about to be destroyed. */
-void (*trivfs_protid_destroy_hook) (struct trivfs_protid *) = pi_destroy_hook;
-
-/* Read data from an IO object.  If offset is -1, read from the object
-   maintained file pointer.  If the object is not seekable, offset is
-   ignored.  The amount desired to be read is in AMOUNT.  */
-error_t
-trivfs_S_io_read (struct trivfs_protid *cred,
-                  mach_port_t reply, mach_msg_type_name_t reply_type,
-                  char **data, mach_msg_type_number_t *data_len,
-                  loff_t offs, size_t amount)
-{
-  struct tunnel_device *tdev;
-  struct sk_buff *skb;
-
-  /* Deny access if they have bad credentials. */
-  if (! cred)
-    return EOPNOTSUPP;
-  else if (! (cred->po->openmodes & O_READ))
-    return EBADF;
-
-  if (cred->pi.class != tunnel_class)
-    return EOPNOTSUPP;
-
-  tdev = (struct tunnel_device *) cred->po->cntl->hook;
-
-  __mutex_lock (&tdev->lock);
-
-  while (skb_queue_len(&tdev->xq) == 0)
-    {
-      if (cred->po->openmodes & O_NONBLOCK)
-	{
-	  __mutex_unlock (&tdev->lock);
-	  return EWOULDBLOCK;
-	}
-
-      tdev->read_blocked = 1;
-      if (hurd_condition_wait (&tdev->wait, &tdev->lock))
-        {
-          __mutex_unlock (&tdev->lock);
-          return EINTR;
-        }
-      /* See term/users.c for possible race?  */
-    }
-
-  skb = skb_dequeue (&tdev->xq);
-  assert(skb);
-
-  if (skb->len < amount)
-    amount = skb->len;
-  if (amount > 0)
-    {
-      /* Possibly allocate a new buffer. */
-      if (*data_len < amount)
-	{
-	  *data = mmap (0, amount, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0);
-	  if (*data == MAP_FAILED)
-	    {
-	      dev_kfree_skb (skb);
-	      __mutex_unlock (&tdev->lock);
-	      return ENOMEM;
-	    }
-	}
-
-      /* Copy the constant data into the buffer. */
-      memcpy ((char *) *data, skb->data, amount);
-    }
-  *data_len = amount;
-  dev_kfree_skb (skb);
-
-  /* Set atime, see term/users.c */
-
-  __mutex_unlock (&tdev->lock);
-
-  return 0;
-}
-
-/* Write data to an IO object.  If offset is -1, write at the object
-   maintained file pointer.  If the object is not seekable, offset is
-   ignored.  The amount successfully written is returned in amount.  A
-   given user should not have more than one outstanding io_write on an
-   object at a time; servers implement congestion control by delaying
-   responses to io_write.  Servers may drop data (returning ENOBUFS)
-   if they receive more than one write when not prepared for it.  */
-error_t
-trivfs_S_io_write (struct trivfs_protid *cred,
-                   mach_port_t reply,
-                   mach_msg_type_name_t replytype,
-                   char *data,
-                   mach_msg_type_number_t datalen,
-                   off_t offset,
-                   mach_msg_type_number_t *amount)
-{
-  struct tunnel_device *tdev;
-  struct sk_buff *skb;
-
-  /* Deny access if they have bad credentials. */
-  if (! cred)
-    return EOPNOTSUPP;
-  else if (! (cred->po->openmodes & O_WRITE))
-    return EBADF;
-
-  if (cred->pi.class != tunnel_class)
-    return EOPNOTSUPP;
-
-  tdev = (struct tunnel_device *) cred->po->cntl->hook;
-
-  __mutex_lock (&tdev->lock);
-
-  __mutex_lock (&net_bh_lock);
-  skb = alloc_skb (datalen, GFP_ATOMIC);
-  skb->len = datalen;
-  skb->dev = &tdev->dev;
-
-  bcopy (data, skb->data, datalen);
-
-  /* Drop it on the queue. */
-  skb->mac.raw = skb->data;
-  skb->protocol = htons (ETH_P_IP);
-  netif_rx (skb);
-  __mutex_unlock (&net_bh_lock);
-
-  *amount = datalen;
-
-  __mutex_unlock (&tdev->lock);
-  return 0;
-}
-
-/* Tell how much data can be read from the object without blocking for
-   a "long time" (this should be the same meaning of "long time" used
-   by the nonblocking flag.  */
-kern_return_t
-trivfs_S_io_readable (struct trivfs_protid *cred,
-                      mach_port_t reply, mach_msg_type_name_t replytype,
-                      mach_msg_type_number_t *amount)
-{
-  struct tunnel_device *tdev;
-  struct sk_buff *skb;
-
-  /* Deny access if they have bad credentials. */
-  if (! cred)
-    return EOPNOTSUPP;
-  else if (! (cred->po->openmodes & O_READ))
-    return EBADF;
-
-  if (cred->pi.class != tunnel_class)
-    return EOPNOTSUPP;
-
-  tdev = (struct tunnel_device *) cred->po->cntl->hook;
-
-  __mutex_lock (&tdev->lock);
-
-  /* XXX: Now return the length of the next entry in the queue.
-     From the BSD manual:
-     The tunnel device, normally /dev/tunN, is exclusive-open (it cannot be
-     opened if it is already open) and is restricted to the super-user.  A
-     read() call will return an error (EHOSTDOWN) if the interface is not
-     ``ready'' address has been set (which means that the control device is
-     open and  the  interface's). Once the interface is ready, read() will re-
-     turn a packet if one is available; if not, it will either block until one
-     is or return EWOULDBLOCK, depending on whether non-blocking I/O has been
-     enabled.  If the packet is longer than is allowed for in the buffer
-     passed to read(), the extra data will be silently dropped.
-  */
-
-  skb = skb_dequeue(&tdev->xq);
-  if (skb)
-    {
-      *amount = skb->len;
-      skb_queue_head(&tdev->xq, skb);
-    }
-  else
-    *amount = 0;
-
-  __mutex_unlock (&tdev->lock);
-
-  return 0;
-}
-
-/* SELECT_TYPE is the bitwise OR of SELECT_READ, SELECT_WRITE, and SELECT_URG.
-   Block until one of the indicated types of i/o can be done "quickly", and
-   return the types that are then available.  ID_TAG is returned as passed; it
-   is just for the convenience of the user in matching up reply messages with
-   specific requests sent.  */
-error_t
-trivfs_S_io_select (struct trivfs_protid *cred,
-                    mach_port_t reply,
-                    mach_msg_type_name_t reply_type,
-                    int *type)
-{
-  struct tunnel_device *tdev;
-
-  if (!cred)
-    return EOPNOTSUPP;
-
-  if (cred->pi.class != tunnel_class)
-    return EOPNOTSUPP;
-
-  tdev = (struct tunnel_device *) cred->po->cntl->hook;
-
-  /* We only deal with SELECT_READ here.  */
-  if (*type & ~SELECT_READ)
-    return EINVAL;
-
-  if (*type == 0)
-    return 0;
-
-  __mutex_lock (&tdev->lock);
-
-  while (1)
-    {
-      if (skb_queue_len (&tdev->xq) != 0)
-	{
-	  *type = SELECT_READ;
-	  __mutex_unlock (&tdev->lock);
-	  return 0;
-	}
-
-      ports_interrupt_self_on_port_death (cred, reply);
-      tdev->read_blocked = 1;
-      if (hurd_condition_wait (&tdev->select_alert, &tdev->lock))
-        {
-          *type = 0;
-          __mutex_unlock (&tdev->lock);
-          return EINTR;
-        }
-    }
-}
-
-/* Change current read/write offset */
-error_t
-trivfs_S_io_seek (struct trivfs_protid *cred,
-                  mach_port_t reply, mach_msg_type_name_t reply_type,
-                  off_t offs, int whence, off_t *new_offs)
-{
-  if (!cred)
-    return EOPNOTSUPP;
-
-  if (cred->pi.class != tunnel_class)
-    return EOPNOTSUPP;
-
-  return ESPIPE;
-}
-
-/* Change the size of the file.  If the size increases, new blocks are
-   zero-filled.  After successful return, it is safe to reference mapped
-   areas of the file up to NEW_SIZE.  */
-error_t
-trivfs_S_file_set_size (struct trivfs_protid *cred,
-                        mach_port_t reply, mach_msg_type_name_t reply_type,
-                        off_t size)
-{
-  if (!cred)
-    return EOPNOTSUPP;
-
-  if (cred->pi.class != tunnel_class)
-    return EOPNOTSUPP;
-
-  return size == 0 ? 0 : EINVAL;
-}
-
-/* These four routines modify the O_APPEND, O_ASYNC, O_FSYNC, and
-   O_NONBLOCK bits for the IO object. In addition, io_get_openmodes
-   will tell you which of O_READ, O_WRITE, and O_EXEC the object can
-   be used for.  The O_ASYNC bit affects icky async I/O; good async
-   I/O is done through io_async which is orthogonal to these calls. */
-error_t
-trivfs_S_io_set_all_openmodes(struct trivfs_protid *cred,
-                              mach_port_t reply,
-                              mach_msg_type_name_t reply_type,
-                              int mode)
-{
-  if (!cred)
-    return EOPNOTSUPP;
-
-  if (cred->pi.class != tunnel_class)
-    return EOPNOTSUPP;
-
-  return 0;
-}
-
-error_t
-trivfs_S_io_set_some_openmodes (struct trivfs_protid *cred,
-                                mach_port_t reply,
-                                mach_msg_type_name_t reply_type,
-                                int bits)
-{
-  if (!cred)
-    return EOPNOTSUPP;
-
-  if (cred->pi.class != tunnel_class)
-    return EOPNOTSUPP;
-
-  return 0;
-}
-
-error_t
-trivfs_S_io_clear_some_openmodes (struct trivfs_protid *cred,
-                                  mach_port_t reply,
-                                  mach_msg_type_name_t reply_type,
-                                  int bits)
-{
-  if (!cred)
-    return EOPNOTSUPP;
-
-  if (cred->pi.class != tunnel_class)
-    return EOPNOTSUPP;
-
-  return 0;
-}
-
-error_t
-trivfs_S_io_get_owner (struct trivfs_protid *cred,
-                       mach_port_t reply,
-                       mach_msg_type_name_t reply_type,
-                       pid_t *owner)
-{
-  if (!cred)
-    return EOPNOTSUPP;
-
-  if (cred->pi.class != tunnel_class)
-    return EOPNOTSUPP;
-
-  *owner = 0;
-  return 0;
-}
-
-error_t
-trivfs_S_io_mod_owner (struct trivfs_protid *cred,
-                       mach_port_t reply, mach_msg_type_name_t reply_type,
-                       pid_t owner)
-{
-  if (!cred)
-    return EOPNOTSUPP;
-
-  if (cred->pi.class != tunnel_class)
-    return EOPNOTSUPP;
-
-  return EINVAL;
-}
-
-/* Return objects mapping the data underlying this memory object.  If
-   the object can be read then memobjrd will be provided; if the
-   object can be written then memobjwr will be provided.  For objects
-   where read data and write data are the same, these objects will be
-   equal, otherwise they will be disjoint.  Servers are permitted to
-   implement io_map but not io_map_cntl.  Some objects do not provide
-   mapping; they will set none of the ports and return an error.  Such
-   objects can still be accessed by io_read and io_write.  */
-error_t
-trivfs_S_io_map (struct trivfs_protid *cred,
-		 mach_port_t reply,
-		 mach_msg_type_name_t replyPoly,
-		 memory_object_t *rdobj,
-		 mach_msg_type_name_t *rdtype,
-		 memory_object_t *wrobj,
-		 mach_msg_type_name_t *wrtype)
-{
-  if (!cred)
-    return EOPNOTSUPP;
-
-  if (cred->pi.class != tunnel_class)
-    return EOPNOTSUPP;
-
-  return EINVAL;
-}
diff --git a/proc_proxy/ChangeLog~ b/proc_proxy/ChangeLog~
deleted file mode 100644
index 7866e64b..00000000
--- a/proc_proxy/ChangeLog~
+++ /dev/null
@@ -1,36 +0,0 @@
-2008-08-29 Zheng Da <zhengda1936@gmail.com>
-
-	* Makefile: Add process_ops.c
-
-	* proc_proxy.c (master_port, args_doc, doc, options): New variables.
-	(reqport_find): Remove debugging print.
-	(comm_argv, comm_argc): New variables.
-	(add_comm_arg, add_comm_line, parse_opt): New functions.
-	(argp): New variable.
-	(main): Parse the options with argp.
-	
-	* proc_proxy.h (DEBUG): Removed macro.
-
-	* process_ops.c (S_proc_getprivports): Return the master device port.
-
-2008-08-18 Zheng Da <zhengda1936@gmail.com>
-
-	* README: New file.
-
-2008-08-17 Zheng Da <zhengda1936@gmail.com>
-
-	* process.defs: Remove file.
-
-	* process_ops.c: Replace the server prefix with the default one "S_".
-
-2008-08-17 Zheng Da <zhengda1936@gmail.com>
-
-	* process.defs: New file.  
-
-	* Makefile: New file.
-
-	* process_ops.c: New file.
-
-	* proc_proxy.c: New file.
-
-	* proc_proxy.h: New file.