From 174ab0f37173d9f9290575d819bced318f45ed90 Mon Sep 17 00:00:00 2001 From: Alberto Compagno Date: Sat, 8 Jun 2019 15:47:14 +0200 Subject: [HICN-216] Fixed problem that was deleating any pending IU (for retrasmission) when a new IU was received Change-Id: I8d41445b5ba455f7613efd1419f5410cd945011d Signed-off-by: Alberto Compagno --- hicn-plugin/src/mapme_ctrl_node.c | 4 ++-- hicn-plugin/src/mapme_eventmgr.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hicn-plugin/src/mapme_ctrl_node.c b/hicn-plugin/src/mapme_ctrl_node.c index ffc4255ed..22a50d49e 100644 --- a/hicn-plugin/src/mapme_ctrl_node.c +++ b/hicn-plugin/src/mapme_ctrl_node.c @@ -310,9 +310,9 @@ VLIB_REGISTER_NODE (hicn_mapme_ctrl_node) = .n_next_nodes = HICN_MAPME_CTRL_N_NEXT, .next_nodes = { - /* + /* * Control packets are not forwarded by this node, but sent by the Event - * Manager. This node is only responsible for sending ACK back, + * Manager. This node is only responsible for sending ACK back, * Acks are like data packets are output on iface's */ [HICN_MAPME_CTRL_NEXT_IP4_OUTPUT] = "hicn-iface-ip4-output", diff --git a/hicn-plugin/src/mapme_eventmgr.c b/hicn-plugin/src/mapme_eventmgr.c index 5d5916403..ce9c0a4b4 100644 --- a/hicn-plugin/src/mapme_eventmgr.c +++ b/hicn-plugin/src/mapme_eventmgr.c @@ -423,7 +423,7 @@ hicn_mapme_eventmgr_process (vlib_main_t * vm, /* Delete entry_id from retransmissions in the current slot (if present) ... */ for (u8 j = 0; j < CURLEN; j++) - if (dpo_cmp (&(CUR[j].dpo), &retx->dpo)) + if (!dpo_cmp (&(CUR[j].dpo), &retx->dpo)) { CUR[j].dpo.dpoi_index = ~0; /* sufficient */ } @@ -431,7 +431,7 @@ hicn_mapme_eventmgr_process (vlib_main_t * vm, /* ... and schedule it for next slot (if not already) */ u8 j; for (j = 0; j < NXTLEN; j++) - if (dpo_cmp (&NXT[j].dpo, &retx->dpo)) + if (!dpo_cmp (&NXT[j].dpo, &retx->dpo)) break; if (j == NXTLEN) /* not found */ NXT[NXTLEN++] = *retx; -- cgit 1.2.3-korg