issue #21

ndn-svs/svspubsub.cpp

@@ -90,6 +90,24 @@ SVSPubSub::publish(const Name& name, span<const uint8_t> value,
   }
 }
 
+
+SeqNo
+SVSPubSub::publish(const Name& name,
+                   const Name& nodePrefix, time::milliseconds freshnessPeriod,
+                   std::vector<Block> mappingBlocks)
+{
+  // Segment the data if larger than MAX_DATA_SIZE
+
+    NodeID nid = nodePrefix == EMPTY_NAME ? m_dataPrefix : nodePrefix;
+    SeqNo seqNo = m_svsync.getCore().getSeqNo(nid) + 1;
+
+    // Insert mapping and manually update the sequence number
+    insertMapping(nid, seqNo, name, mappingBlocks);
+    m_svsync.getCore().updateSeqNo(seqNo, nid);
+
+    return seqNo;
+}
+
 SeqNo
 SVSPubSub::publishPacket(const Data& data, const Name& nodePrefix,
                          std::vector<Block> mappingBlocks)
@@ -140,10 +158,10 @@ SVSPubSub::subscribe(const Name& prefix, const SubscriptionCallback& callback, b
 }
 
 uint32_t
-SVSPubSub::subscribeWithRegex(const Regex &regex, const SubscriptionCallback &callback, bool packets)
+SVSPubSub::subscribeWithRegex(const Regex &regex, const SubscriptionCallback &callback,bool autofetch, bool packets)
 {
   uint32_t handle = ++m_subscriptionCount;
-  Subscription sub = { handle, ndn::Name(), callback, packets, false, make_shared<Regex>(regex)};
+  Subscription sub = { handle, ndn::Name(), callback, packets, false, make_shared<Regex>(regex), autofetch};
   m_regexSubscriptions.push_back(sub);
   return handle;
 }
@@ -284,19 +302,41 @@ SVSPubSub::processMapping(const NodeID& nodeId, SeqNo seqNo)
   bool queued = false;
   for (const auto& sub : m_prefixSubscriptions)
   {
-    if (sub.prefix.isPrefixOf(mapping.first))
+    if (sub.prefix.isPrefixOf(mapping.first) and sub.autofetch)
     {
       m_fetchMap[std::pair(nodeId, seqNo)].push_back(sub);
       queued = true;
     }
+    else if (sub.prefix.isPrefixOf(mapping.first) and !sub.autofetch)
+    {
+      SubscriptionData subData = {
+          mapping.first,
+          ndn::span<const uint8_t>{},
+          nodeId,
+          seqNo,
+          ndn::Data()
+      };
+      sub.callback(subData);
+    }
   }
   for (const auto& sub : m_regexSubscriptions)
   {
-    if (sub.regex->match(mapping.first))
+    if (sub.regex->match(mapping.first) and sub.autofetch)
     {
       m_fetchMap[std::pair(nodeId, seqNo)].push_back(sub);
       queued = true;
     }
+    else if (sub.regex->match(mapping.first) and !sub.autofetch)
+    {
+      SubscriptionData subData = {
+          mapping.first,
+          ndn::span<const uint8_t>{},
+          nodeId,
+          seqNo,
+          ndn::Data()
+      };
+      sub.callback(subData);
+    }
   }
 
   return queued;

ndn-svs/svspubsub.hpp

@@ -116,6 +116,20 @@ class SVSPubSub : noncopyable
           time::milliseconds freshnessPeriod = FRESH_FOREVER,
           std::vector<Block> mappingBlocks = {});
 
+  /**
+   * @brief Publish data names only on the pub/sub group.
+   *
+   * @param name name for the publication
+   * @param nodePrefix Name to publish the data under
+   * @param freshnessPeriod freshness period for the data
+   * @param mappingBlocks Additional blocks to be published with the mapping (use sparingly)
+   */
+  SeqNo
+  publish(const Name& name,
+          const Name& nodePrefix = EMPTY_NAME,
+          time::milliseconds freshnessPeriod = FRESH_FOREVER,
+          std::vector<Block> mappingBlocks = {});
+
   /**
    * @brief Subscribe to a application name prefix.
    *
@@ -138,7 +152,7 @@ class SVSPubSub : noncopyable
    * @returns Handle to the subscription
    */
   uint32_t
-  subscribeWithRegex(const Regex& regex, const SubscriptionCallback& callback, bool packets = false);
+  subscribeWithRegex(const Regex& regex, const SubscriptionCallback& callback, bool autofetch = true, bool packets = false);
 
   /**
    * @brief Subscribe to a data producer
@@ -194,6 +208,7 @@ class SVSPubSub : noncopyable
     bool isPacketSubscription;
     bool prefetch;
     std::shared_ptr<Regex> regex = make_shared<Regex>("^<>+$");
+    bool autofetch = true;
   };
 
   void