5 files changed, 20 insertions, 11 deletions
diff --git a/icnet/ccnx/icnet_ccnx_content_object.cc b/icnet/ccnx/icnet_ccnx_content_object.cc
index 03875724..e4070194 100644
--- a/icnet/ccnx/icnet_ccnx_content_object.cc
+++ b/icnet/ccnx/icnet_ccnx_content_object.cc
@@ -63,11 +63,11 @@ bool ContentObject::operator==(const ContentObject &content_object) {
   return ccnxContentObject_Equals(ccnx_content_object_, content_object.ccnx_content_object_);
 }
 
-PayloadType ContentObject::getContentType() const {
+PayloadType ContentObject::getPayloadType() const {
   return (PayloadType) ccnxContentObject_GetPayloadType(ccnx_content_object_);
 }
 
-void ContentObject::setContentType(PayloadType payload_type) {
+void ContentObject::setPayloadType(PayloadType payload_type) {
   content_type_ = payload_type;
 }
 
diff --git a/icnet/ccnx/icnet_ccnx_content_object.h b/icnet/ccnx/icnet_ccnx_content_object.h
index 148587bb..e7e641e6 100644
--- a/icnet/ccnx/icnet_ccnx_content_object.h
+++ b/icnet/ccnx/icnet_ccnx_content_object.h
@@ -71,13 +71,13 @@ class ContentObject : public std::enable_shared_from_this<ContentObject> {
 
   bool operator==(const ContentObject &content_object);
 
-  PayloadType getContentType() const;
+  PayloadType getPayloadType() const;
 
   bool setContent(PayloadType content_type, const uint8_t *buffer, size_t buffer_size);
 
   bool setContent(const uint8_t *buffer, size_t buffer_size);
 
-  void setContentType(PayloadType payload_type);
+  void setPayloadType(PayloadType payload_type);
 
   Array getContent() const;
 
diff --git a/icnet/ccnx/icnet_ccnx_interest.cc b/icnet/ccnx/icnet_ccnx_interest.cc
index 6b0f92cb..d578d550 100644
--- a/icnet/ccnx/icnet_ccnx_interest.cc
+++ b/icnet/ccnx/icnet_ccnx_interest.cc
@@ -117,6 +117,13 @@ bool Interest::setPayload(const PARCBuffer *payload) {
   return ccnxInterest_SetPayload(interest_, payload);
 }
 
+bool Interest::setPayload(const uint8_t *buffer, std::size_t size) {
+  PARCBuffer *pbuffer = parcBuffer_CreateFromArray(buffer, size);
+  bool ret = setPayload(pbuffer);
+  parcBuffer_Release(&pbuffer);
+  return ret;
+}
+
 bool Interest::setPayloadAndId(const PARCBuffer *payload) {
   return ccnxInterest_SetPayloadAndId(interest_, payload);
 }
@@ -125,8 +132,9 @@ bool Interest::setPayloadWithId(const PARCBuffer *payload, const CCNxInterestPay
   return ccnxInterest_SetPayloadWithId(interest_, payload, payload_id);
 }
 
-PARCBuffer *Interest::getPayload() {
-  return ccnxInterest_GetPayload(interest_);
+utils::Array Interest::getPayload() const {
+  PARCBuffer *buffer = ccnxInterest_GetPayload(interest_);
+  return utils::Array(parcBuffer_Overlay(buffer, 0), parcBuffer_Remaining(buffer));
 }
 
 void Interest::setHopLimit(uint32_t hop_limit) {
diff --git a/icnet/ccnx/icnet_ccnx_interest.h b/icnet/ccnx/icnet_ccnx_interest.h
index 2156b56f..47af3f68 100644
--- a/icnet/ccnx/icnet_ccnx_interest.h
+++ b/icnet/ccnx/icnet_ccnx_interest.h
@@ -17,14 +17,13 @@
 #define ICNET_CCNX_INTEREST_H_
 
 #include "icnet_ccnx_common.h"
+#include "icnet_utils_array.h"
+#include "icnet_ccnx_name.h"
 
 extern "C" {
 #include <ccnx/common/ccnx_Interest.h>
 };
 
-//#include "interest.hpp"
-#include "icnet_ccnx_name.h"
-
 namespace icnet {
 
 namespace ccnx {
@@ -67,11 +66,13 @@ class Interest : public std::enable_shared_from_this<Interest> {
 
   bool setPayload(const PARCBuffer *payload);
 
+  bool setPayload(const uint8_t *buffer, std::size_t size);
+
   bool setPayloadAndId(const PARCBuffer *payload);
 
   bool setPayloadWithId(const PARCBuffer *payload, const CCNxInterestPayloadId *payload_id);
 
-  PARCBuffer *getPayload();
+  utils::Array getPayload() const;
 
   void setHopLimit(uint32_t hop_limit);
 
diff --git a/icnet/ccnx/icnet_ccnx_local_connector.cc b/icnet/ccnx/icnet_ccnx_local_connector.cc
index cd828b08..75691979 100644
--- a/icnet/ccnx/icnet_ccnx_local_connector.cc
+++ b/icnet/ccnx/icnet_ccnx_local_connector.cc
@@ -136,7 +136,7 @@ void LocalConnector::doReadHeader() {
 void LocalConnector::tryReconnect() {
   if (!is_connecting_) {
 #ifdef __ANDROID__
-  __android_log_print(ANDROID_LOG_DEBUG, "libICNet", "Connection lost. Trying to reconnect...\n");
+    __android_log_print(ANDROID_LOG_DEBUG, "libICNet", "Connection lost. Trying to reconnect...\n");
 #else
     std::cerr << "Connection lost. Trying to reconnect..." << std::endl;
 #endif