Skip to content
Snippets Groups Projects
Commit 2ccc75e2 authored by Randy Sommerfeld's avatar Randy Sommerfeld
Browse files

Start of TS and network synchronization refactor

parent d63a2f52
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Hide whitespace changes
Inline Side-by-side
exec/load/ircd/channel.js
+ 13
− 59
View file @ 2ccc75e2
......@@ -245,7 +245,7 @@ function ChanMode(chan,user) {
this.affect_mode_list = ChanMode_affect_mode_list;
}
function IRCClient_set_chanmode(chan,cm_args,ts) {
function IRCClient_set_chanmode(chan,cm_args) {
var c, i, j;
var add;
var final_modestr = "";
......@@ -349,53 +349,6 @@ function IRCClient_set_chanmode(chan,cm_args,ts) {
break;
}
/* If we have TS supremacy (that is, if this server has a channel
TS less than the incoming channel TS), then we invert the modes
sent to us if they're not part of the channel object already. */
if (ts > chan.created) {
for (i in MODE) {
if (MODE[i].state && (chan.mode&i) && (c.addbits&i)) {
continue;
}
if (MODE[i].state && !(chan.mode&i) && (c.addbits&i)) {
this.ircout(format("MODE %lu %s %s",
chan.created,
chan.nam,
"-" + MODE[i].modechar
));
continue;
}
if (MODE[i].list && c.list[i] !== undefined) {
for (j in c.list[i][true]) {
if (chan.is_str_member_of_chanmode_list(i,c.list[i][true][j])) {
continue;
}
this.ircout(format("MODE %lu %s %s",
chan.created,
chan.nam,
"-" + MODE[i].modechar + " " + c.list[i][true][j]
));
}
for (j in c.list[i][false]) {
if (chan.is_str_member_of_chanmode_list(i,c.list[i][false][j])) {
this.ircout(format("MODE %lu %s %s",
chan.created,
chan.nam,
"+" + MODE[i].modechar + " " + c.list[i][false][j]
));
}
}
}
}
/* We end processing here if we're inverting modes from a TS violation */
return;
}
/* Now we run through all the mode toggles and construct our lists for
later display. We also play with the channel bit switches here. */
for (i in MODE) {
......@@ -656,9 +609,8 @@ function IRCClient_do_join(chan_name,join_key) {
}
if (chan_name[0] != "&") {
this.bcast_to_servers_raw(
format(":%s SJOIN %lu %s",
format(":%s JOIN %s",
this.nick,
chan.created,
chan.nam
)
);
......@@ -670,22 +622,24 @@ function IRCClient_do_join(chan_name,join_key) {
chan.users[this.id] = this;
var str="JOIN :" + chan.nam;
var create_op = "";
if (chan_name[0] != "&") {
this.bcast_to_servers_raw(
format(":%s JOIN %s",
this.nick,
chan.nam
)
);
}
if (this.local) {
this.originatorout(str,this);
create_op = "@";
chan.modelist[CHANMODE_OP][this.id] = this;
}
if (chan_name[0] != "&") {
this.bcast_to_servers_raw(
format(":%s SJOIN %lu %s %s :%s%s",
this.bcast_to_servers_raw(format(
":%s MODE %s +o %s",
ServerName,
chan.created,
chan.nam,
chan.chanmode(),
create_op,
this.nick
)
);
));
}
}
if (this.invited.toUpperCase() == chan.nam.toUpperCase())
......
exec/load/ircd/core.js
+ 18
− 0
View file @ 2ccc75e2
......@@ -1385,6 +1385,24 @@ function IRCClient_do_info() {
this.numeric(371, ": Samael, TheStoryTillNow, Torke, #sqt, and all the #square oldbies.");
this.numeric(371, ":In memory of Palidor (Alex Kimbel) March 17, 1984 - December 12, 2012.");
this.numeric(371, ":--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--");
this.numeric(371, ":This is an experimental version of the IRCd. Use at your own risk.");
this.numeric(371, ":Because this version is experimental, no support is provided outside of");
this.numeric(371, ":IRC. All tickets opened on gitlab will be closed.");
this.numeric(371, ":Instead, for support contact the author on IRC and have these ready:");
this.numeric(371, ": 1) Full raw IRC logs (debug log or tcpdump), inclusive of timestamp,");
this.numeric(371, ": 2) Time duration or range when the issue happened,");
this.numeric(371, ": 3) RFC1459 basis for why the behaviour is abnormal,");
this.numeric(371, ": 4) A proposed fix ideally in the form of a patch.");
this.numeric(371, ":--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--");
this.numeric(371, ":This is a kind reminder that the author:");
this.numeric(371, ": 1) Is an unpaid volunteer,");
this.numeric(371, ": 2) Is not the sysop of any BBS,");
this.numeric(371, ": 3) Is not the administrator of the Synchronet IRC network,");
this.numeric(371, ": 4) Does not operate a server on the Synchronet IRC network,");
this.numeric(371, ": 5) Does not operate services on the Synchronet IRC network,");
this.numeric(371, ": 6) Is not a professional programmer and contributes only as a hobby.");
this.numeric(371, ":Therefore, the author asks for patience when resolving issues. Thank you.");
this.numeric(371, ":--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--");
this.numeric(371, ":Synchronet " + system.full_version);
this.numeric(371, ":Compiled with " + system.compiled_with + " at " + system.compiled_when);
this.numeric(371, ":Running on " + system.os_version);
......
exec/load/ircd/server.js
+ 43
− 129
View file @ 2ccc75e2
......@@ -68,7 +68,6 @@ function IRC_Server() {
this.server_chan_info=IRCClient_server_chan_info;
this.server_info=IRCClient_server_info;
this.synchronize=IRCClient_synchronize;
this.reintroduce_nick=IRCClient_reintroduce_nick;
this.finalize_server_connect=IRCClient_finalize_server_connect;
// Global Functions
this.check_timeout=IRCClient_check_timeout;
......@@ -398,7 +397,7 @@ function Server_Work(cmdline) {
this.nick,
tmp.nick
));
this.reintroduce_nick(tmp);
this.quit("Non-Hub kill denied.");
}
}
break;
......@@ -427,13 +426,8 @@ function Server_Work(cmdline) {
));
break;
}
/* Detect TS-style MODE and stuff the real TS in j */
j = parseInt(p[0]);
if (p[0] == j) {
if (parseInt(p[0]) == j)
p.shift();
}
if (!this.hub)
j = Epoch();
if (p[0][0] == "#") {
/* Setting a channel mode */
tmp = Channels[p[0].toUpperCase()];
......@@ -448,7 +442,7 @@ function Server_Work(cmdline) {
if (!j)
j = tmp.created;
p.shift();
origin.set_chanmode(tmp,p,j);
origin.set_chanmode(tmp,p);
break;
}
/* Setting a user mode */
......@@ -499,34 +493,16 @@ function Server_Work(cmdline) {
));
break;
}
if (tmp.created > parseInt(p[2]) && (this.hub || !Enforcement)) {
/* We're on the wrong side. */
if (Enforcement) {
tmp.numeric(436, tmp.nick + " :Nickname Collision KILL.");
this.bcast_to_servers(format(
"KILL %s :Nickname Collision.",
server_bcast_to_servers(format(
":%s KILL %s :Nickname Collision.",
ServerName,
tmp.nick
));
tmp.quit("Nickname Collision",true);
break;
}
if (!this.hub && Enforcement) {
gnotice(format(
"Server %s trying to collide nick %s forwards. Reversing.",
this.nick,
tmp.nick
));
this.ircout(format(
"KILL %s :Inverse Nickname Collision.",
p[0]
));
this.reintroduce_nick(tmp);
break;
}
if (this.hub) {
/* Our TS greater than what was passed to us. */
/* Other side should nuke on our behalf. */
break;
}
break;
}
if (!this.hub) {
if (!this.check_nickname(p[0],true)) {
......@@ -635,30 +611,12 @@ function Server_Work(cmdline) {
tmp = Users[p[0].toUpperCase()];
if (tmp && tmp.nick.toUpperCase() != origin.nick.toUpperCase()) {
gnotice(format(
"Server %s trying to collide via NICK changeover: %s -> %s",
"Server %s trying to collide via NICK changeover: %s -> %s, doing SQUIT",
this.nick,
origin.nick,
p[0]
));
if (Enforcement) {
server_bcast_to_servers(format(
"KILL %s :Bogus nickname changeover.",
origin.nick
));
origin.quit("Bogus nickname changeover.");
this.ircout(format(
"KILL %s :Bogus nickname changeover.",
p[0]
));
this.reintroduce_nick(tmp);
} else {
this.quit(format(
"Server %s trying to collide via NICK changeover: %s -> %s",
this.nick,
origin.nick,
p[0]
));
}
this.quit("Attempted collide via NICK");
break;
}
if (origin.check_nickname(p[0]) < 1) {
......@@ -935,9 +893,6 @@ function Server_Work(cmdline) {
if (!p[1] || p[1][0] != "#")
break;
if (!this.hub)
p[0] = Epoch();
tmp = Channels[p[1].toUpperCase()];
if (!tmp) {
Channels[p[1].toUpperCase()] = new Channel(p[1].toUpperCase());
......@@ -986,37 +941,18 @@ function Server_Work(cmdline) {
), false /*bcast*/);
}
if (tmp.created >= parseInt(p[0])) { /* They have TS superiority */
if (k.isop)
tmp.modelist[CHANMODE_OP][n.id] = n.id;
if (k.isvoice)
tmp.modelist[CHANMODE_VOICE][n.id] = n.id;
if (k.isop || k.isvoice) {
origin.bcast_to_channel(tmp, format(
"MODE %s +%s%s %s",
tmp.nam,
k.isop ? "o" : "",
k.isvoice ? "v" : "",
n.nick
), false /*bcast*/);
}
} else { /* We have TS superiority */
if (k.isop) {
k.isop = false;
this.rawout(format(":%s MODE %s -o %s",
ServerName,
tmp.nam,
n.nick
));
}
if (k.isvoice) {
k.isvoice = false;
this.rawout(format(":%s MODE %s -v %s",
ServerName,
tmp.nam,
n.nick
));
}
if (k.isop)
tmp.modelist[CHANMODE_OP][n.id] = n.id;
if (k.isvoice)
tmp.modelist[CHANMODE_VOICE][n.id] = n.id;
if (k.isop || k.isvoice) {
origin.bcast_to_channel(tmp, format(
"MODE %s +%s%s %s",
tmp.nam,
k.isop ? "o" : "",
k.isvoice ? "v" : "",
n.nick
), false /*bcast*/);
}
if (valid_nicks != "")
......@@ -1512,52 +1448,30 @@ function IRCClient_server_nick_info(sni_client) {
}
}
function IRCClient_reintroduce_nick(nick) {
if (Enforcement) {
log(LOG_DEBUG, "Trying to reintroduce nick while Enforcement mode is off.");
return 0;
}
function IRCClient_server_chan_info(sni_chan) {
var i, u;
this.server_nick_info(nick);
for (uchan in nick.channels) {
var chan = nick.channels[uchan];
var cmodes = "";
if (chan.modelist[CHANMODE_OP][nick.id])
cmodes += "@";
if (chan.modelist[CHANMODE_VOICE][nick.id])
cmodes += "+";
this.rawout(
format("SJOIN %lu %s %s :%s%s",
chan.created,
chan.nam,
chan.chanmode(true),
cmodes,
nick.nick
)
);
if (chan.topic) {
this.rawout(
format("TOPIC %s %s %s :%s",
chan.nam,
chan.topicchangedby,
chan.topictime,
chan.topic
)
);
for (i in sni_chan.users) {
u = sni_chan.users[i];
this.rawout(format(":%s JOIN %s",
u.nick,
sni_chan.nam
));
if (sni_chan.modelist[CHANMODE_OP][u.id]) {
this.rawout(format(":%s MODE %s +o %s",
ServerName,
sni_chan.nam,
u.nick
));
}
if (sni_chan.modelist[CHANMODE_VOICE][u.id]) {
this.rawout(format(":%s MODE %s +v %s",
ServerName,
sni_chan.nam,
u.nick
));
}
}
}
function IRCClient_server_chan_info(sni_chan) {
var i;
this.rawout(format("SJOIN %lu %s %s :%s",
sni_chan.created,
sni_chan.nam,
sni_chan.chanmode(true),
sni_chan.occupants()
));
var modecounter=0;
var modestr="+";
var modeargs="";
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment