2002-02-28 Robert Collins <rbtcollins@hotmail.com>

	* Merged cygwin_daemon into head minus the new shm and ipc exports.

2002-02-28  Robert Collins  <rbtcollins@hotmail.com>

	* fhandler_tty.cc (fhandler_tty_slave::open): More debugging.
	(fhandler_tty_slave::read): Fix printf type for the handle.
	* tty.cc (tty::common_init): Add a FIXME for security.

2002-01-29  Robert Collins  <rbtcollins@hotmail.com>

	* Makefile.in (OBJS): Remove duplicate localtime.o.

2002-01-17  Robert Collins  <rbtcollins@hotmail.com>

	* cygserver.cc (check_and_dup_handle): Consolidate the two variants for
	simplicity.
	Add Some basic debug output.
	(client_request_attach_tty::serve): Use the new debug_printf for clarity.
	Mark the duplicated handles as inheritable - fixup_after_fork() doesn't reopen
	tty's.

2002-01-16  Robert Collins  <rbtcollins@hotmail.com>

	* cygserver.cc (transport): Correct scope.
	(client_request_attach_tty::serve): Add more debug information.
	Fix erroneous use of transport instead of conn.
	* cygserver_transport_pipes.cc (transport_layer_pipes::close): More debug.
	(transport_layer_pipes::read): Ditto.
	(transport_layer_pipes::write): Ditto.
	(transport_layer_pipes::impersonate_client): Ditto.

Mon Oct  8  7:41:00 2001  Robert Collins <rbtcollins@hotmail.com>

	* cygserver.cc (server_request::process): Rename client_request_shm_get to
	client_request_shm.
	* cygserver_process.cc (process_cache::add): Rename to add_task.
	Use process_cleanup instead of process_request.
	(process_cache::remove_process): New method.
	(process::process): Initialize new members.
	(process::~process): New member.
	(process::cleanup): New method.
	(process::add_cleanup_routine): New method.
	(process_request::process): Rename to process_cleanup.
	Call the process object's cleanup method and then delete it.
	(process_process_param::request_loop): Remove the signalling process.
	* cygserver_shm.cc: Globally rename client_request_shm_get to client_request_shm.
	(client_request_shm_get::serve): Handle attach request counting.
	* cygserver_shm.h: Globally rename client_request_shm_get to client_request_shm.
	(class shm_cleanup): New class.
	* shm.cc: Globally rename client_request_shm_get to client_request_shm.
	(client_request_shm::client_request_shm): New constructor for attach requests.
	(shmat): Use it.
	* include/cygwin/cygserver_process.h (class process_request): Rename to
	process_cleanup.
	(class cleanup_routine): New class.
	(class process): New members and methods to allow calling back when the process
	terminates.

Thu Oct  4 14:12:00 2001  Robert Collins <rbtcollins@hotmail.com>
	* cygserver.cc (request_loop): Make static.
	(main): Use new cache constructor syntax.
	Start cache worker threads.
	Cleanup the cache at shutdown.
	* cygserver_process.cc: Run indent.
	(process_cache::process_cache): Add a trigger to use when adding a process.
	(process_cache::process): Move process_entry to process.
	Insert at the end of the list.
	Trigger the request loop when new process's inserted.
	(process_cache::process_requests): Do it.
	(process_cache::add): New method.
	(process_cache::handle_snapshot): New method.
	(process::process): Merge in the process_entry fields.
	(process::handle): Make a stub function.
	(process::exit_code): New method.
	(process_request::process): New method.
	(process_process_param::request_loop): New method.
	* cygserver_shm.cc: New header dependency - threaded_queue.h.
	* threaded_queue.cc (threaded_queue::cleanup): Clearer messages.
	(queue_process_param::stop): Short spinlock on interruptible threads.
	* threaded_queue.h (class threaded_queue): New constructor.
	* include/cygwin/cygserver_process.h (process_request): New class.
	(process_entry): Remove.
	(process): Merge in process_entry.
	(process_cache): Inherit from threaded_queue.

Tue Oct  2 23:24:00 2001  Robert Collins <rbtcollins@hotmail.com>

	* cygserver.cc (class server_process_param): Use new constructor syntax.
	* cygserver_process.cc (process_cache::~process_cache): New function.
	* threaded_queue.cc: Define condition debug_printf.
	Run indent.
	(threaded_queue::cleanup): Move queue_process_param guts to a method.
	(threaded_queue::process_requests): Ditto.
	(queue_process_param::queue_process_param): New method.
	(queue_process_param::~queue_process_param): Ditto.
	(queue_process_param::start): Ditto.
	(queue_process_param::stop): Ditto.
	* threaded_queue.h (class queue_process_param): Add support for
	interruptible request loops.
	* cygwin/include/cygwin/cygserver_process.h (class process_cache): Add
	destructor.

Tue Oct  2 23:24:00 2001  Robert Collins <rbtcollins@hotmail.com>

	* cygserver_client.cc: New flag allow_daemon to disable the daemon completely.
	(cygserver_request): Check it.
	(cygserver_init): Ditto.
	* environ.cc (parse_thing): Add (no)daemon option.

Tue Oct  2 23:00:00 2001  Robert Collins <rbtcollins@hotmail.com>

	* shm.cc: Update to handle include changes from HEAD.

Tue Oct  2 16:06:00 2001  Robert Collins <rbtcollins@hotmail.com>

	* Makefile.in: Remove cygserver_shm.o from cygwin1.dll.
	Rename cygserver_shm_outside.o to cygserver_shm.o.
	* cygserver.cc (server_request::process): Use the new client_request
	constructor.
	* cygserver_client.cc: Remove the #ifdef's stubs for the server method
	within cygwin.
	(client_request_attach_tty::client_request_attach_tty): Use the new
	client_request constructor.
	(client_request_shutdown::client_request_shutdown): Ditto.
	(client_request::client_request): Ditto.
	* cygserver_shm.cc (client_request_shm_get::serve): Remove the
	#ifdef'd stub for in-cygwin builds.
	(client_request_shm_get::client_request_shm_get): Use the new
	client_request constructor, and remove the in-cygwin variants.
	* cygserver_shm.h (class client_request_shm_get): #ifndef test the
	serve method - it's only used in cygserver.
	* shm.cc (client_request_shm_get::client_request_shm_get): New function.
	* include/cygwin/cygserver.h (request_header): New constructor.
	(class client_request): Use it.
	New constructor accepting the header size.
	#ifndef test the server method - it's only used within cygserver.
	(client_request_get_version): #ifdef test the server method.
	(client_request_shutdown): Ditto.
	(client_request_attach_tty): Ditto.

Tue Oct  2  9:57:00 2001  Robert Collins <rbtcollins@hotmail.com>

	* Makefile.in: add threaded_queue.o to cygserver.exe.
	* cygserver.cc: Include threaded_queue.h
	(class server_request): Inherit from queue_request.
	(class server_process_param): Inherit from queue_process_param.
	(class server_request_queue): Inherit from threaded_queue.
	(request_loop): Adjust for new types.
	(server_request_queue::process_requests): Remove guts to
	threaded_queue::process_requests.
	(server_request::server_request): Adjust for new types.
	(worker_function): Delete.
	(server_request_queue::create_workers): Delete.
	(server_request_queue::cleanup): Delete.
	(server_request_queue::add): Move guts to threaded_queue::add.
	* threaded_queue.cc: New file.
	* threaded_queue.h: New file.

Mon Oct  1 12:38:00 2001  Robert Collins <rbtcollins@hotmail.com>

	* cygserver.cc (client_request::serve): New function.
	* cygserver_process.cc: Inlude <pthread.h> for pthread_once.
	(process_cache::process_cache): Initialise a crtiical section for write access.
	(process_cache::process): Use the critical section. Also add missing entries to
	the cache.
	(do_process_init): New function to initalise class process static variables.
	(process::process): Ensure that the process access critical section is
	initialised.
	(process::handle): Close the handle of old process's when they have terminated
	and we are returning the handle for a process with the same pid.
	* cygserver_shm.cc: Run indent.
	Include cygserver_process.h to allow process cache functionality.
	(client_request_shm_get::serve): New parameter for process cache support.
	Use the process cache, not OpenProcess to get a handle to the originating process.
	Fix a handle leak with token_handle.
	* cygserver_shm.h (class client_request_shm_get): Update ::serve for process
	cache support.
	* cygserver_transport_pipes.cc: Redefine debug_printf to be conditional on DEBUG.
	* include/cygwin/cygserver.h: Do not implement client_request::serve in the
	header.
	* include/cygwin/cygserver_process.h (class process_cache): Add a write access
	critical section to prevent races when requests from a  multithreaded
	application arrive.

Sun Sep 30 23:41:00 2001  Robert Collins <rbtcollins@hotmail.com>

	* Makefile.in: Add cygserver_process.o to cygserver.exe.
	* cygserver.cc: Include signal.h and cygwin_version.h.
	Define debug_printf as a macro.
	Define DEBUG to a value.
	(client_request_attach_tty::serve): Add beginning of process cache support.
	Change from #ifdef DEBUG to work with new DEBUG style.
	(client_request_get_version::serve): Add beginning of process cache support.
	(class server_request): New prototype for support of process cache.
	(class queue_process_param): New class to allow request loop threading.
	(class server_request_queue): Add beginning of process cache support.
	Allow request loop threading.
	(request_loop): Thread function for request loops.
	(server_request_queue::process_requests): Initiator for threaded request loops.
	(client_request_shutdown::serve): Add beginning of process cache support.
	(server_request::server_request): Ditto.
	(server_request::process): Use debug_printf. Add beginning of process cache
	support.
	(server_request_queue::cleanup): Kill off any request loop threads.
	(server_request_queue::add): Add beginning of process cache support.
	(handle_signal): Trigger a shutdown.
	(main): Print out some useful info at startup - version, date time.
	Add process cache support.
	Spawn a separate thread for the transport request loop, thus allowing concurrent
	support for multiple transports.
	* cygserver_client.cc (client_request_get_version::serve): Add process cache
	support.
	(client_request_attach_tty::serve): Add process cache support.
	(client_request_shutdown::serve): Add process cache support.
	* cygsserver_process.cc: New file with the process cache support.
	* cygserver_shm.cc: Redefine debug_printf to allow conditional output.
	* cygwin.din: Export shmdt().
	* shm.cc: Run indent.
	Update FIXME's.
	(shmdt): New function.
	* include/cygwin/cygserver.h (class client_request): Add process cache support.
	(class client_request_get_version): Ditto.
	(class client_request_shutdown): Ditto.
	(class client_request_attach_tty): Ditto.
	* include/cygwin/cygserver_process.h: New header for process cache support.

Sun Sep 30  8:52:00 2001  Robert Collins <rbtcollins@hotmail.com>

	* include/cygwin/cygserver_transport.h: Add copyright header.
	* include/cygwin/cygserver_transport_pipes.h: Ditto.
	* include/cygwin/cygserver_transport_sockets.h: Ditto.

Sat Sep 29 20:40:00 2001  Robert Collins <rbtcollins@hotmail.com>

	* Makefile.in: Add cygserver_transport_sockets.o to DLL_OFILES.
	Add cygserver_transport_sockets_outside.o to cygserver.exe.
	* cygserver.cc: Include new include files.
	* cygserver_client.cc: Ditto.
	* cygserver_shm.h: No need to include <sys/socket.h> now.
	* cygerver_transport.cc: Include new include files.
	(transport_layer_base::transport_layer_base): Strip back to a stub.
	(transport_layer_base::listen): Ditto.
	(transport_layer_base::accept): Ditto.
	(transport_layer_base::close): Ditto.
	(transport_layer_base::read): Ditto.
	(transport_layer_base::write): Ditto.
	(transport_layer_base::connect): Ditto.
	* cygserver_transport_pipes.cc: Include new header
	"cygwin/cygserver_transport_pipes.h".
	* cygserver_transport_sockets.cc: New file.
	* dcrt0.cc: No need to include <sys/socket.h> now.
	* fhandler_tty.cc: Ditto.
	* tty.cc: Ditto.
	* include/cygwin/cygserver_transport.h: Strip the base class to a stub.
	Remove the cygserver_transport_pipes class.
	* include/cygwin/cygserver_transport_pipes.h: New file.
	* include/cygwin/cygserver_transport_sockets.h: New file.

Tue Sep 25 16:22:00 2001  Robert Collins <rbtcollins@hotmail.com>

	* autoload.cc: Add dynamic load statement for 'ImpersonateNamedPipeClient'.
	* Makefile.in: Add new object files, and build instructions for cygserver.exe.
	* cygwin.din: Export ftok, shmat, shmctl and shmget.
	* dcrt0.cc: Additional includes for cygserver support.
	(dll_crt0_1): Initialise the cygserver client.
	* fhandler.h (fhandler_tty): New method cygserver_attach_tty.
	* fhandler_tty.cc: Additional includes for cygserver support.
	(fhandler_tty_slave::open): Attempt to use the cygserver when obtaining
	handles from the parent process. On failure or 9x use the current method.
	(fhandler_tty_slave::cygserver_attach_tty): New function.
	* fork.cc (fork_child): Fixup shm memory mapped areas.
	* pinfo.h: Declare fixup_shms_after_fork().
	* security.h: Declare alloc_sd().
	* tty.cc: Additonal includes to support cygserver.
	(tty::common_init): Don't allow others to open us if the cygserver is running.
	* winsup.h: Declare cygserver_running.
	* cygserver.cc: New file.
	* cygserver_client.cc: New file.
	* cygserver_shm.cc: New file.
	* cygserver_shm.h: New file.
	* cygserver_transport.cc: New file.
	* cygserver_transport_pipes.cc: New file.
	* ipc.cc: New file.
	* shm.cc: New file.
	* include/cygwin/cygserver.h: New file.
	* include/cygwin/cygserver_transport.h: New file.
	* include/sys/ipc.h: New file.
	* include/sys/shm.h: New file.

2002-02-28  Robert Collins  <rbtcollins@hotmail.com>

	* thread.cc (semaphore::TryWait): Set errno as required by posix 1003.1.
	(__sem_wait): Ditto.
	(__sem_trywait): Ditto.

1 files changed, 548 insertions, 0 deletions

diff --git a/winsup/cygserver/cygserver.cc b/winsup/cygserver/cygserver.cc
new file mode 100644
index 000000000..57f92c2ac
--- /dev/null
+++ b/winsup/cygserver/cygserver.cc
@@ -0,0 +1,548 @@
+/* cygserver.cc
+
+   Copyright 2001 Red Hat Inc.
+
+   Written by Egor Duda <deo@logos-m.ru>
+
+   This file is part of Cygwin.
+
+   This software is a copyrighted work licensed under the terms of the
+   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
+   details. */
+
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <windows.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <signal.h>
+#include "wincap.h"
+#include "cygwin_version.h"
+
+#include "getopt.h"
+
+#include "cygwin/cygserver_transport.h"
+#include "cygwin/cygserver_transport_pipes.h"
+#include "cygwin/cygserver_transport_sockets.h"
+#include "threaded_queue.h"
+#include "cygwin/cygserver_process.h"
+#include "cygwin/cygserver.h"
+#include "cygserver_shm.h"
+
+/* for quieter operation, set to 0 */
+#define DEBUG 0
+#define debug_printf if (DEBUG) printf
+
+GENERIC_MAPPING access_mapping;
+static class transport_layer_base *transport;
+
+DWORD request_count = 0;
+
+BOOL
+setup_privileges ()
+{
+  BOOL rc, ret_val;
+  HANDLE hToken = NULL;
+  TOKEN_PRIVILEGES sPrivileges;
+
+  rc = OpenProcessToken ( GetCurrentProcess() , TOKEN_ALL_ACCESS , &hToken ) ;
+  if ( !rc )
+    {
+      printf ( "error opening process token (%lu)\n", GetLastError () );
+      ret_val = FALSE;
+      goto out;
+    }
+  rc = LookupPrivilegeValue ( NULL, SE_DEBUG_NAME, &sPrivileges.Privileges[0].Luid );
+  if ( !rc )
+    {
+      printf ( "error getting prigilege luid (%lu)\n", GetLastError () );
+      ret_val = FALSE;
+      goto out;
+    }
+  sPrivileges.PrivilegeCount = 1 ;
+  sPrivileges.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED ;
+  rc = AdjustTokenPrivileges ( hToken, FALSE, &sPrivileges, 0, NULL, NULL ) ;
+  if ( !rc )
+    {
+      printf ( "error adjusting prigilege level. (%lu)\n", GetLastError () );
+      ret_val = FALSE;
+      goto out;
+    }
+
+  access_mapping.GenericRead = FILE_READ_DATA;
+  access_mapping.GenericWrite = FILE_WRITE_DATA;
+  access_mapping.GenericExecute = 0;
+  access_mapping.GenericAll = FILE_READ_DATA | FILE_WRITE_DATA;
+
+  ret_val = TRUE;
+
+out:
+  CloseHandle ( hToken );
+  return ret_val;
+}
+
+int
+check_and_dup_handle (HANDLE from_process, HANDLE to_process,
+		      HANDLE from_process_token,
+                      DWORD access,
+                      HANDLE from_handle,
+                      HANDLE* to_handle_ptr, BOOL bInheritHandle = FALSE)
+{
+  HANDLE local_handle = NULL;
+  int ret_val = EACCES;
+  char sd_buf [1024];
+  PSECURITY_DESCRIPTOR sd = (PSECURITY_DESCRIPTOR) &sd_buf;
+  DWORD bytes_needed;
+  PRIVILEGE_SET ps;
+  DWORD ps_len = sizeof (ps);
+  BOOL status;
+
+  if (from_process != GetCurrentProcess ())
+{ 
+
+  if (!DuplicateHandle (from_process, from_handle,
+	                GetCurrentProcess (), &local_handle,
+                        0, bInheritHandle,
+                        DUPLICATE_SAME_ACCESS))
+    {
+      printf ( "error getting handle(%u) to server (%lu)\n", (unsigned int)from_handle, GetLastError ());
+      goto out;
+    }
+} else
+ local_handle = from_handle;
+
+  if (!GetKernelObjectSecurity (local_handle,
+  			        OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION	| DACL_SECURITY_INFORMATION,
+				sd, sizeof (sd_buf), &bytes_needed))
+    {
+      printf ( "error getting handle SD (%lu)\n", GetLastError ());
+      goto out;
+    }
+
+  MapGenericMask (&access, &access_mapping);
+
+  if (!AccessCheck (sd, from_process_token, access, &access_mapping,
+  		    &ps, &ps_len, &access, &status))
+    {
+      printf ( "error checking access rights (%lu)\n", GetLastError ());
+      goto out;
+    }
+
+  if (!status)
+    {
+      printf ( "access to object denied\n");
+      goto out;
+    }
+
+  if (!DuplicateHandle (from_process, from_handle,
+	                to_process, to_handle_ptr,
+                        access, bInheritHandle, 0))
+    {
+      printf ( "error getting handle to client (%lu)\n", GetLastError ());
+      goto out;
+    }
+  debug_printf ("Duplicated %p to %p\n", from_handle, *to_handle_ptr);
+
+  ret_val = 0;
+                    
+out:
+  if (local_handle && from_process != GetCurrentProcess ())
+    CloseHandle (local_handle);
+
+  return (ret_val);
+}
+
+void
+client_request::serve (transport_layer_base *conn, class process_cache *cache)
+{
+  printf ("*****************************************\n"
+	  "A call to the base client_request class has occured\n"
+	  "This indicates a mismatch in a virtual function definition somewhere\n");
+  exit (1);
+}
+
+void
+client_request_attach_tty::serve(transport_layer_base *conn, class process_cache *cache)
+{
+  HANDLE from_process_handle = NULL;
+  HANDLE to_process_handle = NULL;
+  HANDLE token_handle = NULL;
+  DWORD rc;
+
+  if (header.cb != sizeof (req))
+    {
+      header.error_code = EINVAL;
+      return;
+    }
+
+  debug_printf ("pid %ld:(%p,%p) -> pid %ld\n", req.master_pid,
+  	  			req.from_master, req.to_master,
+				req.pid);
+
+  debug_printf ("opening process %ld\n", req.master_pid);
+  from_process_handle = OpenProcess (PROCESS_DUP_HANDLE, FALSE, req.master_pid);
+  debug_printf ("opening process %ld\n", req.pid);
+  to_process_handle = OpenProcess (PROCESS_DUP_HANDLE, FALSE, req.pid);
+  if (!from_process_handle || !to_process_handle)
+    {
+      printf ("error opening process (%lu)\n", GetLastError ());
+      header.error_code = EACCES;
+      goto out;
+    }
+
+  debug_printf ("Impersonating client\n");
+  conn->impersonate_client ();
+  
+  debug_printf ("about to open thread token\n");
+  rc = OpenThreadToken (GetCurrentThread (),
+  			TOKEN_QUERY,
+                        TRUE,
+			&token_handle);
+
+  debug_printf ("opened thread token, rc=%lu\n", rc);
+  conn->revert_to_self ();
+
+  if (!rc)
+    {
+      printf ("error opening thread token (%lu)\n", GetLastError ());
+      header.error_code = EACCES;
+      goto out;
+    }
+
+  if (check_and_dup_handle (from_process_handle, to_process_handle,
+                            token_handle,
+                            GENERIC_READ,
+                            req.from_master,
+                            &req.from_master, TRUE) != 0)
+    {
+      printf ("error duplicating from_master handle (%lu)\n", GetLastError ());
+      header.error_code = EACCES;
+      goto out;
+    }
+
+  if (req.to_master)
+    {
+      if (check_and_dup_handle (from_process_handle, to_process_handle,
+				token_handle,
+				GENERIC_WRITE,
+				req.to_master,
+				&req.to_master, TRUE) != 0)
+	{
+	  printf ("error duplicating to_master handle (%lu)\n", GetLastError ());
+	  header.error_code = EACCES;
+	  goto out;
+	}
+    }
+
+#if DEBUG
+  printf ("%ld -> %ld(%p,%p)\n", req.master_pid, req.pid,
+  	  			req.from_master, req.to_master);
+#endif
+
+  header.error_code = 0;
+
+out:
+  if (from_process_handle)
+    CloseHandle (from_process_handle);
+  if (to_process_handle)
+    CloseHandle (to_process_handle);
+  if (token_handle)
+    CloseHandle (token_handle);
+}
+
+void
+client_request_get_version::serve(transport_layer_base *conn, class process_cache *cache)
+{
+  if (header.cb != sizeof (version))
+    {
+      header.error_code = EINVAL;
+      return;
+    }
+  header.error_code = 0;
+  version.major = CYGWIN_SERVER_VERSION_MAJOR;
+  version.api   = CYGWIN_SERVER_VERSION_API;
+  version.minor = CYGWIN_SERVER_VERSION_MINOR;
+  version.patch = CYGWIN_SERVER_VERSION_PATCH;
+}
+
+class server_request : public queue_request
+{
+  public:
+  server_request (transport_layer_base *newconn, class process_cache *newcache);
+  virtual void process ();
+  private:
+    char request_buffer [MAX_REQUEST_SIZE];
+    transport_layer_base *conn;
+    class process_cache *cache;
+};
+
+class server_process_param : public queue_process_param
+{
+  public:
+    transport_layer_base *transport;
+    server_process_param () : queue_process_param (false) {};
+};
+
+class server_request_queue : public threaded_queue
+{
+  public:
+    class process_cache *cache;
+    void process_requests (transport_layer_base *transport);
+    virtual void add (transport_layer_base *conn);
+};
+class server_request_queue request_queue;
+
+static DWORD WINAPI
+request_loop (LPVOID LpParam)
+{
+  class server_process_param *params = (server_process_param *) LpParam;
+  class server_request_queue *queue = (server_request_queue *) params->queue;
+  class transport_layer_base * transport = params->transport;
+  while (queue->active)
+  {
+    transport_layer_base * new_conn = transport->accept ();
+    /* FIXME: this is a little ugly. What we really want is to wait on two objects:
+     * one for the pipe/socket, and one for being told to shutdown. Otherwise
+     * this will stay a problem (we won't actually shutdown until the request
+     * _AFTER_ the shutdown request. And sending ourselves a request is ugly
+     */
+     if (new_conn && queue->active)
+         queue->add (new_conn);
+  }
+  return 0;
+}
+
+/* TODO: check we are not being asked to service a already serviced transport */
+void
+server_request_queue::process_requests (transport_layer_base *transport)
+{
+  class server_process_param *params = new server_process_param;
+  params->transport = transport;
+  threaded_queue::process_requests (params, request_loop);
+}
+
+void
+client_request_shutdown::serve (transport_layer_base *conn, class process_cache *cache)
+{
+  /* FIXME: link upwards, and then this becomes a trivial method call to
+   * only shutdown _this queue_
+   */
+  /* tell the main thread to shutdown */
+  request_queue.active=false;
+}
+
+server_request::server_request (transport_layer_base *newconn, class process_cache *newcache)
+{
+  conn = newconn;
+  cache = newcache;
+}
+
+void
+server_request::process ()
+{
+  ssize_t bytes_read, bytes_written;
+  struct request_header* req_ptr = (struct request_header*) &request_buffer;
+  client_request *req = NULL;
+  debug_printf ("about to read\n");
+
+  bytes_read = conn->read (request_buffer, sizeof (struct request_header));
+  if (bytes_read != sizeof (struct request_header))
+    {
+      printf ("error reading from connection (%lu)\n", GetLastError ());
+      goto out;
+    }
+  debug_printf ("got header (%ld)\n", bytes_read);
+
+  switch (req_ptr->req_id)
+    {
+    case CYGSERVER_REQUEST_GET_VERSION:
+      req = new client_request_get_version (); break;
+    case CYGSERVER_REQUEST_ATTACH_TTY:
+      req = new client_request_attach_tty (); break;
+    case CYGSERVER_REQUEST_SHUTDOWN:
+      req = new client_request_shutdown (); break;
+    case CYGSERVER_REQUEST_SHM_GET:
+     req = new client_request_shm (); break;
+    default:
+      req = new client_request (CYGSERVER_REQUEST_INVALID, 0);
+      req->header.error_code = ENOSYS;
+      debug_printf ("Bad client request - returning ENOSYS\n");
+    }
+
+  if (req->header.cb != req_ptr->cb)
+    {
+      debug_printf ("Mismatch in request buffer sizes\n");
+      goto out;
+    }
+
+  if (req->header.cb)
+    {
+
+      bytes_read = conn->read (req->buffer, req->header.cb);
+      if (bytes_read != req->header.cb)
+        {
+          debug_printf ("error reading from connection (%lu)\n", GetLastError ());
+          goto out;
+        }
+      debug_printf ("got body (%ld)\n",bytes_read);
+    }
+
+  /* this is not allowed to fail. We must return ENOSYS at a minimum to the client */
+  req->serve (conn, cache);
+
+  if ((bytes_written = conn->write ((char *)&req->header, sizeof (req->header)))
+    != sizeof(req->header) || (req->header.cb &&
+    (bytes_written = conn->write (req->buffer, req->header.cb)) != req->header.cb))
+    {
+      req->header.error_code = -1;
+      printf ("error writing to connection (%lu)\n", GetLastError ());
+      goto out;
+    }
+
+  debug_printf("Sent reply, size (%ld)\n",bytes_written);
+  printf (".");
+
+out:
+  conn->close ();
+  delete conn;
+  if (req)
+    delete (req);
+}
+
+void
+server_request_queue::add (transport_layer_base *conn)
+{
+  /* safe to not "Try" because workers don't hog this, they wait on the event
+   */
+  /* every derived ::add must enter the section! */
+  EnterCriticalSection (&queuelock);
+  if (!running)
+    {
+      conn->close ();
+      delete conn;
+      LeaveCriticalSection (&queuelock);
+      return;
+    }
+  queue_request * listrequest = new server_request (conn, cache);
+  threaded_queue::add (listrequest);
+  LeaveCriticalSection (&queuelock);
+}
+
+void
+handle_signal (int signal)
+{
+  /* any signal makes us die :} */
+  /* FIXME: link upwards, and then this becomes a trivial method call to
+   * only shutdown _this queue_
+   */
+  /* tell the main thread to shutdown */
+  request_queue.active=false;
+}
+
+struct option longopts[] = {
+  {"shutdown", no_argument, NULL, 's'},
+  {0, no_argument, NULL, 0}
+};
+
+char opts[] = "s";
+
+int
+main (int argc, char **argv)
+{
+  int shutdown=0;
+  char i;
+
+  while ((i = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
+    switch (i)
+      {
+      case 's':
+        shutdown = 1;
+        break;
+      default:
+        break;
+       /*NOTREACHED*/
+      }
+
+  wincap.init();
+  if (wincap.has_security ())
+    setup_privileges ();
+  transport = create_server_transport ();
+
+  if (shutdown)
+    {
+      if (!transport->connect())
+	{
+	  printf ("couldn't establish connection with server\n");
+	  exit (1);
+	}
+      client_request_shutdown *request =
+	new client_request_shutdown ();
+      request->send (transport);
+      transport->close();
+      delete transport;
+      delete request;
+      exit(0);
+    }
+
+  char version[200];
+  /* Cygwin dll release */
+  snprintf (version, 200, "%d.%d.%d(%d.%d/%d/%d)-(%d.%d.%d.%d) %s",
+                 cygwin_version.dll_major / 1000,
+                 cygwin_version.dll_major % 1000,
+                 cygwin_version.dll_minor,
+                 cygwin_version.api_major,
+                 cygwin_version.api_minor,
+                 cygwin_version.shared_data,
+		 CYGWIN_SERVER_VERSION_MAJOR,
+		 CYGWIN_SERVER_VERSION_API,
+		 CYGWIN_SERVER_VERSION_MINOR,
+		 CYGWIN_SERVER_VERSION_PATCH,
+                 cygwin_version.mount_registry,
+		 cygwin_version.dll_build_date);
+  setbuf (stdout, NULL);
+  printf ("daemon version %s starting up", version);
+  if (signal (SIGQUIT, handle_signal) == SIG_ERR)
+    {
+      printf ("\ncould not install signal handler (%d)- aborting startup\n", errno);
+      exit (1);
+    }
+  printf (".");
+  transport->listen ();
+  printf (".");
+  class process_cache cache (2);
+  request_queue.initial_workers = 10;
+  request_queue.cache = &cache;
+  request_queue.create_workers ();
+  printf (".");
+  request_queue.process_requests (transport);
+  printf (".");
+  cache.create_workers ();
+  printf (".");
+  cache.process_requests ();
+  printf (".complete\n");
+  /* TODO: wait on multiple objects - the thread handle for each request loop +
+   * all the process handles. This should be done by querying the request_queue and
+   * the process cache for all their handles, and then waiting for (say) 30 seconds.
+   * after that we recreate the list of handles to wait on, and wait again.
+   * the point of all this abstraction is that we can trivially server both sockets
+   * and pipes simply by making a new transport, and then calling
+   * request_queue.process_requests (transport2);
+   */
+  /* WaitForMultipleObjects abort && request_queue && process_queue && signal
+     -- if signal event then retrigger it
+   */
+  while (1 && request_queue.active) 
+    {
+      sleep (1);
+    }
+  printf ("\nShutdown request recieved - new requests will be denied\n");
+  request_queue.cleanup ();
+  printf ("All pending requests processed\n");
+  transport->close ();
+  printf ("No longer accepting requests - cygwin will operate in daemonless mode\n");
+  cache.cleanup ();
+  printf ("All outstanding process-cache activities completed\n");
+  printf ("daemon shutdown\n");
+}