feat: update config options (#28)

Author: gmelodie

examples/kademlia.cpp

@@ -16,7 +16,7 @@ int main(int argc, char *argv[])
     auto res = nodeA.syncPeerInfo();
     PeerInfo nodeAPeerInfo = res.data.value<PeerInfo>();
 
-    Libp2pModulePlugin nodeB({ nodeAPeerInfo });
+    Libp2pModulePlugin nodeB({}, { nodeAPeerInfo });
 
     if (!nodeB.syncLibp2pStart().ok) {
         qFatal("Node B failed to start");

examples/ping.cpp

@@ -16,7 +16,7 @@ int main(int argc, char *argv[])
     auto res = nodeA.syncPeerInfo();
     PeerInfo infoA = res.data.value<PeerInfo>();
 
-    Libp2pModulePlugin nodeB({ infoA });
+    Libp2pModulePlugin nodeB({}, { infoA });
 
     qDebug() << "Starting node B...";
     if (!nodeB.syncLibp2pStart().ok) {

flake.lock

@@ -8,9 +8,10 @@
 #include <QEventLoop>
 #include <QThread>
 
-Libp2pModulePlugin::Libp2pModulePlugin(const QList<PeerInfo> &bootstrapNodes)
+Libp2pModulePlugin::Libp2pModulePlugin(const QList<QString> addrs, const QList<PeerInfo> &bootstrapNodes, int transport)
     : ctx(nullptr),
-      m_bootstrapNodes(bootstrapNodes)
+      m_bootstrapNodes(bootstrapNodes),
+      m_addrs(addrs)
 {
     qRegisterMetaType<PeerInfo>("PeerInfo");
     qRegisterMetaType<QList<PeerInfo>>("QList<PeerInfo>");
@@ -25,12 +26,37 @@ Libp2pModulePlugin::Libp2pModulePlugin(const QList<PeerInfo> &bootstrapNodes)
 
     std::memset(&config, 0, sizeof(config));
 
-    config.flags |= LIBP2P_CFG_GOSSIPSUB;
     config.mount_gossipsub = 1;
-
-    config.flags |= LIBP2P_CFG_GOSSIPSUB_TRIGGER_SELF;
     config.gossipsub_trigger_self = 1;
 
+    config.max_connections = 50;
+    config.max_in = 25;
+    config.max_out = 25;
+    config.max_conns_per_peer = 1;
+
+    config.transport = transport;
+
+    /* -------------------------
+     * Save local listen addrs
+     * ------------------------- */
+
+    if (!m_addrs.isEmpty()) {
+        m_addrsUtf8.reserve(m_addrs.size());
+        m_addrsPtr.reserve(m_addrs.size());
+
+        for (const QString &addr : m_addrs) {
+            m_addrsUtf8.push_back(addr.toUtf8());
+            m_addrsPtr.push_back(m_addrsUtf8.back().data());
+        }
+
+        config.addrs = const_cast<const char **>(m_addrsPtr.data());
+        config.addrsLen = m_addrsPtr.size();
+    }
+
+    /* -------------------------
+     * Bootstrap nodes
+     * ------------------------- */
+
     if (!m_bootstrapNodes.isEmpty()) {
         m_bootstrapCNodes.reserve(m_bootstrapNodes.size());
         m_addrUtf8Storage.reserve(m_bootstrapNodes.size());
@@ -63,19 +89,14 @@ Libp2pModulePlugin::Libp2pModulePlugin(const QList<PeerInfo> &bootstrapNodes)
             m_bootstrapCNodes.push_back(node);
         }
 
-        config.flags |= LIBP2P_CFG_KAD_BOOTSTRAP_NODES;
         config.kad_bootstrap_nodes = m_bootstrapCNodes.data();
         config.kad_bootstrap_nodes_len = m_bootstrapCNodes.size();
     }
 
-    config.flags |= LIBP2P_CFG_KAD;
     config.mount_kad = 1;
 
-    config.flags |= LIBP2P_CFG_KAD_DISCOVERY;
     config.mount_kad_discovery = 1;
 
-    config.flags |= LIBP2P_CFG_MIX;
-    config.flags |= LIBP2P_CFG_PRIVATE_KEY;
     config.mount_mix = 1;
 
     /* -------------------------

src/plugin.cpp

@@ -44,7 +44,7 @@ class Libp2pModulePlugin : public QObject, public Libp2pModuleInterface
      *
      * bootstrapNodes are used to initially connect to the network.
      */
-    explicit Libp2pModulePlugin(const QList<PeerInfo> &bootstrapNodes = {});
+    explicit Libp2pModulePlugin(const QList<QString> addrs = {}, const QList<PeerInfo> &bootstrapNodes = {}, int transport = LIBP2P_TRANSPORT_TCP);
     ~Libp2pModulePlugin() override;
 
     /// Plugin name exposed to Logos.
@@ -260,19 +260,22 @@ private slots:
 private:
     /// Bootstrap peers used during node startup.
     QList<PeerInfo> m_bootstrapNodes;
-
     /// C-compatible bootstrap node structures.
     QVector<libp2p_bootstrap_node_t> m_bootstrapCNodes;
-
     /// Keeps UTF-8 address buffers alive.
     QVector<QVector<QByteArray>> m_addrUtf8Storage;
-
     /// Keeps char** arrays alive.
     QVector<QVector<char*>> m_addrPtrStorage;
-
     /// Storage for peer IDs.
     QVector<QByteArray> m_peerIdStorage;
 
+    /// List of addrs
+    QList<QString> m_addrs;
+    /// Keeps UTF-8 address buffers alive.
+    QVector<QByteArray> m_addrsUtf8;
+    /// Keeps char* arrays alive.
+    QVector<char*> m_addrsPtr;
+
     /// libp2p context.
     libp2p_ctx_t *ctx = nullptr;
 

src/plugin.h

@@ -42,7 +42,7 @@ private slots:
         PeerInfo nodeAPeerInfo = nodeA.syncPeerInfo().data.value<PeerInfo>();
 
         // setup node B
-        Libp2pModulePlugin nodeB({ nodeAPeerInfo });
+        Libp2pModulePlugin nodeB({}, { nodeAPeerInfo });
         QVERIFY(nodeB.syncLibp2pStart().ok);
 
         QByteArray key = "integration-key";