mirror of
https://github.com/rakshasa/rtorrent.git
synced 2026-08-17 23:52:30 +00:00
* Moved {bind,local}_address() to ConnectionManager.
* Various other API cleanups. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@651 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
+6
-3
@@ -49,6 +49,7 @@
|
||||
#include <sigc++/bind.h>
|
||||
#include <sigc++/hide.h>
|
||||
#include <torrent/bencode.h>
|
||||
#include <torrent/connection_manager.h>
|
||||
#include <torrent/exceptions.h>
|
||||
|
||||
#include "utils/variable_map.h"
|
||||
@@ -289,11 +290,11 @@ Manager::set_bind_address(const std::string& addr) {
|
||||
|
||||
if (torrent::listen_port() != 0) {
|
||||
torrent::listen_close();
|
||||
torrent::set_bind_address(ai->address()->c_sockaddr());
|
||||
torrent::connection_manager()->set_bind_address(ai->address()->c_sockaddr());
|
||||
listen_open();
|
||||
|
||||
} else {
|
||||
torrent::set_bind_address(ai->address()->c_sockaddr());
|
||||
torrent::connection_manager()->set_bind_address(ai->address()->c_sockaddr());
|
||||
}
|
||||
|
||||
rak::address_info::free_address_info(ai);
|
||||
@@ -301,6 +302,7 @@ Manager::set_bind_address(const std::string& addr) {
|
||||
m_pollManager->get_http_stack()->set_bind_address(addr);
|
||||
|
||||
} catch (torrent::input_error& e) {
|
||||
rak::address_info::free_address_info(ai);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
@@ -315,12 +317,13 @@ Manager::set_local_address(const std::string& addr) {
|
||||
|
||||
try {
|
||||
|
||||
torrent::set_local_address(ai->address()->c_sockaddr());
|
||||
torrent::connection_manager()->set_local_address(ai->address()->c_sockaddr());
|
||||
rak::address_info::free_address_info(ai);
|
||||
|
||||
m_pollManager->get_http_stack()->set_bind_address(addr);
|
||||
|
||||
} catch (torrent::input_error& e) {
|
||||
rak::address_info::free_address_info(ai);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user