diff options
Diffstat (limited to 'libtransport/src')
-rw-r--r-- | libtransport/src/hicn/transport/interfaces/socket_consumer.cc | 3 | ||||
-rw-r--r-- | libtransport/src/hicn/transport/utils/log.cc | 10 |
2 files changed, 6 insertions, 7 deletions
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 }; |