From 49c5035cd3fd06a63bcf9510a1d2fa64334ec5fa Mon Sep 17 00:00:00 2001 From: Markus Mittendrein Date: Sun, 8 May 2016 11:14:28 +0200 Subject: Use Port-type for DCC-Port --- src/CRSMConfig.hpp | 4 ++-- src/crsm.cpp | 4 ++-- src/qt-config | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/CRSMConfig.hpp b/src/CRSMConfig.hpp index a566092..fb06f31 100644 --- a/src/CRSMConfig.hpp +++ b/src/CRSMConfig.hpp @@ -77,7 +77,7 @@ public: struct { Boolean Use = true; - Integer Port = 9373; + Port ListenPort = 9373; String Address = "0.0.0.0"; } DCC; @@ -169,7 +169,7 @@ public: ConfigVal(DCC.Use), ConfigVal(DCC.Address), - ConfigVal(DCC.Port), + ConfigValName(DCC.Port, DCC.ListenPort), diff --git a/src/crsm.cpp b/src/crsm.cpp index fbe3340..efd58b8 100644 --- a/src/crsm.cpp +++ b/src/crsm.cpp @@ -1783,7 +1783,7 @@ void CRSM::applyConfig() { if(!dccServer.isListening()) { - dccServer.listen(QHostAddress::Any, Config.DCC.Port); + dccServer.listen(QHostAddress::Any, Config.DCC.ListenPort); } } else @@ -3194,7 +3194,7 @@ CMD_FUNCTION_IMPL(dccConnect) return Success; } QHostInfo info = QHostInfo::fromName(Config.DCC.Address); - connection->sendCommand(IrcCommand::createCtcpRequest(client.nick, "DCC CHAT chat " + QString::number(info.addresses().first().toIPv4Address()) + " " + QString::number(Config.DCC.Port))); + connection->sendCommand(IrcCommand::createCtcpRequest(client.nick, "DCC CHAT chat " + QString::number(info.addresses().first().toIPv4Address()) + " " + QString::number(Config.DCC.ListenPort))); return Success; } diff --git a/src/qt-config b/src/qt-config index 11a2c0f..808350d 160000 --- a/src/qt-config +++ b/src/qt-config @@ -1 +1 @@ -Subproject commit 11a2c0f3e7fe3eff64fdd9ffb40727412e0d2213 +Subproject commit 808350db57eebf8e6a5517a74c5c7b0c71a5d250 -- cgit v1.2.3-54-g00ecf