From: Alexander von Renteln <phon@quassel-irc.org>
Date: Tue, 27 May 2008 13:30:32 +0000 (+0000)
Subject: #BR39 - long messages will now be divided in several messages.
X-Git-Tag: 0.3.0~401
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=0f2de52ddceb138686d2f53c694531744d70f596;hp=a1bcca1c86e88406a0c5495b08731e6b11dd987e

#BR39 - long messages will now be divided in several messages.
---

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index 1adf827a..56156e0d 100644
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -65,6 +65,10 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session) : Q
   _messagesPerSecond = 1;
   _burstSize = 5;
   _tokenBucket = 5; // init with a full bucket
+  // TODO: 
+  // should be 510 (2 bytes are added when writing to the socket)
+  // maxMsgSize is 510 minus the hostmask which will be added by the server
+  _maxMsgSize = 450; 
 
   _tokenBucketTimer.start(_messagesPerSecond * 1000);
   _tokenBucketTimer.setSingleShot(false);
@@ -391,6 +395,7 @@ void NetworkConnection::userInput(BufferInfo buf, QString msg) {
 
 void NetworkConnection::putRawLine(QByteArray s) {
   if(_tokenBucket > 0) {
+    // qDebug() << "putRawLine: " << s;
     writeToSocket(s);
   } else {
     _msgQueue.append(s);
@@ -399,6 +404,7 @@ void NetworkConnection::putRawLine(QByteArray s) {
 
 void NetworkConnection::writeToSocket(QByteArray s) {
   s += "\r\n";
+  // qDebug() << "writeToSocket: " << s.size();
   socket.write(s);
   _tokenBucket--;
 }
@@ -425,6 +431,23 @@ void NetworkConnection::putCmd(const QString &cmd, const QVariantList &params, c
   if(!params.isEmpty())
     msg += " :" + params.last().toByteArray();
 
+  if(cmd == "PRIVMSG" && params.count() > 1) {
+    QByteArray msghead = "PRIVMSG " + params[0].toByteArray() + " :";
+
+    while (msg.size() > _maxMsgSize) {
+      QByteArray splitter(" .,-");
+      int splitPosition = 0;
+      for(int i = 0; i < splitter.size(); i++) {
+        splitPosition = qMax(splitPosition, msg.lastIndexOf(splitter[i], _maxMsgSize));
+      }
+      if(splitPosition < 300) {
+        splitPosition = _maxMsgSize;
+      }
+      putRawLine(msg.left(splitPosition)); 
+      msg = msghead + msg.mid(splitPosition);
+    }
+  }
+
   putRawLine(msg);
 }
 
diff --git a/src/core/networkconnection.h b/src/core/networkconnection.h
index 9b4126d0..8654bd85 100644
--- a/src/core/networkconnection.h
+++ b/src/core/networkconnection.h
@@ -188,6 +188,8 @@ private:
   int _tokenBucket; // the virtual bucket that holds the tokens
   QList<QByteArray> _msgQueue;
 
+  int _maxMsgSize;
+
   void writeToSocket(QByteArray s);
 
 
diff --git a/version.inc b/version.inc
index 59d2abf0..2ba5ac07 100644
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.3.0-pre";
   quasselDate = "2008-05-26";
-  quasselBuild = 860;
+  quasselBuild = 861;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 731;