diff --git a/src/jamidht/conversation.cpp b/src/jamidht/conversation.cpp index dbb736bf93e097270aef763b255ac0b69c4bd2af..085da87bc14132de685307612e356412abe1379e 100644 --- a/src/jamidht/conversation.cpp +++ b/src/jamidht/conversation.cpp @@ -1030,7 +1030,7 @@ Conversation::peersToSyncWith() const } bool -Conversation::isBoostraped() const +Conversation::isBootstraped() const { const auto& routingTable = pimpl_->swarmManager_->getRoutingTable(); return !routingTable.getNodes().empty(); diff --git a/src/jamidht/conversation.h b/src/jamidht/conversation.h index 2f32a3b444f95efa2b26e047eece3aa4c7f6537e..227afeb9dced17eb21e64e6b0cb835cdb1dcdf9b 100644 --- a/src/jamidht/conversation.h +++ b/src/jamidht/conversation.h @@ -234,7 +234,7 @@ public: * Check if we're at least connected to one node * @return if the DRT is connected */ - bool isBoostraped() const; + bool isBootstraped() const; /** * Retrieve the uri from a deviceId * @note used by swarm manager (peersToSyncWith) diff --git a/src/jamidht/conversation_module.cpp b/src/jamidht/conversation_module.cpp index 99a44d41cfca17c92e9200c04746d057daeec64c..b349fc6e514b1d162fd17e8bf71df6c3ed4a29c7 100644 --- a/src/jamidht/conversation_module.cpp +++ b/src/jamidht/conversation_module.cpp @@ -252,7 +252,7 @@ public: const std::string& newBody, const std::string& editedId); - void boostrapCb(const std::string& convId); + void bootstrapCb(const std::string& convId); // The following informations are stored on the disk mutable std::mutex convInfosMtx_; // Note, should be locked after conversationsMtx_ if needed @@ -598,7 +598,7 @@ ConversationModule::Impl::handlePendingConversation(const std::string& conversat conversation->onBootstrapStatus(bootstrapCbTest_); #endif // LIBJAMI_TESTABLE conversation->bootstrap( - std::bind(&ConversationModule::Impl::boostrapCb, this, conversation->id())); + std::bind(&ConversationModule::Impl::bootstrapCb, this, conversation->id())); auto removeRepo = false; { std::lock_guard<std::mutex> lk(conversationsMtx_); @@ -916,7 +916,7 @@ ConversationModule::Impl::sendMessageNotification(Conversation& conversation, std::shuffle(nonConnectedMembers.begin(), nonConnectedMembers.end(), acc->rand); if (nonConnectedMembers.size() > 2) nonConnectedMembers.resize(2); - if (!conversation.isBoostraped()) { + if (!conversation.isBootstraped()) { JAMI_DEBUG("[Conversation {}] Not yet bootstraped, save notification", conversation.id()); // Because we can get some git channels but not bootstraped, we should keep this @@ -1027,7 +1027,7 @@ ConversationModule::Impl::editMessage(const std::string& conversationId, } void -ConversationModule::Impl::boostrapCb(const std::string& convId) +ConversationModule::Impl::bootstrapCb(const std::string& convId) { std::string commitId; { @@ -1273,7 +1273,7 @@ ConversationModule::bootstrap() conv->onBootstrapStatus(pimpl_->bootstrapCbTest_); #endif // LIBJAMI_TESTABLE conv->bootstrap( - std::bind(&ConversationModule::Impl::boostrapCb, pimpl_.get(), conv->id())); + std::bind(&ConversationModule::Impl::bootstrapCb, pimpl_.get(), conv->id())); } } } @@ -1500,7 +1500,7 @@ ConversationModule::startConversation(ConversationMode mode, const std::string& conversation->onBootstrapStatus(pimpl_->bootstrapCbTest_); #endif // LIBJAMI_TESTABLE conversation->bootstrap( - std::bind(&ConversationModule::Impl::boostrapCb, pimpl_.get(), conversation->id())); + std::bind(&ConversationModule::Impl::bootstrapCb, pimpl_.get(), conversation->id())); } catch (const std::exception& e) { JAMI_ERR("[Account %s] Error while generating a conversation %s", pimpl_->accountId_.c_str(), diff --git a/src/jamidht/jamiaccount_config.h b/src/jamidht/jamiaccount_config.h index 3c5a51c72d92e132e04749bbb85890140cdb3e00..cc3e6a6f7340290ecc1911d06b3eaf24affac11d 100644 --- a/src/jamidht/jamiaccount_config.h +++ b/src/jamidht/jamiaccount_config.h @@ -46,7 +46,7 @@ struct JamiAccountConfig : public SipAccountBaseConfig { bool dhtPeerDiscovery {false}; bool accountPeerDiscovery {false}; bool accountPublish {false}; - std::string bootstrapListUrl {"https://config.jami.net/boostrapList"}; + std::string bootstrapListUrl {"https://config.jami.net/bootstrapList"}; bool proxyEnabled {false}; std::string proxyServer {"dhtproxy.jami.net:[80-95]"};