Branch merge.

[irc/rqf/shadowircd.git] / src / send.c

diff --git a/src/send.c b/src/send.c
index 662943dd4e186aa44257d4e61b84f9897c50b742..4b64c2d9d49091b977e8f62d714075e08ca692c9 100644 (file)
--- a/src/send.c
+++ b/src/send.c
@@ -37,7 +37,7 @@
 #include "sprintf_irc.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "hook.h"
 #include "monitor.h"
 
@@ -219,7 +219,7 @@ send_queued_write(rb_fde_t *F, void *data)
  * side effects - write is rescheduled if queue isnt emptied
  */
 void
-send_queued_slink_write(int fd, void *data)
+send_queued_slink_write(rb_fde_t *F, void *data)
 {
        struct Client *to = data;
        int retlen;
@@ -234,7 +234,7 @@ send_queued_slink_write(int fd, void *data)
        /* Next, lets try to write some data */
        if(to->localClient->slinkq)
        {
-               retlen = write(to->localClient->ctrlfd,
+               retlen = rb_write(to->localClient->ctrlF,
                              to->localClient->slinkq + to->localClient->slinkq_ofs,
                              to->localClient->slinkq_len);
 
@@ -271,7 +271,7 @@ send_queued_slink_write(int fd, void *data)
 
        /* if we have any more data, reschedule a write */
        if(to->localClient->slinkq_len)
-               rb_setselect(to->localClient->ctrlfd,
+               rb_setselect(to->localClient->ctrlF,
                               RB_SELECT_WRITE, send_queued_slink_write, to);
 }