- Proxy is now used for tracker / web seeds / peers connections

- Fixed the compiling errors with latest libtorrent svn
This commit is contained in:
Christophe Dumez 2007-05-02 13:52:29 +00:00
commit 9093f8e44a
5 changed files with 23 additions and 9 deletions

View file

@ -1121,7 +1121,8 @@ void GUI::configureSession(bool deleteOptions){
qDebug("Configuring session");
QPair<int, int> limits;
unsigned short old_listenPort, new_listenPort;
session_settings proxySettings;
proxy_settings proxySettings;
session_settings sessionSettings;
// Configure session regarding options
BTSession.setDefaultSavePath(options->getSavePath());
old_listenPort = BTSession.getListenPort();
@ -1190,15 +1191,18 @@ void GUI::configureSession(bool deleteOptions){
}
// Apply Proxy settings
if(options->isProxyEnabled()){
proxySettings.proxy_ip = options->getProxyIp().toStdString();
proxySettings.proxy_port = options->getProxyPort();
proxySettings.hostname = options->getProxyIp().toStdString();
proxySettings.port = options->getProxyPort();
proxySettings.type = proxy_settings::http;
if(options->isProxyAuthEnabled()){
proxySettings.proxy_login = options->getProxyUsername().toStdString();
proxySettings.proxy_password = options->getProxyPassword().toStdString();
proxySettings.username = options->getProxyUsername().toStdString();
proxySettings.password = options->getProxyPassword().toStdString();
proxySettings.type = proxy_settings::http_pw;
}
}
proxySettings.user_agent = "qBittorrent "VERSION;
BTSession.setSessionSettings(proxySettings);
BTSession.setProxySettings(proxySettings);
sessionSettings.user_agent = "qBittorrent "VERSION;
BTSession.setSessionSettings(sessionSettings);
// Scan dir stuff
if(options->getScanDir().isNull()){
BTSession.disableDirectoryScanning();

View file

@ -675,11 +675,18 @@ void bittorrent::disableIPFilter(){
s->set_ip_filter(ip_filter());
}
// Set BT session settings (proxy, user_agent)
// Set BT session settings (user_agent)
void bittorrent::setSessionSettings(session_settings sessionSettings){
s->set_settings(sessionSettings);
}
// Set Proxy
void bittorrent::setProxySettings(proxy_settings proxySettings){
s->set_peer_proxy(proxySettings);
s->set_web_seed_proxy(proxySettings);
s->set_tracker_proxy(proxySettings);
}
// Read alerts sent by the bittorrent session
void bittorrent::readAlerts(){
// look at session alerts and display some infos

View file

@ -116,6 +116,7 @@ class bittorrent : public QObject{
void setUploadRateLimit(int rate);
void setGlobalRatio(float ratio);
void setDHTPort(int dht_port);
void setProxySettings(proxy_settings proxySettings);
void setSessionSettings(session_settings sessionSettings);
void setDefaultSavePath(const QString& savepath);
#ifndef NO_UPNP