diff options
| -rw-r--r-- | Changes | 3 | ||||
| -rw-r--r-- | data/example.conf | 2 | ||||
| -rw-r--r-- | docs/README | 2 | ||||
| -rw-r--r-- | src/protocol/hybrid.c | 10 | ||||
| -rw-r--r-- | src/protocol/hybrid.h | 2 | ||||
| -rw-r--r-- | version.log | 3 |
6 files changed, 15 insertions, 7 deletions
@@ -1,6 +1,9 @@ Anope Version 1.8 - GIT ------------------- +Provided by Michael Wobst - 2013 +05/25 U Update Hybrid protocol module to support Hybrid 8.1 + Anope Version 1.8.8 ------------------- 01/29 F Fixed user modes on BotServ bots on Unreal3.2.10 [#1474] diff --git a/data/example.conf b/data/example.conf index f5562696e..217ca17f0 100644 --- a/data/example.conf +++ b/data/example.conf @@ -78,7 +78,7 @@ # Bahamut 1.4.27 [or later] - "bahamut" # Charybdis 1.0 [or later] - "charybdis" # DreamForge 4.6.7 - "dreamforge" -# Hybrid IRCd 8.0 - "hybrid" +# Hybrid IRCd 8.1 - "hybrid" # InspIRCd 1.1 [beta 8 or later] - "inspircd11" # InspIRCd 1.2 [RC3 or later] - "inspircd12" # InspIRCd 2.0 - "inspircd20" diff --git a/docs/README b/docs/README index 946865508..878ac95c3 100644 --- a/docs/README +++ b/docs/README @@ -202,7 +202,7 @@ Table of Contents * Bahamut 1.4.27 or later (including 1.8) * Charybdis 1.0 or later * DreamForge 4.6.7 - * Hybrid 8 or later + * Hybrid 8.1 or later * InspIRCd 1.x, and 2.0 * Plexus 2.0 or later (including 3.0) * PTlink 6.15 or later diff --git a/src/protocol/hybrid.c b/src/protocol/hybrid.c index 88ee94c52..c9b6ccdd7 100644 --- a/src/protocol/hybrid.c +++ b/src/protocol/hybrid.c @@ -17,7 +17,7 @@ #include "version.h" IRCDVar myIrcd[] = { - {"Hybrid 8.0.*", /* ircd name */ + {"Hybrid 8.1.*", /* ircd name */ "+o", /* nickserv mode */ "+o", /* chanserv mode */ "+o", /* memoserv mode */ @@ -204,7 +204,7 @@ void hybrid_set_umode(User *user, int ac, char **av) break; case 'r': if (add && !nick_identified(user)) { - send_cmd(ServerName, "SVSMODE %s -r", user->nick); + common_svsmode(user, "-r", NULL); user->mode &= ~UMODE_r; } break; @@ -358,7 +358,7 @@ CBMode myCbmodes[128] = { {0}, /* J */ {0}, /* K */ {0}, /* L */ - {0}, /* M */ + {CMODE_M, 0, NULL, NULL}, /* M */ {0}, /* N */ {CMODE_O, CBM_NO_USER_MLOCK, NULL, NULL}, /* O */ {0}, /* P */ @@ -375,7 +375,7 @@ CBMode myCbmodes[128] = { {0}, {0}, {0}, {0}, {0}, {0}, {0}, /* a */ {0}, /* b */ - {0}, /* c */ + {CMODE_c, 0, NULL, NULL}, /* c */ {0}, /* d */ {0}, /* e */ {0}, /* f */ @@ -403,6 +403,7 @@ CBMode myCbmodes[128] = { }; CBModeInfo myCbmodeinfos[] = { + {'c', CMODE_c, 0, NULL, NULL}, {'i', CMODE_i, 0, NULL, NULL}, {'k', CMODE_k, 0, get_key, cs_get_key}, {'l', CMODE_l, CBM_MINUS_NO_ARG, get_limit, cs_get_limit}, @@ -412,6 +413,7 @@ CBModeInfo myCbmodeinfos[] = { {'r', CMODE_r, 0, NULL, NULL}, {'s', CMODE_s, 0, NULL, NULL}, {'t', CMODE_t, 0, NULL, NULL}, + {'M', CMODE_M, 0, NULL, NULL}, {'O', CMODE_O, 0, NULL, NULL}, {'R', CMODE_R, 0, NULL, NULL}, {'S', CMODE_S, 0, NULL, NULL}, diff --git a/src/protocol/hybrid.h b/src/protocol/hybrid.h index 64fc55a95..561822fe5 100644 --- a/src/protocol/hybrid.h +++ b/src/protocol/hybrid.h @@ -41,8 +41,10 @@ #define CMODE_l 0x00000080 /* Limit the number of users in a channel */ #define CMODE_R 0x00000100 /* Only identified users can join */ #define CMODE_r 0x00000200 /* Set for all registered channels */ +#define CMODE_c 0x00000400 /* Control codes cannot be sent to a channel */ #define CMODE_O 0x00000800 /* Oper only channel, as of hybrid7.3 */ #define CMODE_S 0x00001000 /* SSL only channel, as of hybrid7.3 */ +#define CMODE_M 0x00002000 /* Non-regged nicks can't send messages */ #define DEFAULT_MLOCK CMODE_n|CMODE_r|CMODE_t diff --git a/version.log b/version.log index 16b072da1..38ed80cb4 100644 --- a/version.log +++ b/version.log @@ -8,13 +8,14 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="9" VERSION_EXTRA="-git" -VERSION_BUILD="3114" +VERSION_BUILD="3115" # Changes since 1.8.8 Release # Leading up to 1.8.8 Release +#Revision 3115 - Update Hybrid protocol module for Hybrid 8.1 #Revision 3110 - Added japanese language support, patch provided by Ryuunosuke Ayanokouzi #Revision 3109 - Do not allow invalid nicknames to be forbidden in ns_forbid #Revision 3108 - Bug #1474 - Fixed setting umodes on BotServ bots on Unreal3.2.10 |