From de7d6c77854853f9c4c4497d00036c5b25442bc7 Mon Sep 17 00:00:00 2001 From: Joakim Gebart Date: Sat, 24 Jan 2015 08:45:47 +0100 Subject: [PATCH 1/2] sixlowpan: rename global buffer->sixlowpan_buffer --- sys/net/network_layer/sixlowpan/icmp.c | 30 +++++++++++++------------- sys/net/network_layer/sixlowpan/ip.c | 10 ++++----- sys/net/network_layer/sixlowpan/ip.h | 4 ++-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/sys/net/network_layer/sixlowpan/icmp.c b/sys/net/network_layer/sixlowpan/icmp.c index 2170b6fc3b..391bf81b3a 100644 --- a/sys/net/network_layer/sixlowpan/icmp.c +++ b/sys/net/network_layer/sixlowpan/icmp.c @@ -9,7 +9,7 @@ * * @ingroup sixlowpan * @{ - * @file sixlownd.c + * @file * @brief 6lowpan neighbor discovery functions * @author Stephan Zeisberg * @author Martine Lenders @@ -167,72 +167,72 @@ int min(int a, int b) static icmpv6_parameter_prob_hdr_t *get_para_prob_buf(uint8_t ext_len) { - return ((icmpv6_parameter_prob_hdr_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len]); + return ((icmpv6_parameter_prob_hdr_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len]); } static icmpv6_echo_request_hdr_t *get_echo_req_buf(uint8_t ext_len) { - return ((icmpv6_echo_request_hdr_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len]); + return ((icmpv6_echo_request_hdr_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len]); } static icmpv6_echo_reply_hdr_t *get_echo_repl_buf(uint8_t ext_len) { - return ((icmpv6_echo_reply_hdr_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len]); + return ((icmpv6_echo_reply_hdr_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len]); } static icmpv6_router_adv_hdr_t *get_rtr_adv_buf(uint8_t ext_len) { - return ((icmpv6_router_adv_hdr_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len]); + return ((icmpv6_router_adv_hdr_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len]); } static icmpv6_neighbor_sol_hdr_t *get_nbr_sol_buf(uint8_t ext_len) { - return ((icmpv6_neighbor_sol_hdr_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len]); + return ((icmpv6_neighbor_sol_hdr_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len]); } static icmpv6_neighbor_adv_hdr_t *get_nbr_adv_buf(uint8_t ext_len) { - return ((icmpv6_neighbor_adv_hdr_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len]); + return ((icmpv6_neighbor_adv_hdr_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len]); } static icmpv6_ndp_opt_hdr_t *get_opt_buf(uint8_t ext_len, uint8_t opt_len) { - return ((icmpv6_ndp_opt_hdr_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); + return ((icmpv6_ndp_opt_hdr_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); } static icmpv6_ndp_opt_stllao_t *get_opt_stllao_buf(uint8_t ext_len, uint8_t opt_len) { - return ((icmpv6_ndp_opt_stllao_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); + return ((icmpv6_ndp_opt_stllao_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); } static icmpv6_ndp_opt_mtu_t *get_opt_mtu_buf(uint8_t ext_len, uint8_t opt_len) { - return ((icmpv6_ndp_opt_mtu_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); + return ((icmpv6_ndp_opt_mtu_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); } static icmpv6_ndp_opt_abro_t *get_opt_abro_buf(uint8_t ext_len, uint8_t opt_len) { - return ((icmpv6_ndp_opt_abro_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); + return ((icmpv6_ndp_opt_abro_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); } static icmpv6_ndp_opt_6co_hdr_t *get_opt_6co_hdr_buf(uint8_t ext_len, uint8_t opt_len) { - return ((icmpv6_ndp_opt_6co_hdr_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); + return ((icmpv6_ndp_opt_6co_hdr_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); } static uint8_t *get_opt_6co_prefix_buf(uint8_t ext_len, uint8_t opt_len) { - return ((uint8_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); + return ((uint8_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); } static icmpv6_ndp_opt_pi_t *get_opt_pi_buf(uint8_t ext_len, uint8_t opt_len) { - return ((icmpv6_ndp_opt_pi_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); + return ((icmpv6_ndp_opt_pi_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); } static icmpv6_ndp_opt_aro_t *get_opt_aro_buf(uint8_t ext_len, uint8_t opt_len) { - return ((icmpv6_ndp_opt_aro_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); + return ((icmpv6_ndp_opt_aro_t *) &sixlowpan_buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]); } void icmpv6_send_echo_request(ipv6_addr_t *destaddr, uint16_t id, uint16_t seq, uint8_t *data, size_t data_len) diff --git a/sys/net/network_layer/sixlowpan/ip.c b/sys/net/network_layer/sixlowpan/ip.c index 2cdb4be068..082762c35f 100644 --- a/sys/net/network_layer/sixlowpan/ip.c +++ b/sys/net/network_layer/sixlowpan/ip.c @@ -9,7 +9,7 @@ * * @ingroup sixlowpan * @{ - * @file sixlowip.c + * @file * @brief 6lowpan IP layer functions * @author Stephan Zeisberg * @author Martine Lenders @@ -45,7 +45,7 @@ static char addr_str[IPV6_MAX_ADDR_STR_LEN]; #define IPV6_NET_IF_ADDR_BUFFER_LEN (NET_IF_MAX * IPV6_NET_IF_ADDR_LIST_LEN) static uint8_t ip_send_buffer[BUFFER_SIZE]; -uint8_t buffer[BUFFER_SIZE]; +uint8_t sixlowpan_buffer[BUFFER_SIZE]; static msg_t ip_msg_queue[IP_PKT_RECV_BUF_SIZE]; static ipv6_hdr_t *ipv6_buf; static icmpv6_hdr_t *icmp_buf; @@ -162,17 +162,17 @@ uint8_t *get_payload_buf_send(uint8_t ext_len) ipv6_hdr_t *ipv6_get_buf(void) { - return ((ipv6_hdr_t *) &buffer[LL_HDR_LEN]); + return ((ipv6_hdr_t *) &sixlowpan_buffer[LL_HDR_LEN]); } icmpv6_hdr_t *get_icmpv6_buf(uint8_t ext_len) { - return ((icmpv6_hdr_t *) &buffer[LLHDR_IPV6HDR_LEN + ext_len]); + return ((icmpv6_hdr_t *) &sixlowpan_buffer[LLHDR_IPV6HDR_LEN + ext_len]); } uint8_t *get_payload_buf(uint8_t ext_len) { - return &(buffer[LLHDR_IPV6HDR_LEN + ext_len]); + return &(sixlowpan_buffer[LLHDR_IPV6HDR_LEN + ext_len]); } int ipv6_sendto(const ipv6_addr_t *dest, uint8_t next_header, diff --git a/sys/net/network_layer/sixlowpan/ip.h b/sys/net/network_layer/sixlowpan/ip.h index ae642d0e54..eddf12aa82 100644 --- a/sys/net/network_layer/sixlowpan/ip.h +++ b/sys/net/network_layer/sixlowpan/ip.h @@ -9,7 +9,7 @@ * * @ingroup sixlowpan * @{ - * @file sixlowip.h + * @file * @brief 6lowpan IP layer header * @author Stephan Zeisberg * @author Martine Lenders @@ -63,7 +63,7 @@ extern int srh_handler_pid; #define IPV6_NET_IF_ADDR_LIST_LEN (10) // maybe to much /* buffer */ -extern uint8_t buffer[BUFFER_SIZE]; +extern uint8_t sixlowpan_buffer[BUFFER_SIZE]; extern char ip_process_buf[IP_PROCESS_STACKSIZE]; extern kernel_pid_t sixlowip_reg[SIXLOWIP_MAX_REGISTERED]; From f6bade32e6e25fd7e6476ad1e4c00f22e02cbb0e Mon Sep 17 00:00:00 2001 From: Joakim Gebart Date: Sat, 24 Jan 2015 16:27:19 +0100 Subject: [PATCH 2/2] rpl: Rename buffer->sixlowpan_buffer --- sys/net/routing/rpl/rpl_control_messages.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/routing/rpl/rpl_control_messages.c b/sys/net/routing/rpl/rpl_control_messages.c index 4f411a9e55..68d13906b2 100644 --- a/sys/net/routing/rpl/rpl_control_messages.c +++ b/sys/net/routing/rpl/rpl_control_messages.c @@ -160,7 +160,7 @@ static rpl_dao_t *get_rpl_dao_buf(void) static rpl_dao_ack_t *get_rpl_dao_ack_buf(void) { - return ((rpl_dao_ack_t *) & (buffer[(LL_HDR_LEN + IPV6_HDR_LEN + ICMPV6_HDR_LEN)])); + return ((rpl_dao_ack_t *) & (sixlowpan_buffer[(LL_HDR_LEN + IPV6_HDR_LEN + ICMPV6_HDR_LEN)])); } static rpl_dis_t *get_rpl_dis_buf(void)