Fix bug #1009, patch inspired by DukePyrolator, add a TS6 SID generator from DukePyrolator, as well as change SendServer() to take a Server struct and use the result of new_server() in the SendServer() call instead.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2206 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 5 insertions, 5 deletions

diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index dea79b952..acde49ac0 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -585,18 +585,18 @@ class RatboxProto : public IRCDTS6Proto
 	}
 
 	/* SERVER name hop descript */
-	void SendServer(const char *servname, int hop, const char *descript)
+	void SendServer(Server *server)
 	{
-		send_cmd(NULL, "SERVER %s %d :%s", servname, hop, descript);
+		send_cmd(NULL, "SERVER %s %d :%s", server->name, server->hops, server->desc);
 	}
 
 	void SendConnect()
 	{
-		/* Make myself known to myself in the serverlist */
-		me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, TS6SID);
 		ratbox_cmd_pass(uplink_server->password);
 		ratbox_cmd_capab();
-		SendServer(ServerName, 1, ServerDesc);
+		/* Make myself known to myself in the serverlist */
+		me_server = new_server(NULL, ServerName, ServerDesc, SERVER_ISME, TS6SID);
+		SendServer(me_server);
 		ratbox_cmd_svinfo();
 	}