RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Fix so astyle does not confuse casts for ands

Browse Source
This commit is contained in:
authmillenon 2013-08-15 11:27:30 +02:00
parent e2c201f2e0
commit 3624727002
3 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
sys/net/sixlowpan/icmp.c
View File

@ -169,79 +169,72 @@ int min(int a, int b)
static icmpv6_parameter_prob_hdr_t *get_para_prob_buf(uint8_t ext_len) 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 *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len]);
} }
static icmpv6_echo_request_hdr_t *get_echo_req_buf(uint8_t 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 *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len]);
} }
static icmpv6_echo_reply_hdr_t *get_echo_repl_buf(uint8_t 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 *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len]);
} }
static icmpv6_router_adv_hdr_t *get_rtr_adv_buf(uint8_t 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 *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len]);
} }
static icmpv6_neighbor_sol_hdr_t *get_nbr_sol_buf(uint8_t 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 *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len]);
} }
static icmpv6_neighbor_adv_hdr_t *get_nbr_adv_buf(uint8_t 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 *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len]);
} }
static icmpv6_ndp_opt_hdr_t *get_opt_buf(uint8_t ext_len, uint8_t opt_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 + return ((icmpv6_ndp_opt_hdr_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]);
ext_len + opt_len]));
} }
static icmpv6_ndp_opt_stllao_t *get_opt_stllao_buf(uint8_t ext_len, uint8_t 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 + return ((icmpv6_ndp_opt_stllao_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]);
ext_len + opt_len]));
} }
static icmpv6_ndp_opt_mtu_t *get_opt_mtu_buf(uint8_t ext_len, uint8_t 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 + return ((icmpv6_ndp_opt_mtu_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]);
ext_len + opt_len]));
} }
static icmpv6_ndp_opt_abro_t *get_opt_abro_buf(uint8_t ext_len, uint8_t 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 + return ((icmpv6_ndp_opt_abro_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_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) 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 + return ((icmpv6_ndp_opt_6co_hdr_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]);
ext_len + opt_len]));
} }
static uint8_t *get_opt_6co_prefix_buf(uint8_t ext_len, uint8_t 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 *) &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) 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 + return ((icmpv6_ndp_opt_pi_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]);
opt_len]));
} }
static icmpv6_ndp_opt_aro_t *get_opt_aro_buf(uint8_t ext_len, uint8_t 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 + return ((icmpv6_ndp_opt_aro_t *) &buffer[LLHDR_ICMPV6HDR_LEN + ext_len + opt_len]);
opt_len]));
} }
void icmpv6_send_echo_request(ipv6_addr_t *destaddr, uint16_t id, uint16_t seq, char *data, size_t data_len) void icmpv6_send_echo_request(ipv6_addr_t *destaddr, uint16_t id, uint16_t seq, char *data, size_t data_len)
@ -280,9 +273,7 @@ void icmpv6_send_echo_request(ipv6_addr_t *destaddr, uint16_t id, uint16_t seq,
printf("INFO: send echo request to: %s\n", printf("INFO: send echo request to: %s\n",
ipv6_addr_to_str(addr_str, &ipv6_buf->destaddr)); ipv6_addr_to_str(addr_str, &ipv6_buf->destaddr));
#endif #endif
sixlowpan_lowpan_sendto((ieee_802154_long_t *) &(ipv6_buf->destaddr.uint16[4]), sixlowpan_lowpan_sendto((ieee_802154_long_t *) &ipv6_buf->destaddr.uint16[4], (uint8_t *)ipv6_buf, packet_length);
(uint8_t *)ipv6_buf,
packet_length);
} }
void icmpv6_send_echo_reply(ipv6_addr_t *destaddr, uint16_t id, uint16_t seq, char *data, size_t data_len) void icmpv6_send_echo_reply(ipv6_addr_t *destaddr, uint16_t id, uint16_t seq, char *data, size_t data_len)
@ -321,7 +312,7 @@ void icmpv6_send_echo_reply(ipv6_addr_t *destaddr, uint16_t id, uint16_t seq, ch
printf("INFO: send echo request to: %s\n", printf("INFO: send echo request to: %s\n",
ipv6_addr_to_str(addr_str, &ipv6_buf->destaddr)); ipv6_addr_to_str(addr_str, &ipv6_buf->destaddr));
#endif #endif
sixlowpan_lowpan_sendto((ieee_802154_long_t *) &(ipv6_buf->destaddr.uint16[4]), sixlowpan_lowpan_sendto((ieee_802154_long_t *) &ipv6_buf->destaddr.uint16[4],
(uint8_t *)ipv6_buf, (uint8_t *)ipv6_buf,
packet_length); packet_length);
} }
@ -370,7 +361,7 @@ void icmpv6_send_router_sol(uint8_t sllao)
printf("INFO: send router solicitation to: %s\n", printf("INFO: send router solicitation to: %s\n",
ipv6_addr_to_str(addr_str, &ipv6_buf->destaddr)); ipv6_addr_to_str(addr_str, &ipv6_buf->destaddr));
#endif #endif
sixlowpan_lowpan_sendto((ieee_802154_long_t *) &(ipv6_buf->destaddr.uint16[4]), sixlowpan_lowpan_sendto((ieee_802154_long_t *) &ipv6_buf->destaddr.uint16[4],
(uint8_t *)ipv6_buf, (uint8_t *)ipv6_buf,
packet_length); packet_length);
} }
@ -475,7 +466,7 @@ void recv_rtr_sol(void)
printf("INFO: send router advertisment to: %s\n", printf("INFO: send router advertisment to: %s\n",
ipv6_addr_to_str(addr_str, &ipv6_buf->destaddr)); ipv6_addr_to_str(addr_str, &ipv6_buf->destaddr));
#endif #endif
sixlowpan_lowpan_sendto((ieee_802154_long_t *) &(ipv6_buf->destaddr.uint16[4]), sixlowpan_lowpan_sendto((ieee_802154_long_t *) &ipv6_buf->destaddr.uint16[4],
(uint8_t *)ipv6_buf, (uint8_t *)ipv6_buf,
IPV6_HDR_LEN + NTOHS(ipv6_buf->length)); IPV6_HDR_LEN + NTOHS(ipv6_buf->length));
@ -630,13 +621,13 @@ void icmpv6_send_router_adv(ipv6_addr_t *addr, uint8_t sllao, uint8_t mtu, uint8
if (opt_6co_hdr_buf->c_length > 64) { if (opt_6co_hdr_buf->c_length > 64) {
memset((void *)opt_6co_prefix_buf, 0, 16); memset((void *)opt_6co_prefix_buf, 0, 16);
memcpy((void *)opt_6co_prefix_buf, (void *) &(contexts[i].prefix.uint8[0]), opt_6co_hdr_buf->c_length / 8); memcpy((void *)opt_6co_prefix_buf, (void *) &contexts[i].prefix.uint8[0], opt_6co_hdr_buf->c_length / 8);
icmpv6_opt_hdr_len += 16; icmpv6_opt_hdr_len += 16;
packet_length += 16; packet_length += 16;
} }
else { else {
memset((void *)opt_6co_prefix_buf, 0, 8); memset((void *)opt_6co_prefix_buf, 0, 8);
memcpy((void *)opt_6co_prefix_buf, (void *) &(contexts[i].prefix.uint8[0]), opt_6co_hdr_buf->c_length / 8); memcpy((void *)opt_6co_prefix_buf, (void *) &contexts[i].prefix.uint8[0], opt_6co_hdr_buf->c_length / 8);
icmpv6_opt_hdr_len += 8; icmpv6_opt_hdr_len += 8;
packet_length += 8; packet_length += 8;
} }
@ -861,7 +852,7 @@ void recv_rtr_adv(void)
printf("INFO: send neighbor solicitation to: %s\n", printf("INFO: send neighbor solicitation to: %s\n",
ipv6_addr_to_str(addr_str, &(ipv6_buf->destaddr))); ipv6_addr_to_str(addr_str, &(ipv6_buf->destaddr)));
#endif #endif
sixlowpan_lowpan_sendto((ieee_802154_long_t *) &(ipv6_buf->destaddr.uint16[4]), sixlowpan_lowpan_sendto((ieee_802154_long_t *) &ipv6_buf->destaddr.uint16[4],
(uint8_t *)ipv6_buf, (uint8_t *)ipv6_buf,
packet_length); packet_length);
} }
@ -1122,7 +1113,7 @@ void recv_nbr_sol(void)
printf("INFO: send neighbor advertisment to: %s\n", printf("INFO: send neighbor advertisment to: %s\n",
ipv6_addr_to_str(addr_str, &ipv6_buf->destaddr)); ipv6_addr_to_str(addr_str, &ipv6_buf->destaddr));
#endif #endif
sixlowpan_lowpan_sendto((ieee_802154_long_t *) &(ipv6_buf->destaddr.uint16[4]), sixlowpan_lowpan_sendto((ieee_802154_long_t *) &ipv6_buf->destaddr.uint16[4],
(uint8_t *)ipv6_buf, (uint8_t *)ipv6_buf,
packet_length); packet_length);
} }

12
sys/net/sixlowpan/ip.c
View File

@ -63,14 +63,14 @@ void ipv6_send_bytes(ipv6_hdr_t *bytes)
memset(bytes, 0, BUFFER_SIZE); memset(bytes, 0, BUFFER_SIZE);
memcpy(bytes + LL_HDR_LEN, bytes, offset); memcpy(bytes + LL_HDR_LEN, bytes, offset);
sixlowpan_lowpan_sendto((ieee_802154_long_t *) &(bytes->destaddr.uint16[4]), sixlowpan_lowpan_sendto((ieee_802154_long_t *) &bytes->destaddr.uint16[4],
(uint8_t *)bytes, (uint8_t *)bytes,
offset); offset);
} }
ipv6_hdr_t *ipv6_get_buf_send(void) ipv6_hdr_t *ipv6_get_buf_send(void)
{ {
return ((ipv6_hdr_t *) &(ip_send_buffer[LL_HDR_LEN])); return ((ipv6_hdr_t *) &ip_send_buffer[LL_HDR_LEN]);
} }
uint8_t *get_payload_buf_send(uint8_t ext_len) uint8_t *get_payload_buf_send(uint8_t ext_len)
@ -80,12 +80,12 @@ uint8_t *get_payload_buf_send(uint8_t ext_len)
ipv6_hdr_t *ipv6_get_buf(void) ipv6_hdr_t *ipv6_get_buf(void)
{ {
return ((ipv6_hdr_t *) &(buffer[LL_HDR_LEN])); return ((ipv6_hdr_t *) &buffer[LL_HDR_LEN]);
} }
icmpv6_hdr_t *get_icmpv6_buf(uint8_t ext_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 *) &buffer[LLHDR_IPV6HDR_LEN + ext_len]);
} }
uint8_t *get_payload_buf(uint8_t ext_len) uint8_t *get_payload_buf(uint8_t ext_len)
@ -122,7 +122,7 @@ void ipv6_sendto(const ipv6_addr_t *dest, uint8_t next_header,
packet_length = IPV6_HDR_LEN + payload_length; packet_length = IPV6_HDR_LEN + payload_length;
sixlowpan_lowpan_sendto((ieee_802154_long_t *) &(ipv6_buf->destaddr.uint16[4]), sixlowpan_lowpan_sendto((ieee_802154_long_t *) &ipv6_buf->destaddr.uint16[4],
(uint8_t *)ipv6_buf, packet_length); (uint8_t *)ipv6_buf, packet_length);
} }
@ -264,7 +264,7 @@ void ipv6_process(void)
(ipv6_buf->destaddr.uint8[15] != myaddr.uint8[15])) { (ipv6_buf->destaddr.uint8[15] != myaddr.uint8[15])) {
packet_length = IPV6_HDR_LEN + ipv6_buf->length; packet_length = IPV6_HDR_LEN + ipv6_buf->length;
memcpy(ipv6_get_buf_send(), ipv6_get_buf(), packet_length); memcpy(ipv6_get_buf_send(), ipv6_get_buf(), packet_length);
sixlowpan_lowpan_sendto((ieee_802154_long_t *) &(ipv6_buf->destaddr.uint16[4]), sixlowpan_lowpan_sendto((ieee_802154_long_t *) &ipv6_buf->destaddr.uint16[4],
(uint8_t *)ipv6_get_buf_send(), (uint8_t *)ipv6_get_buf_send(),
packet_length); packet_length);
} }

2
sys/net/sixlowpan/mac.c
View File

@ -109,7 +109,7 @@ void sixlowpan_mac_init_802154_short_addr(ieee_802154_short_t *saddr)
ieee_802154_long_t *sixlowpan_mac_get_eui64(const ipv6_addr_t *ipaddr) ieee_802154_long_t *sixlowpan_mac_get_eui64(const ipv6_addr_t *ipaddr)
{ {
return ((ieee_802154_long_t *) &(ipaddr->uint8[8])); return ((ieee_802154_long_t *) &ipaddr->uint8[8]);
} }
void sixlowpan_mac_init_802154_long_addr(ieee_802154_long_t *laddr) void sixlowpan_mac_init_802154_long_addr(ieee_802154_long_t *laddr)