jni: Upgrade NFD and ndn-cxx to version 0.3.4
Change-Id: I72d6decfe927cb71938ec6dfc5b4db3ea598121f
diff --git a/app/src/main/jni/NFD b/app/src/main/jni/NFD
index ce81230..2fc649b 160000
--- a/app/src/main/jni/NFD
+++ b/app/src/main/jni/NFD
@@ -1 +1 @@
-Subproject commit ce81230b09583f9aec98a97653a047aa54fa2bef
+Subproject commit 2fc649bfc67b93b4191cfbee5bcd70330bfb48f0
diff --git a/app/src/main/jni/ndn-cxx b/app/src/main/jni/ndn-cxx
index f0da789..6fa5297 160000
--- a/app/src/main/jni/ndn-cxx
+++ b/app/src/main/jni/ndn-cxx
@@ -1 +1 @@
-Subproject commit f0da789bd232d408da62ff6d30f4fcf24474bcf7
+Subproject commit 6fa52970f35a58df85dae9c1cca7be6c58ab7d0a
diff --git a/app/src/main/jni/ndn-cxx-android/ndn-cxx-config.hpp b/app/src/main/jni/ndn-cxx-android/ndn-cxx-config.hpp
index 019d1bc..92a02e8 100644
--- a/app/src/main/jni/ndn-cxx-android/ndn-cxx-config.hpp
+++ b/app/src/main/jni/ndn-cxx-android/ndn-cxx-config.hpp
@@ -2,10 +2,11 @@
#define W_SRC_NDN_CXX_CONFIG_HPP_WAF
#define NDN_CXX_HAVE_IS_DEFAULT_CONSTRUCTIBLE 1
-#define NDN_CXX_HAVE_IS_MOVE_CONSTRUCTIBLE 1
-#define NDN_CXX_HAVE_IS_MOVE_ASSIGNABLE 1
+#define NDN_CXX_HAVE_IS_NOTHROW_MOVE_CONSTRUCTIBLE 1
+#define NDN_CXX_HAVE_IS_NOTHROW_MOVE_ASSIGNABLE 1
#define NDN_CXX_HAVE_CXX_FRIEND_TYPENAME 1
#define NDN_CXX_HAVE_CXX_OVERRIDE_FINAL 1
+#define NDN_CXX_NDN_CXX_HAVE_VECTOR_INSERT_ERASE_CONST_ITERATOR 1
#define NDN_CXX_HAVE_PTHREAD 1
#define NDN_CXX_HAVE_RT
#define NDN_CXX_HAVE_SQLITE3 1
diff --git a/app/src/main/jni/ndn-cxx.mk b/app/src/main/jni/ndn-cxx.mk
index 3f3fcd6..fc758f6 100644
--- a/app/src/main/jni/ndn-cxx.mk
+++ b/app/src/main/jni/ndn-cxx.mk
@@ -9,6 +9,7 @@
NDN_CXX_SRC_FILES := \
data.cpp \
encoding/block.cpp \
+ encoding/block-helpers.cpp \
encoding/buffer.cpp \
encoding/cryptopp/asn_ext.cpp \
encoding/encoder.cpp \
@@ -20,11 +21,16 @@
interest-filter.cpp \
interest.cpp \
key-locator.cpp \
+ link.cpp \
+ lp/cache-policy.cpp \
+ lp/detail/field-info.cpp \
+ lp/nack-header.cpp \
+ lp/nack.cpp \
+ lp/packet.cpp \
management/nfd-channel-status.cpp \
management/nfd-command-options.cpp \
management/nfd-control-command.cpp \
management/nfd-control-parameters.cpp \
- management/nfd-control-response.cpp \
management/nfd-controller.cpp \
management/nfd-face-event-notification.cpp \
management/nfd-face-query-filter.cpp \
@@ -34,16 +40,28 @@
management/nfd-rib-entry.cpp \
management/nfd-strategy-choice.cpp \
meta-info.cpp \
+ mgmt/control-response.cpp \
+ mgmt/dispatcher.cpp \
+ mgmt/status-dataset-context.cpp \
name-component.cpp \
name.cpp \
+ security/additional-description.cpp \
security/certificate-cache-ttl.cpp \
+ security/certificate-container.cpp \
security/certificate-extension.cpp \
security/certificate-subject-description.cpp \
security/certificate.cpp \
security/digest-sha256.cpp \
security/identity-certificate.cpp \
+ security/identity-container.cpp \
+ security/identity.cpp \
security/key-chain.cpp \
+ security/key-container.cpp \
security/key-params.cpp \
+ security/key.cpp \
+ security/pib-memory.cpp \
+ security/pib-sqlite3.cpp \
+ security/pib.cpp \
security/public-key.cpp \
security/sec-public-info-sqlite3.cpp \
security/sec-public-info.cpp \
@@ -54,9 +72,12 @@
security/secured-bag.cpp \
security/signature-sha256-with-ecdsa.cpp \
security/signature-sha256-with-rsa.cpp \
+ security/signing-helpers.cpp \
+ security/signing-info.cpp \
security/validator-config.cpp \
security/validator-regex.cpp \
security/validator.cpp \
+ security/validity-period.cpp \
selectors.cpp \
signature-info.cpp \
signature.cpp \
@@ -84,6 +105,8 @@
util/segment-fetcher.cpp \
util/signal-connection.cpp \
util/signal-scoped-connection.cpp \
+ util/sqlite3-statement.cpp \
+ util/string-helper.cpp \
util/time-unit-test-clock.cpp \
util/time.cpp
LOCAL_SRC_FILES := $(addprefix ndn-cxx/src/,$(NDN_CXX_SRC_FILES))
diff --git a/app/src/main/jni/nfd-android/version.hpp b/app/src/main/jni/nfd-android/version.hpp
index e1c35fd..e1ebc6f 100644
--- a/app/src/main/jni/nfd-android/version.hpp
+++ b/app/src/main/jni/nfd-android/version.hpp
@@ -38,13 +38,13 @@
*
* MAJOR*1000000 + MINOR*1000 + PATCH
*/
-#define NFD_VERSION 3001
+#define NFD_VERSION 3004
/** \brief NFD version represented as a string
*
* MAJOR.MINOR.PATCH
*/
-#define NFD_VERSION_STRING "0.3.1"
+#define NFD_VERSION_STRING "0.3.4"
/** \brief NFD version string, including git commit information, if NFD is build from
* specific git commit
@@ -60,14 +60,14 @@
*
* Example, 0.1.0-rc1-1-g5c86570
*/
-#define NFD_VERSION_BUILD_STRING "0.3.1-14-gce81230"
+#define NFD_VERSION_BUILD_STRING "0.3.4"
/// MAJOR version
#define NFD_VERSION_MAJOR 0
/// MINOR version
#define NFD_VERSION_MINOR 3
/// PATCH version
-#define NFD_VERSION_PATCH 1
+#define NFD_VERSION_PATCH 4
} // namespace nfd
diff --git a/app/src/main/jni/nfd.mk b/app/src/main/jni/nfd.mk
index 0240882..1b8ea60 100644
--- a/app/src/main/jni/nfd.mk
+++ b/app/src/main/jni/nfd.mk
@@ -53,14 +53,14 @@
daemon/fw/client-control-strategy.cpp \
daemon/fw/face-table.cpp \
daemon/fw/forwarder.cpp \
+ daemon/fw/multicast-strategy.cpp \
daemon/fw/ncc-strategy.cpp \
- daemon/fw/retx-suppression-fixed.cpp \
daemon/fw/retx-suppression-exponential.cpp \
+ daemon/fw/retx-suppression-fixed.cpp \
daemon/fw/retx-suppression.cpp \
daemon/fw/rtt-estimator.cpp \
- daemon/fw/strategy.cpp \
daemon/fw/strategy-registry.cpp \
- daemon/nfd.cpp \
+ daemon/fw/strategy.cpp \
daemon/mgmt/channel-status-publisher.cpp \
daemon/mgmt/command-validator.cpp \
daemon/mgmt/face-manager.cpp \
@@ -75,8 +75,12 @@
daemon/mgmt/strategy-choice-manager.cpp \
daemon/mgmt/strategy-choice-publisher.cpp \
daemon/mgmt/tables-config-section.cpp \
+ daemon/nfd.cpp \
daemon/table/cs-entry-impl.cpp \
daemon/table/cs-entry.cpp \
+ daemon/table/cs-policy-lru.cpp \
+ daemon/table/cs-policy-priority-fifo.cpp \
+ daemon/table/cs-policy.cpp \
daemon/table/cs.cpp \
daemon/table/dead-nonce-list.cpp \
daemon/table/fib-entry.cpp \