mirror of
https://github.com/rakshasa/rtorrent.git
synced 2026-08-13 05:32:31 +00:00
* Moved Listen to ConnectionManager and use a single port rather than
cache it in each download. * Set classic locale on various streams. * Added ChunkStatistic class that will keep track of the number of each chunk, and how many seeders there are. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@654 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
+5
-7
@@ -39,8 +39,6 @@
|
||||
#include <stdexcept>
|
||||
#include <cstdio>
|
||||
#include <cstring>
|
||||
#include <fstream>
|
||||
#include <istream>
|
||||
#include <unistd.h>
|
||||
#include <sys/select.h>
|
||||
#include <rak/address_info.h>
|
||||
@@ -201,12 +199,12 @@ Manager::listen_open() {
|
||||
if (control->variables()->get("port_random").as_string() == "yes") {
|
||||
int boundary = m_portFirst + random() % (m_portLast - m_portFirst + 1);
|
||||
|
||||
if (!torrent::listen_open(boundary, m_portLast) &&
|
||||
!torrent::listen_open(m_portFirst, boundary))
|
||||
if (!torrent::connection_manager()->listen_open(boundary, m_portLast) &&
|
||||
!torrent::connection_manager()->listen_open(m_portFirst, boundary))
|
||||
throw torrent::input_error("Could not open/bind a port for listening.");
|
||||
|
||||
} else {
|
||||
if (!torrent::listen_open(m_portFirst, m_portLast))
|
||||
if (!torrent::connection_manager()->listen_open(m_portFirst, m_portLast))
|
||||
throw torrent::input_error("Could not open/bind a port for listening.");
|
||||
|
||||
}
|
||||
@@ -222,8 +220,8 @@ Manager::set_bind_address(const std::string& addr) {
|
||||
|
||||
try {
|
||||
|
||||
if (torrent::listen_port() != 0) {
|
||||
torrent::listen_close();
|
||||
if (torrent::connection_manager()->listen_port() != 0) {
|
||||
torrent::connection_manager()->listen_close();
|
||||
torrent::connection_manager()->set_bind_address(ai->address()->c_sockaddr());
|
||||
listen_open();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user