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

Merge pull request #256 from OlegHahm/destiny_fixes

Browse Source 
Destiny fixes
This commit is contained in:
Martin Lenders 2013-10-25 05:27:28 -07:00
commit fa01202b65
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/net/destiny/tcp.h
View File

@ -76,7 +76,7 @@ enum tcp_codes {
#define SET_TCP_FIN(a) a = ((a & 0x00) | TCP_FIN)
#define SET_TCP_FIN_ACK(a) a = ((a & 0x00) | TCP_FIN_ACK)
#define TCP_STACK_SIZE 1024
#define TCP_STACK_SIZE KERNEL_CONF_STACKSIZE_DEFAULT
#include "ipv6.h"

2
sys/net/destiny/tcp_timer.h
View File

@ -11,7 +11,7 @@
#define TCP_TIMER_RESOLUTION 500*1000
#define SECOND 1000.0f*1000.0f
#define TCP_TIMER_STACKSIZE 512
#define TCP_TIMER_STACKSIZE KERNEL_CONF_STACKSIZE_DEFAULT
#define TCP_SYN_INITIAL_TIMEOUT 6*SECOND
#define TCP_SYN_TIMEOUT 24*SECOND
#define TCP_MAX_SYN_RETRIES 3

2
sys/net/destiny/udp.h
View File

@ -27,7 +27,7 @@
#define UDP_HDR_LEN 8
#define UDP_STACK_SIZE 512
#define UDP_STACK_SIZE KERNEL_CONF_STACKSIZE_DEFAULT
#include "ipv6.h"

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

@ -32,7 +32,6 @@
#include "lowpan.h"
#include "net_help.h"
#include "msg_help.h"
#define IP_PKT_RECV_BUF_SIZE (64)
#define LLHDR_IPV6HDR_LEN (LL_HDR_LEN + IPV6_HDR_LEN)
@ -593,10 +592,10 @@ char *ipv6_addr_to_str(char *addr_str, const ipv6_addr_t *ipv6_addr)
{
sprintf(addr_str,
"%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x",
ipv6_addr->uint16[0], ipv6_addr->uint16[1],
ipv6_addr->uint16[2], ipv6_addr->uint16[3],
ipv6_addr->uint16[4], ipv6_addr->uint16[5],
ipv6_addr->uint16[6], ipv6_addr->uint16[7]);
NTOHS(ipv6_addr->uint16[0]), NTOHS(ipv6_addr->uint16[1]),
NTOHS(ipv6_addr->uint16[2]), NTOHS(ipv6_addr->uint16[3]),
NTOHS(ipv6_addr->uint16[4]), NTOHS(ipv6_addr->uint16[5]),
NTOHS(ipv6_addr->uint16[6]), NTOHS(ipv6_addr->uint16[7]));
return addr_str;
}