From: Michael Poole <mdpoole@troilus.org>
Date: Tue, 23 Jan 2007 01:57:56 +0000 (+0000)
Subject: Limit ISUPPORT to 16 total items per line.
X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=5f08d7328fe338188bee668b99c0c4f574984833

Limit ISUPPORT to 16 total items per line.


git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1755 c9e4aea6-c8fd-4c43-8297-357d70d61c8c
---

diff --git a/ChangeLog b/ChangeLog
index a986992..0f6a6ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-22  Michael Poole <mdpoole@troilus.org>
+
+	* include/supported.h: Move parameters from FEATURES1 to FEATURES2
+	so that neither ISUPPORT line has more than 15 parameters.  (Some
+	clients are picky about this.)
+
 2007-01-21  Michael Poole <mdpoole@troilus.org>
 
 	* include/patchlevel.h (PATCHLEVEL): Bump for pre10 development.
diff --git a/include/supported.h b/include/supported.h
index bebbc94..3cb99f6 100644
--- a/include/supported.h
+++ b/include/supported.h
@@ -42,15 +42,16 @@
                 " MODES=%i" \
                 " MAXCHANNELS=%i" \
                 " MAXBANS=%i" \
-                " NICKLEN=%i" \
-                " MAXNICKLEN=%i" \
+                " NICKLEN=%i"
+                
+
+#define FEATURES2 " MAXNICKLEN=%i" \
                 " TOPICLEN=%i" \
                 " AWAYLEN=%i" \
                 " KICKLEN=%i" \
                 " CHANNELLEN=%i" \
-                " MAXCHANNELLEN=%i"
-
-#define FEATURES2 "CHANTYPES=%s" \
+                " MAXCHANNELLEN=%i" \
+                " CHANTYPES=%s" \
                 " PREFIX=%s" \
                 " STATUSMSG=%s" \
                 " CHANMODES=%s" \
@@ -59,11 +60,11 @@
 
 #define FEATURESVALUES1 feature_int(FEAT_MAXSILES), MAXMODEPARAMS, \
 			feature_int(FEAT_MAXCHANNELSPERUSER), \
-                        feature_int(FEAT_MAXBANS), feature_int(FEAT_NICKLEN), \
-                        NICKLEN, TOPICLEN, AWAYLEN, TOPICLEN, \
-                        feature_int(FEAT_CHANNELLEN), CHANNELLEN
+                        feature_int(FEAT_MAXBANS), feature_int(FEAT_NICKLEN)
 
-#define FEATURESVALUES2 (feature_bool(FEAT_LOCAL_CHANNELS) ? "#&" : "#"), "(ov)@+", "@+", \
+#define FEATURESVALUES2 NICKLEN, TOPICLEN, AWAYLEN, TOPICLEN, \
+                        feature_int(FEAT_CHANNELLEN), CHANNELLEN, \
+                        (feature_bool(FEAT_LOCAL_CHANNELS) ? "#&" : "#"), "(ov)@+", "@+", \
                         (feature_bool(FEAT_OPLEVELS) ? "b,AkU,l,imnpstrDd" : "b,k,l,imnpstrDd"), \
                         "rfc1459", feature_str(FEAT_NETWORK)