make: Global change: Move all public headers to include folder. Change source to including public headers using #include <ndn-cpp/*>. Split some header files to minimize exposing C .h files.
diff --git a/include/ndn-cpp/transport/tcp-transport.hpp b/include/ndn-cpp/transport/tcp-transport.hpp
new file mode 100644
index 0000000..ce7e697
--- /dev/null
+++ b/include/ndn-cpp/transport/tcp-transport.hpp
@@ -0,0 +1,103 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/**
+ * Copyright (C) 2013 Regents of the University of California.
+ * @author: Jeff Thompson <jefft0@remap.ucla.edu>
+ * See COPYING for copyright and distribution information.
+ */
+
+#ifndef NDN_TCPTRANSPORT_HPP
+#define NDN_TCPTRANSPORT_HPP
+
+#include <string>
+#include "../common.hpp"
+#include "transport.hpp"
+
+struct ndn_TcpTransport;
+struct ndn_BinaryXmlElementReader;
+
+namespace ndn {
+
+class TcpTransport : public Transport {
+public:
+ /**
+ * A TcpTransport::ConnectionInfo extends Transport::ConnectionInfo to hold the host and port info for the TCP connection.
+ */
+ class ConnectionInfo : public Transport::ConnectionInfo {
+ public:
+ /**
+ * Create a ConnectionInfo with the given host and port.
+ * @param host The host for the connection.
+ * @param port The port number for the connection. If omitted, use 6363.
+ */
+ ConnectionInfo(const char *host, unsigned short port = 6363)
+ : host_(host), port_(port)
+ {
+ }
+
+ /**
+ * Get the host given to the constructor.
+ * @return A string reference for the host.
+ */
+ const std::string&
+ getHost() const { return host_; }
+
+ /**
+ * Get the port given to the constructor.
+ * @return The port number.
+ */
+ unsigned short
+ getPort() const { return port_; }
+
+ virtual
+ ~ConnectionInfo();
+
+ private:
+ std::string host_;
+ unsigned short port_;
+ };
+
+ TcpTransport();
+
+ /**
+ * Connect according to the info in ConnectionInfo, and processEvents() will use elementListener.
+ * @param connectionInfo A reference to a TcpTransport::ConnectionInfo.
+ * @param elementListener Not a shared_ptr because we assume that it will remain valid during the life of this object.
+ */
+ virtual void connect(const Transport::ConnectionInfo& connectionInfo, ElementListener& elementListener);
+
+ /**
+ * Set data to the host
+ * @param data A pointer to the buffer of data to send.
+ * @param dataLength The number of bytes in data.
+ */
+ virtual void send(const uint8_t *data, size_t dataLength);
+
+ /**
+ * Process any data to receive. For each element received, call elementListener.onReceivedElement.
+ * This is non-blocking and will return immediately if there is no data to receive.
+ * You should normally not call this directly since it is called by Face.processEvents.
+ * @throw This may throw an exception for reading data or in the callback for processing the data. If you
+ * call this from an main event loop, you may want to catch and log/disregard all exceptions.
+ */
+ virtual void processEvents();
+
+ virtual bool getIsConnected();
+
+ /**
+ * Close the connection to the host.
+ */
+ virtual void close();
+
+ ~TcpTransport();
+
+private:
+ ptr_lib::shared_ptr<struct ndn_TcpTransport> transport_;
+ bool isConnected_;
+ ElementListener *elementListener_;
+ // TODO: This belongs in the socket listener.
+ ptr_lib::shared_ptr<struct ndn_BinaryXmlElementReader> elementReader_;
+};
+
+}
+
+#endif
diff --git a/include/ndn-cpp/transport/transport.hpp b/include/ndn-cpp/transport/transport.hpp
new file mode 100644
index 0000000..3be3dd3
--- /dev/null
+++ b/include/ndn-cpp/transport/transport.hpp
@@ -0,0 +1,73 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/**
+ * Copyright (C) 2013 Regents of the University of California.
+ * @author: Jeff Thompson <jefft0@remap.ucla.edu>
+ * See COPYING for copyright and distribution information.
+ */
+
+#ifndef NDN_TRANSPORT_HPP
+#define NDN_TRANSPORT_HPP
+
+#include <vector>
+
+namespace ndn {
+
+class ElementListener;
+
+class Transport {
+public:
+ /**
+ * A Transport::ConnectionInfo is a base class for connection information used by subclasses of Transport.
+ */
+ class ConnectionInfo {
+ public:
+ virtual ~ConnectionInfo();
+ };
+
+ /**
+ * Connect according to the info in ConnectionInfo, and processEvents() will use elementListener.
+ * @param connectionInfo A reference to an object of a subclass of ConnectionInfo.
+ * @param elementListener Not a shared_ptr because we assume that it will remain valid during the life of this object.
+ */
+ virtual void
+ connect(const Transport::ConnectionInfo& connectionInfo, ElementListener& elementListener);
+
+ /**
+ * Set data to the host
+ * @param data A pointer to the buffer of data to send.
+ * @param dataLength The number of bytes in data.
+ */
+ virtual void
+ send(const uint8_t *data, size_t dataLength);
+
+ void
+ send(const std::vector<uint8_t>& data)
+ {
+ send(&data[0], data.size());
+ }
+
+ /**
+ * Process any data to receive. For each element received, call elementListener.onReceivedElement.
+ * This is non-blocking and will silently time out after a brief period if there is no data to receive.
+ * You should repeatedly call this from an event loop.
+ * @throw This may throw an exception for reading data or in the callback for processing the data. If you
+ * call this from an main event loop, you may want to catch and log/disregard all exceptions.
+ */
+ virtual void
+ processEvents() = 0;
+
+ virtual bool
+ getIsConnected();
+
+ /**
+ * Close the connection. This base class implementation does nothing, but your derived class can override.
+ */
+ virtual void
+ close();
+
+ virtual ~Transport();
+};
+
+}
+
+#endif
diff --git a/include/ndn-cpp/transport/udp-transport.hpp b/include/ndn-cpp/transport/udp-transport.hpp
new file mode 100644
index 0000000..6d83345
--- /dev/null
+++ b/include/ndn-cpp/transport/udp-transport.hpp
@@ -0,0 +1,108 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/**
+ * Copyright (C) 2013 Regents of the University of California.
+ * @author: Jeff Thompson <jefft0@remap.ucla.edu>
+ * See COPYING for copyright and distribution information.
+ */
+
+#ifndef NDN_UDPTRANSPORT_HPP
+#define NDN_UDPTRANSPORT_HPP
+
+#include <string>
+#include "../common.hpp"
+#include "transport.hpp"
+
+struct ndn_UdpTransport;
+struct ndn_BinaryXmlElementReader;
+
+namespace ndn {
+
+class UdpTransport : public Transport {
+public:
+ /**
+ * A UdpTransport::ConnectionInfo extends Transport::ConnectionInfo to hold the host and port info for the UDP connection.
+ */
+ class ConnectionInfo : public Transport::ConnectionInfo {
+ public:
+ /**
+ * Create a ConnectionInfo with the given host and port.
+ * @param host The host for the connection.
+ * @param port The port number for the connection. If omitted, use 6363.
+ */
+ ConnectionInfo(const char *host, unsigned short port = 6363)
+ : host_(host), port_(port)
+ {
+ }
+
+ /**
+ * Get the host given to the constructor.
+ * @return A string reference for the host.
+ */
+ const std::string&
+ getHost() const { return host_; }
+
+ /**
+ * Get the port given to the constructor.
+ * @return The port number.
+ */
+ unsigned short
+ getPort() const { return port_; }
+
+ virtual
+ ~ConnectionInfo();
+
+ private:
+ std::string host_;
+ unsigned short port_;
+ };
+
+ UdpTransport();
+
+ /**
+ * Connect according to the info in ConnectionInfo, and processEvents() will use elementListener.
+ * @param connectionInfo A reference to a TcpTransport::ConnectionInfo.
+ * @param elementListener Not a shared_ptr because we assume that it will remain valid during the life of this object.
+ */
+ virtual void
+ connect(const Transport::ConnectionInfo& connectionInfo, ElementListener& elementListener);
+
+ /**
+ * Set data to the host
+ * @param data A pointer to the buffer of data to send.
+ * @param dataLength The number of bytes in data.
+ */
+ virtual void
+ send(const uint8_t *data, size_t dataLength);
+
+ /**
+ * Process any data to receive. For each element received, call elementListener.onReceivedElement.
+ * This is non-blocking and will return immediately if there is no data to receive.
+ * You should normally not call this directly since it is called by Face.processEvents.
+ * @throw This may throw an exception for reading data or in the callback for processing the data. If you
+ * call this from an main event loop, you may want to catch and log/disregard all exceptions.
+ */
+ virtual void
+ processEvents();
+
+ virtual bool
+ getIsConnected();
+
+ /**
+ * Close the connection to the host.
+ */
+ virtual void
+ close();
+
+ ~UdpTransport();
+
+private:
+ ptr_lib::shared_ptr<struct ndn_UdpTransport> transport_;
+ bool isConnected_;
+ ElementListener *elementListener_;
+ // TODO: This belongs in the socket listener.
+ ptr_lib::shared_ptr<struct ndn_BinaryXmlElementReader> elementReader_;
+};
+
+}
+
+#endif