mumble: pinger fixed by upstream

2 files changed, 0 insertions, 70 deletions

diff --git a/media-sound/mumble/files/pinger_fix.patch b/media-sound/mumble/files/pinger_fix.patch
deleted file mode 100644
index a701100..0000000
--- a/media-sound/mumble/files/pinger_fix.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/src/mumble/ServerHandler.cpp b/src/mumble/ServerHandler.cpp
-index 7e30e76a..d02ad0c1 100644
---- a/src/mumble/ServerHandler.cpp
-+++ b/src/mumble/ServerHandler.cpp
-@@ -349,10 +349,9 @@ void ServerHandler::run() {
- 
- 		tTimestamp.restart();
- 
--		// Setup ping timer;
--		QTimer *ticker = new QTimer(this);
--		connect(ticker, SIGNAL(timeout()), this, SLOT(sendPing()));
--		ticker->start(5000);
-+		ping_ticker = new QTimer(this);
-+		connect(ping_ticker, SIGNAL(timeout()), this, SLOT(sendPing()));
-+
- 
- 		g.mw->rtLast = MumbleProto::Reject_RejectType_None;
- 
-@@ -370,6 +369,8 @@ void ServerHandler::run() {
- 			shouldTryNextTargetServer = false;
- 		}
- 
-+		ping_ticker->stop();
-+
- 		if (qusUdp) {
- 			QMutexLocker qml(&qmUdp);
- 
-@@ -384,7 +385,6 @@ void ServerHandler::run() {
- 			qusUdp = NULL;
- 		}
- 
--		ticker->stop();
- 
- 		ConnectionPtr cptr(cConnection);
- 		if (cptr) {
-@@ -619,7 +619,7 @@ void ServerHandler::serverConnectionStateChanged(QAbstractSocket::SocketState st
- 		tConnectionTimeoutTimer = new QTimer();
- 		connect(tConnectionTimeoutTimer, SIGNAL(timeout()), this, SLOT(serverConnectionTimeoutOnConnect()));
- 		tConnectionTimeoutTimer->setSingleShot(true);
--		tConnectionTimeoutTimer->start(30000);
-+		tConnectionTimeoutTimer->start(120000); //this may take some time on server with large dh
- 	} else if (state == QAbstractSocket::ConnectedState) {
- 		// Start TLS handshake
- 		qtsSock->startClientEncryption();
-@@ -651,6 +651,11 @@ void ServerHandler::serverConnectionConnected() {
- 		return;
- 	}
- 
-+	// Setup ping timer;
-+	//do this after succesfull connection, not before
-+	ping_ticker->start(10000); //do not waste too much traffic here, 10 seconds instead of 5 is ok
-+
-+
- 	MumbleProto::Version mpv;
- 	mpv.set_release(u8(QLatin1String(MUMBLE_RELEASE)));
- 
-diff --git a/src/mumble/ServerHandler.h b/src/mumble/ServerHandler.h
-index bb558c4b..130e65aa 100644
---- a/src/mumble/ServerHandler.h
-+++ b/src/mumble/ServerHandler.h
-@@ -77,7 +77,7 @@ class ServerHandler : public QThread {
- 	public:
- 		Timer tTimestamp;
- 		int iInFlightTCPPings;
--		QTimer *tConnectionTimeoutTimer;
-+		QTimer *tConnectionTimeoutTimer, *ping_ticker;
- 		QList<QSslError> qlErrors;
- 		QList<QSslCertificate> qscCert;
- 		QSslCipher qscCipher;
diff --git a/media-sound/mumble/mumble-scm.ebuild b/media-sound/mumble/mumble-scm.ebuild
index 4746fc7..bfbdd21 100644
--- a/media-sound/mumble/mumble-scm.ebuild
+++ b/media-sound/mumble/mumble-scm.ebuild
@@ -56,7 +56,6 @@ PATCHES=(
 	"${FILESDIR}"/tls12_strong_ciphers.patch
 	"${FILESDIR}"/higher_opus_complexity.patch
 	"${FILESDIR}"/allow_higher_bitrate_and_frame_size.patch
-	"${FILESDIR}"/pinger_fix.patch
 )
 
 #S="${WORKDIR}/${MY_P}"