4 files changed, 10 insertions, 80 deletions

diff --git a/libtransport/src/protocols/CMakeLists.txt b/libtransport/src/protocols/CMakeLists.txt
index 02e626840..6dc1a0737 100644
--- a/libtransport/src/protocols/CMakeLists.txt
+++ b/libtransport/src/protocols/CMakeLists.txt
@@ -33,7 +33,6 @@ list(APPEND HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/verification_manager.h
   ${CMAKE_CURRENT_SOURCE_DIR}/data_processing_events.h
   ${CMAKE_CURRENT_SOURCE_DIR}/raaqm_transport_algorithm.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/transport_algorithm.h
 )
 
 list(APPEND SOURCE_FILES
diff --git a/libtransport/src/protocols/raaqm_transport_algorithm.h b/libtransport/src/protocols/raaqm_transport_algorithm.h
index 5b0b5c05c..eaa65d2a6 100644
--- a/libtransport/src/protocols/raaqm_transport_algorithm.h
+++ b/libtransport/src/protocols/raaqm_transport_algorithm.h
@@ -17,11 +17,11 @@
 
 #include <hicn/transport/interfaces/socket_options_default_values.h>
 #include <hicn/transport/interfaces/statistics.h>
+#include <hicn/transport/protocols/transport_algorithm.h>
 #include <hicn/transport/utils/chrono_typedefs.h>
 #include <protocols/congestion_window_protocol.h>
 #include <protocols/raaqm_data_path.h>
 #include <protocols/rate_estimation.h>
-#include <protocols/transport_algorithm.h>
 
 #include <array>
 #include <queue>
diff --git a/libtransport/src/protocols/transport_algorithm.cc b/libtransport/src/protocols/transport_algorithm.cc
index 2b8d60934..37dbf5453 100644
--- a/libtransport/src/protocols/transport_algorithm.cc
+++ b/libtransport/src/protocols/transport_algorithm.cc
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
+#include <hicn/transport/protocols/transport_algorithm.h>
 #include <hicn/transport/utils/log.h>
 #include <protocols/raaqm_transport_algorithm.h>
-#include <protocols/transport_algorithm.h>
 
 #include <stdexcept>
 
@@ -44,17 +44,17 @@ void custom_deallocate(void *p) {
 
 }  // namespace
 
-void transportAlgorithm_Init(allocator_t *allocator,
-                             deallocator_t *deallocator) {
+extern "C" void transportAlgorithm_Init(allocator_t *allocator,
+                                        deallocator_t *deallocator) {
   algorithm_allocator = allocator;
   algorithm_deallocator = deallocator;
 }
 
-void transportAlgorithm_Destroy(TransportAlgorithm *algorithm) {
+extern "C" void transportAlgorithm_Destroy(TransportAlgorithm *algorithm) {
   custom_deallocate(algorithm);
 }
 
-TransportAlgorithm *transportAlgorithm_CreateRaaqm(
+extern "C" TransportAlgorithm *transportAlgorithm_CreateRaaqm(
     double drop_factor, double minimum_drop_probability, double gamma,
     double beta, uint32_t sample_number, uint32_t interest_lifetime,
     double beta_wifi, double drop_wifi, double beta_lte, double drop_lte,
@@ -71,13 +71,12 @@ TransportAlgorithm *transportAlgorithm_CreateRaaqm(
   return ret;
 }
 
-uint32_t transportAlgorithm_OnContentObject(TransportAlgorithm *algorithm,
-                                            uint32_t suffix,
-                                            uint32_t path_label) {
+extern "C" uint32_t transportAlgorithm_OnContentObject(
+    TransportAlgorithm *algorithm, uint32_t suffix, uint32_t path_label) {
   return algorithm->onContentObject(suffix, path_label);
 }
 
-uint32_t transportAlgorithm_OnInterestTimeout(TransportAlgorithm *algorithm,
-                                              uint32_t suffix) {
+extern "C" uint32_t transportAlgorithm_OnInterestTimeout(
+    TransportAlgorithm *algorithm, uint32_t suffix) {
   return algorithm->onInterestTimeout(suffix);
 }
\ No newline at end of file
diff --git a/libtransport/src/protocols/transport_algorithm.h b/libtransport/src/protocols/transport_algorithm.h
deleted file mode 100644
index 5dacdb3e0..000000000
--- a/libtransport/src/protocols/transport_algorithm.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2020 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:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef transport_algorithm_h
-#define transport_algorithm_h
-
-#include <hicn/header.h>
-#include <hicn/transport/interfaces/socket_options_keys.h>
-#include <stddef.h>
-#include <stdint.h>
-
-/**
- * TransportAlgorithm: class containing the protocol machinery
- */
-#ifdef __cplusplus
-
-#include <hicn/transport/core/content_object.h>
-
-class TransportAlgorithm {
- public:
-  virtual ~TransportAlgorithm() = default;
-  virtual void reset() = 0;
-  virtual uint32_t onContentObject(uint32_t suffix, uint32_t path_label) = 0;
-  virtual uint32_t onInterestTimeout(uint32_t suffix) = 0;
-  virtual void onInterestSent(uint32_t suffix) = 0;
-  virtual void sessionEnd() = 0;
-};
-
-using transport::interface::TransportProtocolAlgorithms;
-
-#else
-typedef void *TransportAlgorithm;
-#endif
-
-typedef void *(allocator_t)(size_t size);
-typedef void *(deallocator_t)(void *ptr);
-
-extern "C" void transportAlgorithm_Init(allocator_t *allocator,
-                                        deallocator_t *deallocator);
-
-extern "C" TransportAlgorithm *transportAlgorithm_CreateRaaqm(
-    double drop_factor, double minimum_drop_probability, double gamma,
-    double beta, uint32_t sample_number, uint32_t interest_lifetime,
-    double beta_wifi, double drop_wifi, double beta_lte, double drop_lte,
-    unsigned int wifi_delay, unsigned int lte_delay, double max_window,
-    double min_window);
-
-extern "C" void transportAlgorithm_Destroy(TransportAlgorithm *algorithm);
-
-extern "C" uint32_t transportAlgorithm_OnContentObject(
-    TransportAlgorithm *algorithm, uint32_t suffix, uint32_t path_label);
-
-extern "C" uint32_t transportAlgorithm_OnInterestTimeout(
-    TransportAlgorithm *algorithm, uint32_t suffix);
-
-#endif /* transport_algorithm_h */
\ No newline at end of file