diff --git a/libretroshare/src/ft/ftcontroller.cc b/libretroshare/src/ft/ftcontroller.cc index 265c88817..d1530205c 100644 --- a/libretroshare/src/ft/ftcontroller.cc +++ b/libretroshare/src/ft/ftcontroller.cc @@ -2014,7 +2014,8 @@ bool ftController::loadList(std::list& load) /* This will get stored on a waiting list - until the * config files are fully loaded */ - +#ifdef TO_REMOVE + (csoler) I removed this because RS_FILE_HINTS_NETWORK_WIDE is actually equal to RS_FILE_REQ_ENCRYPTED, so this test removed the encrypted flag when loading!! // Compatibility with previous versions. if(rsft->flags & RS_FILE_HINTS_NETWORK_WIDE.toUInt32()) { @@ -2022,6 +2023,7 @@ bool ftController::loadList(std::list& load) rsft->flags &= ~RS_FILE_HINTS_NETWORK_WIDE.toUInt32() ; rsft->flags |= RS_FILE_REQ_ANONYMOUS_ROUTING.toUInt32() ; } +#endif #ifdef CONTROL_DEBUG std::cerr << "ftController::loadList(): requesting " << rsft->file.name << ", " << rsft->file.hash << ", " << rsft->file.filesize << std::endl ; diff --git a/libretroshare/src/ft/ftserver.cc b/libretroshare/src/ft/ftserver.cc index 46d3380a9..86f1ad999 100644 --- a/libretroshare/src/ft/ftserver.cc +++ b/libretroshare/src/ft/ftserver.cc @@ -1228,7 +1228,7 @@ bool ftServer::encryptItem(RsTurtleGenericTunnelItem *clear_item,const RsFileHas uint32_t total_data_size = ENCRYPTED_FT_HEADER_SIZE + ENCRYPTED_FT_INITIALIZATION_VECTOR_SIZE + ENCRYPTED_FT_EDATA_SIZE + item_serialized_size + ENCRYPTED_FT_AUTHENTICATION_TAG_SIZE ; #ifdef SERVER_DEBUG - FTSERVER_DEBUG() << " clear part size : " << clear_item->serial_size() << std::endl; + FTSERVER_DEBUG() << " clear part size : " << size(clear_item) << std::endl; FTSERVER_DEBUG() << " total item size : " << total_data_size << std::endl; #endif