#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"
* 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;
/* 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);
else
{
to->localClient->slinkq_ofs = 0;
- MyFree(to->localClient->slinkq);
+ rb_free(to->localClient->slinkq);
to->localClient->slinkq = NULL;
}
}
/* 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);
}
va_list args;
struct Client *target_p;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
buf_head_t linebuf;
/* noone to send to.. */
rb_linebuf_putmsg(&linebuf, format, &args, NULL);
va_end(args);
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, serv_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, serv_list.head)
{
target_p = ptr->data;
struct Client *target_p;
struct membership *msptr;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
rb_linebuf_newbuf(&rb_linebuf_local);
rb_linebuf_newbuf(&rb_linebuf_name);
rb_linebuf_putmsg(&rb_linebuf_name, NULL, NULL, ":%s %s", source_p->name, buf);
rb_linebuf_putmsg(&rb_linebuf_id, NULL, NULL, ":%s %s", use_id(source_p), buf);
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, chptr->members.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->members.head)
{
msptr = ptr->data;
target_p = msptr->client_p;
struct membership *msptr;
struct Client *target_p;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
rb_linebuf_newbuf(&linebuf);
rb_linebuf_putmsg(&linebuf, pattern, &args, NULL);
va_end(args);
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, chptr->locmembers.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head)
{
msptr = ptr->data;
target_p = msptr->client_p;
struct membership *msptr;
struct Client *target_p;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
rb_linebuf_newbuf(&linebuf);
rb_linebuf_putmsg(&linebuf, pattern, &args, NULL);
va_end(args);
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, chptr->locmembers.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head)
{
msptr = ptr->data;
target_p = msptr->client_p;
{
va_list args;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
rb_dlink_node *uptr;
rb_dlink_node *next_uptr;
struct Channel *chptr;
++current_serial;
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, user->user->channel.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, user->user->channel.head)
{
mscptr = ptr->data;
chptr = mscptr->chptr;
{
va_list args;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
rb_dlink_node *uptr;
rb_dlink_node *next_uptr;
struct Channel *chptr;
/* Skip them -- jilles */
user->serial = current_serial;
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, user->user->channel.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, user->user->channel.head)
{
mscptr = ptr->data;
chptr = mscptr->chptr;
va_list args;
struct Client *target_p;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
buf_head_t rb_linebuf_local;
buf_head_t rb_linebuf_name;
buf_head_t rb_linebuf_id;
if(what == MATCH_HOST)
{
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, lclient_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
{
target_p = ptr->data;
/* what = MATCH_SERVER, if it doesnt match us, just send remote */
else if(match(mask, me.name))
{
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, lclient_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
{
target_p = ptr->data;
_send_linebuf(target_p, &rb_linebuf_local);
buf_head_t linebuf;
struct Client *target_p;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
rb_linebuf_newbuf(&linebuf);
rb_linebuf_putmsg(&linebuf, pattern, &args, NULL);
va_end(args);
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, monptr->users.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, monptr->users.head)
{
target_p = ptr->data;
{
struct Client *client_p;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
va_list args;
buf_head_t linebuf;
":%s NOTICE * :*** Notice -- ", me.name);
va_end(args);
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, local_oper_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, local_oper_list.head)
{
client_p = ptr->data;
char *snobuf;
struct Client *client_p;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
va_list args;
buf_head_t linebuf;
}
level &= ~L_NETWIDE;
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, local_oper_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, local_oper_list.head)
{
client_p = ptr->data;
{
struct Client *client_p;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
va_list args;
buf_head_t linebuf;
":%s NOTICE * :*** Notice -- ", source_p->name);
va_end(args);
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, local_oper_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, local_oper_list.head)
{
client_p = ptr->data;
{
struct Client *client_p;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
va_list args;
buf_head_t linebuf;
va_end(args);
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, IsPerson(source_p) && flags == UMODE_WALLOP ? lclient_list.head : local_oper_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, IsPerson(source_p) && flags == UMODE_WALLOP ? lclient_list.head : local_oper_list.head)
{
client_p = ptr->data;
va_list args;
struct Client *client_p;
rb_dlink_node *ptr;
- rb_dlink_node *rb_free(;
+ rb_dlink_node *next_ptr;
buf_head_t rb_linebuf_id;
buf_head_t rb_linebuf_name;
rb_linebuf_putmsg(&rb_linebuf_id, NULL, NULL, ":%s KILL %s :%s",
use_id(&me), use_id(target_p), buf);
- RB_DLINK_FOREACH_SAFE(ptr, rb_free(, serv_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, serv_list.head)
{
client_p = ptr->data;