summaryrefslogtreecommitdiffstats
path: root/ctrl/libhicnctrl/src/modules
diff options
context:
space:
mode:
authorJordan Augé <jordan.auge+fdio@cisco.com>2022-09-30 12:29:05 +0200
committerJordan Augé <jordan.auge+fdio@cisco.com>2022-10-07 17:30:19 +0200
commita61398ad90acdfa4ea0ac03f3d2b9bcbfd7a6dd3 (patch)
tree64cc24594bf2a010691371e16881586830b4b760 /ctrl/libhicnctrl/src/modules
parent3476dd9ddecc87d9212c3bf56a5be52079e27def (diff)
refactor(hicn-light): cleanup and optimizations to UDP socket face
Ticket: HICN-771 Change-Id: Ie84dc2f61888c3fdd7b3728b2a13cacbac503d1a Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>
Diffstat (limited to 'ctrl/libhicnctrl/src/modules')
-rw-r--r--ctrl/libhicnctrl/src/modules/hicn_light.c5
-rw-r--r--ctrl/libhicnctrl/src/modules/hicn_light/connection.c8
-rw-r--r--ctrl/libhicnctrl/src/modules/hicn_light/face.c12
-rw-r--r--ctrl/libhicnctrl/src/modules/hicn_light/face.h2
4 files changed, 9 insertions, 18 deletions
diff --git a/ctrl/libhicnctrl/src/modules/hicn_light.c b/ctrl/libhicnctrl/src/modules/hicn_light.c
index 379cd2fa9..9c6722975 100644
--- a/ctrl/libhicnctrl/src/modules/hicn_light.c
+++ b/ctrl/libhicnctrl/src/modules/hicn_light.c
@@ -919,9 +919,8 @@ NEXT:
if (hc_connection_to_local_listener(&object->connection,
&listener.listener) < 0) {
ERROR(
- "[hicnlight_prepare_connection_create] Could not convert face "
- "to "
- "local listener.");
+ "[hicnlight_prepare_connection_create] Could not "
+ "convert connection to local listener.");
return -1;
}
hc_request_set_state(current_request,
diff --git a/ctrl/libhicnctrl/src/modules/hicn_light/connection.c b/ctrl/libhicnctrl/src/modules/hicn_light/connection.c
index c7d06415e..2b3644939 100644
--- a/ctrl/libhicnctrl/src/modules/hicn_light/connection.c
+++ b/ctrl/libhicnctrl/src/modules/hicn_light/connection.c
@@ -95,22 +95,22 @@ static int hicnlight_connection_parse(const uint8_t *buffer, size_t size,
}
if (!IS_VALID_ADDRESS(item->local_address)) {
- ERROR("[hc_connection_parse] Invalid address received");
+ ERROR("[hc_connection_parse] Invalid local address received");
return -1;
}
if (!IS_VALID_PORT(ntohs(item->local_port))) {
- ERROR("[hc_connection_parse] Invalid port received");
+ ERROR("[hc_connection_parse] Invalid local port received");
return -1;
}
if (!IS_VALID_ADDRESS(item->remote_address)) {
- ERROR("[hc_connection_parse] Invalid address received");
+ ERROR("[hc_connection_parse] Invalid remote address received");
return -1;
}
if (!IS_VALID_PORT(ntohs(item->remote_port))) {
- ERROR("[hc_connection_parse] Invalid port received");
+ ERROR("[hc_connection_parse] Invalid remote port received");
return -1;
}
diff --git a/ctrl/libhicnctrl/src/modules/hicn_light/face.c b/ctrl/libhicnctrl/src/modules/hicn_light/face.c
index 46adf633d..4dcd96191 100644
--- a/ctrl/libhicnctrl/src/modules/hicn_light/face.c
+++ b/ctrl/libhicnctrl/src/modules/hicn_light/face.c
@@ -161,15 +161,5 @@ int hc_face_to_connection(const hc_face_t *face, hc_connection_t *connection,
}
int hc_face_to_listener(const hc_face_t *face, hc_listener_t *listener) {
- switch (face->type) {
- case FACE_TYPE_HICN_LISTENER:
- break;
- case FACE_TYPE_TCP_LISTENER:
- break;
- case FACE_TYPE_UDP_LISTENER:
- break;
- default:
- return -1;
- }
- return -1; /* XXX Not implemented */
+ return -99; /* XXX Not implemented */
}
diff --git a/ctrl/libhicnctrl/src/modules/hicn_light/face.h b/ctrl/libhicnctrl/src/modules/hicn_light/face.h
index 9e1cd48c2..6f202b4ce 100644
--- a/ctrl/libhicnctrl/src/modules/hicn_light/face.h
+++ b/ctrl/libhicnctrl/src/modules/hicn_light/face.h
@@ -4,6 +4,8 @@
#include <hicn/ctrl/objects/connection.h>
#include <hicn/ctrl/objects/face.h>
+int hc_connection_to_face(const hc_connection_t *connection, hc_face_t *face);
+
int hc_face_from_connection(const hc_connection_t *connection, hc_face_t *face);
int hc_face_to_connection(const hc_face_t *face, hc_connection_t *connection,