- fix for UPnP option

This commit is contained in:
Christophe Dumez 2007-03-27 21:12:33 +00:00
commit e0a0a0beb1
4 changed files with 10 additions and 5 deletions

1
TODO
View file

@ -43,3 +43,4 @@
- Improve Ipfilter.dat parser (move to a thread ?) - Improve Ipfilter.dat parser (move to a thread ?)
- Use tooltips to explain options - Use tooltips to explain options
- Exit confirmation only if there are active downloads - Exit confirmation only if there are active downloads
- Support UPnP port edition

View file

@ -986,7 +986,11 @@ void GUI::configureSession(bool deleteOptions){
} }
#ifndef NO_UPNP #ifndef NO_UPNP
// Upnp // Upnp
BTSession.enableUPnP(); if(options->isDHTEnabled()){
BTSession.enableUPnP(options->getUPnPPort());
}else{
BTSession.disableUPnP();
}
#endif #endif
// PeX // PeX
if(!options->isPeXDisabled()){ if(!options->isPeXDisabled()){

View file

@ -75,7 +75,7 @@ torrent_handle bittorrent::getTorrentHandle(const QString& hash) const{
} }
#ifndef NO_UPNP #ifndef NO_UPNP
void bittorrent::enableUPnP(){ void bittorrent::enableUPnP(int port){
if(!UPnPEnabled){ if(!UPnPEnabled){
qDebug("Enabling UPnP"); qDebug("Enabling UPnP");
UPnPEnabled = true; UPnPEnabled = true;
@ -85,7 +85,7 @@ void bittorrent::enableUPnP(){
"TCP", "TCP",
true, true,
"qBittorrent"); "qBittorrent");
m_upnp = new CUPnPControlPoint(50000); m_upnp = new CUPnPControlPoint(port);
m_upnp->AddPortMappings(m_upnpMappings); m_upnp->AddPortMappings(m_upnpMappings);
} }
} }

View file

@ -119,7 +119,7 @@ class bittorrent : public QObject{
void setSessionSettings(session_settings sessionSettings); void setSessionSettings(session_settings sessionSettings);
void setDefaultSavePath(const QString& savepath); void setDefaultSavePath(const QString& savepath);
#ifndef NO_UPNP #ifndef NO_UPNP
void enableUPnP(); void enableUPnP(int port=50000);
void disableUPnP(); void disableUPnP();
#endif #endif