From e6c867ab7f071b0fd7022db57fa7d767f3b1bf10 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonygarnockjones@gmail.com>
Date: Sat, 23 Jun 2012 07:55:47 -0400
Subject: [PATCH] Cope with merge of spawn/monitor into spawn.

---
 new-server.rkt  | 19 ++++++++++++-------
 ssh-session.rkt |  5 +++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/new-server.rkt b/new-server.rkt
index ff338a7..386cbee 100644
--- a/new-server.rkt
+++ b/new-server.rkt
@@ -153,18 +153,21 @@
 	  (extend-transition
 	      (prefix-transition (ssh-reader local-addr remote-addr)
 		(at-meta-level (send-tcp-mode remote-addr local-addr 'bytes)))
-	    (spawn/monitor (ssh-writer local-addr remote-addr) #:debug-name 'ssh-writer)
+	    (spawn (ssh-writer local-addr remote-addr)
+		   #:monitor? #t
+		   #:debug-name 'ssh-writer)
 	    ;; Wait for a cycle to let the reader and writer get
 	    ;; started, then tell the reader we are ready for a
 	    ;; single packet and spawn the session manager.
 	    (yield #:state state
 	      (transition state
 		(send-message (inbound-credit 1))
-		(spawn/monitor (ssh-session local-identification
-					    remote-identification
-					    repl-boot
-					    'server)
-			       #:debug-name 'ssh-session))))]))))
+		(spawn (ssh-session local-identification
+				    remote-identification
+				    repl-boot
+				    'server)
+		       #:monitor? #t
+		       #:debug-name 'ssh-session))))]))))
 
   (define (exn->outbound-packet reason)
     (outbound-packet (ssh-msg-disconnect (exn:fail:contract:protocol-reason-code reason)
@@ -207,7 +210,9 @@
        (at-meta-level (send-tcp-mode remote-addr local-addr 'lines))
        (at-meta-level (send-tcp-credit remote-addr local-addr 1))
 
-       (spawn/monitor (read-handshake-and-become-reader) #:debug-name 'ssh-reader)
+       (spawn (read-handshake-and-become-reader)
+	      #:monitor? #t
+	      #:debug-name 'ssh-reader)
 
        (spawn (transition active-exception-handler
 		(role 'monitor-listener (topic-subscriber (monitor (wild) (wild)))
diff --git a/ssh-session.rkt b/ssh-session.rkt
index 226a523..a319692 100644
--- a/ssh-session.rkt
+++ b/ssh-session.rkt
@@ -870,8 +870,9 @@
 			    peer-identification-string
 			    #f)
 
-      (spawn/monitor (nested-vm 'ssh-application-vm application-boot)
-		     #:debug-name 'ssh-application-vm)
+      (spawn (nested-vm 'ssh-application-vm application-boot)
+	     #:monitor? #t
+	     #:debug-name 'ssh-application-vm)
 
       (role 'rekey-waiter (topic-subscriber (timer-expired 'rekey-timer (wild)))
 	#:state conn