Skip to content

gnrc_sixlowpan_frag: remove redundant PID member #11015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miri64 merged 2 commits into from
Feb 15, 2019
Merged

gnrc_sixlowpan_frag: remove redundant PID member #11015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b27f12b
gnrc_sixlowpan_frag: remove redundant PID member
miri64 Feb 14, 2019
0954fab
gnrc_sixlowpan_frag: make datagram size uint16_t for send
miri64 Feb 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions sys/include/net/gnrc/sixlowpan/frag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,9 @@ typedef struct {
*/
typedef struct {
gnrc_pktsnip_t *pkt; /**< Pointer to the IPv6 packet to be fragmented */
size_t datagram_size; /**< Length of just the (uncompressed) IPv6 packet to be fragmented */
uint16_t datagram_size; /**< Length of just the (uncompressed) IPv6 packet to be fragmented */

@smlng smlng Feb 15, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated, or at least a second commit?

@miri64 miri64 Feb 15, 2019

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Split out in its own commit.

uint16_t offset; /**< Offset of the Nth fragment from the beginning of the
* payload datagram */
kernel_pid_t pid; /**< PID of the interface */
} gnrc_sixlowpan_msg_frag_t;

/**
Expand Down
7 changes: 3 additions & 4 deletions sys/net/gnrc/network_layer/sixlowpan/frag/gnrc_sixlowpan_frag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
#define ENABLE_DEBUG (0)
#include "debug.h"

static gnrc_sixlowpan_msg_frag_t _fragment_msg = {
NULL, 0, 0, KERNEL_PID_UNDEF
};
static gnrc_sixlowpan_msg_frag_t _fragment_msg;

#if ENABLE_DEBUG
/* For PRIu16 etc. */
Expand Down Expand Up @@ -238,7 +236,7 @@ void gnrc_sixlowpan_frag_send(gnrc_pktsnip_t *pkt, void *ctx, unsigned page)
{
assert(ctx != NULL);
gnrc_sixlowpan_msg_frag_t *fragment_msg = ctx;
gnrc_netif_t *iface = gnrc_netif_get_by_pid(fragment_msg->pid);
gnrc_netif_t *iface;
uint16_t res;
/* payload_len: actual size of the packet vs
* datagram_size: size of the uncompressed IPv6 packet */
Expand All @@ -248,6 +246,7 @@ void gnrc_sixlowpan_frag_send(gnrc_pktsnip_t *pkt, void *ctx, unsigned page)
assert((fragment_msg->pkt == pkt) || (pkt == NULL));
(void)page;
(void)pkt;
iface = gnrc_netif_hdr_get_netif(fragment_msg->pkt->data);
#if defined(DEVELHELP) && ENABLE_DEBUG
if (iface == NULL) {
DEBUG("6lo frag: iface == NULL, expect segmentation fault.\n");
Expand Down
1 change: 0 additions & 1 deletion sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ void gnrc_sixlowpan_multiplex_by_size(gnrc_pktsnip_t *pkt,
gnrc_pktbuf_release_error(pkt, ENOMEM);
return;
}
fragment_msg->pid = netif->pid;
fragment_msg->pkt = pkt;
fragment_msg->datagram_size = orig_datagram_size;
/* Sending the first fragment has an offset==0 */
Expand Down