From 3b56c78a3b6dcc5e15e2256ac6b03fb38a640f20 Mon Sep 17 00:00:00 2001
From: Martine Lenders <m.lenders@fu-berlin.de>
Date: Wed, 14 Nov 2018 14:16:42 +0100
Subject: [PATCH] gnrc_icmpv6_error: make build functions private
---
sys/include/net/gnrc/icmpv6/error.h | 46 -------------------
.../icmpv6/error/gnrc_icmpv6_error.c | 21 +++++----
2 files changed, 12 insertions(+), 55 deletions(-)
diff --git a/sys/include/net/gnrc/icmpv6/error.h b/sys/include/net/gnrc/icmpv6/error.h
index 14f25fb9d9..a6dd7ad440 100644
--- a/sys/include/net/gnrc/icmpv6/error.h
+++ b/sys/include/net/gnrc/icmpv6/error.h
@@ -33,52 +33,6 @@
extern "C" {
#endif
-/**
- * @brief Builds an ICMPv6 destination unreachable message for sending.
- *
- * @param[in] code The code for the message @see net/icmpv6.h.
- * @param[in] orig_pkt The invoking packet.
- *
- * @return The destination unreachable message on success.
- * @return NULL, on failure.
- */
-gnrc_pktsnip_t *gnrc_icmpv6_error_dst_unr_build(uint8_t code, gnrc_pktsnip_t *orig_pkt);
-
-/**
- * @brief Builds an ICMPv6 packet too big message for sending.
- *
- * @param[in] mtu The maximum transission unit of the next-hop link.
- * @param[in] orig_pkt The invoking packet.
- *
- * @return The packet too big message on success.
- * @return NULL, on failure.
- */
-gnrc_pktsnip_t *gnrc_icmpv6_error_pkt_too_big_build(uint32_t mtu, gnrc_pktsnip_t *orig_pkt);
-
-/**
- * @brief Builds an ICMPv6 time exceeded message for sending.
- *
- * @param[in] code The code for the message @see net/icmpv6.h.
- * @param[in] orig_pkt The invoking packet.
- *
- * @return The time exceeded message on success.
- * @return NULL, on failure.
- */
-gnrc_pktsnip_t *gnrc_icmpv6_error_time_exc_build(uint8_t code, gnrc_pktsnip_t *orig_pkt);
-
-/**
- * @brief Builds an ICMPv6 parameter problem message for sending.
- *
- * @param[in] code The code for the message @see net/icmpv6.h.
- * @param[in] ptr Pointer to the errorneous octet in @p orig_pkt.
- * @param[in] orig_pkt The invoking packet.
- *
- * @return The parameter problem message on success.
- * @return NULL, on failure.
- */
-gnrc_pktsnip_t *gnrc_icmpv6_error_param_prob_build(uint8_t code, void *ptr,
- gnrc_pktsnip_t *orig_pkt);
-
/**
* @brief Sends an ICMPv6 destination unreachable message for sending.
*
diff --git a/sys/net/gnrc/network_layer/icmpv6/error/gnrc_icmpv6_error.c b/sys/net/gnrc/network_layer/icmpv6/error/gnrc_icmpv6_error.c
index ee8d2cd419..9f61111a41 100644
--- a/sys/net/gnrc/network_layer/icmpv6/error/gnrc_icmpv6_error.c
+++ b/sys/net/gnrc/network_layer/icmpv6/error/gnrc_icmpv6_error.c
@@ -54,17 +54,20 @@ static gnrc_pktsnip_t *_icmpv6_error_build(uint8_t type, uint8_t code,
return pkt;
}
-gnrc_pktsnip_t *gnrc_icmpv6_error_dst_unr_build(uint8_t code, gnrc_pktsnip_t *orig_pkt)
+static inline gnrc_pktsnip_t *_dst_unr_build(uint8_t code,
+ gnrc_pktsnip_t *orig_pkt)
{
return _icmpv6_error_build(ICMPV6_DST_UNR, code, orig_pkt, 0);
}
-gnrc_pktsnip_t *gnrc_icmpv6_error_pkt_too_big_build(uint32_t mtu, gnrc_pktsnip_t *orig_pkt)
+static inline gnrc_pktsnip_t *_pkt_too_big_build(uint32_t mtu,
+ gnrc_pktsnip_t *orig_pkt)
{
return _icmpv6_error_build(ICMPV6_PKT_TOO_BIG, 0, orig_pkt, mtu);
}
-gnrc_pktsnip_t *gnrc_icmpv6_error_time_exc_build(uint8_t code, gnrc_pktsnip_t *orig_pkt)
+static inline gnrc_pktsnip_t *_time_exc_build(uint8_t code,
+ gnrc_pktsnip_t *orig_pkt)
{
return _icmpv6_error_build(ICMPV6_TIME_EXC, code, orig_pkt, 0);
}
@@ -74,8 +77,8 @@ static inline bool _in_range(uint8_t *ptr, uint8_t *start, size_t sz)
return (ptr >= start) && (ptr < (start + sz));
}
-gnrc_pktsnip_t *gnrc_icmpv6_error_param_prob_build(uint8_t code, void *ptr,
- gnrc_pktsnip_t *orig_pkt)
+static gnrc_pktsnip_t *_param_prob_build(uint8_t code, void *ptr,
+ gnrc_pktsnip_t *orig_pkt)
{
gnrc_pktsnip_t *pkt = gnrc_icmpv6_build(NULL, ICMPV6_PARAM_PROB, code,
_fit(orig_pkt));
@@ -120,7 +123,7 @@ gnrc_pktsnip_t *gnrc_icmpv6_error_param_prob_build(uint8_t code, void *ptr,
void gnrc_icmpv6_error_dst_unr_send(uint8_t code, gnrc_pktsnip_t *orig_pkt)
{
- gnrc_pktsnip_t *pkt = gnrc_icmpv6_error_dst_unr_build(code, orig_pkt);
+ gnrc_pktsnip_t *pkt = _dst_unr_build(code, orig_pkt);
if (pkt != NULL) {
gnrc_netapi_send(gnrc_ipv6_pid, pkt);
@@ -134,7 +137,7 @@ void gnrc_icmpv6_error_dst_unr_send(uint8_t code, gnrc_pktsnip_t *orig_pkt)
void gnrc_icmpv6_error_pkt_too_big_send(uint32_t mtu, gnrc_pktsnip_t *orig_pkt)
{
- gnrc_pktsnip_t *pkt = gnrc_icmpv6_error_pkt_too_big_build(mtu, orig_pkt);
+ gnrc_pktsnip_t *pkt = _pkt_too_big_build(mtu, orig_pkt);
if (pkt != NULL) {
gnrc_netapi_send(gnrc_ipv6_pid, pkt);
@@ -148,7 +151,7 @@ void gnrc_icmpv6_error_pkt_too_big_send(uint32_t mtu, gnrc_pktsnip_t *orig_pkt)
void gnrc_icmpv6_error_time_exc_send(uint8_t code, gnrc_pktsnip_t *orig_pkt)
{
- gnrc_pktsnip_t *pkt = gnrc_icmpv6_error_time_exc_build(code, orig_pkt);
+ gnrc_pktsnip_t *pkt = _time_exc_build(code, orig_pkt);
if (pkt != NULL) {
gnrc_netapi_send(gnrc_ipv6_pid, pkt);
@@ -163,7 +166,7 @@ void gnrc_icmpv6_error_time_exc_send(uint8_t code, gnrc_pktsnip_t *orig_pkt)
void gnrc_icmpv6_error_param_prob_send(uint8_t code, void *ptr,
gnrc_pktsnip_t *orig_pkt)
{
- gnrc_pktsnip_t *pkt = gnrc_icmpv6_error_param_prob_build(code, ptr, orig_pkt);
+ gnrc_pktsnip_t *pkt = _param_prob_build(code, ptr, orig_pkt);
if (pkt != NULL) {
gnrc_netapi_send(gnrc_ipv6_pid, pkt);
--
GitLab