summaryrefslogtreecommitdiffstats
path: root/apps/http-proxy/src
diff options
context:
space:
mode:
Diffstat (limited to 'apps/http-proxy/src')
-rw-r--r--apps/http-proxy/src/IcnReceiver.cc15
-rw-r--r--apps/http-proxy/src/IcnReceiver.h3
2 files changed, 9 insertions, 9 deletions
diff --git a/apps/http-proxy/src/IcnReceiver.cc b/apps/http-proxy/src/IcnReceiver.cc
index d4e922c11..18553d84b 100644
--- a/apps/http-proxy/src/IcnReceiver.cc
+++ b/apps/http-proxy/src/IcnReceiver.cc
@@ -24,7 +24,8 @@
namespace transport {
-core::Prefix generatePrefix(const std::string& prefix_url) {
+core::Prefix generatePrefix(const std::string& prefix_url,
+ std::string& first_ipv6_word) {
const char* str = prefix_url.c_str();
uint16_t pos = 0;
@@ -39,7 +40,7 @@ core::Prefix generatePrefix(const std::string& prefix_url) {
uint32_t locator_hash = utils::hash::fnv32_buf(str, strlen(str));
std::stringstream stream;
- stream << std::hex << http::default_values::ipv6_first_word << ":0";
+ stream << first_ipv6_word << ":0";
for (uint16_t* word = (uint16_t*)&locator_hash;
std::size_t(word) < (std::size_t(&locator_hash) + sizeof(locator_hash));
@@ -52,12 +53,10 @@ core::Prefix generatePrefix(const std::string& prefix_url) {
return core::Prefix(stream.str(), 64);
}
-AsyncConsumerProducer::AsyncConsumerProducer(const std::string& prefix,
- std::string& ip_address,
- std::string& port,
- std::string& cache_size,
- std::string& mtu)
- : prefix_(generatePrefix(prefix)),
+AsyncConsumerProducer::AsyncConsumerProducer(
+ const std::string& prefix, std::string& ip_address, std::string& port,
+ std::string& cache_size, std::string& mtu, std::string& first_ipv6_word)
+ : prefix_(generatePrefix(prefix, first_ipv6_word)),
producer_socket_(),
ip_address_(ip_address),
port_(port),
diff --git a/apps/http-proxy/src/IcnReceiver.h b/apps/http-proxy/src/IcnReceiver.h
index ea4eeb010..67f615ad7 100644
--- a/apps/http-proxy/src/IcnReceiver.h
+++ b/apps/http-proxy/src/IcnReceiver.h
@@ -35,7 +35,8 @@ class AsyncConsumerProducer {
public:
explicit AsyncConsumerProducer(const std::string& prefix,
std::string& ip_address, std::string& port,
- std::string& cache_size, std::string& mtu);
+ std::string& cache_size, std::string& mtu,
+ std::string& first_ipv6_word);
void start();