From 10e953b8b5f86854a7065987f6fc98f5c2c40db1 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
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

92dc3e8bddd11ebc8112abfdfd6df15e59'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=d2f4e192dc3e8bddd11ebc8112abfdfd6df15e59&amp;follow=1'>root</a>/<a href='/src/log/doc?id=d2f4e192dc3e8bddd11ebc8112abfdfd6df15e59&amp;follow=1'>doc</a>/<a href='/src/log/doc/zlib?id=d2f4e192dc3e8bddd11ebc8112abfdfd6df15e59&amp;follow=1'>zlib</a>/<a href='/src/log/doc/zlib/gzeof.3?id=d2f4e192dc3e8bddd11ebc8112abfdfd6df15e59&amp;follow=1'>gzeof.3</a> (<a href='/src/log/doc/zlib/gzeof.3?id=d2f4e192dc3e8bddd11ebc8112abfdfd6df15e59'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/doc/zlib/gzeof.3?id=d2f4e192dc3e8bddd11ebc8112abfdfd6df15e59&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-03-22 11:39:53 -0400'>2022-03-22</span></td><td><a href='/src/commit/home/.profile?id=f4b5e5c6ead2718253c70f7e0a6ed9562aea8cf1&amp;follow=1'>Source ~/.profile.local if it exists</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2022-03-18 21:58:00 -0400'>2022-03-18</span></td><td><a href='/src/commit/www/text.causal.agency/Makefile?id=7c4e81d9ba645289df1b8371a0524b0a98ea0796&amp;follow=1'>Publish "Addendum 2021"</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2022-03-16 18:37:31 -0400'>2022-03-16</span></td><td><a href='/src/commit/port/wcwidth/wide.h?id=c5ce5ebf4dd599345c50e5c1267f0a7bbaa3050b&amp;follow=1'>Remove wcwidth port</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2022-03-16 14:07:48 -0400'>2022-03-16</span></td><td><a href='/src/commit/install.sh?id=4885b462ab5f33941e0ba46f02e48082d18dcfa2&amp;follow=1'>Remove -j4 from ./Plan</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2022-03-15 22:42:57 -0400'>2022-03-15</span></td><td><a href='/src/commit/install.sh?id=91c41bbb7e3e7fad6aa839ae0ad41e9382d24cbf&amp;follow=1'>Rewrite Linux install.sh for Debian</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2022-03-15 22:27:26 -0400'>2022-03-15</span></td><td><a href='/src/commit/bin/dash/src/var.h?id=4ff38caa83d5f8f5bc36ff0baa4fa4b3895b1f4f&amp;follow=1'>Remove dash</a></td><td>June McEnroe