Add support for the draft/extended-monitor capability

include/s_serv.h

@@ -68,6 +68,7 @@ extern unsigned int CLICAP_USERHOST_IN_NAMES;
 extern unsigned int CLICAP_CAP_NOTIFY;
 extern unsigned int CLICAP_CHGHOST;
 extern unsigned int CLICAP_ECHO_MESSAGE;
+extern unsigned int CLICAP_EXTENDED_MONITOR;
 
 /*
  * XXX: this is kind of ugly, but this allows us to have backwards

include/send.h

@@ -75,6 +75,7 @@ extern void sendto_match_butone(struct Client *, struct Client *,
 extern void sendto_match_servs(struct Client *source_p, const char *mask,
 				int capab, int, const char *, ...) AFP(5, 6);
 
+extern void sendto_monitor_with_capability_butserial(struct Client *, struct monitor *monptr, int caps, int negcaps, bool skipserial, const char *, ...) AFP(6, 7);
 extern void sendto_monitor(struct Client *, struct monitor *monptr, const char *, ...) AFP(3, 4);
 
 extern void sendto_anywhere(struct Client *, struct Client *, const char *,

ircd/s_serv.c

@@ -95,6 +95,7 @@ unsigned int CLICAP_USERHOST_IN_NAMES;
 unsigned int CLICAP_CAP_NOTIFY;
 unsigned int CLICAP_CHGHOST;
 unsigned int CLICAP_ECHO_MESSAGE;
+unsigned int CLICAP_EXTENDED_MONITOR;
 
 /*
  * initialize our builtin capability table. --nenolod
@@ -142,6 +143,7 @@ init_builtin_capabs(void)
 	CLICAP_CAP_NOTIFY = capability_put(cli_capindex, "cap-notify", NULL);
 	CLICAP_CHGHOST = capability_put(cli_capindex, "chghost", &high_priority);
 	CLICAP_ECHO_MESSAGE = capability_put(cli_capindex, "echo-message", NULL);
+	CLICAP_EXTENDED_MONITOR = capability_put(cli_capindex, "draft/extended-monitor", &high_priority);
 }
 
 static CNCB serv_connect_callback;

ircd/s_user.c

@@ -1637,6 +1637,10 @@ change_nick_user_host(struct Client *target_p,	const char *nick, const char *use
 		sendto_common_channels_local_butone(target_p, CLICAP_CHGHOST, NOCAPS,
 						    ":%s!%s@%s CHGHOST %s %s",
 						    target_p->name, target_p->username, target_p->host, user, host);
+		struct monitor *monptr = find_monitor(target_p->name, 0);
+		if(monptr)
+			sendto_monitor_with_capability_butserial(target_p, monptr, CLICAP_EXTENDED_MONITOR | CLICAP_CHGHOST, NOCAPS, true, ":%s!%s@%s CHGHOST %s %s",
+						    target_p->name, target_p->username, target_p->host, user, host);
 
 		if(MyClient(target_p) && changed_case)
 			sendto_one(target_p, ":%s!%s@%s NICK %s",

ircd/send.c

@@ -1163,34 +1163,33 @@ sendto_local_clients_with_capability(int cap, const char *pattern, ...)
 	msgbuf_cache_free(&msgbuf_cache);
 }
 
-/* sendto_monitor()
+/*
+ * _sendto_monitor_with_capability_butserial()
  *
- * inputs	- monitor nick to send to, format, va_args
- * outputs	- message to local users monitoring the given nick
- * side effects -
+ * Shared implementation of sendto_monitor_with_capability_butserial and _sendto_monitor
  */
 void
-sendto_monitor(struct Client *source_p, struct monitor *monptr, const char *pattern, ...)
+_sendto_monitor_with_capability_butserial(struct Client *source_p, struct monitor *monptr, int caps, int negcaps, bool skipserial, const char *pattern, va_list * args)
 {
-	va_list args;
 	struct Client *target_p;
 	rb_dlink_node *ptr;
 	rb_dlink_node *next_ptr;
 	struct MsgBuf msgbuf;
 	struct MsgBuf_cache msgbuf_cache;
-	rb_strf_t strings = { .format = pattern, .format_args = &args, .next = NULL };
+	rb_strf_t strings = { .format = pattern, .format_args = args, .next = NULL };
 
 	build_msgbuf_tags(&msgbuf, source_p);
 
-	va_start(args, pattern);
 	msgbuf_cache_init(&msgbuf_cache, &msgbuf, &strings);
-	va_end(args);
 
 	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, monptr->users.head)
 	{
 		target_p = ptr->data;
 
-		if(IsIOError(target_p))
+		if(IsIOError(target_p) ||
+			(skipserial && target_p->serial == current_serial) ||
+			!IsCapable(target_p, caps) ||
+			!NotCapable(target_p, negcaps))
 			continue;
 
 		_send_linebuf(target_p, msgbuf_cache_get(&msgbuf_cache, CLIENT_CAPS_ONLY(target_p)));
@@ -1199,6 +1198,38 @@ sendto_monitor(struct Client *source_p, struct monitor *monptr, const char *patt
 	msgbuf_cache_free(&msgbuf_cache);
 }
 
+/* sendto_monitor_with_capability_butserial()
+ *
+ * inputs	- monitor nick to send to, caps, negate caps, whether to send to clients having current serial, format, va_args
+ * outputs	- message to local users monitoring the given nick
+ * side effects -
+ */
+void
+sendto_monitor_with_capability_butserial(struct Client *source_p, struct monitor *monptr, int caps, int negcaps, bool skipserial, const char *pattern, ...)
+{
+	va_list args;
+
+	va_start(args, pattern);
+	_sendto_monitor_with_capability_butserial(source_p, monptr, caps, negcaps, skipserial, pattern, &args);
+	va_end(args);
+}
+
+/* sendto_monitor()
+ *
+ * inputs	- monitor nick to send to, format, va_args
+ * outputs	- message to local users monitoring the given nick
+ * side effects -
+ */
+void
+sendto_monitor(struct Client *source_p, struct monitor *monptr, const char *pattern, ...)
+{
+	va_list args;
+
+	va_start(args, pattern);
+	_sendto_monitor_with_capability_butserial(source_p, monptr, NOCAPS, NOCAPS, false, pattern, &args);
+	va_end(args);
+}
+
 /* _sendto_anywhere()
  *
  * inputs	- real_target, target, source, va_args

modules/m_away.c

@@ -26,6 +26,7 @@
 #include "client.h"
 #include "match.h"
 #include "ircd.h"
+#include "monitor.h"
 #include "numeric.h"
 #include "send.h"
 #include "msg.h"
@@ -89,6 +90,10 @@ m_away(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
 
 			sendto_common_channels_local_butone(source_p, CLICAP_AWAY_NOTIFY, NOCAPS, ":%s!%s@%s AWAY",
 							    source_p->name, source_p->username, source_p->host);
+			struct monitor *monptr = find_monitor(source_p->name, 0);
+			if(monptr)
+				sendto_monitor_with_capability_butserial(source_p, monptr, CLICAP_EXTENDED_MONITOR | CLICAP_AWAY_NOTIFY, NOCAPS, true, ":%s!%s@%s AWAY",
+							    source_p->name, source_p->username, source_p->host);
 		}
 		if(MyConnect(source_p))
 			sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
@@ -127,6 +132,14 @@ m_away(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
 						    source_p->username,
 						    source_p->host,
 						    source_p->user->away);
+		struct monitor *monptr = find_monitor(source_p->name, 0);
+		if(monptr)
+			sendto_monitor_with_capability_butserial(source_p, monptr, CLICAP_EXTENDED_MONITOR | CLICAP_AWAY_NOTIFY, NOCAPS, true,
+						    ":%s!%s@%s AWAY :%s",
+						    source_p->name,
+						    source_p->username,
+						    source_p->host,
+						    source_p->user->away);
 	}
 
 	if(MyConnect(source_p))

modules/m_services.c

@@ -139,6 +139,11 @@ me_su(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 	sendto_common_channels_local(target_p, CLICAP_ACCOUNT_NOTIFY, NOCAPS, ":%s!%s@%s ACCOUNT %s",
 					    target_p->name, target_p->username, target_p->host,
 					    EmptyString(target_p->user->suser) ? "*" : target_p->user->suser);
+	struct monitor *monptr = find_monitor(target_p->name, 0);
+	if(monptr)
+		sendto_monitor_with_capability_butserial(target_p, monptr, CLICAP_EXTENDED_MONITOR | CLICAP_ACCOUNT_NOTIFY, NOCAPS, true, ":%s!%s@%s ACCOUNT %s",
+					    target_p->name, target_p->username, target_p->host,
+					    EmptyString(target_p->user->suser) ? "*" : target_p->user->suser);
 
 	invalidate_bancache_user(target_p);
 }