From 2091dfaa69a882fd9b1fa23b7ddfd34c8695b49d Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Fri, 3 Mar 2017 16:58:55 +0800
Subject: [PATCH] Follow http user-agent format

Add version variable without the starting "v"
---
 CMakeLists.txt                  | 14 ++++++++------
 src/base/bittorrent/session.cpp |  2 +-
 src/base/net/dnsupdater.cpp     |  4 ++--
 src/gui/programupdater.cpp      |  2 +-
 version.pri                     |  2 ++
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86178e05a..7c9c03633 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,15 +17,17 @@ endif()
 
 set(PROJECT_VERSION "${PROJECT_VERSION}${VER_STATUS}")
 
-add_definitions(-DVERSION_MAJOR=${VER_MAJOR})
-add_definitions(-DVERSION_MINOR=${VER_MINOR})
-add_definitions(-DVERSION_BUGFIX=${VER_BUGFIX})
-add_definitions(-DVERSION_BUILD=${VER_BUILD})
+add_definitions(-DQBT_VERSION_MAJOR=${VER_MAJOR})
+add_definitions(-DQBT_VERSION_MINOR=${VER_MINOR})
+add_definitions(-DQBT_VERSION_BUGFIX=${VER_BUGFIX})
+add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD})
 
 # os2 {
-#     DEFINES += VERSION=\'\"v$${PROJECT_VERSION}\"\'
+#     DEFINES += DQBT_VERSION=\'\"v$${PROJECT_VERSION}\"\'
+#     DEFINES += DQBT_VERSION_2=\'\"$${PROJECT_VERSION}\"\'
 # } else {
-add_definitions(-DVERSION="v${PROJECT_VERSION}")
+add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}")
+add_definitions(-DQBT_VERSION_2="${PROJECT_VERSION}")
 # }
 
 # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og")
diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp
index 2e1fda24d..1ff83a185 100644
--- a/src/base/bittorrent/session.cpp
+++ b/src/base/bittorrent/session.cpp
@@ -91,7 +91,7 @@
 
 static const char PEER_ID[] = "qB";
 static const char RESUME_FOLDER[] = "BT_backup";
-static const char USER_AGENT[] = "qBittorrent " VERSION;
+static const char USER_AGENT[] = "qBittorrent/" QBT_VERSION;  // to pass trackers whitelists, using the "v" prefixed version string
 
 namespace libt = libtorrent;
 using namespace BitTorrent;
diff --git a/src/base/net/dnsupdater.cpp b/src/base/net/dnsupdater.cpp
index 17618f2d3..2a57e1e99 100644
--- a/src/base/net/dnsupdater.cpp
+++ b/src/base/net/dnsupdater.cpp
@@ -78,7 +78,7 @@ void DNSUpdater::checkPublicIP()
 
     DownloadHandler *handler = DownloadManager::instance()->downloadUrl(
                 "http://checkip.dyndns.org", false, 0, false,
-                "qBittorrent/" QBT_VERSION);
+                "qBittorrent/" QBT_VERSION_2);
     connect(handler, SIGNAL(downloadFinished(QString, QByteArray)), SLOT(ipRequestFinished(QString, QByteArray)));
     connect(handler, SIGNAL(downloadFailed(QString, QString)), SLOT(ipRequestFailed(QString, QString)));
 
@@ -125,7 +125,7 @@ void DNSUpdater::updateDNSService()
     m_lastIPCheckTime = QDateTime::currentDateTime();
     DownloadHandler *handler = DownloadManager::instance()->downloadUrl(
                 getUpdateUrl(), false, 0, false,
-                "qBittorrent/" QBT_VERSION);
+                "qBittorrent/" QBT_VERSION_2);
     connect(handler, SIGNAL(downloadFinished(QString, QByteArray)), SLOT(ipUpdateFinished(QString, QByteArray)));
     connect(handler, SIGNAL(downloadFailed(QString, QString)), SLOT(ipUpdateFailed(QString, QString)));
 }
diff --git a/src/gui/programupdater.cpp b/src/gui/programupdater.cpp
index f57c5807d..e4ce2597e 100644
--- a/src/gui/programupdater.cpp
+++ b/src/gui/programupdater.cpp
@@ -66,7 +66,7 @@ void ProgramUpdater::checkForUpdates()
                 RSS_URL, false, 0, false,
                 // Don't change this User-Agent. In case our updater goes haywire,
                 // the filehost can identify it and contact us.
-                "qBittorrent/" QBT_VERSION " ProgramUpdater (www.qbittorrent.org)");
+                "qBittorrent/" QBT_VERSION_2 " ProgramUpdater (www.qbittorrent.org)");
     connect(handler, SIGNAL(downloadFinished(QString,QByteArray)), SLOT(rssDownloadFinished(QString,QByteArray)));
     connect(handler, SIGNAL(downloadFailed(QString,QString)), SLOT(rssDownloadFailed(QString,QString)));
 }
diff --git a/version.pri b/version.pri
index 3aba3b56f..e1495b634 100644
--- a/version.pri
+++ b/version.pri
@@ -23,7 +23,9 @@ DEFINES += QBT_VERSION_BUILD=$${VER_BUILD}
 
 os2 {
     DEFINES += QBT_VERSION=\'\"v$${PROJECT_VERSION}\"\'
+    DEFINES += QBT_VERSION_2=\'\"$${PROJECT_VERSION}\"\'
 }
 else {
     DEFINES += QBT_VERSION=\\\"v$${PROJECT_VERSION}\\\"
+    DEFINES += QBT_VERSION_2=\\\"$${PROJECT_VERSION}\\\"
 }