-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
16158: gnrc_sixlowpan_frag_sfr_congure_sfr: initial import r=miri64 a=miri64 Co-authored-by: Martine Lenders <m.lenders@fu-berlin.de>
- Loading branch information
Showing
9 changed files
with
436 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
sys/net/gnrc/network_layer/sixlowpan/frag/sfr/congure_sfr.c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,115 @@ | ||
/* | ||
* Copyright (C) 2021 Freie Universität Berlin | ||
* | ||
* This file is subject to the terms and conditions of the GNU Lesser | ||
* General Public License v2.1. See the file LICENSE in the top level | ||
* directory for more details. | ||
*/ | ||
|
||
/** | ||
* @{ | ||
* | ||
* @file | ||
* @author Martine Lenders <m.lenders@fu-berlin.de> | ||
*/ | ||
|
||
#include "kernel_defines.h" | ||
#include "congure.h" | ||
#include "net/gnrc/sixlowpan/config.h" | ||
|
||
#include "net/gnrc/sixlowpan/frag/sfr/congure.h" | ||
|
||
/* This implements a very simple SFR as suggested in | ||
* https://datatracker.ietf.org/doc/html/rfc8931#appendix-C */ | ||
|
||
typedef congure_snd_t congure_sfr_snd_t; | ||
|
||
static void _snd_init(congure_snd_t *cong, void *ctx); | ||
static int32_t _snd_inter_msg_interval(congure_snd_t *cong, unsigned msg_size); | ||
static void _snd_report_msg_sent(congure_snd_t *cong, unsigned sent_size); | ||
static void _snd_report_msg_discarded(congure_snd_t *cong, unsigned msg_size); | ||
static void _snd_report_msgs_lost(congure_snd_t *cong, congure_snd_msg_t *msgs); | ||
static void _snd_report_msgs_timeout(congure_snd_t *cong, congure_snd_msg_t *msgs); | ||
static void _snd_report_msg_acked(congure_snd_t *cong, congure_snd_msg_t *msg, | ||
congure_snd_ack_t *ack); | ||
static void _snd_report_ecn_ce(congure_snd_t *cong, ztimer_now_t time); | ||
|
||
static congure_sfr_snd_t _sfr_congures_sfr[CONFIG_GNRC_SIXLOWPAN_FRAG_FB_SIZE]; | ||
static const congure_snd_driver_t _driver = { | ||
.init = _snd_init, | ||
.inter_msg_interval = _snd_inter_msg_interval, | ||
.report_msg_sent = _snd_report_msg_sent, | ||
.report_msg_discarded = _snd_report_msg_discarded, | ||
.report_msgs_timeout = _snd_report_msgs_timeout, | ||
.report_msgs_lost = _snd_report_msgs_lost, | ||
.report_msg_acked = _snd_report_msg_acked, | ||
.report_ecn_ce = _snd_report_ecn_ce, | ||
}; | ||
|
||
congure_snd_t *gnrc_sixlowpan_frag_sfr_congure_snd_get(void) | ||
{ | ||
for (unsigned i = 0; i < ARRAY_SIZE(_sfr_congures_sfr); i++) { | ||
if (_sfr_congures_sfr[i].driver == NULL) { | ||
_sfr_congures_sfr[i].driver = &_driver; | ||
return &_sfr_congures_sfr[i]; | ||
} | ||
} | ||
return NULL; | ||
} | ||
|
||
static void _snd_init(congure_snd_t *cong, void *ctx) | ||
{ | ||
(void)ctx; | ||
cong->cwnd = CONFIG_GNRC_SIXLOWPAN_SFR_OPT_WIN_SIZE; | ||
} | ||
|
||
static int32_t _snd_inter_msg_interval(congure_snd_t *cong, unsigned msg_size) | ||
{ | ||
(void)cong; | ||
(void)msg_size; | ||
return CONFIG_GNRC_SIXLOWPAN_SFR_INTER_FRAME_GAP_US; | ||
} | ||
|
||
static void _snd_report_msg_sent(congure_snd_t *cong, unsigned sent_size) | ||
{ | ||
(void)cong; | ||
(void)sent_size; | ||
} | ||
|
||
static void _snd_report_msg_discarded(congure_snd_t *cong, unsigned msg_size) | ||
{ | ||
(void)cong; | ||
(void)msg_size; | ||
} | ||
|
||
static void _snd_report_msgs_lost(congure_snd_t *cong, congure_snd_msg_t *msgs) | ||
{ | ||
/* Appendix C defines loss as timeout, so this does nothing */ | ||
(void)cong; | ||
(void)msgs; | ||
} | ||
|
||
static void _snd_report_msgs_timeout(congure_snd_t *cong, | ||
congure_snd_msg_t *msgs) | ||
{ | ||
(void)msgs; | ||
if (cong->cwnd > 1U) { | ||
cong->cwnd /= 2U; | ||
} | ||
} | ||
|
||
static void _snd_report_msg_acked(congure_snd_t *cong, congure_snd_msg_t *msg, | ||
congure_snd_ack_t *ack) | ||
{ | ||
(void)cong; | ||
(void)msg; | ||
(void)ack; | ||
} | ||
|
||
static void _snd_report_ecn_ce(congure_snd_t *cong, ztimer_now_t time) | ||
{ | ||
(void)time; | ||
if (cong->cwnd > 1U) { | ||
cong->cwnd--; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
include ../Makefile.tests_common | ||
|
||
USEMODULE += auto_init_gnrc_netif | ||
USEMODULE += gnrc_ipv6_router_default | ||
USEMODULE += gnrc_sixlowpan_frag_sfr | ||
USEMODULE += gnrc_udp | ||
USEMODULE += gnrc_rpl | ||
USEMODULE += auto_init_gnrc_rpl | ||
USEMODULE += gnrc_pktdump | ||
USEMODULE += gnrc_icmpv6_echo | ||
USEMODULE += shell | ||
USEMODULE += shell_cmds_default | ||
USEMODULE += shell_cmd_gnrc_pktbuf | ||
USEMODULE += shell_cmd_gnrc_udp | ||
USEMODULE += ps | ||
USEMODULE += netstats_l2 | ||
USEMODULE += netstats_ipv6 | ||
USEMODULE += netstats_rpl | ||
|
||
ifeq (native, $(BOARD)) | ||
USEMODULE += socket_zep | ||
USEMODULE += socket_zep_hello | ||
USEMODULE += netdev | ||
TERMFLAGS = -z 127.0.0.1:17754 # Murdock has no IPv6 support | ||
else | ||
USEMODULE += netdev_default | ||
# automated test only works on native | ||
TESTS= | ||
endif | ||
|
||
CONGURE_IMPL ?= congure_sfr | ||
|
||
ifeq (congure_sfr,$(CONGURE_IMPL)) | ||
USEMODULE += gnrc_sixlowpan_frag_sfr_congure_sfr | ||
else | ||
$(error "Unknown CongURE implementation `$(CONGURE_IMPL)`") | ||
endif | ||
|
||
.PHONY: zep_dispatch | ||
|
||
zep_dispatch: | ||
$(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS) $@ | ||
|
||
TERMDEPS += zep_dispatch | ||
|
||
include $(RIOTBASE)/Makefile.include | ||
|
||
# Set a custom channel if needed | ||
include $(RIOTMAKE)/default-radio-settings.inc.mk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
BOARD_INSUFFICIENT_MEMORY := \ | ||
airfy-beacon \ | ||
arduino-duemilanove \ | ||
arduino-leonardo \ | ||
arduino-mega2560 \ | ||
arduino-nano \ | ||
arduino-uno \ | ||
atmega328p \ | ||
atmega328p-xplained-mini \ | ||
atxmega-a3bu-xplained \ | ||
blackpill-stm32f103c8 \ | ||
blackpill-stm32f103cb \ | ||
bluepill-stm32f030c8 \ | ||
bluepill-stm32f103c8 \ | ||
bluepill-stm32f103cb \ | ||
calliope-mini \ | ||
derfmega128 \ | ||
hifive1 \ | ||
hifive1b \ | ||
i-nucleo-lrwan1 \ | ||
im880b \ | ||
lsn50 \ | ||
microbit \ | ||
microduino-corerf \ | ||
msb-430 \ | ||
msb-430h \ | ||
nrf51dongle \ | ||
nrf6310 \ | ||
nucleo-f030r8 \ | ||
nucleo-f031k6 \ | ||
nucleo-f042k6 \ | ||
nucleo-f070rb \ | ||
nucleo-f072rb \ | ||
nucleo-f302r8 \ | ||
nucleo-f303k8 \ | ||
nucleo-f334r8 \ | ||
nucleo-l011k4 \ | ||
nucleo-l031k6 \ | ||
nucleo-l053r8 \ | ||
samd10-xmini \ | ||
saml10-xpro \ | ||
saml11-xpro \ | ||
slstk3400a \ | ||
stk3200 \ | ||
stm32f030f4-demo \ | ||
stm32f0discovery \ | ||
stm32f7508-dk \ | ||
stm32g0316-disco \ | ||
stm32l0538-disco \ | ||
stm32mp157c-dk2 \ | ||
telosb \ | ||
waspmote-pro \ | ||
yunjia-nrf51822 \ | ||
z1 \ | ||
zigduino \ | ||
# |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
SFR CongURE implementation test | ||
=============================== | ||
This test is largely based on the [`gnrc_networking`][1] example but is changed | ||
so SFR with different CongURE implementations can be tested. When `CONGURE_IMPL` | ||
is not set in the environment, `gnrc_sixlowpan_frag_sfr_congure_sfr` is used, | ||
other implementations can be used with `congure_<impl>`. | ||
|
||
[1]: https://github.com/RIOT-OS/RIOT/tree/master/examples/gnrc_networking |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
/* | ||
* Copyright (C) 2015-21 Freie Universität Berlin | ||
* | ||
* This file is subject to the terms and conditions of the GNU Lesser | ||
* General Public License v2.1. See the file LICENSE in the top level | ||
* directory for more details. | ||
*/ | ||
|
||
/** | ||
* @ingroup tests | ||
* @{ | ||
* | ||
* @file | ||
* | ||
* @author Hauke Petersen <hauke.petersen@fu-berlin.de> | ||
* @author Martine Lenders <m.lenders@fu-berlin.de> | ||
* | ||
* @} | ||
*/ | ||
|
||
#include <stdio.h> | ||
|
||
#include "fmt.h" | ||
#include "shell.h" | ||
#include "msg.h" | ||
|
||
#define MAIN_QUEUE_SIZE (8) | ||
static msg_t _main_msg_queue[MAIN_QUEUE_SIZE]; | ||
|
||
int main(void) | ||
{ | ||
msg_init_queue(_main_msg_queue, MAIN_QUEUE_SIZE); | ||
|
||
char line_buf[SHELL_DEFAULT_BUFSIZE]; | ||
shell_run(NULL, line_buf, SHELL_DEFAULT_BUFSIZE); | ||
|
||
/* should be never reached */ | ||
return 0; | ||
} |
Oops, something went wrong.