aboutsummaryrefslogtreecommitdiffstats
path: root/lib/includes/hicn/face.h
diff options
context:
space:
mode:
authorLuca Muscariello <muscariello@ieee.org>2022-08-04 16:06:34 +0200
committerLuca Muscariello <muscariello@ieee.org>2022-08-04 16:31:51 +0200
commit6d22a0db96aa7f8e3102ae44d00c09e36a2e9c57 (patch)
tree79546bbf09f6fbf74db7bc89117843f06ce937ea /lib/includes/hicn/face.h
parent012843b1c0bc0838e69085ed83a79ec8b6f97360 (diff)
feat: Due to the deep modifications related to names and packet format,
this task cover a large part of the codebase and involves several changes: - the library provides a name data structure (hicn_name_t ), which is composed of a name prefix (hicn_name_prefix_t) and a name suffix (hicn_name_suffix_t), and it has been extended to provide all support functions required for name manipulation, including common prefix computation, as required for the Longest Prefix Match (LPM)in the forwarder, in addition to Exact Prefix Match (EPM). - all code has been rewritten to use this data structure instead of having for instance the forwarder define its own name class (used to be Name and NameBitVector) the code has been refactored to minimize name allocations and copies, one remaining aspect is the difference of name storage between PIT and CS entries (respectively in the PIT entry, and in the message buffer), which causes the packet cache index to be updated when a PIT entry is converted into a CS entry. By storing the name in the PIT/CS entry everytime, we might save on this operation). - hicn-light FIB has been rewritten : code has been refactored and should now be shorter and documented; unit tests have been drafted but more would be required to cover all cases and match the algorithms to add/remove nodes, as specified in the doc. all protocol details and hICN header formats are now abstracted by the library for the forwarder (and thus header.h and  protocols/*.h have been removed from public includes, and replaced by packet.h providing protocol agnostic packet level functions, completely replacing the compat.h header that used to provide similar functions. - this works by exposing a opaque buffer to the application (a kind of socket buffer) which is used by the lib to cache the packet format and offsets of the different layers in the buffer and provider efficient operations (the packet format is either defined for packet construction, or guessed at ingress, and this structure is updated accordingly only once). Co-authored-by: Jordan Augé <jordan.auge+fdio@cisco.com> Signed-off-by: Luca Muscariello <muscariello@ieee.org> Change-Id: I31e321897f85f0267fe8ba4720363c180564492f
Diffstat (limited to 'lib/includes/hicn/face.h')
-rw-r--r--lib/includes/hicn/face.h26
1 files changed, 19 insertions, 7 deletions
diff --git a/lib/includes/hicn/face.h b/lib/includes/hicn/face.h
index 31906afab..fbdacec5f 100644
--- a/lib/includes/hicn/face.h
+++ b/lib/includes/hicn/face.h
@@ -37,6 +37,7 @@
/* Netdevice type */
#include <net/if.h> // IFNAMSIZ
+#include "base.h"
#define foreach_netdevice_type \
_ (UNDEFINED) \
@@ -58,10 +59,17 @@ typedef enum
#undef _
} netdevice_type_t;
+typedef uint32_t netdevice_flags_t;
+#define NETDEVICE_FLAGS_EMPTY 0
+#define netdevice_flags_clear(F) (F = 0)
+#define netdevice_flags_add(F, T) ((F) |= 1 << (T))
+#define netdevice_flags_remove(F, T) ((F) &= ~(1 << (T)))
+#define netdevice_flags_has(F, T) ((F) & (1 << (T)))
+
extern const char *_netdevice_type_str[];
#define netdevice_type_str(x) _netdevice_type_str[x]
-#define NETDEVICE_INVALID_INDEX ~0
+#define INVALID_NETDEVICE_ID ~0
/* Netdevice */
@@ -97,6 +105,7 @@ int netdevice_set_name (netdevice_t *netdevice, const char *name);
int netdevice_update_index (netdevice_t *netdevice);
int netdevice_update_name (netdevice_t *netdevice);
int netdevice_cmp (const netdevice_t *nd1, const netdevice_t *nd2);
+bool netdevice_is_empty (const netdevice_t *netdevice);
#define NETDEVICE_UNDEFINED_INDEX 0
@@ -175,9 +184,12 @@ face_type_t face_type_from_str (const char *str);
/* Face */
typedef u32 face_id_t;
+#define INVALID_FACE_ID ~0
typedef struct
{
+ face_id_t id;
+ char name[SYMBOLIC_NAME_LEN];
face_type_t type;
face_state_t admin_state;
face_state_t state;
@@ -191,16 +203,16 @@ typedef struct
*/
netdevice_t netdevice;
int family; /* To access family independently of face type */
- ip_address_t local_addr;
- ip_address_t remote_addr;
+ hicn_ip_address_t local_addr;
+ hicn_ip_address_t remote_addr;
u16 local_port;
u16 remote_port;
} face_t;
int face_initialize (face_t *face);
int face_initialize_udp (face_t *face, const char *interface_name,
- const ip_address_t *local_addr, u16 local_port,
- const ip_address_t *remote_addr, u16 remote_port,
+ const hicn_ip_address_t *local_addr, u16 local_port,
+ const hicn_ip_address_t *remote_addr, u16 remote_port,
int family);
int face_initialize_udp_sa (face_t *face, const char *interface_name,
const struct sockaddr *local_addr,
@@ -208,8 +220,8 @@ int face_initialize_udp_sa (face_t *face, const char *interface_name,
face_t *face_create ();
face_t *face_create_udp (const char *interface_name,
- const ip_address_t *local_addr, u16 local_port,
- const ip_address_t *remote_addr, u16 remote_port,
+ const hicn_ip_address_t *local_addr, u16 local_port,
+ const hicn_ip_address_t *remote_addr, u16 remote_port,
int family);
face_t *face_create_udp_sa (const char *interface_name,
const struct sockaddr *local_addr,