From c9e91ffe0ca792109c146453005fe20eee6a4932 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Wed, 5 Mar 2008 17:51:13 -0700
Subject: [PATCH] Fixed Iobuf.rebind bug

---
 iobuf.ml | 14 +++++---------
 tests.ml |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/iobuf.ml b/iobuf.ml
index 3868bfd..ff59f3d 100644
--- a/iobuf.ml
+++ b/iobuf.ml
@@ -8,7 +8,7 @@ type t = {ues: Unixqueue.event_system;
           unsent: string ref;
           ibuf: string;
           ibuf_len: int ref;
-          handle_command: t -> Command.t -> unit}
+          handle_command: (t -> Command.t -> unit) ref}
 
 let ibuf_max = 4096
 let max_outq = 50
@@ -18,11 +18,7 @@ let by_file_descr = Hashtbl.create 25
 
 let bind ues grp fd handle_command =
   let (outq, unsent, ibuf, ibuf_len) =
-    try
-      let old = Hashtbl.find by_file_descr fd in
-        (old.outq, old.unsent, old.ibuf, old.ibuf_len)
-    with Not_found ->
-      (Queue.create (), ref "", String.create ibuf_max, ref 0)
+    (Queue.create (), ref "", String.create ibuf_max, ref 0)
   in
   let iobuf = {ues = ues;
                grp = grp;
@@ -31,13 +27,13 @@ let bind ues grp fd handle_command =
                unsent = unsent;
                ibuf = ibuf;
                ibuf_len = ibuf_len;
-               handle_command = handle_command}
+               handle_command = ref handle_command}
   in
     Hashtbl.replace by_file_descr fd iobuf;
     Unixqueue.add_resource ues grp (Unixqueue.Wait_in fd, -.1.0)
 
 let rebind t handle_command =
-  bind t.ues t.grp t.fd handle_command
+  t.handle_command := handle_command
 
 let write iobuf cmd =
   let was_empty = Queue.is_empty iobuf.outq in
@@ -69,7 +65,7 @@ let handle_input iobuf =
 	  String.blit leftover 0 iobuf.ibuf 0 !(iobuf.ibuf_len)
       | line :: tl ->
 	  let parsed = Command.from_string line in
-	    iobuf.handle_command iobuf parsed;
+	    !(iobuf.handle_command) iobuf parsed;
 	    loop tl
   in
     loop lines
diff --git a/tests.ml b/tests.ml
index f1bc373..e2050da 100644
--- a/tests.ml
+++ b/tests.ml
@@ -38,7 +38,7 @@ let do_login nick =
     Send ("USER " ^ nick ^ " +iw " ^ nick ^ " :gecos\r\n");
     Send ("NICK " ^ nick ^ "\r\n");
     Recv (":testserver.test 001 " ^ nick ^ " :Welcome to IRC.\r\n");
-    Recv (":testserver.test 002 " ^ nick ^ " :I am testserver.test running version " ^ Irc.version ^ "\r\n");
+    Recv (":testserver.test 002 " ^ nick ^ " :I am testserver.test Running version " ^ Irc.version ^ "\r\n");
     Recv (":testserver.test 003 " ^ nick ^ " :This server was created sometime\r\n");
     Recv (":testserver.test 004 " ^ nick ^ " :testserver.test 0.1 l t\r\n");
   ]