projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add command queue prepend, prioritize PING/PONG
[quassel.git]
/
src
/
core
/
corenetwork.cpp
diff --git
a/src/core/corenetwork.cpp
b/src/core/corenetwork.cpp
index
ca935d9
..
f622eea
100644
(file)
--- a/
src/core/corenetwork.cpp
+++ b/
src/core/corenetwork.cpp
@@
-268,16
+268,21
@@
void CoreNetwork::userInput(BufferInfo buf, QString msg)
}
}
-void CoreNetwork::putRawLine(
QByteArray s
)
+void CoreNetwork::putRawLine(
const QByteArray s, const bool prepend
)
{
{
- if (_tokenBucket > 0)
+ if (_tokenBucket > 0)
{
writeToSocket(s);
writeToSocket(s);
- else
- _msgQueue.append(s);
+ } else {
+ if (prepend) {
+ _msgQueue.prepend(s);
+ } else {
+ _msgQueue.append(s);
+ }
+ }
}
}
-void CoreNetwork::putCmd(const QString &cmd, const QList<QByteArray> ¶ms, const QByteArray &prefix)
+void CoreNetwork::putCmd(const QString &cmd, const QList<QByteArray> ¶ms, const QByteArray &prefix
, const bool prepend
)
{
QByteArray msg;
{
QByteArray msg;
@@
-294,16
+299,16
@@
void CoreNetwork::putCmd(const QString &cmd, const QList<QByteArray> ¶ms, co
msg += params[i];
}
msg += params[i];
}
- putRawLine(msg);
+ putRawLine(msg
, prepend
);
}
}
-void CoreNetwork::putCmd(const QString &cmd, const QList<QList<QByteArray>> ¶ms, const QByteArray &prefix)
+void CoreNetwork::putCmd(const QString &cmd, const QList<QList<QByteArray>> ¶ms, const QByteArray &prefix
, const bool prependAll
)
{
QListIterator<QList<QByteArray>> i(params);
while (i.hasNext()) {
QList<QByteArray> msg = i.next();
{
QListIterator<QList<QByteArray>> i(params);
while (i.hasNext()) {
QList<QByteArray> msg = i.next();
- putCmd(cmd, msg, prefix);
+ putCmd(cmd, msg, prefix
, prependAll
);
}
}
}
}