From 6b904e34cb98b37b2f2b8b7e21de73730f94c1bf Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 26 May 2008 11:25:12 +0000
Subject: [PATCH] Increased the allowed packet size for chat messages. Changed
 the capacity of the message column in chatlog (see sql update).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12725 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-Trunk.txt            |  3 +++
 sql-files/upgrade_svn12725.sql |  1 +
 src/map/clif.c                 | 11 ++++++-----
 src/map/map.h                  |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 sql-files/upgrade_svn12725.sql

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 25a0c0585a..c6f705e317 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2008/05/26
+	* Increased the allowed packet size for chat messages [ultramage]
+	- changed the capacity of the message column in chatlog (see sql update)
 2008/05/25
 	* Increased storage space to 600 [Playtester]
 2008/05/24
diff --git a/sql-files/upgrade_svn12725.sql b/sql-files/upgrade_svn12725.sql
new file mode 100644
index 0000000000..bccdca61b6
--- /dev/null
+++ b/sql-files/upgrade_svn12725.sql
@@ -0,0 +1 @@
+ALTER TABLE `chatlog` CHANGE `message` `message` VARCHAR( 255 ) NOT NULL
diff --git a/src/map/clif.c b/src/map/clif.c
index 05e71fe197..663ef51ea5 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7570,12 +7570,13 @@ static bool clif_process_message(struct map_session_data* sd, int format, char**
 		ShowWarning("clif_process_message: Player '%s' sent an unterminated message string!\n", sd->status.name);
 		return false;		
 	}
-	if( messagelen > CHAT_SIZE_MAX )
+	if( messagelen > CHAT_SIZE_MAX-1 )
 	{	// messages mustn't be too long
-		// Normally you can only enter CHATBOX_SIZE-1 chars into the chat box, but Frost Joke / Dazzler's text can be longer.
-		// Neither the official client nor server place any restriction on the length of the text in the packet,
-		// but we'll only allow reasonably long strings here. This also makes sure all strings fit into the `chatlog` table.
-		ShowWarning("clif_process_message: Player '%s' sent a message too long ('%.*s')!\n", sd->status.name, CHAT_SIZE_MAX, message);
+		// Normally you can only enter CHATBOX_SIZE-1 letters into the chat box, but Frost Joke / Dazzler's text can be longer.
+		// Also, the physical size of strings that use multibyte encoding can go multiple times over the chatbox capacity.
+		// Neither the official client nor server place any restriction on the length of the data in the packet,
+		// but we'll only allow reasonably long strings here. This also makes sure that they fit into the `chatlog` table.
+		ShowWarning("clif_process_message: Player '%s' sent a message too long ('%.*s')!\n", sd->status.name, CHAT_SIZE_MAX-1, message);
 		return false;
 	}
 
diff --git a/src/map/map.h b/src/map/map.h
index c32951b455..954e211b99 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -151,7 +151,7 @@ enum {
 #define CHATROOM_TITLE_SIZE (36 + 1)
 #define CHATROOM_PASS_SIZE (8 + 1)
 //Max allowed chat text length
-#define CHAT_SIZE_MAX 150
+#define CHAT_SIZE_MAX 256
 
 #define DEFAULT_AUTOSAVE_INTERVAL 5*60*1000