bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/ieee802154: Add a choice on which packet to print-out

Browse Source 
All, RX only or TX only

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2017-11-06 15:16:24 +01:00 committed by Jukka Rissanen
parent b181dc6791
commit c968e102e6
2 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
subsys/net/ip/l2/ieee802154/Kconfig
View File

@ -35,6 +35,31 @@ config NET_DEBUG_L2_IEEE802154_DISPLAY_PACKET
Enable printing out in/out 802.15.4 packets. This is extremely
verbose, do not enable this unless you know what you are doing.
if NET_DEBUG_L2_IEEE802154_DISPLAY_PACKET
choice
prompt "Which packet do you want to print-out?"
default NET_DEBUG_L2_IEEE802154_DISPLAY_PACKET_FULL
config NET_DEBUG_L2_IEEE802154_DISPLAY_PACKET_FULL
bool "Print-out both RX and TX packets"
help
This will print-out both received and transmitted packets.
config NET_DEBUG_L2_IEEE802154_DISPLAY_PACKET_RX
bool "Print-out only RX packets"
help
This will print-out received packets only.
config NET_DEBUG_L2_IEEE802154_DISPLAY_PACKET_TX
bool "Print-out only TX packets"
help
This will print-out transmitted packets only.
endchoice
endif # NET_DEBUG_L2_IEEE802154_DISPLAY_PACKET
config NET_L2_IEEE802154_ACK_REPLY
bool "Enable IEEE 802.15.4 ACK reply logic"
default n

24
subsys/net/ip/l2/ieee802154/ieee802154.c
View File

@ -41,9 +41,19 @@
#include "net_private.h"
static inline void pkt_hexdump(const char *title, struct net_pkt *pkt,
bool full)
bool in, bool full)
{
net_hexdump_frags(title, pkt, full);
if ((IS_ENABLED(CONFIG_NET_DEBUG_L2_IEEE802154_DISPLAY_PACKET_RX) ||
IS_ENABLED(CONFIG_NET_DEBUG_L2_IEEE802154_DISPLAY_PACKET_FULL)) &&
in) {
net_hexdump_frags(title, pkt, full);
}
if ((IS_ENABLED(CONFIG_NET_DEBUG_L2_IEEE802154_DISPLAY_PACKET_TX) ||
IS_ENABLED(CONFIG_NET_DEBUG_L2_IEEE802154_DISPLAY_PACKET_FULL)) &&
!in) {
net_hexdump_frags(title, pkt, full);
}
}
#ifndef CONFIG_NET_DEBUG_L2_IEEE802154
@ -163,7 +173,7 @@ enum net_verdict ieee802154_manage_recv_packet(struct net_if *iface,
net_pkt_ll_src(pkt)->addr = src ? net_pkt_ll(pkt) + src : NULL;
net_pkt_ll_dst(pkt)->addr = dst ? net_pkt_ll(pkt) + dst : NULL;
pkt_hexdump(RX_PKT_TITLE, pkt, false);
pkt_hexdump(RX_PKT_TITLE, pkt, true, false);
out:
return verdict;
}
@ -173,7 +183,7 @@ static inline bool ieee802154_manage_send_packet(struct net_if *iface,
{
bool ret;
pkt_hexdump(TX_PKT_TITLE " (before 6lo)", pkt, false);
pkt_hexdump(TX_PKT_TITLE " (before 6lo)", pkt, false, false);
#ifdef CONFIG_NET_L2_IEEE802154_FRAGMENT
ret = net_6lo_compress(pkt, true, ieee802154_fragment);
@ -181,7 +191,7 @@ static inline bool ieee802154_manage_send_packet(struct net_if *iface,
ret = net_6lo_compress(pkt, true, NULL);
#endif
pkt_hexdump(TX_PKT_TITLE " (after 6lo)", pkt, false);
pkt_hexdump(TX_PKT_TITLE " (after 6lo)", pkt, false, false);
return ret;
}
@ -233,7 +243,7 @@ static enum net_verdict ieee802154_recv(struct net_if *iface,
return NET_DROP;
}
pkt_hexdump(RX_PKT_TITLE " (with ll)", pkt, true);
pkt_hexdump(RX_PKT_TITLE " (with ll)", pkt, true, true);
return ieee802154_manage_recv_packet(iface, pkt);
}
@ -269,7 +279,7 @@ static enum net_verdict ieee802154_send(struct net_if *iface,
frag = frag->frags;
}
pkt_hexdump(TX_PKT_TITLE " (with ll)", pkt, true);
pkt_hexdump(TX_PKT_TITLE " (with ll)", pkt, false, true);
net_if_queue_tx(iface, pkt);