From 1e3fe13a5bc6b54bdcd7205bbf8c0456cb7377c8 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Mon, 28 Mar 2011 12:45:22 -0400 Subject: [PATCH 1/2] update sparkle rss from server and fix changelog to 0.0.2 --- admin/mac/sparkle-beta.rss | 4 ++-- admin/mac/sparkle.rss | 4 ++-- admin/win/sparklewin-beta.rss | 10 +++++++++- admin/win/sparklewin.rss | 10 +++++++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/admin/mac/sparkle-beta.rss b/admin/mac/sparkle-beta.rss index 124746590..c0ee02303 100755 --- a/admin/mac/sparkle-beta.rss +++ b/admin/mac/sparkle-beta.rss @@ -16,10 +16,10 @@ Version 0.0.2 (Tomahawk Player Beta - It Lives?) - https://github.com/tomahawk-player/tomahawk/raw/stable/ChangeLog + https://github.com/tomahawk-player/tomahawk/raw/0.0.2/ChangeLog Mon, 28 Mar 2011 06:13:01 +0100 - + diff --git a/admin/mac/sparkle.rss b/admin/mac/sparkle.rss index 7e98e4568..fa6bfafcc 100755 --- a/admin/mac/sparkle.rss +++ b/admin/mac/sparkle.rss @@ -16,10 +16,10 @@ Version 0.0.2 (Tomahawk Player - It Lives!) - https://github.com/tomahawk-player/tomahawk/raw/stable/ChangeLog + https://github.com/tomahawk-player/tomahawk/raw/0.0.2/ChangeLog Mon, 28 Mar 2011 06:13:01 +0100 - + diff --git a/admin/win/sparklewin-beta.rss b/admin/win/sparklewin-beta.rss index 14d33d797..335303fdd 100644 --- a/admin/win/sparklewin-beta.rss +++ b/admin/win/sparklewin-beta.rss @@ -8,10 +8,18 @@ Version 0.0.1 (Tomahawk Player Beta - It Lives?) - https://github.com/tomahawk-player/tomahawk/raw/stable/ChangeLog + https://github.com/tomahawk-player/tomahawk/raw/0.0.1/ChangeLog Fri, 25 Mar 2011 00:00:01 +0100 + + Version 0.0.2 (Tomahawk Player Beta - It Lives?) + + https://github.com/tomahawk-player/tomahawk/raw/0.0.2/ChangeLog + + Mon, 28 Mar 2011 05:00:02 +0100 + + diff --git a/admin/win/sparklewin.rss b/admin/win/sparklewin.rss index aa9f8f4fa..9986a74ad 100644 --- a/admin/win/sparklewin.rss +++ b/admin/win/sparklewin.rss @@ -11,7 +11,15 @@ https://github.com/tomahawk-player/tomahawk/raw/0.0.1/ChangeLog Fri, 25 Mar 2011 00:00:01 +0100 - + + + + Version 0.0.2 (Tomahawk Player - It Lives!) + + https://github.com/tomahawk-player/tomahawk/raw/0.0.2/ChangeLog + + Mon, 28 Mar 2011 05:00:02 +0100 + From 896d6ad9f42ae61e3043c0d196cad3ba7db41f1c Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 28 Mar 2011 17:25:43 -0400 Subject: [PATCH 2/2] Clean up port logic --- src/libtomahawk/network/servent.cpp | 27 ++++++++++++++++++++------- src/libtomahawk/tomahawksettings.cpp | 6 ++++++ src/libtomahawk/tomahawksettings.h | 1 + 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/libtomahawk/network/servent.cpp b/src/libtomahawk/network/servent.cpp index 495e903de..0c0d8285c 100644 --- a/src/libtomahawk/network/servent.cpp +++ b/src/libtomahawk/network/servent.cpp @@ -92,17 +92,30 @@ bool Servent::startListening( QHostAddress ha, bool upnp, int port ) { m_port = port; - // try listening on one port higher as well, to aid debugging - // and let you run 2 instances easily - if( !listen( ha, m_port ) && !listen( ha, ++m_port ) ) + int defPort = TomahawkSettings::instance()->defaultPort(); + // Listen on both the selected port and, if not the same, the default port -- the latter sometimes necessary for zeroconf + // TODO: only listen on both when zeroconf sip is enabled + // TODO: use a real zeroconf system instead of a simple UDP broadcast? + if( !listen( ha, m_port ) ) { - qDebug() << "Failed to listen on port" << m_port; - qDebug() << "Error string is " << errorString(); - return false; + bool defPortAlso = false; + if( m_port != defPort ) + defPortAlso = listen( ha, defPort ); + if( !defPortAlso ) + { + qDebug() << "Failed to listen on both port " << m_port << " and port " << defPort; + qDebug() << "Error string is " << errorString(); + return false; + } + else + qDebug() << "Servent listening on port " << defPort << " servent thread:" << thread(); } else { - qDebug() << "Servent listening on port" << m_port << " servent thread:" << thread(); + bool defPortAlso = listen( ha, defPort ); + qDebug() << "Servent listening on port " << m_port << " servent thread:" << thread(); + if( defPortAlso ) + qDebug() << "Servent also listening on port " << defPort << " servent thread:" << thread(); } // --lanhack means to advertise your LAN IP over jabber as if it were externallyVisible diff --git a/src/libtomahawk/tomahawksettings.cpp b/src/libtomahawk/tomahawksettings.cpp index a4008388b..6af02b76f 100644 --- a/src/libtomahawk/tomahawksettings.cpp +++ b/src/libtomahawk/tomahawksettings.cpp @@ -377,6 +377,12 @@ TomahawkSettings::setExternalHostname(const QString& externalHostname) setValue( "network/external-hostname", externalHostname ); } +int +TomahawkSettings::defaultPort() const +{ + return 50210; +} + int TomahawkSettings::externalPort() const { diff --git a/src/libtomahawk/tomahawksettings.h b/src/libtomahawk/tomahawksettings.h index f7f5e2922..b836317fc 100644 --- a/src/libtomahawk/tomahawksettings.h +++ b/src/libtomahawk/tomahawksettings.h @@ -95,6 +95,7 @@ public: QString externalHostname() const; void setExternalHostname( const QString& externalHostname ); + int defaultPort() const; int externalPort() const; void setExternalPort( int externalPort );