wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

make test_ssl build without openssl (and also not do anything)

This commit is contained in:
Arvid Norberg 2013-12-16 06:17:05 +00:00
parent ad772aecd8
commit 60a33f8cf8
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/peer_connection.cpp
View File

@ -3960,9 +3960,10 @@ namespace libtorrent
TORRENT_ASSERT(offset >= 0);
if (size > 0)
{
std::memmove(&m_recv_buffer[0] + offset, &m_recv_buffer[0] + offset + size, m_recv_pos - size - offset);
m_recv_pos -= size;
m_recv_pos -= size;
}
#ifdef TORRENT_DEBUG
std::fill(m_recv_buffer.begin() + m_recv_pos, m_recv_buffer.end(), 0);

20
test/test_ssl.cpp
View File

@ -46,7 +46,6 @@ POSSIBILITY OF SUCH DAMAGE.
#ifdef TORRENT_USE_OPENSSL
#include <boost/asio/ssl/error.hpp> // for asio::error::get_ssl_category()
#include <boost/asio/ssl.hpp>
#endif
using namespace libtorrent;
using boost::tuples::ignore;
@ -75,11 +74,7 @@ test_config_t test_config[] =
{"downloader has a cert, but not seed (connect to regular port)", false, false, true, false, 0, 0},
{"downloader has a cert, but not seed (connect to ssl port)", true, false, true, false, 1, 1},
{"both downloader and seed has a cert (connect to regular port)", false, true, true, false, 0, 0},
#ifdef TORRENT_USE_OPENSSL
{"both downloader and seed has a cert (connect to ssl port)", true, true, true, true, 0, 0},
#else
{"both downloader and seed has a cert (connect to ssl port)", true, true, true, false, 0, 0},
#endif
};
int peer_disconnects = 0;
@ -95,10 +90,8 @@ bool on_alert(alert* a)
++peer_disconnects;
++peer_errors;
#ifdef TORRENT_USE_OPENSSL
if (e->error.category() == boost::asio::error::get_ssl_category())
++ssl_peer_disconnects;
#endif
}
return false;
}
@ -115,14 +108,6 @@ void test_ssl(int test_idx, bool use_utp)
fprintf(stderr, "\n%s TEST: %s Protocol: %s\n\n", time_now_string(), test.name, use_utp ? "uTP": "TCP");
#ifndef TORRENT_USE_OPENSSL
if (test.use_ssl_ports)
{
fprintf(stderr, "N/A\n");
return;
}
#endif
// in case the previous run was terminated
error_code ec;
remove_all("tmp1_ssl", ec);
@ -243,10 +228,8 @@ void test_ssl(int test_idx, bool use_utp)
fprintf(stderr, "peer_errors: %d expected: %d\n", peer_errors, test.peer_errors);
TEST_EQUAL(peer_errors, test.peer_errors);
#ifdef TORRENT_USE_OPENSSL
fprintf(stderr, "ssl_disconnects: %d expected: %d\n", ssl_peer_disconnects, test.ssl_disconnects);
TEST_EQUAL(ssl_peer_disconnects, test.ssl_disconnects);
#endif
fprintf(stderr, "%s: EXPECT: %s\n", time_now_string(), test.expected_to_complete ? "SUCCEESS" : "FAILURE");
fprintf(stderr, "%s: RESULT: %s\n", time_now_string(), tor2.status().is_seeding ? "SUCCEESS" : "FAILURE");
TEST_CHECK(tor2.status().is_seeding == test.expected_to_complete);
@ -526,11 +509,13 @@ void test_malicious_peer()
TEST_EQUAL(attacks[i].expect, success);
}
}
#endif // TORRENT_USE_OPENSSL
int test_main()
{
using namespace libtorrent;
#ifdef TORRENT_USE_OPENSSL
test_malicious_peer();
// No support for SSL/uTP yet, so always pass in false
@ -541,6 +526,7 @@ int test_main()
remove_all("tmp1_ssl", ec);
remove_all("tmp2_ssl", ec);
#endif // TORRENT_USE_OPENSSL
return 0;
}