riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12325 from miri64/gnrc_sixlowpan_frag_vrb/enh/rm-out_dst

Browse Source 
gnrc_sixlowpan_frag_vrb: re-use now unused super::dst for out_dst
This commit is contained in:
Martine Lenders 2019-10-01 07:55:49 +02:00 committed by GitHub
commit db8dcaee48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/include/net/gnrc/sixlowpan/frag/vrb.h
View File

@ -36,27 +36,20 @@ extern "C" {
/**
* @brief Representation of the virtual reassembly buffer entry
*
* gnrc_sixlowpan_frag_rb_base_t::dst of gnrc_sixlowpan_frag_vrb_t::super
* becomes the next hop destination address.
*/
typedef struct {
gnrc_sixlowpan_frag_rb_base_t super; /**< base type */
/**
* @brief Link-layer destination address to which the fragments are
* supposed to be forwarded to
*/
uint8_t out_dst[IEEE802154_LONG_ADDRESS_LEN];
/**
* @brief Outgoing interface to gnrc_sixlowpan_frag_vrb_t::out_dst
* @brief Outgoing interface to gnrc_sixlowpan_frag_rb_base_t::dst
*/
gnrc_netif_t *out_netif;
/**
* @brief Outgoing tag to gnrc_sixlowpan_frag_vrb_t::out_dst
* @brief Outgoing tag to gnrc_sixlowpan_frag_rb_base_t::dst
*/
uint16_t out_tag;
/**
* @brief Length of gnrc_sixlowpan_frag_vrb_t::out_dst
*/
uint8_t out_dst_len;
} gnrc_sixlowpan_frag_vrb_t;
/**

28
sys/net/gnrc/network_layer/sixlowpan/frag/vrb/gnrc_sixlowpan_frag_vrb.c
View File

@ -34,6 +34,16 @@ uint16_t gnrc_sixlowpan_frag_next_tag(void)
}
#endif /* !defined(MODULE_GNRC_SIXLOWPAN_FRAG) && defined(TEST_SUITES) */
static inline bool _equal_index(const gnrc_sixlowpan_frag_vrb_t *vrbe,
const uint8_t *src, size_t src_len,
unsigned tag)
{
return ((vrbe->super.tag == tag) &&
(vrbe->super.src_len == src_len) &&
(memcmp(vrbe->super.src, src, src_len) == 0));
}
gnrc_sixlowpan_frag_vrb_t *gnrc_sixlowpan_frag_vrb_add(
const gnrc_sixlowpan_frag_rb_base_t *base,
gnrc_netif_t *out_netif, const uint8_t *out_dst, size_t out_dst_len)
@ -48,14 +58,14 @@ gnrc_sixlowpan_frag_vrb_t *gnrc_sixlowpan_frag_vrb_add(
gnrc_sixlowpan_frag_vrb_t *ptr = &_vrb[i];
if (gnrc_sixlowpan_frag_vrb_entry_empty(ptr) ||
(memcmp(&ptr->super, base, sizeof(ptr->super)) == 0)) {
_equal_index(ptr, base->src, base->src_len, base->tag)) {
vrbe = ptr;
if (gnrc_sixlowpan_frag_vrb_entry_empty(vrbe)) {
vrbe->super = *base;
vrbe->out_netif = out_netif;
memcpy(vrbe->out_dst, out_dst, out_dst_len);
memcpy(vrbe->super.dst, out_dst, out_dst_len);
vrbe->out_tag = gnrc_sixlowpan_frag_next_tag();
vrbe->out_dst_len = out_dst_len;
vrbe->super.dst_len = out_dst_len;
DEBUG("6lo vrb: creating entry (%s, ",
gnrc_netif_addr_to_str(vrbe->super.src,
vrbe->super.src_len,
@ -66,8 +76,8 @@ gnrc_sixlowpan_frag_vrb_t *gnrc_sixlowpan_frag_vrb_add(
l2addr_str),
(unsigned)vrbe->super.datagram_size, vrbe->super.tag);
DEBUG("(%s, %u)\n",
gnrc_netif_addr_to_str(vrbe->out_dst,
vrbe->out_dst_len,
gnrc_netif_addr_to_str(vrbe->super.dst,
vrbe->super.dst_len,
l2addr_str), vrbe->out_tag);
}
break;
@ -89,12 +99,10 @@ gnrc_sixlowpan_frag_vrb_t *gnrc_sixlowpan_frag_vrb_get(
for (unsigned i = 0; i < GNRC_SIXLOWPAN_FRAG_VRB_SIZE; i++) {
gnrc_sixlowpan_frag_vrb_t *vrbe = &_vrb[i];
if ((vrbe->super.tag == src_tag) &&
(vrbe->super.src_len == src_len) &&
(memcmp(vrbe->super.src, src, src_len) == 0)) {
if (_equal_index(vrbe, src, src_len, src_tag)) {
DEBUG("6lo vrb: got VRB to (%s, %u)\n",
gnrc_netif_addr_to_str(vrbe->out_dst,
vrbe->out_dst_len,
gnrc_netif_addr_to_str(vrbe->super.dst,
vrbe->super.dst_len,
l2addr_str), vrbe->out_tag);
return vrbe;
}

7
tests/unittests/tests-gnrc_sixlowpan_frag_vrb/tests-gnrc_sixlowpan_frag_vrb.c
View File

@ -80,16 +80,13 @@ static void test_vrb_add__success(void)
TEST_ASSERT_EQUAL_INT(_base.src_len, res->super.src_len);
TEST_ASSERT_MESSAGE(memcmp(_base.src, res->super.src, TEST_SRC_LEN) == 0,
"TEST_SRC != res->super.src");
TEST_ASSERT_EQUAL_INT(_base.dst_len, res->super.src_len);
TEST_ASSERT_MESSAGE(memcmp(_base.dst, res->super.dst, TEST_DST_LEN) == 0,
"TEST_DST != res->super.dst");
TEST_ASSERT_EQUAL_INT(_base.tag, res->super.tag);
TEST_ASSERT_EQUAL_INT(_base.datagram_size, res->super.datagram_size);
TEST_ASSERT_EQUAL_INT(_base.current_size, res->super.current_size);
TEST_ASSERT_EQUAL_INT(_base.arrival, res->super.arrival);
TEST_ASSERT((&_dummy_netif) == res->out_netif);
TEST_ASSERT_EQUAL_INT(sizeof(_out_dst), res->out_dst_len);
TEST_ASSERT_MESSAGE(memcmp(_out_dst, res->out_dst, sizeof(_out_dst)) == 0,
TEST_ASSERT_EQUAL_INT(sizeof(_out_dst), res->super.dst_len);
TEST_ASSERT_MESSAGE(memcmp(_out_dst, res->super.dst, sizeof(_out_dst)) == 0,
"TEST_DST != res->super.dst");
TEST_ASSERT_EQUAL_INT(TEST_TAG_INITIAL, res->out_tag);
TEST_ASSERT(TEST_TAG_INITIAL != tag);