Browse Source

- Added a message log when an UPnP WAN service is detected

adaptive-webui-19844
Christophe Dumez 18 years ago
parent
commit
4ca852c2b3
  1. 2
      TODO
  2. 6
      src/GUI.cpp
  3. 1
      src/GUI.h
  4. 2
      src/UPnP.cpp
  5. 1
      src/UPnP.h
  6. 6
      src/bittorrent.cpp
  7. 2
      src/bittorrent.h

2
TODO

@ -43,5 +43,5 @@ @@ -43,5 +43,5 @@
- Use tooltips to explain options
- Exit confirmation only if there are active downloads (display number of downloads) - SMARTER
- Make use of QNetworkInterface (could be useful ?)
- Display more info in log (PeX, UPnP, DHT w/ ports...)
- Display more info in log (UPnP successful)
- Possibility to disable the trayicon

6
src/GUI.cpp

@ -106,6 +106,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){ @@ -106,6 +106,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){
tabs->setTabText(0, tr("Transfers") +" (0)");
#ifndef NO_UPNP
connect(&BTSession, SIGNAL(noWanServiceDetected()), this, SLOT(displayNoUPnPWanServiceDetected()));
connect(&BTSession, SIGNAL(wanServiceDetected()), this, SLOT(displayUPnPWanServiceDetected()));
#endif
connect(&BTSession, SIGNAL(addedTorrent(const QString&, torrent_handle&, bool)), this, SLOT(torrentAdded(const QString&, torrent_handle&, bool)));
connect(&BTSession, SIGNAL(duplicateTorrent(const QString&)), this, SLOT(torrentDuplicate(const QString&)));
@ -284,6 +285,11 @@ void GUI::readParamsOnSocket(){ @@ -284,6 +285,11 @@ void GUI::readParamsOnSocket(){
void GUI::displayNoUPnPWanServiceDetected(){
setInfoBar(tr("UPnP: no WAN service detected..."), "red");
}
void GUI::displayUPnPWanServiceDetected(){
setInfoBar(tr("UPnP: WAN service detected!"), "green");
}
#endif
// Toggle paused state of selected torrent

1
src/GUI.h

@ -142,6 +142,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{ @@ -142,6 +142,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
void askForTorrentUrl();
#ifndef NO_UPNP
void displayNoUPnPWanServiceDetected();
void displayUPnPWanServiceDetected();
#endif

2
src/UPnP.cpp

@ -893,7 +893,7 @@ bool CUPnPControlPoint::AddPortMappings( @@ -893,7 +893,7 @@ bool CUPnPControlPoint::AddPortMappings(
qDebug("UPnP: %s", msg.str().c_str());
return false;
}
emit yeswanServiceDetected();
int n = upnpPortMapping.size();
bool ok = false;

1
src/UPnP.h

@ -599,6 +599,7 @@ public: @@ -599,6 +599,7 @@ public:
signals:
void noWanServiceDetected();
void yeswanServiceDetected();
private:
void OnEventReceived(

6
src/bittorrent.cpp

@ -90,6 +90,7 @@ void bittorrent::enableUPnP(int port){ @@ -90,6 +90,7 @@ void bittorrent::enableUPnP(int port){
"qBittorrent");
m_upnp = new CUPnPControlPoint(port);
connect(m_upnp, SIGNAL(noWanServiceDetected()), this, SLOT(noWanServiceEventHandler()));
connect(m_upnp, SIGNAL(yeswanServiceDetected()), this, SLOT(wanServiceEventHandler()));
m_upnp->AddPortMappings(m_upnpMappings);
}
}
@ -99,6 +100,11 @@ void bittorrent::noWanServiceEventHandler(){ @@ -99,6 +100,11 @@ void bittorrent::noWanServiceEventHandler(){
emit noWanServiceDetected();
}
void bittorrent::wanServiceEventHandler(){
// Forward this signal
emit wanServiceDetected();
}
// Set UPnP port (>= 1000)
void bittorrent::setUPnPPort(int upnp_port){
if(!UPnPEnabled){

2
src/bittorrent.h

@ -135,6 +135,7 @@ class bittorrent : public QObject{ @@ -135,6 +135,7 @@ class bittorrent : public QObject{
void saveTrackerFile(const QString& hash);
#ifndef NO_UPNP
void noWanServiceEventHandler();
void wanServiceEventHandler();
#endif
signals:
@ -152,6 +153,7 @@ class bittorrent : public QObject{ @@ -152,6 +153,7 @@ class bittorrent : public QObject{
void aboutToDownloadFromUrl(const QString& url);
#ifndef NO_UPNP
void noWanServiceDetected();
void wanServiceDetected();
#endif
};

Loading…
Cancel
Save