summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/init.c8
-rw-r--r--src/ircd.c10
-rw-r--r--src/protocol/bahamut.c25
-rw-r--r--src/protocol/bahamut.h2
-rw-r--r--src/protocol/charybdis.c30
-rw-r--r--src/protocol/charybdis.h2
-rw-r--r--src/protocol/inspircd11.c27
-rwxr-xr-xsrc/protocol/inspircd11.h2
-rw-r--r--src/protocol/ratbox.c30
-rw-r--r--src/protocol/ratbox.h2
-rw-r--r--src/protocol/unreal32.c29
-rw-r--r--src/protocol/unreal32.h2
12 files changed, 56 insertions, 113 deletions
diff --git a/src/init.c b/src/init.c
index 96b3ef39f..973acb13f 100644
--- a/src/init.c
+++ b/src/init.c
@@ -6,9 +6,9 @@
* Please read COPYING and README for further details.
*
* Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- *
- * $Id$
+ * Based on the original code of Services by Andy Church.
+ *
+ * $Id$
*
*/
@@ -739,7 +739,7 @@ int init_secondary(int ac, char **av)
RemotePort);
}
- anope_cmd_connect(servernum);
+ anope_cmd_connect();
send_event(EVENT_CONNECT, 1, EVENT_STOP);
sgets2(inbuf, sizeof(inbuf), servsock);
diff --git a/src/ircd.c b/src/ircd.c
index be4adc8c4..30224452a 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -63,7 +63,6 @@ void initIrcdProto()
ircdproto.ircd_cmd_242 = NULL;
ircdproto.ircd_cmd_243 = NULL;
ircdproto.ircd_cmd_211 = NULL;
- ircdproto.ircd_cmd_connect = NULL;
ircdproto.ircd_cmd_svshold = NULL;
ircdproto.ircd_cmd_release_svshold = NULL;
ircdproto.ircd_cmd_unsgline = NULL;
@@ -491,9 +490,9 @@ void anope_cmd_vhost_on(const char *nick, const char *vIdent, const char *vhost)
ircdprotonew->cmd_vhost_on(nick, vIdent, vhost);
}
-void anope_cmd_connect(int servernum)
+void anope_cmd_connect()
{
- ircdproto.ircd_cmd_connect(servernum);
+ ircdprotonew->cmd_connect();
}
void anope_cmd_svshold(const char *nick)
@@ -706,11 +705,6 @@ void pmodule_cmd_211(void (*func) (const char *buf))
ircdproto.ircd_cmd_211 = func;
}
-void pmodule_cmd_connect(void (*func) (int servernum))
-{
- ircdproto.ircd_cmd_connect = func;
-}
-
void pmodule_cmd_svshold(void (*func) (const char *nick))
{
ircdproto.ircd_cmd_svshold = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index d72935bf8..916275e16 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -839,22 +839,16 @@ void bahamut_cmd_capab()
"CAPAB SSJOIN NOQUIT BURST UNCONNECT NICKIP TSMODE TS3");
}
-void bahamut_cmd_connect(int servernum)
+void BahamutIRCdProto::cmd_connect()
{
- me_server =
- new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
-
- if (servernum == 1) {
- bahamut_cmd_pass(RemotePassword);
- } else if (servernum == 2) {
- bahamut_cmd_pass(RemotePassword2);
- } else if (servernum == 3) {
- bahamut_cmd_pass(RemotePassword3);
- }
- bahamut_cmd_capab();
- bahamut_cmd_server(ServerName, 1, ServerDesc);
- bahamut_cmd_svinfo();
- bahamut_cmd_burst();
+ me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
+ if (servernum == 1) bahamut_cmd_pass(RemotePassword);
+ else if (servernum == 2) bahamut_cmd_pass(RemotePassword2);
+ else if (servernum == 3) bahamut_cmd_pass(RemotePassword3);
+ bahamut_cmd_capab();
+ bahamut_cmd_server(ServerName, 1, ServerDesc);
+ bahamut_cmd_svinfo();
+ bahamut_cmd_burst();
}
@@ -1403,7 +1397,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(bahamut_cmd_242);
pmodule_cmd_243(bahamut_cmd_243);
pmodule_cmd_211(bahamut_cmd_211);
- pmodule_cmd_connect(bahamut_cmd_connect);
pmodule_cmd_svshold(bahamut_cmd_svshold);
pmodule_cmd_release_svshold(bahamut_cmd_release_svshold);
pmodule_cmd_unsgline(bahamut_cmd_unsgline);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index d3240b779..5d47a8533 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -76,7 +76,6 @@ void bahamut_cmd_318(const char *source, const char *who);
void bahamut_cmd_242(const char *buf);
void bahamut_cmd_243(const char *buf);
void bahamut_cmd_211(const char *buf);
-void bahamut_cmd_connect(int servernum);
void bahamut_cmd_svshold(const char *nick);
void bahamut_cmd_release_svshold(const char *nick);
void bahamut_cmd_unsgline(const char *mask);
@@ -113,4 +112,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
void cmd_join(const char *, const char *, time_t);
void cmd_unsqline(const char *);
void cmd_sqline(const char *, const char *);
+ void cmd_connect();
} ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 1f56cad85..7c9ef39a0 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -906,26 +906,17 @@ void charybdis_cmd_server(const char *servname, int hop, const char *descript)
send_cmd(NULL, "SERVER %s %d :%s", servname, hop, descript);
}
-void charybdis_cmd_connect(int servernum)
+void CharybdisProto::cmd_connect()
{
- /* Make myself known to myself in the serverlist */
- if (UseTS6) {
- me_server =
- new_server(NULL, ServerName, ServerDesc, SERVER_ISME, TS6SID);
- } else {
- me_server =
- new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
- }
- if (servernum == 1)
- charybdis_cmd_pass(RemotePassword);
- else if (servernum == 2)
- charybdis_cmd_pass(RemotePassword2);
- else if (servernum == 3)
- charybdis_cmd_pass(RemotePassword3);
-
- charybdis_cmd_capab();
- charybdis_cmd_server(ServerName, 1, ServerDesc);
- charybdis_cmd_svinfo();
+ /* Make myself known to myself in the serverlist */
+ if (UseTS6) me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, TS6SID);
+ else me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
+ if (servernum == 1) charybdis_cmd_pass(RemotePassword);
+ else if (servernum == 2) charybdis_cmd_pass(RemotePassword2);
+ else if (servernum == 3) charybdis_cmd_pass(RemotePassword3);
+ charybdis_cmd_capab();
+ charybdis_cmd_server(ServerName, 1, ServerDesc);
+ charybdis_cmd_svinfo();
}
void CharybdisProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
@@ -1679,7 +1670,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(charybdis_cmd_242);
pmodule_cmd_243(charybdis_cmd_243);
pmodule_cmd_211(charybdis_cmd_211);
- pmodule_cmd_connect(charybdis_cmd_connect);
pmodule_cmd_svshold(charybdis_cmd_svshold);
pmodule_cmd_release_svshold(charybdis_cmd_release_svshold);
pmodule_cmd_unsgline(charybdis_cmd_unsgline);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 2d1c98ad9..e81447a7b 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -64,7 +64,6 @@ void charybdis_cmd_318(const char *source, const char *who);
void charybdis_cmd_242(const char *buf);
void charybdis_cmd_243(const char *buf);
void charybdis_cmd_211(const char *buf);
-void charybdis_cmd_connect(int servernum);
void charybdis_cmd_svshold(const char *nick);
void charybdis_cmd_release_svshold(const char *nick);
void charybdis_cmd_unsgline(const char *mask);
@@ -110,4 +109,5 @@ class CharybdisProto : public IRCDProtoNew {
void cmd_sqline(const char *, const char *);
void cmd_svsnick(const char *, const char *, time_t);
void cmd_vhost_on(const char *, const char *, const char *);
+ void cmd_connect();
} ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index c2a7cea58..31ca0311b 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -984,25 +984,15 @@ void InspIRCdProto::cmd_vhost_on(const char *nick, const char *vIdent, const cha
inspircd_cmd_chghost(nick, vhost);
}
-void inspircd_cmd_connect(int servernum)
+void InspIRCdProto::cmd_connect()
{
- if (servernum == 1) {
- inspircd_cmd_pass(RemotePassword);
- }
- if (servernum == 2) {
- inspircd_cmd_pass(RemotePassword2);
- }
- if (servernum == 3) {
- inspircd_cmd_pass(RemotePassword3);
- }
- inspircd_cmd_server(ServerName, 0, ServerDesc);
- send_cmd(NULL, "BURST");
- send_cmd(ServerName, "VERSION :Anope-%s %s :%s - %s (%s) -- %s",
- version_number, ServerName, ircd->name, version_flags,
- EncModule, version_build);
-
- me_server =
- new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
+ if (servernum == 1) inspircd_cmd_pass(RemotePassword);
+ else if (servernum == 2) inspircd_cmd_pass(RemotePassword2);
+ else if (servernum == 3) inspircd_cmd_pass(RemotePassword3);
+ inspircd_cmd_server(ServerName, 0, ServerDesc);
+ send_cmd(NULL, "BURST");
+ send_cmd(ServerName, "VERSION :Anope-%s %s :%s - %s (%s) -- %s", version_number, ServerName, ircd->name, version_flags, EncModule, version_build);
+ me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
}
/* Events */
@@ -1658,7 +1648,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(inspircd_cmd_242);
pmodule_cmd_243(inspircd_cmd_243);
pmodule_cmd_211(inspircd_cmd_211);
- pmodule_cmd_connect(inspircd_cmd_connect);
pmodule_cmd_svshold(inspircd_cmd_svshold);
pmodule_cmd_release_svshold(inspircd_cmd_release_svshold);
pmodule_cmd_unsgline(inspircd_cmd_unsgline);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index 186ac1b79..762435f9a 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -69,7 +69,6 @@ void inspircd_cmd_318(const char *source, const char *who);
void inspircd_cmd_242(const char *buf);
void inspircd_cmd_243(const char *buf);
void inspircd_cmd_211(const char *buf);
-void inspircd_cmd_connect(int servernum);
void inspircd_cmd_svshold(const char *nick);
void inspircd_cmd_release_svshold(const char *nick);
void inspircd_cmd_unsgline(const char *mask);
@@ -119,4 +118,5 @@ class InspIRCdProto : public IRCDProtoNew {
void cmd_sqline(const char *, const char *);
void cmd_squit(const char *, const char *);
void cmd_vhost_on(const char *, const char *, const char *);
+ void cmd_connect();
} ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 30f57d173..d1baa51d7 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -841,26 +841,17 @@ void ratbox_cmd_server(const char *servname, int hop, const char *descript)
send_cmd(NULL, "SERVER %s %d :%s", servname, hop, descript);
}
-void ratbox_cmd_connect(int servernum)
+void RatboxProto::cmd_connect()
{
- /* Make myself known to myself in the serverlist */
- if (UseTS6) {
- me_server =
- new_server(NULL, ServerName, ServerDesc, SERVER_ISME, TS6SID);
- } else {
- me_server =
- new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
- }
- if (servernum == 1)
- ratbox_cmd_pass(RemotePassword);
- else if (servernum == 2)
- ratbox_cmd_pass(RemotePassword2);
- else if (servernum == 3)
- ratbox_cmd_pass(RemotePassword3);
-
- ratbox_cmd_capab();
- ratbox_cmd_server(ServerName, 1, ServerDesc);
- ratbox_cmd_svinfo();
+ /* Make myself known to myself in the serverlist */
+ if (UseTS6) me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, TS6SID);
+ else me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
+ if (servernum == 1) ratbox_cmd_pass(RemotePassword);
+ else if (servernum == 2) ratbox_cmd_pass(RemotePassword2);
+ else if (servernum == 3) ratbox_cmd_pass(RemotePassword3);
+ ratbox_cmd_capab();
+ ratbox_cmd_server(ServerName, 1, ServerDesc);
+ ratbox_cmd_svinfo();
}
void RatboxProto::cmd_bot_nick(const char *nick, const char *user, const char *host, const char *real, const char *modes)
@@ -1569,7 +1560,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(ratbox_cmd_242);
pmodule_cmd_243(ratbox_cmd_243);
pmodule_cmd_211(ratbox_cmd_211);
- pmodule_cmd_connect(ratbox_cmd_connect);
pmodule_cmd_svshold(ratbox_cmd_svshold);
pmodule_cmd_release_svshold(ratbox_cmd_release_svshold);
pmodule_cmd_unsgline(ratbox_cmd_unsgline);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index e17cc7b4c..ba12efbea 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -63,7 +63,6 @@ void ratbox_cmd_318(const char *source, const char *who);
void ratbox_cmd_242(const char *buf);
void ratbox_cmd_243(const char *buf);
void ratbox_cmd_211(const char *buf);
-void ratbox_cmd_connect(int servernum);
void ratbox_cmd_svshold(const char *nick);
void ratbox_cmd_release_svshold(const char *nick);
void ratbox_cmd_unsgline(const char *mask);
@@ -107,4 +106,5 @@ class RatboxProto : public IRCDProtoNew {
void cmd_global(const char *, const char *);
void cmd_sqline(const char *, const char *);
void cmd_svsnick(const char *, const char *, time_t) { } // Ratbox doesn't have an SVSNICK command
+ void cmd_connect();
} ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 9ec7c83e8..eb3417f22 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -899,27 +899,15 @@ void UnrealIRCdProto::cmd_vhost_on(const char *nick, const char *vIdent, const c
unreal_cmd_chghost(nick, vhost);
}
-void unreal_cmd_connect(int servernum)
+void UnrealIRCdProto::cmd_connect()
{
- if (Numeric) {
- me_server =
- new_server(NULL, ServerName, ServerDesc, SERVER_ISME, Numeric);
- } else {
- me_server =
- new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
- }
-
- unreal_cmd_capab();
- if (servernum == 1) {
- unreal_cmd_pass(RemotePassword);
- }
- if (servernum == 2) {
- unreal_cmd_pass(RemotePassword2);
- }
- if (servernum == 3) {
- unreal_cmd_pass(RemotePassword3);
- }
- unreal_cmd_server(ServerName, 1, ServerDesc);
+ if (Numeric) me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, Numeric);
+ else me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, NULL);
+ unreal_cmd_capab();
+ if (servernum == 1) unreal_cmd_pass(RemotePassword);
+ else if (servernum == 2) unreal_cmd_pass(RemotePassword2);
+ else if (servernum == 3) unreal_cmd_pass(RemotePassword3);
+ unreal_cmd_server(ServerName, 1, ServerDesc);
}
/* Events */
@@ -1952,7 +1940,6 @@ void moduleAddAnopeCmds()
pmodule_cmd_242(unreal_cmd_242);
pmodule_cmd_243(unreal_cmd_243);
pmodule_cmd_211(unreal_cmd_211);
- pmodule_cmd_connect(unreal_cmd_connect);
pmodule_cmd_svshold(unreal_cmd_svshold);
pmodule_cmd_release_svshold(unreal_cmd_release_svshold);
pmodule_cmd_unsgline(unreal_cmd_unsgline);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index c59dd3a05..b1c35c8a9 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -98,7 +98,6 @@ void unreal_cmd_318(const char *source, const char *who);
void unreal_cmd_242(const char *buf);
void unreal_cmd_243(const char *buf);
void unreal_cmd_211(const char *buf);
-void unreal_cmd_connect(int servernum);
void unreal_cmd_svshold(const char *nick);
void unreal_cmd_release_svshold(const char *nick);
void unreal_cmd_unsgline(const char *mask);
@@ -139,4 +138,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
void cmd_svso(const char *, const char *, const char *);
void cmd_chg_nick(const char *, const char *);
void cmd_vhost_on(const char *, const char *, const char *);
+ void cmd_connect();
} ircd_proto;
generated by cgit (git 2.34.1) at 2025-06-18 05:46:24 +0000