X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;h=760dcb3c7d2666fd17753f2a8a73527edcd0b294;hp=3d9fcc73c18dff8defef76c5130b7999c3195384;hb=7942d6e0e0c29f870b471e44df6ba172732ef43a;hpb=546e609b7e2fa683e8b7b90d6079dd3a80ed4c6b

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index 3d9fcc73..760dcb3c 100644
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -29,7 +29,6 @@
 
 #include "ircchannel.h"
 #include "ircuser.h"
-#include "network.h"
 #include "identity.h"
 
 #include "ircserverhandler.h"
@@ -59,17 +58,15 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session)
     // TokenBucket to avaid sending too much at once
     _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)
+    _tokenBucket(5) // init with a full bucket
 {
   _autoReconnectTimer.setSingleShot(true);
   _socketCloseTimer.setSingleShot(true);
   connect(&_socketCloseTimer, SIGNAL(timeout()), this, SLOT(socketCloseTimeout()));
-  
+
+  _pingTimer.setInterval(60000);
+  connect(&_pingTimer, SIGNAL(timeout()), this, SLOT(sendPing()));
+
   _autoWhoTimer.setInterval(_autoWhoDelay * 1000);
   _autoWhoCycleTimer.setInterval(_autoWhoInterval * 1000);
   
@@ -220,6 +217,8 @@ void NetworkConnection::networkInitialized(const QString &currentServer) {
   network()->setConnected(true);
   emit connected(networkId());
 
+  _pingTimer.start();
+
   if(_autoWhoEnabled) {
     _autoWhoCycleTimer.start();
     _autoWhoTimer.start();
@@ -375,6 +374,7 @@ void NetworkConnection::socketCloseTimeout() {
 }
 
 void NetworkConnection::socketDisconnected() {
+  _pingTimer.stop();
   _autoWhoCycleTimer.stop();
   _autoWhoTimer.stop();
   _autoWhoQueue.clear();
@@ -433,38 +433,84 @@ void NetworkConnection::fillBucketAndProcessQueue() {
   }
 }
 
-void NetworkConnection::putCmd(const QString &cmd, const QVariantList &params, const QByteArray &prefix) {
-  QByteArray msg;
-  if(!prefix.isEmpty())
-    msg += ":" + prefix + " ";
-  msg += cmd.toUpper().toAscii();
+// returns 0 if the message will not be chopped by the irc server or number of chopped bytes if message is too long
+int NetworkConnection::lastParamOverrun(const QString &cmd, const QList<QByteArray> &params) {
+  //the server will pass our message that trunkated to 512 bytes including CRLF with the following format:
+  // ":prefix COMMAND param0 param1 :lastparam"
+  // where prefix = "nickname!user@host"
+  // that means that the last message can be as long as:
+  // 512 - nicklen - userlen - hostlen - commandlen - sum(param[0]..param[n-1])) - 2 (for CRLF) - 4 (":!@" + 1space between prefix and command) - max(paramcount - 1, 0) (space for simple params) - 2 (space and colon for last param)
+  IrcUser *me = network()->me();
+  int maxLen = 480 - cmd.toAscii().count(); // educated guess in case we don't know us (yet?)
 
-  for(int i = 0; i < params.size() - 1; i++) {
-    msg += " " + params[i].toByteArray();
+  if(me)
+    maxLen = 512 - serverEncode(me->nick()).count() - serverEncode(me->user()).count() - serverEncode(me->host()).count() - cmd.toAscii().count() - 6;
+
+  if(!params.isEmpty()) {
+    for(int i = 0; i < params.count() - 1; i++) {
+      maxLen -= (params[i].count() + 1);
+    }
+    maxLen -= 2; // " :" last param separator;
+    
+    if(params.last().count() > maxLen) {
+      return params.last().count() - maxLen;
+    } else {
+      return 0;
+    }
+  } else {
+    return 0;
   }
-  if(!params.isEmpty())
-    msg += " :" + params.last().toByteArray();
+}
 
+void NetworkConnection::putCmd(const QString &cmd, const QList<QByteArray> &params, const QByteArray &prefix) {
+  QByteArray msg;
   if(cmd == "PRIVMSG" && params.count() > 1) {
-    QByteArray msghead = "PRIVMSG " + params[0].toByteArray() + " :";
+    int overrun = lastParamOverrun(cmd, params);
+    if(overrun) {
+      QList<QByteArray> paramCopy1;
+      QList<QByteArray> paramCopy2;
+      for(int i = 0; i < params.count() - 1; i++) {
+	paramCopy1 << params[i];
+	paramCopy2 << params[i];
+      }
 
-    while (msg.size() > _maxMsgSize) {
+      QByteArray lastPart = params.last();
       QByteArray splitter(" .,-");
-      int splitPosition = 0;
+      int maxSplitPos = params.last().count() - overrun;
+      int splitPos = -1;
       for(int i = 0; i < splitter.size(); i++) {
-        splitPosition = qMax(splitPosition, msg.lastIndexOf(splitter[i], _maxMsgSize));
+	splitPos = qMax(splitPos, lastPart.lastIndexOf(splitter[i], maxSplitPos));
       }
-      if(splitPosition < 300) {
-        splitPosition = _maxMsgSize;
+
+      if(splitPos == -1) {
+	splitPos = maxSplitPos;
       }
-      putRawLine(msg.left(splitPosition)); 
-      msg = msghead + msg.mid(splitPosition);
+      
+      paramCopy1 << lastPart.left(splitPos);
+      paramCopy2 << lastPart.mid(splitPos);
+      putCmd(cmd, paramCopy1, prefix);
+      putCmd(cmd, paramCopy2, prefix);
+      return;
     }
   }
+     
+  if(!prefix.isEmpty())
+    msg += ":" + prefix + " ";
+  msg += cmd.toUpper().toAscii();
+
+  for(int i = 0; i < params.size() - 1; i++) {
+    msg += " " + params[i];
+  }
+  if(!params.isEmpty())
+    msg += " :" + params.last();
 
   putRawLine(msg);
 }
 
+void NetworkConnection::sendPing() {
+  userInputHandler()->handlePing(BufferInfo(), QString());
+}
+
 void NetworkConnection::sendAutoWho() {
   while(!_autoWhoQueue.isEmpty()) {
     QString chan = _autoWhoQueue.takeFirst();