* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: send.c 3520 2007-06-30 22:15:35Z jilles $
*/
#include "stdinc.h"
-#include "tools.h"
#include "send.h"
#include "channel.h"
#include "class.h"
#include "client.h"
#include "common.h"
-#include "irc_string.h"
+#include "match.h"
#include "ircd.h"
#include "numeric.h"
-#include "commio.h"
#include "s_serv.h"
-#include "sprintf_irc.h"
#include "s_conf.h"
#include "s_newconf.h"
-#include "linebuf.h"
-#include "s_log.h"
-#include "memory.h"
+#include "logger.h"
#include "hook.h"
#include "monitor.h"
/* send the message to the link the target is attached to */
#define send_linebuf(a,b) _send_linebuf((a->from ? a->from : a) ,b)
+static void send_queued_write(rb_fde_t *F, void *data);
+
unsigned long current_serial = 0L;
+struct Client *remote_rehash_oper_p;
+
/* send_linebuf()
*
* inputs - client to send to, linebuf to attach
if(!MyConnect(to) || IsIOError(to))
return 0;
- if(linebuf_len(&to->localClient->buf_sendq) > get_sendq(to))
+ if(rb_linebuf_len(&to->localClient->buf_sendq) > get_sendq(to))
{
if(IsServer(to))
{
sendto_realops_snomask(SNO_GENERAL, L_ALL,
"Max SendQ limit exceeded for %s: %u > %lu",
- get_server_name(to, HIDE_IP),
- linebuf_len(&to->localClient->buf_sendq),
+ to->name,
+ rb_linebuf_len(&to->localClient->buf_sendq),
get_sendq(to));
ilog(L_SERVER, "Max SendQ limit exceeded for %s: %u > %lu",
log_client_name(to, SHOW_IP),
- linebuf_len(&to->localClient->buf_sendq),
+ rb_linebuf_len(&to->localClient->buf_sendq),
get_sendq(to));
}
- if(IsClient(to))
- to->flags |= FLAGS_SENDQEX;
-
- dead_link(to);
+ dead_link(to, 1);
return -1;
}
else
/* just attach the linebuf to the sendq instead of
* generating a new one
*/
- linebuf_attach(&to->localClient->buf_sendq, linebuf);
+ rb_linebuf_attach(&to->localClient->buf_sendq, linebuf);
}
/*
*/
to->localClient->sendM += 1;
me.localClient->sendM += 1;
- if(linebuf_len(&to->localClient->buf_sendq) > 0)
- send_queued_write(to->localClient->fd, to);
+ if(rb_linebuf_len(&to->localClient->buf_sendq) > 0)
+ send_queued(to);
return 0;
}
if(to->from)
to = to->from;
- /* test for fake direction */
- if(!MyClient(from) && IsPerson(to) && (to == from->from))
- {
- if(IsServer(from))
- {
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Send message to %s[%s] dropped from %s(Fake Dir)",
- to->name, to->from->name, from->name);
- return;
- }
-
- sendto_realops_snomask(SNO_GENERAL, L_ALL,
- "Ghosted: %s[%s@%s] from %s[%s@%s] (%s)",
- to->name, to->username, to->host,
- from->name, from->username, from->host, to->from->name);
- kill_client_serv_butone(NULL, to, "%s (%s[%s@%s] Ghosted %s)",
- me.name, to->name, to->username,
- to->host, to->from->name);
-
- to->flags |= FLAGS_KILLED;
-
- exit_client(NULL, to, &me, "Ghosted client");
- return;
- }
+ /* we assume the caller has already tested for fake direction */
_send_linebuf(to, linebuf);
return;
* side effects - write is rescheduled if queue isnt emptied
*/
void
-send_queued_write(int fd, void *data)
+send_queued(struct Client *to)
{
- struct Client *to = data;
int retlen;
- int flags;
#ifdef USE_IODEBUG_HOOKS
hook_data_int hd;
#endif
- fde_t *F = comm_locate_fd(to->localClient->fd);
+ rb_fde_t *F = to->localClient->F;
if (!F)
return;
if(IsIOError(to))
return;
+ /* Something wants us to not send anything currently */
+ /* if(IsCork(to))
+ return; */
+
+ /* try to flush later when the write event resets this */
+ if(IsFlush(to))
+ return;
+
#ifdef USE_IODEBUG_HOOKS
hd.client = to;
if(to->localClient->buf_sendq.list.head)
to->localClient->buf_sendq.writeofs;
#endif
- if(linebuf_len(&to->localClient->buf_sendq))
+ if(rb_linebuf_len(&to->localClient->buf_sendq))
{
while ((retlen =
- linebuf_flush(F, &to->localClient->buf_sendq)) > 0)
+ rb_linebuf_flush(F, &to->localClient->buf_sendq)) > 0)
{
/* We have some data written .. update counters */
#ifdef USE_IODEBUG_HOOKS
#endif
+ ClearFlush(to);
+
to->localClient->sendB += retlen;
me.localClient->sendB += retlen;
if(to->localClient->sendB > 1023)
}
}
- if(retlen == 0 || (retlen < 0 && !ignoreErrno(errno)))
+ if(retlen == 0 || (retlen < 0 && !rb_ignore_errno(errno)))
{
- dead_link(to);
+ dead_link(to, 0);
return;
}
}
- if(ignoreErrno(errno))
- flags = COMM_SELECT_WRITE|COMM_SELECT_RETRY;
+
+ if(rb_linebuf_len(&to->localClient->buf_sendq))
+ {
+ SetFlush(to);
+ rb_setselect(to->localClient->F, RB_SELECT_WRITE,
+ send_queued_write, to);
+ }
else
- flags = COMM_SELECT_WRITE;
- if(linebuf_len(&to->localClient->buf_sendq))
- comm_setselect(fd, FDLIST_IDLECLIENT, flags,
- send_queued_write, to, 0);
+ ClearFlush(to);
+}
+
+void
+send_pop_queue(struct Client *to)
+{
+ if(to->from != NULL)
+ to = to->from;
+ if(!MyConnect(to) || IsIOError(to))
+ return;
+ if(rb_linebuf_len(&to->localClient->buf_sendq) > 0)
+ send_queued(to);
}
-/* send_queued_slink_write()
+/* send_queued_write()
*
* inputs - fd to have queue sent, client we're sending to
* outputs - contents of queue
- * side effects - write is rescheduled if queue isnt emptied
+ * side effects - write is scheduled if queue isnt emptied
*/
-void
-send_queued_slink_write(int fd, void *data)
+static void
+send_queued_write(rb_fde_t *F, void *data)
{
struct Client *to = data;
- int retlen;
-
- /*
- ** Once socket is marked dead, we cannot start writing to it,
- ** even if the error is removed...
- */
- if(IsIOError(to))
- return;
-
- /* Next, lets try to write some data */
- if(to->localClient->slinkq)
- {
- retlen = write(to->localClient->ctrlfd,
- to->localClient->slinkq + to->localClient->slinkq_ofs,
- to->localClient->slinkq_len);
-
- if(retlen < 0)
- {
- /* If we have a fatal error */
- if(!ignoreErrno(errno))
- {
- dead_link(to);
- return;
- }
- }
- /* 0 bytes is an EOF .. */
- else if(retlen == 0)
- {
- dead_link(to);
- return;
- }
- else
- {
- to->localClient->slinkq_len -= retlen;
-
- s_assert(to->localClient->slinkq_len >= 0);
- if(to->localClient->slinkq_len)
- to->localClient->slinkq_ofs += retlen;
- else
- {
- to->localClient->slinkq_ofs = 0;
- MyFree(to->localClient->slinkq);
- to->localClient->slinkq = NULL;
- }
- }
- }
-
- /* if we have any more data, reschedule a write */
- if(to->localClient->slinkq_len)
- comm_setselect(to->localClient->ctrlfd, FDLIST_IDLECLIENT,
- COMM_SELECT_WRITE|COMM_SELECT_RETRY, send_queued_slink_write, to, 0);
+ ClearFlush(to);
+ send_queued(to);
}
/* sendto_one()
if(IsIOError(target_p))
return;
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
- linebuf_putmsg(&linebuf, pattern, &args, NULL);
+ rb_linebuf_putmsg(&linebuf, pattern, &args, NULL);
va_end(args);
_send_linebuf(target_p, &linebuf);
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
return;
}
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
- linebuf_putmsg(&linebuf, pattern, &args,
+ rb_linebuf_putmsg(&linebuf, pattern, &args,
":%s %s %s ",
get_id(source_p, target_p),
command, get_id(target_p, target_p));
va_end(args);
_send_linebuf(dest_p, &linebuf);
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
/* sendto_one_notice()
return;
}
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
- linebuf_putmsg(&linebuf, pattern, &args,
+ rb_linebuf_putmsg(&linebuf, pattern, &args,
":%s NOTICE %s ",
get_id(&me, target_p), *(to = get_id(target_p, target_p)) != '\0' ? to : "*");
va_end(args);
_send_linebuf(dest_p, &linebuf);
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
return;
}
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
- linebuf_putmsg(&linebuf, pattern, &args,
+ rb_linebuf_putmsg(&linebuf, pattern, &args,
":%s %03d %s ",
get_id(&me, target_p),
numeric, *(to = get_id(target_p, target_p)) != '\0' ? to : "*");
va_end(args);
_send_linebuf(dest_p, &linebuf);
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
/*
{
va_list args;
struct Client *target_p;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
buf_head_t linebuf;
/* noone to send to.. */
- if(dlink_list_length(&serv_list) == 0)
+ if(rb_dlink_list_length(&serv_list) == 0)
return;
if(chptr != NULL && *chptr->chname != '#')
return;
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, format);
- linebuf_putmsg(&linebuf, format, &args, NULL);
+ rb_linebuf_putmsg(&linebuf, format, &args, NULL);
va_end(args);
- DLINK_FOREACH_SAFE(ptr, next_ptr, serv_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, serv_list.head)
{
target_p = ptr->data;
_send_linebuf(target_p, &linebuf);
}
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
{
static char buf[BUFSIZE];
va_list args;
- buf_head_t linebuf_local;
- buf_head_t linebuf_name;
- buf_head_t linebuf_id;
+ buf_head_t rb_linebuf_local;
+ buf_head_t rb_linebuf_id;
struct Client *target_p;
struct membership *msptr;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
- linebuf_newbuf(&linebuf_local);
- linebuf_newbuf(&linebuf_name);
- linebuf_newbuf(&linebuf_id);
+ rb_linebuf_newbuf(&rb_linebuf_local);
+ rb_linebuf_newbuf(&rb_linebuf_id);
current_serial++;
va_start(args, pattern);
- ircvsnprintf(buf, sizeof(buf), pattern, args);
+ rb_vsnprintf(buf, sizeof(buf), pattern, args);
va_end(args);
if(IsServer(source_p))
- linebuf_putmsg(&linebuf_local, NULL, NULL,
+ rb_linebuf_putmsg(&rb_linebuf_local, NULL, NULL,
":%s %s", source_p->name, buf);
else
- linebuf_putmsg(&linebuf_local, NULL, NULL,
+ rb_linebuf_putmsg(&rb_linebuf_local, NULL, NULL,
":%s!%s@%s %s",
source_p->name, source_p->username,
source_p->host, buf);
- linebuf_putmsg(&linebuf_name, NULL, NULL, ":%s %s", source_p->name, buf);
- linebuf_putmsg(&linebuf_id, NULL, NULL, ":%s %s", use_id(source_p), buf);
+ rb_linebuf_putmsg(&rb_linebuf_id, NULL, NULL, ":%s %s", use_id(source_p), buf);
- DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->members.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->members.head)
{
msptr = ptr->data;
target_p = msptr->client_p;
if(target_p->from->serial != current_serial)
{
- if(has_id(target_p->from))
- send_linebuf_remote(target_p, source_p, &linebuf_id);
- else
- send_linebuf_remote(target_p, source_p, &linebuf_name);
-
+ send_linebuf_remote(target_p, source_p, &rb_linebuf_id);
target_p->from->serial = current_serial;
}
}
else
- _send_linebuf(target_p, &linebuf_local);
+ _send_linebuf(target_p, &rb_linebuf_local);
}
- linebuf_donebuf(&linebuf_local);
- linebuf_donebuf(&linebuf_name);
- linebuf_donebuf(&linebuf_id);
+ rb_linebuf_donebuf(&rb_linebuf_local);
+ rb_linebuf_donebuf(&rb_linebuf_id);
}
+/* sendto_channel_flags()
+ *
+ * inputs - server not to send to, flags needed, source, channel, va_args
+ * outputs - message is sent to channel members
+ * side effects -
+ */
+void
+sendto_channel_opmod(struct Client *one, struct Client *source_p,
+ struct Channel *chptr, const char *command,
+ const char *text)
+{
+ buf_head_t rb_linebuf_local;
+ buf_head_t rb_linebuf_old;
+ buf_head_t rb_linebuf_new;
+ struct Client *target_p;
+ struct membership *msptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
+
+ rb_linebuf_newbuf(&rb_linebuf_local);
+ rb_linebuf_newbuf(&rb_linebuf_old);
+ rb_linebuf_newbuf(&rb_linebuf_new);
+
+ current_serial++;
+
+ if(IsServer(source_p))
+ rb_linebuf_putmsg(&rb_linebuf_local, NULL, NULL,
+ ":%s %s %s :%s",
+ source_p->name, command, chptr->chname, text);
+ else
+ rb_linebuf_putmsg(&rb_linebuf_local, NULL, NULL,
+ ":%s!%s@%s %s %s :%s",
+ source_p->name, source_p->username,
+ source_p->host, command, chptr->chname, text);
+
+ if (chptr->mode.mode & MODE_MODERATED)
+ rb_linebuf_putmsg(&rb_linebuf_old, NULL, NULL,
+ ":%s %s %s :%s",
+ use_id(source_p), command, chptr->chname, text);
+ else
+ rb_linebuf_putmsg(&rb_linebuf_old, NULL, NULL,
+ ":%s NOTICE @%s :<%s:%s> %s",
+ use_id(source_p->servptr), chptr->chname,
+ source_p->name, chptr->chname, text);
+ rb_linebuf_putmsg(&rb_linebuf_new, NULL, NULL,
+ ":%s %s =%s :%s",
+ use_id(source_p), command, chptr->chname, text);
+
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->members.head)
+ {
+ msptr = ptr->data;
+ target_p = msptr->client_p;
+
+ if(IsIOError(target_p->from) || target_p->from == one)
+ continue;
+
+ if(!is_any_op(msptr))
+ continue;
+
+ if(IsDeaf(target_p))
+ continue;
+
+ if(!MyClient(target_p))
+ {
+ /* if we've got a specific type, target must support
+ * CHW.. --fl
+ */
+ if(NotCapable(target_p->from, CAP_CHW))
+ continue;
+
+ if(target_p->from->serial != current_serial)
+ {
+ if (IsCapable(target_p->from, CAP_EOPMOD))
+ send_linebuf_remote(target_p, source_p, &rb_linebuf_new);
+ else
+ send_linebuf_remote(target_p, source_p, &rb_linebuf_old);
+ target_p->from->serial = current_serial;
+ }
+ }
+ else
+ _send_linebuf(target_p, &rb_linebuf_local);
+ }
+
+ rb_linebuf_donebuf(&rb_linebuf_local);
+ rb_linebuf_donebuf(&rb_linebuf_old);
+ rb_linebuf_donebuf(&rb_linebuf_new);
+}
/* sendto_channel_local()
*
buf_head_t linebuf;
struct membership *msptr;
struct Client *target_p;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
- linebuf_putmsg(&linebuf, pattern, &args, NULL);
+ rb_linebuf_putmsg(&linebuf, pattern, &args, NULL);
va_end(args);
- DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head)
{
msptr = ptr->data;
target_p = msptr->client_p;
if(IsIOError(target_p))
continue;
- if(type && ((msptr->flags & type) == 0))
+ if(type == ONLY_OPERS)
+ {
+ if(!IsOper(target_p))
+ continue;
+ }
+ else if(type && ((msptr->flags & type) == 0))
continue;
_send_linebuf(target_p, &linebuf);
}
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
/* sendto_channel_local_butone()
buf_head_t linebuf;
struct membership *msptr;
struct Client *target_p;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
- linebuf_putmsg(&linebuf, pattern, &args, NULL);
+ rb_linebuf_putmsg(&linebuf, pattern, &args, NULL);
va_end(args);
- DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head)
{
msptr = ptr->data;
target_p = msptr->client_p;
_send_linebuf(target_p, &linebuf);
}
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
/*
sendto_common_channels_local(struct Client *user, const char *pattern, ...)
{
va_list args;
- dlink_node *ptr;
- dlink_node *next_ptr;
- dlink_node *uptr;
- dlink_node *next_uptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
+ rb_dlink_node *uptr;
+ rb_dlink_node *next_uptr;
struct Channel *chptr;
struct Client *target_p;
struct membership *msptr;
struct membership *mscptr;
buf_head_t linebuf;
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
- linebuf_putmsg(&linebuf, pattern, &args, NULL);
+ rb_linebuf_putmsg(&linebuf, pattern, &args, NULL);
va_end(args);
++current_serial;
- DLINK_FOREACH_SAFE(ptr, next_ptr, user->user->channel.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, user->user->channel.head)
{
mscptr = ptr->data;
chptr = mscptr->chptr;
- DLINK_FOREACH_SAFE(uptr, next_uptr, chptr->locmembers.head)
+ RB_DLINK_FOREACH_SAFE(uptr, next_uptr, chptr->locmembers.head)
{
msptr = uptr->data;
target_p = msptr->client_p;
if(MyConnect(user) && (user->serial != current_serial))
send_linebuf(user, &linebuf);
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
/*
sendto_common_channels_local_butone(struct Client *user, const char *pattern, ...)
{
va_list args;
- dlink_node *ptr;
- dlink_node *next_ptr;
- dlink_node *uptr;
- dlink_node *next_uptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
+ rb_dlink_node *uptr;
+ rb_dlink_node *next_uptr;
struct Channel *chptr;
struct Client *target_p;
struct membership *msptr;
struct membership *mscptr;
buf_head_t linebuf;
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
- linebuf_putmsg(&linebuf, pattern, &args, NULL);
+ rb_linebuf_putmsg(&linebuf, pattern, &args, NULL);
va_end(args);
++current_serial;
/* Skip them -- jilles */
user->serial = current_serial;
- DLINK_FOREACH_SAFE(ptr, next_ptr, user->user->channel.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, user->user->channel.head)
{
mscptr = ptr->data;
chptr = mscptr->chptr;
- DLINK_FOREACH_SAFE(uptr, next_uptr, chptr->locmembers.head)
+ RB_DLINK_FOREACH_SAFE(uptr, next_uptr, chptr->locmembers.head)
{
msptr = uptr->data;
target_p = msptr->client_p;
}
}
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
/* sendto_match_butone()
static char buf[BUFSIZE];
va_list args;
struct Client *target_p;
- dlink_node *ptr;
- dlink_node *next_ptr;
- buf_head_t linebuf_local;
- buf_head_t linebuf_name;
- buf_head_t linebuf_id;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
+ buf_head_t rb_linebuf_local;
+ buf_head_t rb_linebuf_id;
- linebuf_newbuf(&linebuf_local);
- linebuf_newbuf(&linebuf_name);
- linebuf_newbuf(&linebuf_id);
+ rb_linebuf_newbuf(&rb_linebuf_local);
+ rb_linebuf_newbuf(&rb_linebuf_id);
va_start(args, pattern);
- ircvsnprintf(buf, sizeof(buf), pattern, args);
+ rb_vsnprintf(buf, sizeof(buf), pattern, args);
va_end(args);
if(IsServer(source_p))
- linebuf_putmsg(&linebuf_local, NULL, NULL,
+ rb_linebuf_putmsg(&rb_linebuf_local, NULL, NULL,
":%s %s", source_p->name, buf);
else
- linebuf_putmsg(&linebuf_local, NULL, NULL,
+ rb_linebuf_putmsg(&rb_linebuf_local, NULL, NULL,
":%s!%s@%s %s",
source_p->name, source_p->username,
source_p->host, buf);
- linebuf_putmsg(&linebuf_name, NULL, NULL, ":%s %s", source_p->name, buf);
- linebuf_putmsg(&linebuf_id, NULL, NULL, ":%s %s", use_id(source_p), buf);
+ rb_linebuf_putmsg(&rb_linebuf_id, NULL, NULL, ":%s %s", use_id(source_p), buf);
if(what == MATCH_HOST)
{
- DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
{
target_p = ptr->data;
if(match(mask, target_p->host))
- _send_linebuf(target_p, &linebuf_local);
+ _send_linebuf(target_p, &rb_linebuf_local);
}
}
/* what = MATCH_SERVER, if it doesnt match us, just send remote */
else if(match(mask, me.name))
{
- DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, lclient_list.head)
{
target_p = ptr->data;
- _send_linebuf(target_p, &linebuf_local);
+ _send_linebuf(target_p, &rb_linebuf_local);
}
}
- DLINK_FOREACH(ptr, serv_list.head)
+ RB_DLINK_FOREACH(ptr, serv_list.head)
{
target_p = ptr->data;
if(target_p == one)
continue;
- if(has_id(target_p))
- send_linebuf_remote(target_p, source_p, &linebuf_id);
- else
- send_linebuf_remote(target_p, source_p, &linebuf_name);
+ send_linebuf_remote(target_p, source_p, &rb_linebuf_id);
}
- linebuf_donebuf(&linebuf_local);
- linebuf_donebuf(&linebuf_id);
- linebuf_donebuf(&linebuf_name);
+ rb_linebuf_donebuf(&rb_linebuf_local);
+ rb_linebuf_donebuf(&rb_linebuf_id);
}
/* sendto_match_servs()
{
static char buf[BUFSIZE];
va_list args;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
struct Client *target_p;
- buf_head_t linebuf_id;
- buf_head_t linebuf_name;
+ buf_head_t rb_linebuf_id;
if(EmptyString(mask))
return;
- linebuf_newbuf(&linebuf_id);
- linebuf_newbuf(&linebuf_name);
+ rb_linebuf_newbuf(&rb_linebuf_id);
va_start(args, pattern);
- ircvsnprintf(buf, sizeof(buf), pattern, args);
+ rb_vsnprintf(buf, sizeof(buf), pattern, args);
va_end(args);
- linebuf_putmsg(&linebuf_id, NULL, NULL,
+ rb_linebuf_putmsg(&rb_linebuf_id, NULL, NULL,
":%s %s", use_id(source_p), buf);
- linebuf_putmsg(&linebuf_name, NULL, NULL,
- ":%s %s", source_p->name, buf);
current_serial++;
- DLINK_FOREACH(ptr, global_serv_list.head)
+ RB_DLINK_FOREACH(ptr, global_serv_list.head)
{
target_p = ptr->data;
if(nocap && !NotCapable(target_p->from, nocap))
continue;
- if(has_id(target_p->from))
- _send_linebuf(target_p->from, &linebuf_id);
- else
- _send_linebuf(target_p->from, &linebuf_name);
+ _send_linebuf(target_p->from, &rb_linebuf_id);
}
}
- linebuf_donebuf(&linebuf_id);
- linebuf_donebuf(&linebuf_name);
+ rb_linebuf_donebuf(&rb_linebuf_id);
}
/* sendto_monitor()
va_list args;
buf_head_t linebuf;
struct Client *target_p;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
- linebuf_putmsg(&linebuf, pattern, &args, NULL);
+ rb_linebuf_putmsg(&linebuf, pattern, &args, NULL);
va_end(args);
- DLINK_FOREACH_SAFE(ptr, next_ptr, monptr->users.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, monptr->users.head)
{
target_p = ptr->data;
_send_linebuf(target_p, &linebuf);
}
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
/* sendto_anywhere()
va_list args;
buf_head_t linebuf;
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
if(MyClient(target_p))
{
if(IsServer(source_p))
- linebuf_putmsg(&linebuf, pattern, &args, ":%s %s %s ",
+ rb_linebuf_putmsg(&linebuf, pattern, &args, ":%s %s %s ",
source_p->name, command,
target_p->name);
else
- linebuf_putmsg(&linebuf, pattern, &args,
+ rb_linebuf_putmsg(&linebuf, pattern, &args,
":%s!%s@%s %s %s ",
source_p->name, source_p->username,
source_p->host, command,
target_p->name);
}
else
- linebuf_putmsg(&linebuf, pattern, &args, ":%s %s %s ",
+ rb_linebuf_putmsg(&linebuf, pattern, &args, ":%s %s %s ",
get_id(source_p, target_p), command,
get_id(target_p, target_p));
va_end(args);
else
send_linebuf_remote(target_p, source_p, &linebuf);
- linebuf_donebuf(&linebuf);
-}
-
-/* sendto_realops_flags()
- *
- * inputs - umode needed, level (opers/admin), va_args
- * output -
- * side effects - message is sent to opers with matching umodes
- */
-void
-sendto_realops_flags(int flags, int level, const char *pattern, ...)
-{
- struct Client *client_p;
- dlink_node *ptr;
- dlink_node *next_ptr;
- va_list args;
- buf_head_t linebuf;
-
- linebuf_newbuf(&linebuf);
-
- va_start(args, pattern);
- linebuf_putmsg(&linebuf, pattern, &args,
- ":%s NOTICE * :*** Notice -- ", me.name);
- va_end(args);
-
- DLINK_FOREACH_SAFE(ptr, next_ptr, local_oper_list.head)
- {
- client_p = ptr->data;
-
- /* If we're sending it to opers and theyre an admin, skip.
- * If we're sending it to admins, and theyre not, skip.
- */
- if(((level == L_ADMIN) && !IsOperAdmin(client_p)) ||
- ((level == L_OPER) && IsOperAdmin(client_p)))
- continue;
-
- if(client_p->umodes & flags)
- _send_linebuf(client_p, &linebuf);
- }
-
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
/* sendto_realops_snomask()
static char buf[BUFSIZE];
char *snobuf;
struct Client *client_p;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
va_list args;
buf_head_t linebuf;
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
/* Be very sure not to do things like "Trying to send to myself"
* L_NETWIDE, otherwise infinite recursion may result! -- jilles */
{
/* rather a lot of copying around, oh well -- jilles */
va_start(args, pattern);
- ircvsnprintf(buf, sizeof(buf), pattern, args);
+ rb_vsnprintf(buf, sizeof(buf), pattern, args);
va_end(args);
- linebuf_putmsg(&linebuf, pattern, NULL,
+ rb_linebuf_putmsg(&linebuf, pattern, NULL,
":%s NOTICE * :*** Notice -- %s", me.name, buf);
snobuf = construct_snobuf(flags);
if (snobuf[1] != '\0')
- {
sendto_server(NULL, NULL, CAP_ENCAP|CAP_TS6, NOCAPS,
":%s ENCAP * SNOTE %c :%s",
me.id, snobuf[1], buf);
- sendto_server(NULL, NULL, CAP_ENCAP, CAP_TS6,
- ":%s ENCAP * SNOTE %c :%s",
- me.name, snobuf[1], buf);
- }
+ }
+ else if (remote_rehash_oper_p != NULL)
+ {
+ /* rather a lot of copying around, oh well -- jilles */
+ va_start(args, pattern);
+ rb_vsnprintf(buf, sizeof(buf), pattern, args);
+ va_end(args);
+ rb_linebuf_putmsg(&linebuf, pattern, NULL,
+ ":%s NOTICE * :*** Notice -- %s", me.name, buf);
+ sendto_one_notice(remote_rehash_oper_p, ":*** Notice -- %s", buf);
}
else
{
va_start(args, pattern);
- linebuf_putmsg(&linebuf, pattern, &args,
+ rb_linebuf_putmsg(&linebuf, pattern, &args,
":%s NOTICE * :*** Notice -- ", me.name);
va_end(args);
}
level &= ~L_NETWIDE;
- DLINK_FOREACH_SAFE(ptr, next_ptr, local_oper_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, local_oper_list.head)
{
client_p = ptr->data;
_send_linebuf(client_p, &linebuf);
}
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
/* sendto_realops_snomask_from()
*
const char *pattern, ...)
{
struct Client *client_p;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
va_list args;
buf_head_t linebuf;
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
- linebuf_putmsg(&linebuf, pattern, &args,
+ rb_linebuf_putmsg(&linebuf, pattern, &args,
":%s NOTICE * :*** Notice -- ", source_p->name);
va_end(args);
- DLINK_FOREACH_SAFE(ptr, next_ptr, local_oper_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, local_oper_list.head)
{
client_p = ptr->data;
_send_linebuf(client_p, &linebuf);
}
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
/*
sendto_wallops_flags(int flags, struct Client *source_p, const char *pattern, ...)
{
struct Client *client_p;
- dlink_node *ptr;
- dlink_node *next_ptr;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
va_list args;
buf_head_t linebuf;
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
if(IsPerson(source_p))
- linebuf_putmsg(&linebuf, pattern, &args,
+ rb_linebuf_putmsg(&linebuf, pattern, &args,
":%s!%s@%s WALLOPS :", source_p->name,
source_p->username, source_p->host);
else
- linebuf_putmsg(&linebuf, pattern, &args, ":%s WALLOPS :", source_p->name);
+ rb_linebuf_putmsg(&linebuf, pattern, &args, ":%s WALLOPS :", source_p->name);
va_end(args);
- DLINK_FOREACH_SAFE(ptr, next_ptr, 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;
_send_linebuf(client_p, &linebuf);
}
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
/* kill_client()
va_list args;
buf_head_t linebuf;
- linebuf_newbuf(&linebuf);
+ rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
- linebuf_putmsg(&linebuf, pattern, &args, ":%s KILL %s :",
+ rb_linebuf_putmsg(&linebuf, pattern, &args, ":%s KILL %s :",
get_id(&me, target_p), get_id(diedie, target_p));
va_end(args);
send_linebuf(target_p, &linebuf);
- linebuf_donebuf(&linebuf);
+ rb_linebuf_donebuf(&linebuf);
}
static char buf[BUFSIZE];
va_list args;
struct Client *client_p;
- dlink_node *ptr;
- dlink_node *next_ptr;
- buf_head_t linebuf_id;
- buf_head_t linebuf_name;
+ rb_dlink_node *ptr;
+ rb_dlink_node *next_ptr;
+ buf_head_t rb_linebuf_id;
- linebuf_newbuf(&linebuf_name);
- linebuf_newbuf(&linebuf_id);
+ rb_linebuf_newbuf(&rb_linebuf_id);
va_start(args, pattern);
- ircvsnprintf(buf, sizeof(buf), pattern, args);
+ rb_vsnprintf(buf, sizeof(buf), pattern, args);
va_end(args);
- linebuf_putmsg(&linebuf_name, NULL, NULL, ":%s KILL %s :%s",
- me.name, target_p->name, buf);
- linebuf_putmsg(&linebuf_id, NULL, NULL, ":%s KILL %s :%s",
+ rb_linebuf_putmsg(&rb_linebuf_id, NULL, NULL, ":%s KILL %s :%s",
use_id(&me), use_id(target_p), buf);
- DLINK_FOREACH_SAFE(ptr, next_ptr, serv_list.head)
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, serv_list.head)
{
client_p = ptr->data;
(!has_id(client_p) || !has_id(target_p)))
continue;
- if(has_id(client_p))
- _send_linebuf(client_p, &linebuf_id);
- else
- _send_linebuf(client_p, &linebuf_name);
+ _send_linebuf(client_p, &rb_linebuf_id);
}
- linebuf_donebuf(&linebuf_id);
- linebuf_donebuf(&linebuf_name);
+ rb_linebuf_donebuf(&rb_linebuf_id);
}
projects / irc / rqf / shadowircd.git / blobdiff