diff options
author | Jordan Augé <jordan.auge+fdio@cisco.com> | 2020-09-23 17:50:52 +0200 |
---|---|---|
committer | Jordan Augé <jordan.auge+fdio@cisco.com> | 2020-09-28 18:25:30 +0200 |
commit | 32dccec98e4c7d7e4ce902e19ba8d1b29b823758 (patch) | |
tree | 95c5dec2083a3774c13bd5f896743cd6c5c42a7a /hicn-light/src/hicn/core/mapme.c | |
parent | 7356408ca1554468c9d7b9840aaaee28b4341c8d (diff) |
[HICN-570] Message buffer (incl. CS and PIT changes)
Change-Id: I4c508e4b04dee3acbfc3da1d26e1770cb826f22b
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>
Diffstat (limited to 'hicn-light/src/hicn/core/mapme.c')
-rw-r--r-- | hicn-light/src/hicn/core/mapme.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/hicn-light/src/hicn/core/mapme.c b/hicn-light/src/hicn/core/mapme.c index ae4a29f13..8f40cb34a 100644 --- a/hicn-light/src/hicn/core/mapme.c +++ b/hicn-light/src/hicn/core/mapme.c @@ -120,7 +120,6 @@ #include <hicn/core/connection.h> #include <hicn/core/forwarder.h> #include <hicn/core/msgbuf.h> -#include <hicn/core/messagePacketType.h> // packet types #include <hicn/core/ticks.h> #include <hicn/core/fib_entry.h> #include <hicn/core/pit.h> @@ -757,7 +756,7 @@ mapme_on_interest(mapme_t * mapme, uint8_t * packet, ERROR("Failed to send ACK packet"); } - Name *name = name_CreateFromPacket(packet, MESSAGE_TYPE_INTEREST); + Name *name = name_create_from_interest(packet); name_setLen(name, prefix->len); char *name_str = name_ToString(name); @@ -871,8 +870,7 @@ mapme_on_data(mapme_t *mapme, const uint8_t * packet, { INFO("Receive IU/IN Ack on connection %d", ingress_id); - const Name * name = - name_CreateFromPacket(packet, MESSAGE_TYPE_DATA); + const Name * name = name_create_from_data(packet); name_setLen((Name*) name, prefix->len); char * name_str = name_ToString(name); @@ -919,10 +917,14 @@ mapme_on_data(mapme_t *mapme, const uint8_t * packet, * processed by MAP-Me core. */ void -mapme_process(mapme_t *mapme, uint8_t *packet, unsigned conn_id) +mapme_process(mapme_t *mapme, msgbuf_t * msgbuf) { hicn_prefix_t prefix; mapme_params_t params; + + uint8_t * packet = msgbuf_get_packet(msgbuf); + unsigned conn_id = msgbuf_get_connection_id(msgbuf); + int rc = hicn_mapme_parse_packet(packet, &prefix, ¶ms); if (rc < 0) return; |