* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: m_monitor.c 312 2005-11-07 10:47:33Z jilles $
*/
#include "stdinc.h"
#include "send.h"
#include "supported.h"
+static const char monitor_desc[] = "Provides the MONITOR facility for tracking user signon and signoff";
+
static int monitor_init(void);
static void monitor_deinit(void);
-static int m_monitor(struct Client *, struct Client *, int, const char **);
+static void m_monitor(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
struct Message monitor_msgtab = {
- "MONITOR", 0, 0, 0, MFLG_SLOW,
+ "MONITOR", 0, 0, 0, 0,
{mg_unreg, {m_monitor, 2}, mg_ignore, mg_ignore, mg_ignore, {m_monitor, 2}}
};
mapi_clist_av1 monitor_clist[] = { &monitor_msgtab, NULL };
-DECLARE_MODULE_AV1(monitor, monitor_init, monitor_deinit, monitor_clist, NULL, NULL, "$Revision: 312 $");
+
+DECLARE_MODULE_AV2(monitor, monitor_init, monitor_deinit, monitor_clist, NULL, NULL, NULL, NULL, monitor_desc);
static int monitor_init(void)
{
static void
add_monitor(struct Client *client_p, const char *nicks)
{
- char onbuf[BUFSIZE], offbuf[BUFSIZE];
+ rb_dlink_node *prev_head, *ptr;
struct Client *target_p;
struct monitor *monptr;
const char *name;
char *tmp;
char *p;
- char *onptr, *offptr;
- int mlen, arglen;
- int cur_onlen, cur_offlen;
-
- /* these two are same length, just diff numeric */
- cur_offlen = cur_onlen = mlen = sprintf(onbuf, form_str(RPL_MONONLINE),
- me.name, client_p->name, "");
- sprintf(offbuf, form_str(RPL_MONOFFLINE),
- me.name, client_p->name, "");
-
- onptr = onbuf + mlen;
- offptr = offbuf + mlen;
+ prev_head = client_p->localClient->monitor_list.head;
tmp = LOCAL_COPY(nicks);
for(name = rb_strtok_r(tmp, ",", &p); name; name = rb_strtok_r(NULL, ",", &p))
if(rb_dlink_list_length(&client_p->localClient->monitor_list) >=
(unsigned long)ConfigFileEntry.max_monitor)
{
- char buf[100];
-
- if(cur_onlen != mlen)
- sendto_one(client_p, "%s", onbuf);
- if(cur_offlen != mlen)
- sendto_one(client_p, "%s", offbuf);
-
- if(p)
- rb_snprintf(buf, sizeof(buf), "%s,%s", name, p);
- else
- rb_snprintf(buf, sizeof(buf), "%s", name);
-
- sendto_one(client_p, form_str(ERR_MONLISTFULL),
- me.name, client_p->name,
- ConfigFileEntry.max_monitor, buf);
- return;
+ break;
}
- if (!is_valid_nick(name))
+ if (!clean_nick(name, 0))
continue;
monptr = find_monitor(name, 1);
rb_dlinkAddAlloc(client_p, &monptr->users);
rb_dlinkAddAlloc(monptr, &client_p->localClient->monitor_list);
+ }
- if((target_p = find_named_person(name)) != NULL)
- {
- if(cur_onlen + strlen(target_p->name) +
- strlen(target_p->username) + strlen(target_p->host) + 3 >= BUFSIZE-3)
- {
- sendto_one(client_p, "%s", onbuf);
- cur_onlen = mlen;
- onptr = onbuf + mlen;
- }
+ send_multiline_init(client_p, ",", form_str(RPL_MONONLINE),
+ me.name,
+ client_p->name,
+ "");
- if(cur_onlen != mlen)
- {
- *onptr++ = ',';
- cur_onlen++;
- }
+ if (prev_head != NULL)
+ prev_head = prev_head->prev;
+ else
+ prev_head = client_p->localClient->monitor_list.tail;
- arglen = sprintf(onptr, "%s!%s@%s",
- target_p->name, target_p->username,
+ RB_DLINK_FOREACH_PREV(ptr, prev_head)
+ {
+ monptr = ptr->data;
+ target_p = find_named_person(monptr->name);
+
+ if (target_p != NULL)
+ {
+ send_multiline_item(client_p, "%s!%s@%s",
+ target_p->name,
+ target_p->username,
target_p->host);
- onptr += arglen;
- cur_onlen += arglen;
}
- else
- {
- if(cur_offlen + strlen(name) + 1 >= BUFSIZE-3)
- {
- sendto_one(client_p, "%s", offbuf);
- cur_offlen = mlen;
- offptr = offbuf + mlen;
- }
+ }
- if(cur_offlen != mlen)
- {
- *offptr++ = ',';
- cur_offlen++;
- }
+ send_multiline_fini(client_p, NULL);
+
+ send_multiline_init(client_p, ",", form_str(RPL_MONOFFLINE),
+ me.name,
+ client_p->name,
+ "");
- arglen = sprintf(offptr, "%s", name);
- offptr += arglen;
- cur_offlen += arglen;
+ RB_DLINK_FOREACH_PREV(ptr, prev_head)
+ {
+ monptr = ptr->data;
+
+ if (find_named_person(monptr->name) == NULL)
+ {
+ send_multiline_item(client_p, "%s", monptr->name);
}
}
- if(cur_onlen != mlen)
- sendto_one(client_p, "%s", onbuf);
- if(cur_offlen != mlen)
- sendto_one(client_p, "%s", offbuf);
+ send_multiline_fini(client_p, NULL);
+
+ if (name)
+ {
+ char buf[400];
+
+ if (p)
+ snprintf(buf, sizeof buf, "%s,%s", name, p);
+ else
+ snprintf(buf, sizeof buf, "%s", name);
+
+ sendto_one(client_p, form_str(ERR_MONLISTFULL),
+ me.name,
+ client_p->name,
+ ConfigFileEntry.max_monitor,
+ buf);
+ }
}
static void
static void
list_monitor(struct Client *client_p)
{
- char buf[BUFSIZE];
struct monitor *monptr;
- char *nbuf;
rb_dlink_node *ptr;
- int mlen, arglen, cur_len;
if(!rb_dlink_list_length(&client_p->localClient->monitor_list))
{
return;
}
- cur_len = mlen = sprintf(buf, form_str(RPL_MONLIST),
- me.name, client_p->name, "");
- nbuf = buf + mlen;
+ send_multiline_init(client_p, ",", form_str(RPL_MONLIST),
+ me.name,
+ client_p->name,
+ "");
RB_DLINK_FOREACH(ptr, client_p->localClient->monitor_list.head)
{
monptr = ptr->data;
- if(cur_len + strlen(monptr->name) + 1 >= BUFSIZE-3)
- {
- sendto_one(client_p, "%s", buf);
- nbuf = buf + mlen;
- cur_len = mlen;
- }
-
- if(cur_len != mlen)
- {
- *nbuf++ = ',';
- cur_len++;
- }
-
- arglen = sprintf(nbuf, "%s", monptr->name);
- cur_len += arglen;
- nbuf += arglen;
+ send_multiline_item(client_p, "%s", monptr->name);
}
- sendto_one(client_p, "%s", buf);
+ send_multiline_fini(client_p, NULL);
sendto_one(client_p, form_str(RPL_ENDOFMONLIST),
me.name, client_p->name);
}
static void
show_monitor_status(struct Client *client_p)
{
- char onbuf[BUFSIZE], offbuf[BUFSIZE];
struct Client *target_p;
struct monitor *monptr;
- char *onptr, *offptr;
- int cur_onlen, cur_offlen;
- int mlen, arglen;
rb_dlink_node *ptr;
- mlen = cur_onlen = sprintf(onbuf, form_str(RPL_MONONLINE),
- me.name, client_p->name, "");
- cur_offlen = sprintf(offbuf, form_str(RPL_MONOFFLINE),
- me.name, client_p->name, "");
-
- onptr = onbuf + mlen;
- offptr = offbuf + mlen;
+ send_multiline_init(client_p, ",", form_str(RPL_MONONLINE),
+ me.name,
+ client_p->name,
+ "");
RB_DLINK_FOREACH(ptr, client_p->localClient->monitor_list.head)
{
monptr = ptr->data;
+ target_p = find_named_person(monptr->name);
- if((target_p = find_named_person(monptr->name)) != NULL)
+ if (target_p != NULL)
{
- if(cur_onlen + strlen(target_p->name) +
- strlen(target_p->username) + strlen(target_p->host) + 3 >= BUFSIZE-3)
- {
- sendto_one(client_p, "%s", onbuf);
- cur_onlen = mlen;
- onptr = onbuf + mlen;
- }
-
- if(cur_onlen != mlen)
- {
- *onptr++ = ',';
- cur_onlen++;
- }
-
- arglen = sprintf(onptr, "%s!%s@%s",
- target_p->name, target_p->username,
+ send_multiline_item(client_p, "%s!%s@%s",
+ target_p->name,
+ target_p->username,
target_p->host);
- onptr += arglen;
- cur_onlen += arglen;
}
- else
- {
- if(cur_offlen + strlen(monptr->name) + 1 >= BUFSIZE-3)
- {
- sendto_one(client_p, "%s", offbuf);
- cur_offlen = mlen;
- offptr = offbuf + mlen;
- }
+ }
- if(cur_offlen != mlen)
- {
- *offptr++ = ',';
- cur_offlen++;
- }
+ send_multiline_fini(client_p, NULL);
+
+ send_multiline_init(client_p, ",", form_str(RPL_MONOFFLINE),
+ me.name,
+ client_p->name,
+ "");
+
+ RB_DLINK_FOREACH(ptr, client_p->localClient->monitor_list.head)
+ {
+ monptr = ptr->data;
- arglen = sprintf(offptr, "%s", monptr->name);
- offptr += arglen;
- cur_offlen += arglen;
+ if (find_named_person(monptr->name) == NULL)
+ {
+ send_multiline_item(client_p, "%s", monptr->name);
}
}
- if(cur_onlen != mlen)
- sendto_one(client_p, "%s", onbuf);
- if(cur_offlen != mlen)
- sendto_one(client_p, "%s", offbuf);
+ send_multiline_fini(client_p, NULL);
}
-static int
-m_monitor(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_monitor(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
switch(parv[1][0])
{
{
sendto_one(client_p, form_str(ERR_NEEDMOREPARAMS),
me.name, source_p->name, "MONITOR");
- return 0;
+ return;
}
add_monitor(source_p, parv[2]);
{
sendto_one(client_p, form_str(ERR_NEEDMOREPARAMS),
me.name, source_p->name, "MONITOR");
- return 0;
+ return;
}
del_monitor(source_p, parv[2]);
default:
break;
}
-
- return 0;
}
-