diff options
| author | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-01-16 18:30:52 +0000 |
|---|---|---|
| committer | michael <michael@82007160-df01-0410-b94d-b575c5fd34c7> | 2013-01-16 18:30:52 +0000 |
| commit | 83f7ffe7e5cb8110964209e86ce8e44b11f4088d (patch) | |
| tree | fa1f4842002862f58a04f01dcf9675a1b206e5b2 /include | |
| parent | b0f035dd5ef59e0f9096b5e716411bbb7b5afa24 (diff) | |
- Forward-port -r1750 [IMPORTANT: nick and topic lengths are now configurable
via ircd.conf. A max_nick_length, as well as a max_topic_length configuration
option can now be found in the serverinfo{} block]
- OpenSSL 0.9.8s and higher is now required in order to enable ssl support
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1751 82007160-df01-0410-b94d-b575c5fd34c7
Diffstat (limited to 'include')
| -rw-r--r-- | include/channel.h | 2 | ||||
| -rw-r--r-- | include/conf.h | 3 | ||||
| -rw-r--r-- | include/ircd_defs.h | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/channel.h b/include/channel.h index d81dac8..bf7b9ad 100644 --- a/include/channel.h +++ b/include/channel.h @@ -116,7 +116,7 @@ extern void check_spambot_warning(struct Client *, const char *); extern void check_splitmode(void *); extern void free_channel_list(dlink_list *); extern void destroy_channel(struct Channel *); -extern void set_channel_topic(struct Channel *, const char *, const char *, time_t); +extern void set_channel_topic(struct Channel *, const char *, const char *, time_t, int); extern const char *get_member_status(const struct Membership *, int); diff --git a/include/conf.h b/include/conf.h index b176cff..16555f5 100644 --- a/include/conf.h +++ b/include/conf.h @@ -300,6 +300,8 @@ struct server_info struct irc_ssaddr ip; struct irc_ssaddr ip6; unsigned int max_clients; + unsigned int max_nick_length; + unsigned int max_topic_length; int specific_ipv4_vhost; int specific_ipv6_vhost; struct sockaddr_in dns_host; @@ -360,6 +362,7 @@ extern struct MaskItem *find_exact_name_conf(enum maskitem_type, const struct Cl extern void conf_free(struct MaskItem *); extern void report_confitem_types(struct Client *, enum maskitem_type); extern void yyerror(const char *); +extern void conf_error_report(const char *); extern void cleanup_tklines(void *); extern int rehash(int); extern void lookup_confhost(struct MaskItem *); diff --git a/include/ircd_defs.h b/include/ircd_defs.h index 55215eb..2756ea1 100644 --- a/include/ircd_defs.h +++ b/include/ircd_defs.h @@ -38,6 +38,7 @@ #define IRCD_BUFSIZE 512 /* WARNING: *DONT* CHANGE THIS!!!! */ #define HOSTLEN 63 /* Length of hostname. Updated to comply with RFC 1123 */ +#define NICKLEN 30 #define USERLEN 10 #define PORTNAMELEN 6 /* ":31337" */ @@ -49,6 +50,7 @@ #define KILLLEN 90 #define LOCAL_CHANNELLEN 50 #define CHANNELLEN 200 +#define TOPICLEN 300 #define REASONLEN 120 #define KICKLEN 160 #define AWAYLEN 160 |