neale
/
irc-bot
mirror of https://github.com/nealey/irc-bot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Iobuf.rebind bug

This commit is contained in:
Neale Pickett 2008-03-05 17:51:13 -07:00
parent 0e8a998293
commit c9e91ffe0c
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
iobuf.ml
View File

@ -8,7 +8,7 @@ type t = {ues: Unixqueue.event_system;
unsent: string ref; unsent: string ref;
ibuf: string; ibuf: string;
ibuf_len: int ref; ibuf_len: int ref;
handle_command: t -> Command.t -> unit} handle_command: (t -> Command.t -> unit) ref}
let ibuf_max = 4096 let ibuf_max = 4096
let max_outq = 50 let max_outq = 50
@ -18,10 +18,6 @@ let by_file_descr = Hashtbl.create 25
let bind ues grp fd handle_command = let bind ues grp fd handle_command =
let (outq, unsent, ibuf, ibuf_len) = 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 in
let iobuf = {ues = ues; let iobuf = {ues = ues;
@ -31,13 +27,13 @@ let bind ues grp fd handle_command =
unsent = unsent; unsent = unsent;
ibuf = ibuf; ibuf = ibuf;
ibuf_len = ibuf_len; ibuf_len = ibuf_len;
handle_command = handle_command} handle_command = ref handle_command}
in in
Hashtbl.replace by_file_descr fd iobuf; Hashtbl.replace by_file_descr fd iobuf;
Unixqueue.add_resource ues grp (Unixqueue.Wait_in fd, -.1.0) Unixqueue.add_resource ues grp (Unixqueue.Wait_in fd, -.1.0)
let rebind t handle_command = let rebind t handle_command =
bind t.ues t.grp t.fd handle_command t.handle_command := handle_command
let write iobuf cmd = let write iobuf cmd =
let was_empty = Queue.is_empty iobuf.outq in 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) String.blit leftover 0 iobuf.ibuf 0 !(iobuf.ibuf_len)
| line :: tl -> | line :: tl ->
let parsed = Command.from_string line in let parsed = Command.from_string line in
iobuf.handle_command iobuf parsed; !(iobuf.handle_command) iobuf parsed;
loop tl loop tl
in in
loop lines loop lines

2
tests.ml
View File

@ -38,7 +38,7 @@ let do_login nick =
Send ("USER " ^ nick ^ " +iw " ^ nick ^ " :gecos\r\n"); Send ("USER " ^ nick ^ " +iw " ^ nick ^ " :gecos\r\n");
Send ("NICK " ^ nick ^ "\r\n"); Send ("NICK " ^ nick ^ "\r\n");
Recv (":testserver.test 001 " ^ nick ^ " :Welcome to IRC.\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 003 " ^ nick ^ " :This server was created sometime\r\n");
Recv (":testserver.test 004 " ^ nick ^ " :testserver.test 0.1 l t\r\n"); Recv (":testserver.test 004 " ^ nick ^ " :testserver.test 0.1 l t\r\n");
] ]