kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-26 15:03:53 +01:00
Code Releases Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Ludwig Ortmann 2013-05-30 09:44:47 +02:00
commit 5795bd6810
10 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ doc/doxygen/html
doc/doxygen/latex
doc/doxygen/man
*bin
*~

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

@ -16,8 +16,8 @@
#include "hwtimer.h"
#include "tcp_timer.h"
#include "tcp_hc.h"
#include "sys/net/net_help/net_help.h"
#include "sys/net/net_help/msg_help.h"
#include "../net_help/net_help.h"
#include "../net_help/msg_help.h"
socket_internal_t sockets[MAX_SOCKETS];

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

@ -12,7 +12,7 @@
#include "tcp.h"
#include "udp.h"
#include "in.h"
#include "sys/net/sixlowpan/sixlowip.h"
#include "../sixlowpan/sixlowip.h"
/*
* Types

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

@ -16,9 +16,9 @@
#include "tcp.h"
#include "in.h"
#include "socket.h"
#include "sys/net/net_help/net_help.h"
#include "sys/net/net_help/msg_help.h"
#include "sys/net/sixlowpan/sixlowpan.h"
#include "../net_help/net_help.h"
#include "../net_help/msg_help.h"
#include "../sixlowpan/sixlowpan.h"
void printTCPHeader(tcp_hdr_t *tcp_header)
{

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

@ -71,7 +71,7 @@ enum tcp_codes
#define TCP_STACK_SIZE 1024
#include "sys/net/sixlowpan/sixlowip.h"
#include "../sixlowpan/sixlowip.h"
typedef struct __attribute__ ((packed)) tcp_mms_o_t
{

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

@ -12,8 +12,8 @@
#include "tcp_hc.h"
#include "socket.h"
#include "tcp.h"
#include "sys/net/sixlowpan/sixlowip.h"
#include "sys/net/net_help/net_help.h"
#include "../sixlowpan/sixlowip.h"
#include "../net_help/net_help.h"
#ifdef TCP_HC

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

@ -9,7 +9,7 @@
#define TCP_HC_H_
#include "tcp.h"
#include "sys/net/sixlowpan/sixlowip.h"
#include "../sixlowpan/sixlowip.h"
#include "socket.h"
#ifdef TCP_HC

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

@ -16,7 +16,7 @@
#include "destiny.h"
#include "socket.h"
#include "net_help/msg_help.h"
#include "sys/net/sixlowpan/sixlowpan.h"
#include "../sixlowpan/sixlowpan.h"
void handle_synchro_timeout(socket_internal_t *current_socket)
{

8
sys/net/destiny/udp.c
View File

@ -5,12 +5,12 @@
#include "udp.h"
#include "msg.h"
#include "sys/net/sixlowpan/sixlowip.h"
#include "sys/net/sixlowpan/sixlowpan.h"
#include "../sixlowpan/sixlowip.h"
#include "../sixlowpan/sixlowpan.h"
#include "socket.h"
#include "in.h"
#include "sys/net/net_help/net_help.h"
#include "sys/net/net_help/msg_help.h"
#include "../net_help/net_help.h"
#include "../net_help/msg_help.h"
uint16_t udp_csum(ipv6_hdr_t *ipv6_header, udp_hdr_t *udp_header)
{

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

@ -12,7 +12,7 @@
#define UDP_STACK_SIZE 512
#include "sys/net/sixlowpan/sixlowip.h"
#include "../sixlowpan/sixlowip.h"
typedef struct __attribute__ ((packed)) udp_h_t{
uint16_t src_port;