Skip to content

Route ENCAP messages directly (2.11.3) #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patrick-irc merged 2 commits into from
Apr 3, 2026
Merged

Route ENCAP messages directly (2.11.3) #79

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24d2570
Route ENCAP messages directly if possible (2.11.3)
patrick-irc Apr 3, 2026
b69fd52
Route ENCAP messages directly if possible (2.11.3) - ignore unknown t…
patrick-irc Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions ircd/s_serv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3793,6 +3793,38 @@ static void report_listeners(aClient *sptr, char *to)
}
}

static void
encap_route(aClient *cptr, char *mask, char *buf)
{
aClient *acptr;
int exact;

if (!strcmp(mask, me.name) || !strcmp(mask, me.serv->sid))
return;

exact = (strchr(mask, '*') == NULL &&
strchr(mask, '?') == NULL &&
strchr(mask, '#') == NULL);

if (!exact)
{
sendto_serv_v(cptr, SV_UID, "%s", buf);
return;
}

acptr = find_sid(mask, NULL);
if (!acptr)
acptr = find_server(mask, NULL);

if (!acptr)
{
return;
}

if (acptr->from != cptr)
sendto_one(acptr, "%s", buf);
}

/*
** allows ENCAPsulation of commands
** parv[0] is ignored (though it's source)
Expand Down Expand Up @@ -3823,8 +3855,8 @@ int m_encap(aClient *cptr, aClient *sptr, int parc, char *parv[])
else
len += sprintf(buf+len, " %s", parv[i]);
}
/* ...and broadcast it. */
sendto_serv_v(cptr, SV_UID, "%s", buf);

encap_route(cptr, parv[1], buf);

/* FIXME: in 2.11.1 */
/* Do we match parv[1]? */
Expand Down
Loading