gnrc_sixlowpan_frag_sfr: provide CongURE support

RIOT-OS · May 4, 2021 · fcaad8b · fcaad8b
1 parent 3cb3b5a
commit fcaad8b
Show file tree

Hide file tree

Showing 10 changed files with 636 additions and 81 deletions.
diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk
@@ -60,6 +60,7 @@ PSEUDOMODULES += gnrc_sixlowpan_border_router_default
 PSEUDOMODULES += gnrc_sixlowpan_default
 PSEUDOMODULES += gnrc_sixlowpan_frag_hint
 PSEUDOMODULES += gnrc_sixlowpan_frag_sfr_stats
+PSEUDOMODULES += gnrc_sixlowpan_frag_sfr_congure
 PSEUDOMODULES += gnrc_sixlowpan_iphc_nhc
 PSEUDOMODULES += gnrc_sixlowpan_nd_border_router
 PSEUDOMODULES += gnrc_sixlowpan_router_default

diff --git a/sys/include/net/gnrc/sixlowpan/config.h b/sys/include/net/gnrc/sixlowpan/config.h
@@ -209,7 +209,13 @@ extern "C" {
  * size will vary between @ref CONFIG_GNRC_SIXLOWPAN_SFR_MIN_WIN_SIZE and @ref
  * CONFIG_GNRC_SIXLOWPAN_SFR_MAX_WIN_SIZE.
  */
+#ifdef CONFIG_GNRC_SIXLOWPAN_SFR_USE_ECN
+#if IS_USED(MODULE_GNRC_SIXLOWPAN_FRAG_SFR_CONGURE)
+#define CONFIG_GNRC_SIXLOWPAN_SFR_USE_ECN           1U
+#else
 #define CONFIG_GNRC_SIXLOWPAN_SFR_USE_ECN           0U
+#endif
+#endif
 
 /**
  * @brief   Default minimum value of window size that the sender can use

diff --git a/sys/include/net/gnrc/sixlowpan/frag/sfr.h b/sys/include/net/gnrc/sixlowpan/frag/sfr.h
@@ -182,8 +182,11 @@ void gnrc_sixlowpan_frag_sfr_arq_timeout(gnrc_sixlowpan_frag_fb_t *fbuf);
 
 /**
  * @brief   Handles inter frame gap
+ *
+ * @param[in] fbuf  The fragmentation buffer representing the datagram for which
+ *                  the next frame should uphold the inter frame gap
  */
-void gnrc_sixlowpan_frag_sfr_inter_frame_gap(void);
+void gnrc_sixlowpan_frag_sfr_inter_frame_gap(gnrc_sixlowpan_frag_fb_t *fbuf);
 
 #if IS_USED(MODULE_GNRC_SIXLOWPAN_FRAG_SFR_STATS)
 /**