Allocate the backend on the heap (for simpler gc).

Rev: src/lsh.c:1.25
Rev: src/lshd.c:1.22

src/lsh.c

@@ -108,8 +108,7 @@ int main(int argc, char **argv)
   
   struct sockaddr_in remote;
 
-  /* STATIC, because the object exists at gc time */
-  struct io_backend backend = { STATIC_HEADER };
+  NEW(io_backend, backend);
 
   struct lsh_string *random_seed;
   struct randomness *r;
@@ -171,7 +170,7 @@ int main(int argc, char **argv)
       exit(1);
     }
 
-  init_backend(&backend);
+  init_backend(backend);
   
   random_seed = ssh_format("%z", "gazonk");
   r = make_poor_random(&sha_algorithm, random_seed);
@@ -208,9 +207,9 @@ int main(int argc, char **argv)
   service = make_connection_service
     (make_alist(0, -1),
      make_alist(0, -1),
-     make_client_startup(io_read(&backend, in, NULL, NULL),
-			 io_write(&backend, out, BLOCK_SIZE, NULL),
-			 io_write(&backend, err, BLOCK_SIZE, NULL),
+     make_client_startup(io_read(backend, in, NULL, NULL),
+			 io_write(backend, out, BLOCK_SIZE, NULL),
+			 io_write(backend, err, BLOCK_SIZE, NULL),
 			 ATOM_SHELL, ssh_format(""), &lsh_exit_code));
   
   kexinit_handler = make_kexinit_handler
@@ -221,8 +220,8 @@ int main(int argc, char **argv)
 					  ATOM_SSH_CONNECTION,
 					  service)));
   
-  if (!io_connect(&backend, &remote, NULL,
-		  make_client_callback(&backend,
+  if (!io_connect(backend, &remote, NULL,
+		  make_client_callback(backend,
 				       "lsh - a free ssh",
 				       SSH_MAX_PACKET,
 				       r, make_kexinit,
@@ -237,7 +236,7 @@ int main(int argc, char **argv)
   /* Exit code if no session is established */
   lsh_exit_code = 17;
   
-  io_run(&backend);
+  io_run(backend);
 
   return lsh_exit_code;
 }

src/lshd.c

@@ -126,8 +126,7 @@ int main(int argc, char **argv)
 
   struct sockaddr_in local;
 
-  /* STATIC, because the object exists at gc time */
-  struct io_backend backend = { STATIC_HEADER };
+  NEW(io_backend, backend);
 
   struct reap *reaper;
   
@@ -176,7 +175,7 @@ int main(int argc, char **argv)
       exit(1);
     }
 
-  init_backend(&backend);
+  init_backend(backend);
   reaper = make_reaper();
   random_seed = ssh_format("%z", "foobar");
 
@@ -206,15 +205,15 @@ int main(int argc, char **argv)
 			       make_server_session_service
 			       (make_alist(0, -1),
 				make_alist(1, ATOM_SHELL,
-					   make_shell_handler(&backend,
+					   make_shell_handler(backend,
 							      reaper),
 					   -1)),
 			       -1)),
 		   -1)),
        -1)));
      
-  if (!io_listen(&backend, &local, 
-	    make_server_callback(&backend,
+  if (!io_listen(backend, &local, 
+	    make_server_callback(backend,
 				 "lsh - a free ssh",
 				 SSH_MAX_PACKET,
 				 r, make_kexinit,
@@ -224,7 +223,7 @@ int main(int argc, char **argv)
       return 1;
     }
   
-  reaper_run(reaper, &backend);
+  reaper_run(reaper, backend);
 
   return 0;
 }