From 10e953b8b5f86854a7065987f6fc98f5c2c40db1 Mon Sep 17 00:00:00 2001
From: C. McEnroe
Date: Sun, 16 Aug 2020 22:52:01 -0400
Subject: Set origin fields to "*" if missing
Also determine if a message is from the server by if the host field has
been copied from the nick field.
EFNet sends NOTICEs with no origin during registration.
RFC 1459 has this to say:
> If the prefix is missing from the message, it is assumed to have
> originated from the connection from which it was received.
I suppose a more correct implementation would be to set the origin to
the hostname of the server, but we don't store that globally, so this
is good enough.
---
handle.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/handle.c b/handle.c
index fcc0c5d..a954824 100644
--- a/handle.c
+++ b/handle.c
@@ -76,7 +76,7 @@ static const char *capList(enum Cap caps) {
static void require(struct Message *msg, bool origin, uint len) {
if (origin) {
- if (!msg->nick) errx(EX_PROTOCOL, "%s missing origin", msg->cmd);
+ if (!msg->nick) msg->nick = "*";
if (!msg->user) msg->user = msg->nick;
if (!msg->host) msg->host = msg->user;
}
@@ -1114,7 +1114,7 @@ static const char *colorMentions(uint id, struct Message *msg) {
static void handlePrivmsg(struct Message *msg) {
require(msg, true, 2);
bool query = !strchr(network.chanTypes, msg->params[0][0]);
- bool server = strchr(msg->nick, '.');
+ bool server = (msg->host == msg->nick);
bool mine = !strcmp(msg->nick, self.nick);
uint id;
if (query && server) {
--
cgit 1.4.1-2-gfad0