Merge pull request #33 from JoyStream/development

dev to master - v0.1.4

Author: mnaamani

conan_package/base.py

@@ -3,7 +3,7 @@
 
 class ExtensionBase(ConanFile):
     name = "Extension"
-    version = "0.1.3"
+    version = "0.1.4"
     license = "(c) JoyStream Inc. 2016-2017"
     url = "https://github.com/JoyStream/extension-conan.git"
     git_repo = "git@github.com:JoyStream/extension-cpp.git"

sources/include/extension/PeerPlugin.hpp

@@ -158,19 +158,19 @@ namespace status {
             try {
                 written = writer.write(payload);
             } catch(std::exception &e) {
-                std::clog << "Error writing message payload, message not sent." << std::endl;
+                std::clog << "Error Writing message payload, " << getMessageName(messageType) << " message not sent!" << std::endl;
                 return;
             }
 
             if(size != written) {
-                std::clog << "Error payload not fully written, message not sent." << std::endl;
+                std::clog << "Error Payload not fully written, " << getMessageName(messageType) << " message not sent!" << std::endl;
                 return;
             }
 
             // Send message buffer
             m.send(_connection);
 
-            std::clog << "SENT:" << getMessageName(messageType) << " = " << written << "bytes" << std::endl;
+            std::clog << "SENT: " << getMessageName(messageType) << " (" << written << ") bytes" << std::endl;
         }
 
         // Status of plugin

sources/include/extension/TorrentPlugin.hpp

@@ -186,7 +186,7 @@ class TorrentPlugin : public libtorrent::torrent_plugin {
     // Removes peer from session, if present
     void removeFromSession(PeerPlugin*);
 
-    int pickNextPiece(const std::vector<protocol_session::detail::Piece<libtorrent::peer_id>> * pieces); 
+    int pickNextPiece(const std::vector<protocol_session::detail::Piece<libtorrent::peer_id>> * pieces);
 
     // Processes extended message from peer
     template<class M>

sources/src/PeerPlugin.cpp

@@ -54,7 +54,7 @@ namespace extension {
     }
 
     PeerPlugin::~PeerPlugin() {
-        std::clog << "~PeerPlugin() called." << std::endl;
+        //std::clog << "~PeerPlugin() called." << std::endl;
     }
 
     char const* PeerPlugin::type() const {
@@ -176,6 +176,7 @@ namespace extension {
         if(_peerBEP10SupportStatus != BEPSupportStatus::supported) {
 
             // Remove peer
+            std::clog << "Dropping Peer: bad handshake (non-BEP10 peer sent extended handshake)" << std::endl;
             libtorrent::error_code ec; // "Peer misbehaved: didn't support BEP10, but it sent extended handshake."
             drop(ec);
 
@@ -191,6 +192,7 @@ namespace extension {
             _peerPaymentBEPSupportStatus = BEPSupportStatus::not_supported;
 
             // Remove peer
+            std::clog << "Dropping Peer: bad handshake (not dictionary)" << std::endl;
             libtorrent::error_code ec; // "Malformed handshake received: not dictionary."
             drop(ec);
 
@@ -211,6 +213,7 @@ namespace extension {
                 // If the version string is not in the extension, it has not properly sent an unmapping
 
                 // Remove peer
+                std::clog << "Dropping Peer: bad handshake - peer sent full mapping without first sending unmapping" << std::endl;
                 libtorrent::error_code ec; // "Malformed protocol version format provided: " << versionString
                 drop(ec);
             }
@@ -230,6 +233,7 @@ namespace extension {
             _peerPaymentBEPSupportStatus = BEPSupportStatus::not_supported;
 
             // Remove peer
+            std::clog << "Dropping Peer: bad handshake (malformed protocol vesrion format)" << std::endl;
             libtorrent::error_code ec; // "Malformed protocol version format provided: " << versionString
             drop(ec);
 
@@ -246,6 +250,7 @@ namespace extension {
             _peerPaymentBEPSupportStatus = BEPSupportStatus::not_supported;
 
             // Remove peer
+            std::clog << "Dropping Peer: bad handshake (m key not present)" << std::endl;
             libtorrent::error_code ec; // "Malformed handshake received: m key not present."
             drop(ec);
 
@@ -260,6 +265,7 @@ namespace extension {
             _peerPaymentBEPSupportStatus  = BEPSupportStatus::not_supported;
 
             // Remove peer
+            std::clog << "Dropping Peer: bad handshake (m key not mapping to dictionary)" << std::endl;
             libtorrent::error_code ec; // "Malformed handshake received: m key not mapping to dictionary."
             drop(ec);
 
@@ -282,6 +288,7 @@ namespace extension {
                 _peerPaymentBEPSupportStatus  = BEPSupportStatus::not_supported;
 
                 // Remove peer
+                std::clog << "Dropping Peer: bad handshake (peer already sent full mapping)" << std::endl;
                 libtorrent::error_code ec; // "Peer misbehaved: sent uninstall mapping, despite not recently annoncing valid mapping to uninstall."
                 drop(ec);
 
@@ -299,11 +306,11 @@ namespace extension {
             // If the uninstall mapping was valid we do not need to disconnect the peer
             if(e.problem == exception::InvalidMessageMappingDictionary::Problem::UninstallMappingFound) {
                if(peerMappingWasPreviouslySet) {
-                    std::clog << "Uninstall mapping was found." << std::endl;
+                    std::clog << "Removing Peer from Session - Uninstall mapping was sent." << std::endl;
                     // Remove from session if present
                     _plugin->removeFromSession(this);
                } else {
-                    std::clog << "Uninstall mapping was found, but no mapping has been previoulsy installed" << std::endl;
+                    std::clog << "Dropping Peer: bad handshake (attempting to uninstall mapping but no mapping exists)" << std::endl;
                     libtorrent::error_code ec;
                     drop(ec);
                }
@@ -449,12 +456,12 @@ namespace extension {
 
         // If this peer is not part of this session, then we ignore the message
         if(_plugin->_session.mode() == protocol_session::SessionMode::not_set) {
-            std::clog << "Ignoring extended message, session mode not set" << std::endl;
+            std::clog << "Warning: Ignoring extended message, session mode not set" << std::endl;
             return false;
         }
 
         if(!_plugin->peerInSession(this)) {
-            std::clog << "Ignoring extended message, connection not in session" << std::endl;
+            std::clog << "Warning: Ignoring extended message, connection not in session" << std::endl;
             return false;
         }
 
@@ -552,7 +559,7 @@ namespace extension {
 
         } catch (std::exception & e) {
 
-            std::clog << "Extended Message was Malformed" << std::endl;
+            std::clog << "Dropping Peer: Extended Message was Malformed" << std::endl;
 
             // Remove this peer
             libtorrent::error_code ec; // <-- "Malformed extended message received, removing."

sources/src/TorrentPlugin.cpp

@@ -50,7 +50,7 @@ TorrentPlugin::TorrentPlugin(Plugin * plugin,
 }
 
 TorrentPlugin::~TorrentPlugin() {
-    std::clog << "~TorrentPlugin()" << std::endl;
+    //std::clog << "~TorrentPlugin()" << std::endl;
 }
 
 boost::shared_ptr<libtorrent::peer_plugin> TorrentPlugin::new_connection(const libtorrent::peer_connection_handle & connection) {
@@ -718,8 +718,11 @@ protocol_session::RemovedConnectionCallbackHandler<libtorrent::peer_id> TorrentP
         // triggers callback.
         if(cause == protocol_session::DisconnectCause::client)
             return;
-        else // all other reasons are considered misbehaviour
-            _misbehavedPeers.insert(endPoint);
+        else {
+          std::clog << "Adding peer to misbehavedPeers list: " << endPoint << " cause: " << (int)cause << std::endl;
+          // all other reasons are considered misbehaviour
+          _misbehavedPeers.insert(endPoint);
+        }
 
         // *** Record cause for some purpose? ***