summaryrefslogtreecommitdiff
path: root/structures.h
diff options
context:
space:
mode:
authorLuke Bratch <luke@bratch.co.uk>2021-01-18 21:51:00 +0000
committerLuke Bratch <luke@bratch.co.uk>2021-01-18 21:51:00 +0000
commita16d9bdecb572bb266a84ec90767d613ce8ce255 (patch)
tree865c745fab117969647ea722334f35304595a7d5 /structures.h
parent323e273bc7dbc2b244e536a10b6c370651c76b8a (diff)
Make the "channels" configuration file entry an array.
Diffstat (limited to 'structures.h')
-rw-r--r--structures.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/structures.h b/structures.h
index 26b7439..9e5f575 100644
--- a/structures.h
+++ b/structures.h
@@ -22,11 +22,11 @@
#define MAXDATASIZE 513 // max number of bytes we can get at once (RFC2812 says 512, plus one for null terminator)
#define MAXCHANLENGTH 50 // 50 according to RFC 2811 and RFC 2822
+#define MAXCHANKEYLEN 24 // Maxium channel key length, 23 determined by testing various clients/servers (plus one for null terminator)
#define MAXNICKLENGTH 64 // Randomly picked (TODO - is there an actual maximum number (ignoring the RFC preference of 9)?)
#define MAXUSERNAMELEN 64 // Randomly picked (TODO - is there an actual maximum username length?)
#define MAXREALNAMELEN 128 // Randomly picked (TODO - is there an actual maximum real name length?)
#define MAXPORTLEN 6 // Up to 65535, so 5 characters + 1 for null
-#define MAXAUTOCHANLEN 1024 // Randomly picked maximum length of the auto channel list
#define CLIENTCODELEN 17 // Max length of a client code + 1 for null
#define MAXCLIENTCODES 64 // Max number of client codes to track
#define MAXCONFARR 10 // Max number of entries that a configuration array can have
@@ -67,7 +67,7 @@ struct settings {
char ircusername[MAXUSERNAMELEN]; // (Is this also true for the username? Can the server change that?)
char ircrealname[MAXREALNAMELEN];
char password[MAXDATASIZE];
- char autochannels[MAXAUTOCHANLEN];
+ char autochannels[MAXCONFARR][MAXDATASIZE]; // MAXDATASIZE instead of MAXCHANLENGTH + 1 + MAXCHANKEYLEN so getconfarr() only has one string size to deal with
char ircserver[HOST_NAME_MAX];
char ircserverport[MAXPORTLEN];
char ircserverpassword[MAXDATASIZE - 5]; // -5 for "PASS "