1 files changed, 25 insertions, 23 deletions

diff --git a/apps/http-proxy/src/forwarder_interface.cc b/apps/http-proxy/src/forwarder_interface.cc
index c2448de9a..717679e09 100644
--- a/apps/http-proxy/src/forwarder_interface.cc
+++ b/apps/http-proxy/src/forwarder_interface.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 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:
@@ -14,8 +14,8 @@
  */
 
 #include <arpa/inet.h>
+#include <hicn/apps/utils/logger.h>
 #include <hicn/http-proxy/forwarder_interface.h>
-#include <hicn/transport/utils/log.h>
 
 #include <chrono>
 #include <iostream>
@@ -27,7 +27,7 @@ namespace transport {
 ForwarderInterface::~ForwarderInterface() {}
 
 int ForwarderInterface::connectToForwarder() {
-  sock_ = hc_sock_create();
+  sock_ = hc_sock_create(FORWARDER_TYPE_HICNLIGHT, NULL);
   if (!sock_) return -1;
 
   if (hc_sock_connect(sock_) < 0) {
@@ -96,7 +96,8 @@ void ForwarderInterface::internalRemoveConnectedUser(uint32_t route_id) {
   std::vector<hc_route_t *> routes_to_remove;
   foreach_route(r, data) {
     char remote_addr[INET6_ADDRSTRLEN];
-    int ret = ip_address_ntop(&r->remote_addr, remote_addr, r->len, r->family);
+    int ret =
+        hicn_ip_address_ntop(&r->remote_addr, remote_addr, r->len, r->family);
     if (ret < 0) continue;
 
     std::string route_addr(remote_addr);
@@ -119,7 +120,7 @@ void ForwarderInterface::internalRemoveConnectedUser(uint32_t route_id) {
   for (unsigned i = 0; i < routes_to_remove.size(); i++) {
     connids_to_remove.insert(routes_to_remove[i]->face_id);
     if (hc_route_delete(sock_, routes_to_remove[i]) < 0) {
-      TRANSPORT_LOG_ERROR << "Error removing route from forwarder.";
+      LoggerErr() << "Error removing route from forwarder.";
     }
   }
 
@@ -146,24 +147,23 @@ void ForwarderInterface::internalRemoveConnectedUser(uint32_t route_id) {
 
   for (unsigned i = 0; i < conns_to_remove.size(); i++) {
     if (hc_connection_delete(sock_, conns_to_remove[i]) < 0) {
-      TRANSPORT_LOG_ERROR << "Error removing connection from forwarder.";
+      LoggerErr() << "Error removing connection from forwarder.";
     }
   }
 
   hc_data_free(data);
 }
 
-void ForwarderInterface::internalCreateFaceAndRoute(RouteInfoPtr route_info,
-                                                    uint8_t max_try,
-                                                    asio::steady_timer *timer,
-                                                    SetRouteCallback callback) {
+void ForwarderInterface::internalCreateFaceAndRoute(
+    RouteInfoPtr route_info, uint8_t max_try, asio::steady_timer *timer,
+    const SetRouteCallback &callback) {
   int ret = tryToCreateFaceAndRoute(route_info.get());
 
   if (ret < 0 && max_try > 0) {
     max_try--;
     timer->expires_from_now(std::chrono::milliseconds(500));
     timer->async_wait([this, _route_info = std::move(route_info), max_try,
-                       timer, callback](std::error_code ec) {
+                       timer, callback](const std::error_code &ec) {
       if (ec) return;
       internalCreateFaceAndRoute(std::move(_route_info), max_try, timer,
                                  std::move(callback));
@@ -185,7 +185,8 @@ void ForwarderInterface::internalCreateFaceAndRoute(RouteInfoPtr route_info,
   delete timer;
 }
 
-int ForwarderInterface::tryToCreateFaceAndRoute(route_info_t *route_info) {
+int ForwarderInterface::tryToCreateFaceAndRoute(
+    const route_info_t *route_info) {
   if (!sock_) return -1;
 
   hc_data_t *data;
@@ -201,8 +202,9 @@ int ForwarderInterface::tryToCreateFaceAndRoute(route_info_t *route_info) {
     if (interface.compare("lo") != 0) {
       found = true;
 
-      ip_address_t remote_ip;
-      if (ip_address_pton(route_info->remote_addr.c_str(), &remote_ip) < 0) {
+      hicn_ip_address_t remote_ip;
+      if (hicn_ip_address_pton(route_info->remote_addr.c_str(), &remote_ip) <
+          0) {
         hc_data_free(data);
         return -1;
       }
@@ -210,14 +212,14 @@ int ForwarderInterface::tryToCreateFaceAndRoute(route_info_t *route_info) {
       hc_face_t face;
       memset(&face, 0, sizeof(hc_face_t));
 
-      face.face.type = FACE_TYPE_UDP;
-      face.face.family = route_info->family;
-      face.face.local_addr = l->local_addr;
-      face.face.remote_addr = remote_ip;
-      face.face.local_port = l->local_port;
-      face.face.remote_port = route_info->remote_port;
+      face.type = FACE_TYPE_UDP;
+      face.family = route_info->family;
+      face.local_addr = l->local_addr;
+      face.remote_addr = remote_ip;
+      face.local_port = l->local_port;
+      face.remote_port = route_info->remote_port;
 
-      if (netdevice_set_name(&face.face.netdevice, l->interface_name) < 0) {
+      if (netdevice_set_name(&face.netdevice, l->interface_name) < 0) {
         hc_data_free(data);
         return -1;
       }
@@ -237,10 +239,10 @@ int ForwarderInterface::tryToCreateFaceAndRoute(route_info_t *route_info) {
     return -1;
   }
 
-  ip_address_t route_ip;
+  hicn_ip_address_t route_ip;
   hc_route_t route;
 
-  if (ip_address_pton(route_info->route_addr.c_str(), &route_ip) < 0) {
+  if (hicn_ip_address_pton(route_info->route_addr.c_str(), &route_ip) < 0) {
     hc_data_free(data);
     return -1;
   }