patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

net: icmpv6: Simplify debug calls

Browse source 
Debugging code snippet inside handle_echo_reply() does not look nice,
just provided inline functions and simplified it.

Change-Id: Idc3a9284153aaa04d0431a9dd705c4f1c51b817d
Signed-off-by: Ravi kumar Veeramally <ravikumar.veeramally@linux.intel.com>
This commit is contained in:
Ravi kumar Veeramally 2017-03-03 10:10:51 +02:00 committed by Jukka Rissanen
parent 992549ab40
commit e17fe10673
1 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
subsys/net/ip/icmpv6.c
View file

@ -56,6 +56,31 @@ static inline void setup_ipv6_header(struct net_buf *buf, uint16_t extra_len,
NET_ICMPV6_UNUSED_LEN);
}
#if defined(CONFIG_NET_DEBUG_ICMPV6)
static inline void echo_request_debug(struct net_buf *buf)
{
char out[NET_IPV6_ADDR_LEN];
snprintk(out, sizeof(out), "%s",
net_sprint_ipv6_addr(&NET_IPV6_BUF(buf)->dst));
NET_DBG("Received Echo Request from %s to %s",
net_sprint_ipv6_addr(&NET_IPV6_BUF(buf)->src), out);
}
static inline void echo_reply_debug(struct net_buf *buf)
{
char out[NET_IPV6_ADDR_LEN];
snprintk(out, sizeof(out), "%s",
net_sprint_ipv6_addr(&NET_IPV6_BUF(buf)->dst));
NET_DBG("Sending Echo Reply from %s to %s",
net_sprint_ipv6_addr(&NET_IPV6_BUF(buf)->src), out);
}
#else
#define echo_request_debug(buf)
#define echo_reply_debug(buf)
#endif /* CONFIG_NET_DEBUG_ICMPV6 */
static enum net_verdict handle_echo_request(struct net_buf *orig)
{
struct net_buf *buf;
@ -63,16 +88,7 @@ static enum net_verdict handle_echo_request(struct net_buf *orig)
struct net_if *iface;
uint16_t payload_len;
#if defined(CONFIG_NET_DEBUG_ICMPV6)
do {
char out[NET_IPV6_ADDR_LEN];
snprintk(out, sizeof(out), "%s",
net_sprint_ipv6_addr(&NET_IPV6_BUF(orig)->dst));
NET_DBG("Received Echo Request from %s to %s",
net_sprint_ipv6_addr(&NET_IPV6_BUF(orig)->src), out);
} while (0);
#endif /* CONFIG_NET_DEBUG_ICMPV6 */
echo_request_debug(orig);
iface = net_nbuf_iface(orig);
@ -122,16 +138,7 @@ static enum net_verdict handle_echo_request(struct net_buf *orig)
NET_ICMP_BUF(buf)->chksum = 0;
NET_ICMP_BUF(buf)->chksum = ~net_calc_chksum_icmpv6(buf);
#if defined(CONFIG_NET_DEBUG_ICMPV6)
do {
char out[NET_IPV6_ADDR_LEN];
snprintk(out, sizeof(out), "%s",
net_sprint_ipv6_addr(&NET_IPV6_BUF(buf)->dst));
NET_DBG("Sending Echo Reply from %s to %s",
net_sprint_ipv6_addr(&NET_IPV6_BUF(buf)->src), out);
} while (0);
#endif /* CONFIG_NET_DEBUG_ICMPV6 */
echo_reply_debug(buf);
if (net_send_data(buf) < 0) {
goto drop;