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

merged changes from RC_1_0

This commit is contained in:
Arvid Norberg 2015-05-31 21:57:38 +00:00
parent e35d8d3933
commit 3409c782f8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/libtorrent/extensions.hpp
View File

@ -357,7 +357,7 @@ namespace libtorrent
// can add entries to the extension handshake // can add entries to the extension handshake
// this is not called for web seeds // this is not called for web seeds
virtual void add_handshake(entry&) {} virtual void add_handshake(entry&) {}
// called when the peer is being disconnected. // called when the peer is being disconnected.
virtual void on_disconnect(error_code const& /*ec*/) {} virtual void on_disconnect(error_code const& /*ec*/) {}
@ -369,13 +369,13 @@ namespace libtorrent
// throwing an exception from any of the handlers (except add_handshake) // throwing an exception from any of the handlers (except add_handshake)
// closes the connection // closes the connection
// this is called when the initial BT handshake is received. Returning false // this is called when the initial BT handshake is received. Returning false
// means that the other end doesn't support this extension and will remove // means that the other end doesn't support this extension and will remove
// it from the list of plugins. // it from the list of plugins.
// this is not called for web seeds // this is not called for web seeds
virtual bool on_handshake(char const* /*reserved_bits*/) { return true; } virtual bool on_handshake(char const* /*reserved_bits*/) { return true; }
// called when the extension handshake from the other end is received // called when the extension handshake from the other end is received
// if this returns false, it means that this extension isn't // if this returns false, it means that this extension isn't
// supported by this peer. It will result in this peer_plugin // supported by this peer. It will result in this peer_plugin

6
include/libtorrent/session.hpp
View File

@ -165,13 +165,13 @@ namespace libtorrent
{ {
public: public:
// If the fingerprint in the first overload is omited, the client will // If the fingerprint in the first overload is omited, the client will get
// get a default fingerprint stating the version of libtorrent. The // a default fingerprint stating the version of libtorrent. The
// fingerprint is a short string that will be used in the peer-id to // fingerprint is a short string that will be used in the peer-id to
// identify the client and the client's version. For more details see the // identify the client and the client's version. For more details see the
// fingerprint class. // fingerprint class.
// //
// The flags paramater can be used to start default features (upnp & // The flags parameter can be used to start default features (upnp &
// nat-pmp) and default plugins (ut_metadata, ut_pex and smart_ban). The // nat-pmp) and default plugins (ut_metadata, ut_pex and smart_ban). The
// default is to start those features. If you do not want them to start, // default is to start those features. If you do not want them to start,
// pass 0 as the flags parameter. // pass 0 as the flags parameter.