Switch from NDNx to CCNx
Change-Id: Icc2e6dd95d9c4e0ba22b7efb9933c1db7194842e
diff --git a/ndnx/ndnx-wrapper.h b/ndnx/ndnx-wrapper.h
new file mode 100644
index 0000000..9da54f6
--- /dev/null
+++ b/ndnx/ndnx-wrapper.h
@@ -0,0 +1,162 @@
+/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2013 University of California, Los Angeles
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
+ * Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ */
+
+#ifndef NDNX_WRAPPER_H
+#define NDNX_WRAPPER_H
+
+#include <boost/thread/locks.hpp>
+#include <boost/thread/recursive_mutex.hpp>
+#include <boost/thread/thread.hpp>
+
+#include "ndnx-common.h"
+#include "ndnx-name.h"
+#include "ndnx-selectors.h"
+#include "ndnx-closure.h"
+#include "ndnx-pco.h"
+#include "executor.h"
+
+namespace Ndnx {
+
+struct NdnxOperationException : boost::exception, std::exception { };
+
+class Verifier;
+class NdnxWrapper
+{
+public:
+ const static int MAX_FRESHNESS = 2147; // max value for ndnx
+ const static int DEFAULT_FRESHNESS = 60;
+ typedef boost::function<void (Name, Selectors)> InterestCallback;
+
+ NdnxWrapper();
+ ~NdnxWrapper();
+
+ void
+ start (); // called automatically in constructor
+
+ /**
+ * @brief Because of uncertainty with executor, in some case it is necessary to call shutdown explicitly (see test-server-and-fetch.cc)
+ */
+ void
+ shutdown (); // called in destructor, but can called manually
+
+ int
+ setInterestFilter (const Name &prefix, const InterestCallback &interestCallback, bool record = true);
+
+ void
+ clearInterestFilter (const Name &prefix, bool record = true);
+
+ int
+ sendInterest (const Name &interest, const Closure &closure, const Selectors &selector = Selectors());
+
+ int
+ publishData (const Name &name, const unsigned char *buf, size_t len, int freshness = DEFAULT_FRESHNESS, const Name &keyName=Name());
+
+ inline int
+ publishData (const Name &name, const Bytes &content, int freshness = DEFAULT_FRESHNESS, const Name &keyName=Name());
+
+ inline int
+ publishData (const Name &name, const std::string &content, int freshness = DEFAULT_FRESHNESS, const Name &keyName=Name());
+
+ int
+ publishUnsignedData(const Name &name, const unsigned char *buf, size_t len, int freshness = DEFAULT_FRESHNESS);
+
+ inline int
+ publishUnsignedData(const Name &name, const Bytes &content, int freshness = DEFAULT_FRESHNESS);
+
+ inline int
+ publishUnsignedData(const Name &name, const std::string &content, int freshness = DEFAULT_FRESHNESS);
+
+ static Name
+ getLocalPrefix ();
+
+ Bytes
+ createContentObject(const Name &name, const void *buf, size_t len, int freshness = DEFAULT_FRESHNESS, const Name &keyNameParam=Name());
+
+ int
+ putToNdnd (const Bytes &contentObject);
+
+ bool
+ verify(PcoPtr &pco, double maxWait = 1 /*seconds*/);
+
+ PcoPtr
+ get (const Name &interest, const Selectors &selector = Selectors(), double maxWait = 4.0/*seconds*/);
+
+private:
+ NdnxWrapper(const NdnxWrapper &other) {}
+
+protected:
+ void
+ connectNdnd();
+
+ /// @cond include_hidden
+ void
+ ndnLoop ();
+
+ /// @endcond
+
+protected:
+ typedef boost::shared_mutex Lock;
+ typedef boost::unique_lock<Lock> WriteLock;
+ typedef boost::shared_lock<Lock> ReadLock;
+
+ typedef boost::recursive_mutex RecLock;
+ typedef boost::unique_lock<RecLock> UniqueRecLock;
+
+ ndn* m_handle;
+ RecLock m_mutex;
+ boost::thread m_thread;
+ bool m_running;
+ bool m_connected;
+ std::map<Name, InterestCallback> m_registeredInterests;
+ ExecutorPtr m_executor;
+ Verifier *m_verifier;
+};
+
+typedef boost::shared_ptr<NdnxWrapper> NdnxWrapperPtr;
+
+inline int
+NdnxWrapper::publishData (const Name &name, const Bytes &content, int freshness, const Name &keyName)
+{
+ return publishData(name, head(content), content.size(), freshness, keyName);
+}
+
+inline int
+NdnxWrapper::publishData (const Name &name, const std::string &content, int freshness, const Name &keyName)
+{
+ return publishData(name, reinterpret_cast<const unsigned char *> (content.c_str ()), content.size (), freshness, keyName);
+}
+
+inline int
+NdnxWrapper::publishUnsignedData(const Name &name, const Bytes &content, int freshness)
+{
+ return publishUnsignedData(name, head(content), content.size(), freshness);
+}
+
+inline int
+NdnxWrapper::publishUnsignedData(const Name &name, const std::string &content, int freshness)
+{
+ return publishUnsignedData(name, reinterpret_cast<const unsigned char *> (content.c_str ()), content.size (), freshness);
+}
+
+
+} // Ndnx
+
+#endif