diff options
| -rw-r--r-- | include/conf.h | 32 | ||||
| -rw-r--r-- | modules/m_stats.c | 4 |
2 files changed, 14 insertions, 22 deletions
diff --git a/include/conf.h b/include/conf.h index b9af053..583444c 100644 --- a/include/conf.h +++ b/include/conf.h @@ -42,33 +42,29 @@ /* MaskItem->flags */ #define CONF_FLAGS_DO_IDENTD 0x00000001 -#define CONF_FLAGS_LIMIT_IP 0x00000002 #define CONF_FLAGS_NO_TILDE 0x00000004 #define CONF_FLAGS_NEED_IDENTD 0x00000008 -#define CONF_FLAGS_NOMATCH_IP 0x00000010 -#define CONF_FLAGS_EXEMPTKLINE 0x00000020 -#define CONF_FLAGS_NOLIMIT 0x00000040 -#define CONF_FLAGS_SPOOF_IP 0x00000080 -#define CONF_FLAGS_SPOOF_NOTICE 0x00000100 -#define CONF_FLAGS_REDIR 0x00000200 -#define CONF_FLAGS_EXEMPTGLINE 0x00000400 -#define CONF_FLAGS_CAN_FLOOD 0x00000800 -#define CONF_FLAGS_NEED_PASSWORD 0x00001000 -#define CONF_FLAGS_ALLOW_AUTO_CONN 0x00002000 -#define CONF_FLAGS_ENCRYPTED 0x00004000 -#define CONF_FLAGS_IN_DATABASE 0x00008000 -#define CONF_FLAGS_EXEMPTRESV 0x00010000 -#define CONF_FLAGS_SSL 0x00020000 -#define CONF_FLAGS_WEBIRC 0x00040000 +#define CONF_FLAGS_EXEMPTKLINE 0x00000010 +#define CONF_FLAGS_NOLIMIT 0x00000020 +#define CONF_FLAGS_SPOOF_IP 0x00000040 +#define CONF_FLAGS_SPOOF_NOTICE 0x00000080 +#define CONF_FLAGS_REDIR 0x00000100 +#define CONF_FLAGS_EXEMPTGLINE 0x00000200 +#define CONF_FLAGS_CAN_FLOOD 0x00000400 +#define CONF_FLAGS_NEED_PASSWORD 0x00000800 +#define CONF_FLAGS_ALLOW_AUTO_CONN 0x00001000 +#define CONF_FLAGS_ENCRYPTED 0x00002000 +#define CONF_FLAGS_IN_DATABASE 0x00004000 +#define CONF_FLAGS_EXEMPTRESV 0x00008000 +#define CONF_FLAGS_SSL 0x00010000 +#define CONF_FLAGS_WEBIRC 0x00020000 /* Macros for struct MaskItem */ #define IsConfWebIRC(x) ((x)->flags & CONF_FLAGS_WEBIRC) -#define IsLimitIp(x) ((x)->flags & CONF_FLAGS_LIMIT_IP) #define IsNoTilde(x) ((x)->flags & CONF_FLAGS_NO_TILDE) #define IsConfCanFlood(x) ((x)->flags & CONF_FLAGS_CAN_FLOOD) #define IsNeedPassword(x) ((x)->flags & CONF_FLAGS_NEED_PASSWORD) #define IsNeedIdentd(x) ((x)->flags & CONF_FLAGS_NEED_IDENTD) -#define IsNoMatchIp(x) ((x)->flags & CONF_FLAGS_NOMATCH_IP) #define IsConfExemptKline(x) ((x)->flags & CONF_FLAGS_EXEMPTKLINE) #define IsConfExemptLimits(x) ((x)->flags & CONF_FLAGS_NOLIMIT) #define IsConfExemptGline(x) ((x)->flags & CONF_FLAGS_EXEMPTGLINE) diff --git a/modules/m_stats.c b/modules/m_stats.c index 27fc660..aa5dc66 100644 --- a/modules/m_stats.c +++ b/modules/m_stats.c @@ -856,16 +856,12 @@ show_iline_prefix(const struct Client *sptr, const struct MaskItem *conf) *prefix_ptr++ = '<'; if (IsNoTilde(conf)) *prefix_ptr++ = '-'; - if (IsLimitIp(conf)) - *prefix_ptr++ = '!'; if (IsNeedIdentd(conf)) *prefix_ptr++ = '+'; if (!IsNeedPassword(conf)) *prefix_ptr++ = '&'; if (IsConfExemptResv(conf)) *prefix_ptr++ = '$'; - if (IsNoMatchIp(conf)) - *prefix_ptr++ = '%'; if (IsConfDoSpoofIp(conf)) *prefix_ptr++ = '='; if (MyOper(sptr) && IsConfExemptKline(conf)) |