Added support for multiple uplink blocks in the new config.

Moved the type and id directives from the uplink block to the serverinfo block.
Small config fixes.

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

1 files changed, 2 insertions, 10 deletions

diff --git a/include/extern.h b/include/extern.h
index b1706b622..1ff32aba5 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -227,15 +227,7 @@ char *sockstrerror(int error);
 
 /**** config.c ****/
 
-E char *RemoteServer;
-E int   RemotePort;
-E char *RemotePassword;
-E char *RemoteServer2;
-E int   RemotePort2;
-E char *RemotePassword2;
-E char *RemoteServer3;
-E int   RemotePort3;
-E char *RemotePassword3;
+E std::list<Uplink *> Uplinks;
 E char *LocalHost;
 E int   LocalPort;
 
@@ -514,7 +506,7 @@ E void set_lastmask(User * u);
 E void introduce_user(const char *user);
 E int init_primary(int ac, char **av);
 E int init_secondary(int ac, char **av);
-E int servernum;
+E Uplink *uplink_server;
 
 /**** ircd.c ****/
 E void pmodule_ircd_proto(IRCDProto *);