Before moving notice-Q from PeerSet to Peer

Author: semmerson

.gitignore

@@ -40,3 +40,4 @@ sndrRepo/
 .libs/
 vgcore.*
 /hycast-1.0/
+/build/

AUTHORS

@@ -1 +1 @@
-Steven R. Emmerson
+Steven R. Emmerson <[email protected]>

CMakeLists.txt

@@ -22,12 +22,10 @@ PROJECT(Hycast VERSION 1.0
 # Specify the C standard
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED True)
-set(CMAKE_BUILD_TYPE Debug)
 
 # Specify the C++ standard
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
-set(CMAKE_BUILD_TYPE Debug)
 
 # Specify the Eclipse IDE version
 set(CMAKE_ECLIPSE_VERSION 4.17)
@@ -40,6 +38,7 @@ endif()
 # Configure a configuration header file
 configure_file(config-cmake.h config.h)
 include_directories(${CMAKE_BINARY_DIR}) # necessary
+include_directories(AFTER SYSTEM /usr/include/c++/4.8.5) # necessary
 
 # Add the main subdirectory
 add_subdirectory(main)

main/.gitignore

@@ -12,3 +12,4 @@ core.*
 /DerivedTemplateOfABC.cpp
 /p2p/
 /p2p-old/
+/protocol/

main/HycastProto.cpp

@@ -32,13 +32,12 @@ namespace hycast {
 
 const PduId PduId::UNSET(0);
 const PduId PduId::PEER_SRVR_ADDRS(1);
-const PduId PduId::PUB_PATH_NOTICE(2);
-const PduId PduId::PROD_INFO_NOTICE(3);
-const PduId PduId::DATA_SEG_NOTICE(4);
-const PduId PduId::PROD_INFO_REQUEST(5);
-const PduId PduId::DATA_SEG_REQUEST(6);
-const PduId PduId::PROD_INFO(7);
-const PduId PduId::DATA_SEG(8);
+const PduId PduId::PROD_INFO_NOTICE(2);
+const PduId PduId::DATA_SEG_NOTICE(3);
+const PduId PduId::PROD_INFO_REQUEST(4);
+const PduId PduId::DATA_SEG_REQUEST(5);
+const PduId PduId::PROD_INFO(6);
+const PduId PduId::DATA_SEG(7);
 
 PduId::PduId(Type value)
     : value(value)
@@ -68,23 +67,23 @@ std::string DataSegId::to_string(const bool withName) const
             ", offset=" + std::to_string(offset) + "}";
 }
 
-String NoteReq::to_string() const {
+String DatumId::to_string() const {
     return (id == Id::PROD_INDEX)
             ? prodIndex.to_string()
             : (id == Id::DATA_SEG_ID)
                 ? dataSegId.to_string()
                 : "<unset>";
 }
 
-size_t NoteReq::hash() const noexcept {
+size_t DatumId::hash() const noexcept {
     return (id == Id::PROD_INDEX)
             ? prodIndex.hash()
             : (id == Id::DATA_SEG_ID)
                 ? dataSegId.hash()
                 : 0;
 }
 
-bool NoteReq::operator==(const NoteReq& rhs) const noexcept {
+bool DatumId::operator==(const DatumId& rhs) const noexcept {
     if (id != rhs.id)    return false;
     if (id == Id::UNSET) return true;
     return (id == Id::PROD_INDEX)
@@ -149,27 +148,27 @@ class ProdInfo::Impl
     }
 
     bool write(Xprt& xprt) const {
-        LOG_NOTE("Writing product information to %s", xprt.to_string().data());
+        //LOG_DEBUG("Writing product information to %s", xprt.to_string().data());
         auto success = index.write(xprt);
         if (success) {
-            LOG_NOTE("Writing product name to %s", xprt.to_string().data());
+            //LOG_DEBUG("Writing product name to %s", xprt.to_string().data());
             success = xprt.write(name);
             if (success) {
-                LOG_NOTE("Writing product size to %s", xprt.to_string().data());
+                //LOG_DEBUG("Writing product size to %s", xprt.to_string().data());
                 success = xprt.write(size);
             }
         }
         return success;
     }
 
     bool read(Xprt& xprt) {
-        LOG_NOTE("Reading product information from %s", xprt.to_string().data());
+        //LOG_DEBUG("Reading product information from %s", xprt.to_string().data());
         auto success = index.read(xprt);
         if (success) {
-            LOG_NOTE("Reading product name from %s", xprt.to_string().data());
+            //LOG_DEBUG("Reading product name from %s", xprt.to_string().data());
             success = xprt.read(name);
             if (success) {
-                LOG_NOTE("Reading product size from %s", xprt.to_string().data());
+                //LOG_DEBUG("Reading product size from %s", xprt.to_string().data());
                 success = xprt.read(size);
             }
         }

main/HycastProto.h

@@ -48,6 +48,9 @@ using String = std::string;
 
 constexpr uint8_t PROTOCOL_VERSION = 1;
 
+class P2pMgr;
+class SubP2pMgr;
+
 /******************************************************************************/
 // PDU payloads
 
@@ -228,12 +231,10 @@ class ProdIndex : public XprtAble
     }
 
     bool write(Xprt& xprt) const override {
-        LOG_NOTE("Writing product-index to %s", xprt.to_string().data());
         return xprt.write(index);
     }
 
     bool read(Xprt& xprt) override {
-        LOG_NOTE("Reading product-index from %s", xprt.to_string().data());
         return xprt.read(index);
     }
 };
@@ -271,21 +272,16 @@ struct DataSegId : public XprtAble
     }
 
     bool write(Xprt& xprt) const override {
-        LOG_NOTE("Writing data-segment identifier to %s", xprt.to_string().data());
         auto success = prodIndex.write(xprt);
         if (success) {
-            LOG_NOTE("Writing offset to %s", xprt.to_string().data());
             success = xprt.write(offset);
         }
         return success;
     }
 
     bool read(Xprt& xprt) override {
-        LOG_NOTE("Reading data-segment identifier from %s",
-                xprt.to_string().data());
         auto success = prodIndex.read(xprt);
         if (success)  {
-            LOG_NOTE("Reading offset from %s", xprt.to_string().data());
             success = xprt.read(offset);
         }
         return success;
@@ -380,7 +376,7 @@ class DataSeg final : public XprtAble
 
     operator bool() const;
 
-    const DataSegId getId() const noexcept;
+    const DataSegId& getId() const noexcept;
 
     ProdSize getProdSize() const noexcept;
 
@@ -394,6 +390,8 @@ class DataSeg final : public XprtAble
         return getId().offset;
     }
 
+    bool operator==(const DataSeg& rhs) const;
+
     String to_string(bool withName = false) const;
 
     bool write(Xprt& xprt) const override;
@@ -435,7 +433,7 @@ class Product
  * such entities can be handled as a single object for the purpose of argument
  * passing and container element.
  */
-struct NoteReq
+struct DatumId
 {
 public:
     enum class Id {
@@ -448,42 +446,43 @@ struct NoteReq
         DataSegId dataSegId;
     };
 
-    NoteReq() noexcept
+    DatumId() noexcept
         : prodIndex()
         , id(Id::UNSET)
     {}
 
-    explicit NoteReq(const ProdIndex prodIndex) noexcept
+    explicit DatumId(const ProdIndex prodIndex) noexcept
         : id(Id::PROD_INDEX)
         , prodIndex(prodIndex)
     {}
 
-    explicit NoteReq(const DataSegId dataSegId) noexcept
+    explicit DatumId(const DataSegId dataSegId) noexcept
         : id(Id::DATA_SEG_ID)
         , dataSegId(dataSegId)
     {}
 
-    NoteReq(const NoteReq& noteReq) noexcept {
-        ::memcpy(this, &noteReq, sizeof(NoteReq));
+    DatumId(const DatumId& datumId) noexcept {
+        ::memcpy(this, &datumId, sizeof(DatumId));
     }
 
-    ~NoteReq() noexcept {
+    ~DatumId() noexcept {
     }
 
-    NoteReq& operator=(const NoteReq& noteReq) =default;
-
-    NoteReq& operator=(NoteReq&& noteReq) =default;
+    DatumId& operator=(const DatumId& rhs) noexcept {
+        ::memcpy(this, &rhs, sizeof(DatumId));
+        return *this;
+    }
 
     operator bool() const {
         return id != Id::UNSET;
     }
 
     String to_string() const;
 
-    // `std::hash<NoteReq>()` is also defined
+    // `std::hash<DatumId>()` is also defined
     size_t hash() const noexcept;
 
-    bool operator==(const NoteReq& rhs) const noexcept;
+    bool operator==(const DatumId& rhs) const noexcept;
 };
 
 /******************************************************************************/
@@ -505,8 +504,6 @@ class NoticeRcvr
 {
 public:
     virtual ~NoticeRcvr() {}
-    virtual void recvNotice(const PubPath   notice,
-                            Peer            peer) =0;
     virtual bool recvNotice(const ProdIndex notice,
                             Peer            peer) =0;
     virtual bool recvNotice(const DataSegId notice,
@@ -520,8 +517,8 @@ class RequestRcvr
     virtual ~RequestRcvr() {}
     virtual ProdInfo recvRequest(const ProdIndex request,
                                  Peer            peer) =0;
-    virtual DataSeg recvRequest(const DataSegId  request,
-                                Peer             peer) =0;
+    virtual DataSeg recvRequest(const DataSegId request,
+                                Peer            peer) =0;
 };
 
 /// Data receiver/server
@@ -537,8 +534,8 @@ class DataRcvr
 
 /**
  * Interface for a Hycast node. Implementations manage incoming P2P requests for
- * data and outgoing P2P transmissions. This interface is implemented by a
- * publishing node.
+ * data and outgoing P2P transmissions. This interface is implemented by both a
+ * publishing node and a subscribing node.
  */
 class Node
 {
@@ -552,7 +549,9 @@ class Node
      * @return                 Product information. Will test false if it
      *                         doesn't exist.
      */
-    ProdInfo recvRequest(const ProdIndex request);
+    virtual ProdInfo recvRequest(
+            const ProdIndex request,
+            P2pMgr&         p2pMgr) =0;
 
     /**
      * Receives a request for a data-segment.
@@ -561,7 +560,9 @@ class Node
      * @return                 Product information. Will test false if it
      *                         doesn't exist.
      */
-    DataSeg recvRequest(const DataSegId request);
+    virtual DataSeg recvRequest(
+            const DataSegId request,
+            P2pMgr&         p2pMgr) =0;
 };
 
 /**
@@ -572,24 +573,53 @@ class SubNode : public Node
 {
 public:
     virtual ~SubNode() noexcept =default;
+
+    /**
+     * Receives notice about the availability of a product from the P2P network.
+     *
+     * @param[in] index    Index of available product
+     * @retval    `true`   Product information should be requested
+     * @retval    `false`  Product information should not be requested
+     */
+    virtual bool recvNotice(
+            const ProdIndex index,
+            SubP2pMgr&      p2pMgr) =0;
+
+    /**
+     * Receives notice about the availability of a data-segment from the P2P
+     * network.
+     *
+     * @param[in] segId    Identifier of available data-segment
+     * @retval    `true`   Data-segment information should be requested
+     * @retval    `false`  Data-segment information should not be requested
+     */
+    virtual bool recvNotice(
+            const DataSegId segId,
+            SubP2pMgr&      p2pMgr) =0;
+
+    virtual void recvData(
+            const ProdInfo prodInfo,
+            SubP2pMgr&      p2pMgr) =0;
+
+    virtual void recvData(
+            const DataSeg dataSeg,
+            SubP2pMgr&      p2pMgr) =0;
 };
 
 } // namespace
 
 namespace std {
     template<>
-    class hash<hycast::ProdIndex> {
-    public:
+    struct hash<hycast::ProdIndex> {
         size_t operator()(const hycast::ProdIndex& prodIndex) const noexcept {
             return prodIndex.hash();
         }
     };
 
     template<>
-    class hash<hycast::NoteReq> {
-    public:
-        size_t operator()(const hycast::NoteReq& noteReq) const noexcept {
-            return noteReq.hash();
+    struct hash<hycast::DatumId> {
+        size_t operator()(const hycast::DatumId& datumId) const noexcept {
+            return datumId.hash();
         }
     };
 }

main/inet/InetAddr.cpp

@@ -479,9 +479,8 @@ class Inet6Addr final : public InetAddr::Impl
     }
 
     size_t hash() const noexcept {
-        return myHash(((static_cast<uint64_t>(addr.s6_addr32[0]) ^
-                addr.s6_addr32[1]) << 32) |
-                (addr.s6_addr32[2] ^ addr.s6_addr32[3]));
+        return myHash(*reinterpret_cast<const uint64_t*>(addr.s6_addr) ^
+                      *reinterpret_cast<const uint64_t*>(addr.s6_addr+8));
     }
 
     int socket(