projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8b0e32a
)
Don't respond to key exchange requests in channels
author
Bas Pape
<baspape@gmail.com>
Sun, 25 Aug 2013 09:07:00 +0000
(11:07 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Thu, 10 Oct 2013 19:20:26 +0000
(21:20 +0200)
src/core/ircparser.cpp
patch
|
blob
|
history
diff --git
a/src/core/ircparser.cpp
b/src/core/ircparser.cpp
index
0d47398
..
88c6b3c
100644
(file)
--- a/
src/core/ircparser.cpp
+++ b/
src/core/ircparser.cpp
@@
-232,9
+232,9
@@
void IrcParser::processNetworkIncoming(NetworkDataEvent *e)
#ifdef HAVE_QCA2
// Handle DH1080 key exchange
#ifdef HAVE_QCA2
// Handle DH1080 key exchange
- if (params[1].startsWith("DH1080_INIT")) {
+ if (params[1].startsWith("DH1080_INIT")
&& !net->isChannelName(target)
) {
events << new KeyEvent(EventManager::KeyEvent, net, prefix, target, KeyEvent::Init, params[1].mid(12));
events << new KeyEvent(EventManager::KeyEvent, net, prefix, target, KeyEvent::Init, params[1].mid(12));
- } else if (params[1].startsWith("DH1080_FINISH")) {
+ } else if (params[1].startsWith("DH1080_FINISH")
&& !net->isChannelName(target)
) {
events << new KeyEvent(EventManager::KeyEvent, net, prefix, target, KeyEvent::Finish, params[1].mid(14));
} else
#endif
events << new KeyEvent(EventManager::KeyEvent, net, prefix, target, KeyEvent::Finish, params[1].mid(14));
} else
#endif