diff options
author | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-08-08 16:39:14 +0000 |
---|---|---|
committer | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-08-08 16:39:14 +0000 |
commit | 4e76d134288ad0c446cfd1d6e0204948c898981e (patch) | |
tree | b8f4de0e0ede90a92b1bb8677ec2caece21ed3f8 | |
parent | 51d869db5768386c8c638415426fa97985ad5693 (diff) |
Remove SSYNC_UNKNOWN. All IRCds can report sync state, and for those that _really_ can't, we can find out via PING/PONG exchange anyway. We will be making use of sync state more shortly.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2441 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r-- | include/services.h | 6 | ||||
-rw-r--r-- | src/protocol/bahamut.c | 1 | ||||
-rw-r--r-- | src/protocol/inspircd11.c | 1 | ||||
-rw-r--r-- | src/protocol/inspircd12.cpp | 1 | ||||
-rw-r--r-- | src/protocol/ratbox.c | 1 | ||||
-rw-r--r-- | src/protocol/unreal32.c | 1 | ||||
-rw-r--r-- | src/servers.c | 8 |
7 files changed, 5 insertions, 14 deletions
diff --git a/include/services.h b/include/services.h index c86a5bd1d..79ee35f09 100644 --- a/include/services.h +++ b/include/services.h @@ -521,7 +521,6 @@ struct ircdvars_ { int supporthelper; /* +h helper umodes */ int p10; /* ircd is P10 */ char *nickchars; /* character set */ - int sync; /* reports sync state */ int cidrchanbei; /* channel bans/excepts/invites support CIDR (syntax: +b *!*@192.168.0.0/15) * 0 for no support, 1 for strict cidr support, anything else * for ircd specific support (nefarious only cares about first /mask) */ @@ -807,9 +806,8 @@ typedef struct { /* Server data */ typedef enum { - SSYNC_UNKNOWN = 0, /* We can't get the sync state */ - SSYNC_IN_PROGRESS = 1, /* Sync is currently in progress */ - SSYNC_DONE = 2 /* We're in sync */ + SSYNC_IN_PROGRESS = 0, /* Sync is currently in progress */ + SSYNC_DONE = 1 /* We're in sync */ } SyncState; struct server_ { diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index 7ebdae106..e8be32ca9 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -127,7 +127,6 @@ IRCDVar myIrcd[] = { 1, /* support helper umode */ 0, /* p10 */ NULL, /* character set */ - 1, /* reports sync state */ 0, /* CIDR channelbans */ "$", /* TLD Prefix for Global */ } diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index c81d9b416..43369f4c3 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -136,7 +136,6 @@ IRCDVar myIrcd[] = { 1, /* support helper umode */ 0, /* p10 */ NULL, /* character set */ - 0, /* reports sync state */ 1, /* CIDR channelbans */ "$", /* TLD Prefix for Global */ } diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp index d364d5100..ab22aa29c 100644 --- a/src/protocol/inspircd12.cpp +++ b/src/protocol/inspircd12.cpp @@ -136,7 +136,6 @@ IRCDVar myIrcd[] = { 1, /* support helper umode */ 0, /* p10 */ NULL, /* character set */ - 0, /* reports sync state */ 1, /* CIDR channelbans */ "$", /* TLD Prefix for Global */ } diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index c989dc004..7cb6cb884 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -112,7 +112,6 @@ IRCDVar myIrcd[] = { 0, /* support helper umode */ 0, /* p10 */ NULL, /* character set */ - 0, /* reports sync state */ 0, /* CIDR channelbans */ "$$", /* TLD Prefix for Global */ } diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index b47b22368..44752af7a 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -149,7 +149,6 @@ IRCDVar myIrcd[] = { 1, /* support helper umode */ 0, /* p10 */ NULL, /* character set */ - 1, /* reports sync state */ 0, /* CIDR channelbans */ "$", /* TLD Prefix for Global */ } diff --git a/src/servers.c b/src/servers.c index 5a6cb0239..b820b22e9 100644 --- a/src/servers.c +++ b/src/servers.c @@ -137,10 +137,8 @@ Server *new_server(Server * server_uplink, const char *name, const char *desc, } else { serv->suid = NULL; } - if (ircd->sync) - serv->sync = SSYNC_IN_PROGRESS; - else - serv->sync = SSYNC_UNKNOWN; + + serv->sync = SSYNC_IN_PROGRESS; serv->links = NULL; serv->prev = NULL; @@ -539,7 +537,7 @@ int is_ulined(const char *server) */ int is_sync(Server * server) { - if ((server->sync == SSYNC_DONE) || (server->sync == SSYNC_UNKNOWN)) + if (server->sync == SSYNC_DONE) return 1; return 0; } |