github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2010-03-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Use global option for PREF_LISTEN_PORT and PREF_BT_LPD_INTERFACE.
	* src/BtSetup.cc
pull/1/head
Tatsuhiro Tsujikawa 2010-03-11 15:15:06 +00:00
parent ca2b33c3da
commit f16a1d0e30
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-03-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Use global option for PREF_LISTEN_PORT and PREF_BT_LPD_INTERFACE.
* src/BtSetup.cc
2010-03-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-03-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Resurrected --http-proxy-user and --http-proxy-passwd option. Resurrected --http-proxy-user and --http-proxy-passwd option.

5
src/BtSetup.cc
View File

@ -159,7 +159,7 @@ void BtSetup::setup(std::vector<Command*>& commands,
} }
if(PeerListenCommand::getNumInstance() == 0) { if(PeerListenCommand::getNumInstance() == 0) {
PeerListenCommand* listenCommand = PeerListenCommand::getInstance(e); PeerListenCommand* listenCommand = PeerListenCommand::getInstance(e);
IntSequence seq = util::parseIntRange(option->get(PREF_LISTEN_PORT)); IntSequence seq = util::parseIntRange(e->option->get(PREF_LISTEN_PORT));
uint16_t port; uint16_t port;
if(listenCommand->bindPort(port, seq)) { if(listenCommand->bindPort(port, seq)) {
btRuntime->setListenPort(port); btRuntime->setListenPort(port);
@ -175,13 +175,12 @@ void BtSetup::setup(std::vector<Command*>& commands,
} }
if(option->getAsBool(PREF_BT_ENABLE_LPD) && if(option->getAsBool(PREF_BT_ENABLE_LPD) &&
(metadataGetMode || torrentAttrs[bittorrent::PRIVATE].i() == 0)) { (metadataGetMode || torrentAttrs[bittorrent::PRIVATE].i() == 0)) {
if(LpdReceiveMessageCommand::getNumInstance() == 0) { if(LpdReceiveMessageCommand::getNumInstance() == 0) {
_logger->info("Initializing LpdMessageReceiver."); _logger->info("Initializing LpdMessageReceiver.");
SharedHandle<LpdMessageReceiver> receiver SharedHandle<LpdMessageReceiver> receiver
(new LpdMessageReceiver(LPD_MULTICAST_ADDR, LPD_MULTICAST_PORT)); (new LpdMessageReceiver(LPD_MULTICAST_ADDR, LPD_MULTICAST_PORT));
bool initialized = false; bool initialized = false;
const std::string& lpdInterface = option->get(PREF_BT_LPD_INTERFACE); const std::string& lpdInterface = e->option->get(PREF_BT_LPD_INTERFACE);
if(lpdInterface.empty()) { if(lpdInterface.empty()) {
if(receiver->init("")) { if(receiver->init("")) {
initialized = true; initialized = true;