* along with this program; if not, write to the Free Software
* 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"
rb_linebuf_newbuf(linebuf);
msgbuf_unparse_prefix(buf, sizeof buf, msgbuf, capmask);
rb_linebuf_putprefix(linebuf, pattern, va, buf);
-}
+}
/* linebuf_put_msgbuf
*
msgbuf->origin = buf;
msgbuf->cmd = cmd;
- if (IsPerson(from))
+ if (from != NULL && IsPerson(from))
snprintf(buf, sizeof buf, "%s!%s@%s", from->name, from->username, from->host);
- else
+ else if (from != NULL)
rb_strlcpy(buf, from->name, sizeof buf);
+ else
+ rb_strlcpy(buf, me.name, sizeof buf);
hdata.client = from;
hdata.arg1 = msgbuf;
sendto_channel_flags(struct Client *one, int type, struct Client *source_p,
struct Channel *chptr, const char *pattern, ...)
{
- static char buf[BUFSIZE];
+ char buf[IRCD_BUFSIZE];
va_list args;
buf_head_t rb_linebuf_local;
buf_head_t rb_linebuf_id;
struct membership *msptr;
rb_dlink_node *ptr;
rb_dlink_node *next_ptr;
+ int current_capmask = 0;
+ struct MsgBuf msgbuf;
rb_linebuf_newbuf(&rb_linebuf_local);
rb_linebuf_newbuf(&rb_linebuf_id);
current_serial++;
+ build_msgbuf_from(&msgbuf, source_p, NULL);
+
va_start(args, pattern);
- vsnprintf(buf, sizeof(buf), pattern, args);
+ vsnprintf(buf, sizeof buf, pattern, args);
va_end(args);
- if(IsServer(source_p))
- rb_linebuf_putmsg(&rb_linebuf_local, NULL, NULL,
- ":%s %s", source_p->name, buf);
- else
- rb_linebuf_putmsg(&rb_linebuf_local, NULL, NULL,
- ":%s!%s@%s %s",
- source_p->name, source_p->username,
- source_p->host, buf);
-
+ linebuf_put_msgbuf(&msgbuf, &rb_linebuf_local, NOCAPS, "%s", buf);
rb_linebuf_putmsg(&rb_linebuf_id, NULL, NULL, ":%s %s", use_id(source_p), buf);
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)
+ if(!MyClient(source_p) && (IsIOError(target_p->from) || target_p->from == one))
+ continue;
+
+ if(MyClient(source_p) && !IsCapable(source_p, CLICAP_ECHO_MESSAGE) && target_p == one)
continue;
if(type && ((msptr->flags & type) == 0))
}
}
else
+ {
+ if (target_p->localClient->caps != current_capmask)
+ {
+ /* reset the linebuf */
+ rb_linebuf_donebuf(&rb_linebuf_local);
+ rb_linebuf_newbuf(&rb_linebuf_local);
+
+ /* render the new linebuf and attach it */
+ linebuf_put_msgbuf(&msgbuf, &rb_linebuf_local, target_p->localClient->caps, "%s", buf);
+ current_capmask = target_p->localClient->caps;
+ }
+
_send_linebuf(target_p, &rb_linebuf_local);
+ }
}
rb_linebuf_donebuf(&rb_linebuf_local);
msptr = ptr->data;
target_p = msptr->client_p;
- if(IsIOError(target_p->from) || target_p->from == one)
+ if(!MyClient(source_p) && (IsIOError(target_p->from) || target_p->from == one))
+ continue;
+
+ if(MyClient(source_p) && !IsCapable(source_p, CLICAP_ECHO_MESSAGE) && target_p == one)
continue;
if((msptr->flags & CHFL_CHANOP) == 0)
struct MsgBuf msgbuf;
rb_dlink_node *ptr;
rb_dlink_node *next_ptr;
- unsigned int current_capmask = 0;
rb_linebuf_newbuf(&linebuf);
va_start(args, pattern);
rb_linebuf_putmsg(&linebuf, pattern, &args, NULL);
+ va_end(args);
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head)
{
if(type && ((msptr->flags & type) == 0))
continue;
- if (target_p->localClient->caps != current_capmask)
- {
- /* reset the linebuf */
- rb_linebuf_donebuf(&linebuf);
- rb_linebuf_newbuf(&linebuf);
-
- /* render the new linebuf and attach it */
- linebuf_put_msgvbuf(&msgbuf, &linebuf, target_p->localClient->caps, pattern, &args);
- current_capmask = target_p->localClient->caps;
- }
-
/* attach the present linebuf to the target */
_send_linebuf(target_p, &linebuf);
}
- va_end(args);
-
rb_linebuf_donebuf(&linebuf);
}
va_list args;
buf_head_t linebuf;
+ rb_linebuf_newbuf(&linebuf);
+
va_start(args, pattern);
if(MyClient(target_p))