Propagate server-time implicitly (ugh)

solanum-ircd · Sep 19, 2021 · 4eec52d · 4eec52d
1 parent 1a03242
commit 4eec52d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/include/parse.h b/include/parse.h
@@ -42,4 +42,7 @@ extern char *reconstruct_parv(int parc, const char *parv[]);
 extern rb_dictionary *alias_dict;
 extern rb_dictionary *cmd_dict;
 
+extern const struct MsgBuf *incoming_message;
+extern const struct Client *incoming_client;
+
 #endif /* INCLUDED_parse_h_h */
diff --git a/ircd/parse.c b/ircd/parse.c
@@ -44,6 +44,9 @@
 rb_dictionary *cmd_dict = NULL;
 rb_dictionary *alias_dict = NULL;
 
+const struct MsgBuf *incoming_message = NULL;
+const struct Client *incoming_client = NULL;
+
 static void cancel_clients(struct Client *, struct Client *);
 static void remove_unknown(struct Client *, const char *, char *);
 
@@ -153,6 +156,9 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 		return;
 	}
 
+	incoming_message = &msgbuf;
+	incoming_client = client_p;
+
 	if(handle_command(mptr, &msgbuf, client_p, from) < -1)
 	{
 		char *p;
@@ -177,6 +183,8 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 		}
 	}
 
+	incoming_message = NULL;
+	incoming_client = NULL;
 }
 
 /*

diff --git a/modules/cap_server_time.c b/modules/cap_server_time.c
@@ -32,6 +32,7 @@
 #include "s_serv.h"
 #include "numeric.h"
 #include "chmode.h"
+#include "parse.h"
 #include "inline/stringops.h"
 
 static const char cap_server_time_desc[] =
@@ -54,9 +55,15 @@ cap_server_time_process(void *data_)
 {
 	hook_data *data = data_;
 	static char buf[BUFSIZE];
+	const char *tagged_time;
 	struct MsgBuf *msgbuf = data->arg1;
 	struct timeval tv;
 
+	if (incoming_client != NULL && IsServer(incoming_client) && !msgbuf_get_tag(msgbuf, "time") && (tagged_time = msgbuf_get_tag(incoming_message, "time")))
+	{
+		msgbuf_append_tag(msgbuf, "time", tagged_time, CLICAP_SERVER_TIME);
+	}
+
 	if (!IsMe(data->client) && !MyClient(data->client))
 		return;