1 files changed, 31 insertions, 28 deletions

diff --git a/libtransport/includes/hicn/transport/interfaces/socket_options_default_values.h b/libtransport/includes/hicn/transport/interfaces/socket_options_default_values.h
index da8eafcd9..11edae193 100644
--- a/libtransport/includes/hicn/transport/interfaces/socket_options_default_values.h
+++ b/libtransport/includes/hicn/transport/interfaces/socket_options_default_values.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Cisco and/or its affiliates.
+ * Copyright (c) 2021-2022 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -15,10 +15,14 @@
 
 #pragma once
 
+#include <hicn/transport/portability/portability.h>
+
 extern "C" {
+#ifndef _WIN32
+TRANSPORT_CLANG_DISABLE_WARNING("-Wextern-c-compat")
+#endif
 #include <hicn/base.h>
-#include <hicn/compat.h>
-}
+};
 
 #include <chrono>
 #include <cstdint>
@@ -31,21 +35,20 @@ namespace default_values {
 
 // Packet format
 // #define NEW_PACKET_FORMAT
-static constexpr hicn_format_t packet_format =
+static constexpr hicn_packet_format_t packet_format =
 #ifdef NEW_PACKET_FORMAT
-    HF_INET6_UDP;
+    HICN_PACKET_FORMAT_NEW;
 #else
-    HF_INET6_TCP;
+    HICN_PACKET_FORMAT_IPV6_TCP;
 #endif
 
 // Parameters
-static constexpr uint32_t interest_lifetime = 1001;  // milliseconds
-static constexpr uint32_t never_expire_time = HICN_MAX_LIFETIME;
-static constexpr uint32_t content_object_expiry_time =
+static const uint32_t interest_lifetime = 1001;  // milliseconds
+static const uint32_t never_expire_time = HICN_MAX_LIFETIME;
+static const uint32_t content_object_expiry_time =
     never_expire_time;  // milliseconds -> 50 seconds
-static constexpr uint32_t content_object_packet_size =
-    1500;  // The ethernet MTU
-static constexpr uint32_t producer_socket_output_buffer_size =
+static const uint32_t content_object_packet_size = 1500;  // The ethernet MTU
+static const uint32_t producer_socket_output_buffer_size =
     150000;  // Content Object
 static constexpr uint32_t log_2_default_buffer_size = 12;
 static constexpr uint32_t signature_size = 260;           // bytes
@@ -58,26 +61,26 @@ static constexpr uint32_t manifest_factor_relevant = 100;
 static constexpr uint32_t manifest_factor_alert = 20;
 
 // RAAQM
-static constexpr int sample_number = 30;
-static constexpr double gamma_value = 1;
-static constexpr double beta_value = 0.8;
-static constexpr double drop_factor = 0.2;
-static constexpr double minimum_drop_probability = 0.00001;
-static constexpr int path_id = 0;
-static constexpr double rate_alpha = 0.8;
+static const int sample_number = 30;
+static const double gamma_value = 1;
+static const double beta_value = 0.8;
+static const double drop_factor = 0.2;
+static const double minimum_drop_probability = 0.00001;
+static const int path_id = 0;
+static const double rate_alpha = 0.8;
 
 // Rate estimation
-static constexpr uint32_t batch = 50;
-static constexpr uint32_t kv = 20;
-static constexpr double alpha = 0.8;
-static constexpr uint32_t rate_choice = 0;
+static const uint32_t batch = 50;
+static const uint32_t kv = 20;
+static const double alpha = 0.8;
+static const uint32_t rate_choice = 0;
 
 // maximum allowed values
-static constexpr uint32_t transport_protocol_min_retransmissions = 0;
-static constexpr uint32_t transport_protocol_max_retransmissions = 128;
-static constexpr uint32_t max_content_object_size = 8096;
-static constexpr uint32_t min_window_size = 1;        // Interests
-static constexpr uint32_t max_window_size = 256 * 2;  // Interests
+static const uint32_t transport_protocol_min_retransmissions = 0;
+static const uint32_t transport_protocol_max_retransmissions = 128;
+static const uint32_t max_content_object_size = 8096;
+static const uint32_t min_window_size = 1;        // Interests
+static const uint32_t max_window_size = 256 * 2;  // Interests
 
 }  // namespace default_values