diff options
| -rw-r--r-- | ctrl/facemgr/includes/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ctrl/facemgr/includes/hicn/facemgr/api.h | 2 | ||||
| -rw-r--r-- | ctrl/facemgr/src/api.c | 2 | ||||
| -rw-r--r-- | ctrl/facemgr/src/interfaces/android_utility/android_utility.c | 3 | ||||
| -rw-r--r-- | ctrl/facemgr/src/interfaces/android_utility/android_utility.h (renamed from ctrl/facemgr/includes/hicn/android_utility/android_utility.h) | 0 | ||||
| -rw-r--r-- | libtransport/src/hicn/transport/interfaces/socket_consumer.cc | 3 | ||||
| -rw-r--r-- | libtransport/src/hicn/transport/utils/log.cc | 10 |
7 files changed, 10 insertions, 11 deletions
diff --git a/ctrl/facemgr/includes/CMakeLists.txt b/ctrl/facemgr/includes/CMakeLists.txt index d2510c205..065a9022f 100644 --- a/ctrl/facemgr/includes/CMakeLists.txt +++ b/ctrl/facemgr/includes/CMakeLists.txt @@ -26,7 +26,6 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Android") ${CMAKE_CURRENT_SOURCE_DIR}/hicn/facemgr/cfg.h ${CMAKE_CURRENT_SOURCE_DIR}/hicn/facemgr/facelet.h ${CMAKE_CURRENT_SOURCE_DIR}/hicn/facemgr/loop.h - ${CMAKE_CURRENT_SOURCE_DIR}/hicn/android_utility/android_utility.h PARENT_SCOPE ) diff --git a/ctrl/facemgr/includes/hicn/facemgr/api.h b/ctrl/facemgr/includes/hicn/facemgr/api.h index fcc31eb37..e9d25f132 100644 --- a/ctrl/facemgr/includes/hicn/facemgr/api.h +++ b/ctrl/facemgr/includes/hicn/facemgr/api.h @@ -24,7 +24,7 @@ #include <hicn/facemgr/facelet.h> #include <hicn/util/ip_address.h> #ifdef __ANDROID__ -#include <hicn/android_utility/android_utility.h> +#include <jni.h> #endif /* facemgr callbacks */ diff --git a/ctrl/facemgr/src/api.c b/ctrl/facemgr/src/api.c index 24d629d28..f934883de 100644 --- a/ctrl/facemgr/src/api.c +++ b/ctrl/facemgr/src/api.c @@ -60,7 +60,7 @@ #endif /* __linux__ */ #ifdef WITH_ANDROID_UTILITY -#include <hicn/android_utility/android_utility.h> +#include "interfaces/android_utility/android_utility.h" #endif /* WITH_ANDROID_UTILITY */ #include <hicn/ctrl/face.h> diff --git a/ctrl/facemgr/src/interfaces/android_utility/android_utility.c b/ctrl/facemgr/src/interfaces/android_utility/android_utility.c index 8eca6c2b0..d1fe324fb 100644 --- a/ctrl/facemgr/src/interfaces/android_utility/android_utility.c +++ b/ctrl/facemgr/src/interfaces/android_utility/android_utility.c @@ -25,7 +25,8 @@ #include <hicn/util/log.h> #include "../../common.h" #include "../../interface.h" -#include <hicn/android_utility/android_utility.h> + +#include "android_utility.h" #define FACEMGR_ANDROID_UTILITY_CLASS "com/cisco/hicn/forwarder/supportlibrary/AndroidUtility" diff --git a/ctrl/facemgr/includes/hicn/android_utility/android_utility.h b/ctrl/facemgr/src/interfaces/android_utility/android_utility.h index 53adfedf6..53adfedf6 100644 --- a/ctrl/facemgr/includes/hicn/android_utility/android_utility.h +++ b/ctrl/facemgr/src/interfaces/android_utility/android_utility.h diff --git a/libtransport/src/hicn/transport/interfaces/socket_consumer.cc b/libtransport/src/hicn/transport/interfaces/socket_consumer.cc index 64b60101d..fbe4bed1a 100644 --- a/libtransport/src/hicn/transport/interfaces/socket_consumer.cc +++ b/libtransport/src/hicn/transport/interfaces/socket_consumer.cc @@ -44,6 +44,7 @@ ConsumerSocket::ConsumerSocket(int protocol, asio::io_service &io_service) /****** END RAAQM Parameters ******/ rate_estimation_alpha_(default_values::rate_alpha), rate_estimation_observer_(nullptr), + rate_estimation_batching_parameter_(default_values::batch), rate_estimation_choice_(0), verifier_(std::make_shared<utils::Verifier>()), verify_signature_(false), @@ -788,4 +789,4 @@ int ConsumerSocket::getSocketOption( } // namespace interface -} // end namespace transport
\ No newline at end of file +} // end namespace transport diff --git a/libtransport/src/hicn/transport/utils/log.cc b/libtransport/src/hicn/transport/utils/log.cc index 00bd7d54f..27dd3f541 100644 --- a/libtransport/src/hicn/transport/utils/log.cc +++ b/libtransport/src/hicn/transport/utils/log.cc @@ -42,16 +42,14 @@ * will be provided by Android log. Android log features will be used to output * log level and tag. */ -#ifdef TRANSPORT_LOG_USE_ANDROID_LOG -#undef TRANSPORT_LOG_USE_ANDROID_LOG + #if defined(__ANDROID__) #define TRANSPORT_LOG_USE_ANDROID_LOG 1 +#define ANDROID_TAG "HicnTransport" #else #define TRANSPORT_LOG_USE_ANDROID_LOG 0 #endif -#else -#define TRANSPORT_LOG_USE_ANDROID_LOG 0 -#endif + /* When defined, NSLog (uses Apple System Log) will be used instead of stderr * (ignored on non-Apple platforms). Date, time, pid and tid (context) will be * provided by NSLog. Curiously, doesn't use NSLog() directly, but piggybacks on @@ -619,7 +617,7 @@ static void out_android_callback(const transport_log_message *const msg, tag = msg->tag_b; *msg->tag_e = 0; } - __android_log_print(android_lvl(msg->lvl), tag, "%s", msg->msg_b); + __android_log_print(android_lvl(msg->lvl), ANDROID_TAG, "%s", msg->msg_b); } enum { OUT_ANDROID_MASK = TRANSPORT_LOG_PUT_STD & ~TRANSPORT_LOG_PUT_CTX }; |