1 files changed, 14 insertions, 13 deletions

diff --git a/libtransport/includes/hicn/transport/core/io_module.h b/libtransport/includes/hicn/transport/core/io_module.h
index ea3cf4e16..cfaa61975 100644
--- a/libtransport/includes/hicn/transport/core/io_module.h
+++ b/libtransport/includes/hicn/transport/core/io_module.h
@@ -19,6 +19,7 @@
 #include <hicn/transport/core/connector.h>
 #include <hicn/transport/core/packet.h>
 #include <hicn/transport/core/prefix.h>
+#include <hicn/transport/portability/endianess.h>
 #include <hicn/transport/portability/portability.h>
 #include <hicn/transport/utils/chrono_typedefs.h>
 #include <hicn/transport/utils/membuf.h>
@@ -40,7 +41,7 @@ typedef struct {
 
 class Connector;
 
-class IoModule {
+class IoModule : utils::NonCopyable {
  protected:
   IoModule()
       : inet_address_({}),
@@ -48,13 +49,12 @@ class IoModule {
         mtu_(1500),
         output_interface_(""),
         content_store_reserved_(5000) {
-    inet_address_.v4.as_u32 = htonl(0x7f00001);
+    inet_address_.v4.as_u32 = portability::host_to_net(0x7f00001);
     inet6_address_.v6.as_u8[15] = 0x01;
   }
 
  public:
   static IoModule *load(const char *);
-  static bool unload(IoModule *);
 
  public:
   virtual ~IoModule();
@@ -64,15 +64,21 @@ class IoModule {
   virtual bool isConnected() = 0;
 
   virtual void init(Connector::PacketReceivedCallback &&receive_callback,
+                    Connector::PacketSentCallback &&sent_callback,
+                    Connector::OnCloseCallback &&close_callback,
                     Connector::OnReconnectCallback &&reconnect_callback,
                     asio::io_service &io_service,
                     const std::string &app_name = "Libtransport") = 0;
 
   virtual void registerRoute(const Prefix &prefix) = 0;
+  virtual void sendMapme() {}
+
+  virtual void setForwardingStrategy(const Prefix &prefix,
+                                     std::string &strategy){};
 
   virtual std::uint32_t getMtu() = 0;
 
-  virtual bool isControlMessage(const uint8_t *message) = 0;
+  virtual bool isControlMessage(utils::MemBuf &packet_buffer) = 0;
 
   virtual void processControlMessageReply(utils::MemBuf &packet_buffer) = 0;
 
@@ -82,14 +88,14 @@ class IoModule {
     counters_.tx_packets++;
     counters_.tx_bytes += packet.payloadSize() + packet.headerSize();
 
-    if (_is_ipv4(packet.getFormat())) {
+    if (HICN_PACKET_FORMAT_IS_IPV4(packet.getFormat())) {
       packet.setLocator(inet_address_);
     } else {
       packet.setLocator(inet6_address_);
     }
   }
 
-  virtual void send(const uint8_t *packet, std::size_t len) = 0;
+  virtual void send(const utils::MemBuf::Ptr &buffer) = 0;
 
   void setContentStoreSize(uint32_t cs_size) {
     content_store_reserved_ = cs_size;
@@ -103,14 +109,9 @@ class IoModule {
 
   const std::string &getOutputInterface() { return output_interface_; }
 
-#ifndef ANDROID
- private:
-  void *handle_;
-#endif
-
  protected:
-  ip_address_t inet_address_;
-  ip_address_t inet6_address_;
+  hicn_ip_address_t inet_address_;
+  hicn_ip_address_t inet6_address_;
   uint16_t mtu_;
   std::string output_interface_;
   uint32_t content_store_reserved_;