diff options
| author |  Sadie Powell | 2022-03-11 14:27:32 +0000 |
|---|---|---|
| committer | Sadie Powell | 2022-03-11 14:52:56 +0000 |
| commit | 2d329701db1d5c0361c018e088eb82c457f8ec7c (patch) | |
| tree | 7897c5fcdf7eecb8c96bf31c030043d76574fa23 /src/modules/m_channames.cpp | |
| parent | Refactor the opermodes module. (diff) | |
| parent | Use UCHAR_MAX instead of raw sizes in channames. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_channames.cpp')
| -rw-r--r-- | src/modules/m_channames.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp index fbea7d640..f1f805b84 100644 --- a/src/modules/m_channames.cpp +++ b/src/modules/m_channames.cpp @@ -24,7 +24,7 @@ #include "inspircd.h" -static std::bitset<256> allowedmap; +static std::bitset<UCHAR_MAX + 1> allowedmap; class NewIsChannelHandler final { @@ -61,11 +61,6 @@ public: { } - void init() override - { - ServerInstance->Channels.IsChannel = NewIsChannelHandler::Call; - } - void ValidateChans() { Modes::ChangeList removepermchan; @@ -119,17 +114,18 @@ public: irc::portparser denyrange(denyToken, false); long denyno = -1; while (0 != (denyno = denyrange.GetToken())) - allowedmap[denyno & 0xFF] = false; + allowedmap[denyno & UCHAR_MAX] = false; irc::portparser allowrange(allowToken, false); long allowno = -1; while (0 != (allowno = allowrange.GetToken())) - allowedmap[allowno & 0xFF] = true; + allowedmap[allowno & UCHAR_MAX] = true; allowedmap[0x07] = false; // BEL allowedmap[0x20] = false; // ' ' allowedmap[0x2C] = false; // ',' + ServerInstance->Channels.IsChannel = NewIsChannelHandler::Call; ValidateChans(); } |