RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

fixed some struct issues (broken by cc fixes)

Browse Source
This commit is contained in:
Oliver Hahm 2013-06-24 14:11:30 +02:00
parent c1ec60eaf6
commit f2ec1009af
11 changed files with 429 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/net/destiny/socket.c
View File

@ -293,7 +293,7 @@ socket_internal_t *get_udp_socket(ipv6_hdr_t *ipv6_header, udp_hdr_t *udp_header
bool is_four_touple(socket_internal_t *current_socket, ipv6_hdr_t *ipv6_header,
tcp_hdr_t *tcp_header)
{
return ((ipv6_get_addr_match(&current_socket->socket_values.local_address.sin6_addr
return ((ipv6_get_addr_match(&current_socket->socket_values.local_address.sin6_addr,
&ipv6_header->destaddr) == 128) &&
(current_socket->socket_values.local_address.sin6_port == tcp_header->dst_port) &&
(ipv6_get_addr_match(&current_socket->socket_values.foreign_address.sin6_addr,
@ -528,9 +528,9 @@ int connect(int socket, sockaddr6_t *addr, uint32_t addrlen)
current_tcp_socket->tcp_control.rcv_irs = 0;
mutex_lock(&global_sequence_clunter_mutex);
current_tcp_socket->tcp_control.send_is = global_sequence_counter;
current_tcp_socket->tcp_control.send_iss = global_sequence_counter;
mutex_unlock(&global_sequence_clunter_mutex, 0);
current_tcp_socket->tcp_control.state = SYN_SENT;
current_tcp_socket->tcp_control.state = SYN_SENT;
#ifdef TCP_HC
/* Choosing random number Context ID */

4
sys/net/destiny/tcp.c
View File

@ -165,8 +165,8 @@ void handle_tcp_syn_packet(ipv6_hdr_t *ipv6_header, tcp_hdr_t *tcp_header,
net_msg_send(&m_send_tcp, tcp_socket->recv_pid, 0, TCP_SYN);
}
else {
printf("Dropped TCP SYN Message because an error occured while
requesting a new queued socket!\n");
printf("Dropped TCP SYN Message because an error occured while "\
"requesting a new queued socket!\n");
}
}
else {

4
sys/net/sixlowpan/bordermultiplex.c
View File

@ -47,7 +47,7 @@ void demultiplex(border_packet_t *packet, int len)
switch(l3_header_buf->ethertype) {
case(BORDER_ETHERTYPE_IPV6): {
struct ipv6_hdr_t *ipv6_buf = (struct ipv6_hdr_t *)(((unsigned char *)packet) + sizeof(border_l3_header_t));
ipv6_hdr_t *ipv6_buf = (ipv6_hdr_t *)(((unsigned char *)packet) + sizeof(border_l3_header_t));
border_send_ipv6_over_lowpan(ipv6_buf, 1, 1);
break;
}
@ -102,7 +102,7 @@ void demultiplex(border_packet_t *packet, int len)
}
}
void multiplex_send_ipv6_over_uart(struct ipv6_hdr_t *packet)
void multiplex_send_ipv6_over_uart(ipv6_hdr_t *packet)
{
border_l3_header_t *serial_buf;

2
sys/net/sixlowpan/bordermultiplex.h
View File

@ -83,7 +83,7 @@ typedef struct __attribute__((packed)) {
#define BORDER_BUFFER_SIZE (sizeof (border_l3_header_t) + MTU)
void demultiplex(border_packet_t *packet, int len);
void multiplex_send_ipv6_over_uart(struct ipv6_hdr_t *packet);
void multiplex_send_ipv6_over_uart(ipv6_hdr_t *packet);
void multiplex_send_addr_over_uart(ipv6_addr_t *addr);
int readpacket(uint8_t *packet_buf, size_t size);

6
sys/net/sixlowpan/sixlowborder.c
View File

@ -159,7 +159,7 @@ uint8_t border_initialize(transceiver_type_t trans, ipv6_addr_t *border_router_a
return SUCCESS;
}
void border_send_ipv6_over_lowpan(struct ipv6_hdr_t *packet, uint8_t aro_flag, uint8_t sixco_flag)
void border_send_ipv6_over_lowpan(ipv6_hdr_t *packet, uint8_t aro_flag, uint8_t sixco_flag)
{
uint16_t offset = IPV6_HDR_LEN + HTONS(packet->length);
@ -175,11 +175,11 @@ void border_send_ipv6_over_lowpan(struct ipv6_hdr_t *packet, uint8_t aro_flag, u
void border_process_lowpan(void)
{
msg_t m;
struct ipv6_hdr_t *ipv6_buf;
ipv6_hdr_t *ipv6_buf;
while(1) {
msg_receive(&m);
ipv6_buf = (struct ipv6_hdr_t *)m.content.ptr;
ipv6_buf = (ipv6_hdr_t *)m.content.ptr;
if(ipv6_buf->nextheader == PROTO_NUM_ICMPV6) {
struct icmpv6_hdr_t *icmp_buf = (struct icmpv6_hdr_t *)(((uint8_t *)ipv6_buf) + IPV6_HDR_LEN);

2
sys/net/sixlowpan/sixlowborder.h
View File

@ -36,7 +36,7 @@ uint8_t *get_serial_out_buffer(int offset);
uint8_t *get_serial_in_buffer(int offset);
uint8_t border_initialize(transceiver_type_t trans, ipv6_addr_t *border_router_addr);
void border_send_ipv6_over_lowpan(struct ipv6_hdr_t *packet, uint8_t aro_flag, uint8_t sixco_flag);
void border_send_ipv6_over_lowpan(ipv6_hdr_t *packet, uint8_t aro_flag, uint8_t sixco_flag);
void border_process_lowpan(void);
#endif /* SIXLOWBORDER_H*/

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

@ -36,7 +36,7 @@
uint8_t ip_send_buffer[BUFFER_SIZE];
uint8_t buffer[BUFFER_SIZE];
msg_t msg_queue[IP_PKT_RECV_BUF_SIZE];
struct ipv6_hdr_t *ipv6_buf;
ipv6_hdr_t *ipv6_buf;
struct icmpv6_hdr_t *icmp_buf;
uint8_t ipv6_ext_hdr_len;
uint8_t *nextheader;
@ -46,9 +46,9 @@ int udp_packet_handler_pid = 0;
int tcp_packet_handler_pid = 0;
int rpl_process_pid = 0;
struct ipv6_hdr_t *get_ipv6_buf_send(void)
ipv6_hdr_t *get_ipv6_buf_send(void)
{
return ((struct 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)
@ -56,9 +56,9 @@ uint8_t *get_payload_buf_send(uint8_t ext_len)
return &(ip_send_buffer[LLHDR_IPV6HDR_LEN + ext_len]);
}
struct ipv6_hdr_t *get_ipv6_buf(void)
ipv6_hdr_t *get_ipv6_buf(void)
{
return ((struct ipv6_hdr_t *) & (buffer[LL_HDR_LEN]));
return ((ipv6_hdr_t *)&(buffer[LL_HDR_LEN]));
}
struct icmpv6_hdr_t *get_icmpv6_buf(uint8_t ext_len)
@ -176,7 +176,7 @@ void ipv6_process(void)
while(1) {
msg_receive(&m_recv_lowpan);
ipv6_buf = (struct ipv6_hdr_t *) m_recv_lowpan.content.ptr;
ipv6_buf = (ipv6_hdr_t *)m_recv_lowpan.content.ptr;
/* identifiy packet */
nextheader = &ipv6_buf->nextheader;

2
sys/net/sixlowpan/sixlowip.h
View File

@ -147,7 +147,7 @@ extern iface_t iface;
/* function prototypes */
struct icmpv6_hdr_t *get_icmpv6_buf(uint8_t ext_len);
struct ipv6_hdr_t *get_ipv6_buf(void);
ipv6_hdr_t *get_ipv6_buf(void);
uint8_t *get_payload_buf(uint8_t ext_len);
uint8_t *get_payload_buf_send(uint8_t ext_len);

6
sys/net/sixlowpan/sixlowmac.c
View File

@ -21,6 +21,8 @@
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include "sixlowmac.h"
#include "sixlowip.h"
#include "sixlownd.h"
@ -33,7 +35,7 @@
#include "transceiver.h"
#include "vtimer.h"
#include "ieee802154_frame.h"
#include "sys/net/net_help/net_help.h"
#include "net_help/net_help.h"
char radio_stack_buffer[RADIO_STACK_SIZE];
msg_t msg_q[RADIO_RCV_BUF_SIZE];
@ -223,7 +225,7 @@ void send_ieee802154_frame(ieee_802154_long_t *addr, uint8_t *payload,
p.data = buf;
msg_send_receive(&mesg, &transceiver_rsp, transceiver_pid);
printf("%s, %u: %u\n", __FILE__, __LINE__, transceiver_rsp.content.value);
printf("%s, %u: %"PRIu32"\n", __FILE__, __LINE__, transceiver_rsp.content.value);
hwtimer_wait(5000);
}

52
sys/net/sixlowpan/sixlownd.c
View File

@ -58,19 +58,19 @@ plist_t plist[OPT_PI_LIST_LEN];
static uint8_t *llao;
addr_list_t *addr_list_ptr;
static struct ipv6_hdr_t *ipv6_buf;
static ipv6_hdr_t *ipv6_buf;
static struct icmpv6_hdr_t *icmp_buf;
static struct rtr_adv_t *rtr_adv_buf;
static struct nbr_sol_t *nbr_sol_buf;
static struct nbr_adv_t *nbr_adv_buf;
static struct opt_buf_t *opt_buf;
static struct opt_stllao_t *opt_stllao_buf;
static struct opt_mtu_t *opt_mtu_buf;
static struct opt_abro_t *opt_abro_buf;
static struct opt_6co_hdr_t *opt_6co_hdr_buf;
static opt_buf_t *opt_buf;
static opt_stllao_t *opt_stllao_buf;
static opt_mtu_t *opt_mtu_buf;
static opt_abro_t *opt_abro_buf;
static opt_6co_hdr_t *opt_6co_hdr_buf;
static uint8_t *opt_6co_prefix_buf;
static struct opt_pi_t *opt_pi_buf;
static struct opt_aro_t *opt_aro_buf;
static opt_pi_t *opt_pi_buf;
static opt_aro_t *opt_aro_buf;
nbr_cache_t *nbr_entry;
def_rtr_lst_t *def_rtr_entry;
@ -98,51 +98,51 @@ int min(int a, int b)
static struct para_prob_t *get_para_prob_buf(uint8_t ext_len)
{
return ((struct para_prob_t *) & (buffer[LLHDR_ICMPV6HDR_LEN + ext_len]));
return ((struct para_prob_t *)&(buffer[LLHDR_ICMPV6HDR_LEN + ext_len]));
}
static struct rtr_adv_t *get_rtr_adv_buf(uint8_t ext_len)
{
return ((struct rtr_adv_t *) & (buffer[LLHDR_ICMPV6HDR_LEN + ext_len]));
return ((struct rtr_adv_t *)&(buffer[LLHDR_ICMPV6HDR_LEN + ext_len]));
}
static struct nbr_sol_t *get_nbr_sol_buf(uint8_t ext_len)
{
return ((struct nbr_sol_t *) & (buffer[LLHDR_ICMPV6HDR_LEN + ext_len]));
return ((struct nbr_sol_t *)&(buffer[LLHDR_ICMPV6HDR_LEN + ext_len]));
}
static struct nbr_adv_t *get_nbr_adv_buf(uint8_t ext_len)
{
return ((struct nbr_adv_t *) & (buffer[LLHDR_ICMPV6HDR_LEN + ext_len]));
return ((struct nbr_adv_t *)&(buffer[LLHDR_ICMPV6HDR_LEN + ext_len]));
}
static struct opt_buf_t *get_opt_buf(uint8_t ext_len, uint8_t opt_len)
static opt_buf_t *get_opt_buf(uint8_t ext_len, uint8_t opt_len)
{
return ((struct opt_buf_t *) & (buffer[LLHDR_ICMPV6HDR_LEN +
return ((opt_buf_t *)&(buffer[LLHDR_ICMPV6HDR_LEN +
ext_len + opt_len]));
}
static struct opt_stllao_t *get_opt_stllao_buf(uint8_t ext_len, uint8_t opt_len)
static opt_stllao_t *get_opt_stllao_buf(uint8_t ext_len, uint8_t opt_len)
{
return ((struct opt_stllao_t *)&(buffer[LLHDR_ICMPV6HDR_LEN +
return ((opt_stllao_t *)&(buffer[LLHDR_ICMPV6HDR_LEN +
ext_len + opt_len]));
}
static struct opt_mtu_t *get_opt_mtu_buf(uint8_t ext_len, uint8_t opt_len)
static opt_mtu_t *get_opt_mtu_buf(uint8_t ext_len, uint8_t opt_len)
{
return ((struct opt_mtu_t *) & (buffer[LLHDR_ICMPV6HDR_LEN +
return ((opt_mtu_t *)&(buffer[LLHDR_ICMPV6HDR_LEN +
ext_len + opt_len]));
}
static struct opt_abro_t *get_opt_abro_buf(uint8_t ext_len, uint8_t opt_len)
static opt_abro_t *get_opt_abro_buf(uint8_t ext_len, uint8_t opt_len)
{
return ((struct opt_abro_t *)&(buffer[LLHDR_ICMPV6HDR_LEN +
return ((opt_abro_t *)&(buffer[LLHDR_ICMPV6HDR_LEN +
ext_len + opt_len]));
}
static struct opt_6co_hdr_t *get_opt_6co_hdr_buf(uint8_t ext_len, uint8_t opt_len)
static opt_6co_hdr_t *get_opt_6co_hdr_buf(uint8_t ext_len, uint8_t opt_len)
{
return ((struct opt_6co_hdr_t *)&(buffer[LLHDR_ICMPV6HDR_LEN +
return ((opt_6co_hdr_t *)&(buffer[LLHDR_ICMPV6HDR_LEN +
ext_len + opt_len]));
}
@ -151,15 +151,15 @@ 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]));
}
static struct opt_pi_t *get_opt_pi_buf(uint8_t ext_len, uint8_t opt_len)
static opt_pi_t *get_opt_pi_buf(uint8_t ext_len, uint8_t opt_len)
{
return ((struct opt_pi_t *)&(buffer[LLHDR_ICMPV6HDR_LEN + ext_len +
return ((opt_pi_t *)&(buffer[LLHDR_ICMPV6HDR_LEN + ext_len +
opt_len]));
}
static struct opt_aro_t *get_opt_aro_buf(uint8_t ext_len, uint8_t opt_len)
static opt_aro_t *get_opt_aro_buf(uint8_t ext_len, uint8_t opt_len)
{
return ((struct opt_aro_t *)&(buffer[LLHDR_ICMPV6HDR_LEN + ext_len +
return ((opt_aro_t *)&(buffer[LLHDR_ICMPV6HDR_LEN + ext_len +
opt_len]));
}

2
sys/net/sixlowpan/sixlowpan.h
View File

@ -55,7 +55,7 @@ extern mutex_t lowpan_context_mutex;
extern uint8_t static_route;
extern uint16_t local_address;
typedef struct lowpan_context_t {
typedef struct {
uint8_t num;
ipv6_addr_t prefix;
uint8_t length;