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

Merge pull request #421 from OlegHahm/revert_tcp_optional

Browse Source 
Revert tcp optional
This commit is contained in:
Martin Lenders 2013-12-17 05:45:30 -08:00
commit 41da8481dd
3 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,11 +28,11 @@
#include "tcp_timer.h"
#include "udp.h"
#ifdef DESTINY_WITH_TCP
char tcp_stack_buffer[TCP_STACK_SIZE];
#endif
char udp_stack_buffer[UDP_STACK_SIZE];
char tcp_timer_stack[TCP_TIMER_STACKSIZE];
int destiny_init_transport_layer(void)
{
printf("Initializing transport layer packages. Size of socket_type: %u\n",
@ -51,7 +51,6 @@ int destiny_init_transport_layer(void)
ipv6_register_next_header_handler(IPV6_PROTO_NUM_UDP, udp_thread_pid);
#ifdef DESTINY_WITH_TCP
/* TCP */
timex_t now;
vtimer_now(&now);
@ -76,7 +75,6 @@ int destiny_init_transport_layer(void)
CREATE_STACKTEST, tcp_general_timer, "tcp_general_timer") < 0) {
return -1;
}
#endif
return 0;
}

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

@ -29,11 +29,9 @@
#include "net_help.h"
#include "msg_help.h"
#ifdef DESTINY_WITH_TCP
#include "tcp.h"
#include "tcp_hc.h"
#include "tcp_timer.h"
#endif
#include "udp.h"
#include "socket.h"
@ -44,14 +42,11 @@ socket_internal_t sockets[MAX_SOCKETS];
void print_socket(socket_t *current_socket);
void print_internal_socket(socket_internal_t *current_socket_internal);
#ifdef DESTINY_WITH_TCP
void printf_tcp_context(tcp_hc_context_t *current_tcp_context);
#endif
int exists_socket(int socket);
void set_socket_address(sockaddr6_t *sockaddr, sa_family_t sin6_family,
uint16_t sin6_port, uint32_t sin6_flowinfo,
ipv6_addr_t *sin6_addr);
#ifdef DESTINY_WITH_TCP
void set_tcp_packet(tcp_hdr_t *tcp_hdr, uint16_t src_port, uint16_t dst_port,
uint32_t seq_nr, uint32_t ack_nr,
uint8_t dataOffset_reserved, uint8_t reserved_flags,
@ -145,7 +140,6 @@ void print_tcp_status(int in_or_out, ipv6_hdr_t *ipv6_header,
printf_tcp_context(&tcp_socket->tcp_control.tcp_context);
#endif
}
#endif
void print_socket(socket_t *current_socket)
{
@ -227,7 +221,6 @@ bool isUDPSocket(uint8_t s)
}
}
#ifdef DESTINY_WITH_TCP
bool is_tcp_socket(int s)
{
if ((exists_socket(s)) &&
@ -241,7 +234,6 @@ bool is_tcp_socket(int s)
return false;
}
}
#endif
int bind_udp_socket(int s, sockaddr6_t *name, int namelen, uint8_t pid)
{
@ -263,7 +255,6 @@ int bind_udp_socket(int s, sockaddr6_t *name, int namelen, uint8_t pid)
return 0;
}
#ifdef DESTINY_WITH_TCP
int bind_tcp_socket(int s, sockaddr6_t *name, int namelen, uint8_t pid)
{
int i;
@ -284,7 +275,6 @@ int bind_tcp_socket(int s, sockaddr6_t *name, int namelen, uint8_t pid)
get_socket(s)->socket_values.tcp_control.rto = TCP_INITIAL_ACK_TIMEOUT;
return 0;
}
#endif
int destiny_socket(int domain, int type, int protocol)
{
@ -336,7 +326,6 @@ bool is_four_touple(socket_internal_t *current_socket, ipv6_hdr_t *ipv6_header,
(current_socket->socket_values.foreign_address.sin6_port == tcp_header->src_port));
}
#ifdef DESTINY_WITH_TCP
socket_internal_t *get_tcp_socket(ipv6_hdr_t *ipv6_header, tcp_hdr_t *tcp_header)
{
uint8_t i = 1;
@ -373,7 +362,6 @@ socket_internal_t *get_tcp_socket(ipv6_hdr_t *ipv6_header, tcp_hdr_t *tcp_header
/* Return either NULL if nothing was matched or the listening 2 touple socket */
return listening_socket;
}
#endif
uint16_t get_free_source_port(uint8_t protocol)
{
@ -400,7 +388,6 @@ void set_socket_address(sockaddr6_t *sockaddr, uint8_t sin6_family,
memcpy(&sockaddr->sin6_addr, sin6_addr, 16);
}
#ifdef DESTINY_WITH_TCP
void set_tcp_packet(tcp_hdr_t *tcp_hdr, uint16_t src_port, uint16_t dst_port,
uint32_t seq_nr, uint32_t ack_nr, uint8_t dataOffset_reserved,
uint8_t reserved_flags, uint16_t window, uint16_t checksum,
@ -743,12 +730,10 @@ int32_t destiny_socket_send(int s, const void *buf, uint32_t len, int flags)
ipv6_hdr_t *temp_ipv6_header = ((ipv6_hdr_t *)(&send_buffer));
tcp_hdr_t *current_tcp_packet = ((tcp_hdr_t *)(&send_buffer[IPV6_HDR_LEN]));
#ifdef DESTINY_WITH_TCP
/* Check if socket exists and is TCP socket */
if (!is_tcp_socket(s)) {
return -1;
}
#endif
current_int_tcp_socket = get_socket(s);
current_tcp_socket = &current_int_tcp_socket->socket_values;
@ -942,13 +927,11 @@ int32_t destiny_socket_recv(int s, void *buf, uint32_t len, int flags)
msg_t m_recv, m_send;
socket_internal_t *current_int_tcp_socket;
#ifdef DESTINY_WITH_TCP
/* Check if socket exists */
if (!is_tcp_socket(s)) {
printf("INFO: NO TCP SOCKET!\n");
return -1;
}
#endif
current_int_tcp_socket = get_socket(s);
@ -978,7 +961,6 @@ int32_t destiny_socket_recv(int s, void *buf, uint32_t len, int flags)
/* Received Last ACK (connection closed) or no data to read yet */
return -1;
}
#endif
int32_t destiny_socket_recvfrom(int s, void *buf, uint32_t len, int flags,
sockaddr6_t *from, uint32_t *fromlen)
@ -1009,11 +991,9 @@ int32_t destiny_socket_recvfrom(int s, void *buf, uint32_t len, int flags,
msg_reply(&m_recv, &m_send);
return NTOHS(udp_header->length) - UDP_HDR_LEN;
}
#ifdef DESTINY_WITH_TCP
else if (is_tcp_socket(s)) {
return destiny_socket_recv(s, buf, len, flags);
}
#endif
else {
printf("Socket Type not supported!\n");
return -1;
@ -1065,7 +1045,6 @@ int destiny_socket_close(int s)
socket_internal_t *current_socket = get_socket(s);
if (current_socket != NULL) {
#ifdef DESTINY_WITH_TCP
if (is_tcp_socket(s)) {
/* Variables */
msg_t m_recv;
@ -1100,9 +1079,7 @@ int destiny_socket_close(int s)
close_socket(current_socket);
return 1;
}
else
#endif
if (isUDPSocket(s)) {
else if (isUDPSocket(s)) {
close_socket(current_socket);
return 0;
}
@ -1129,7 +1106,6 @@ int destiny_socket_bind(int s, sockaddr6_t *addr, int addrlen)
case (PF_INET6): {
switch (current_socket->type) {
/* TCP */
#ifdef DESTINY_WITH_TCP
case (SOCK_STREAM): {
if ((current_socket->protocol == 0) ||
(current_socket->protocol == IPPROTO_TCP)) {
@ -1144,7 +1120,6 @@ int destiny_socket_bind(int s, sockaddr6_t *addr, int addrlen)
break;
}
#endif
/* UDP */
case (SOCK_DGRAM): {
@ -1198,7 +1173,6 @@ int destiny_socket_bind(int s, sockaddr6_t *addr, int addrlen)
return -1;
}
#ifdef DESTINY_WITH_TCP
int destiny_socket_listen(int s, int backlog)
{
(void) backlog;
@ -1409,4 +1383,3 @@ socket_internal_t *new_tcp_queued_socket(ipv6_hdr_t *ipv6_header,
return current_queued_socket;
}
#endif

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

@ -15,7 +15,6 @@
* @}
*/
#ifdef DESTINY_WITH_TCP
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
@ -32,8 +31,6 @@
#include "tcp_timer.h"
char tcp_timer_stack[TCP_TIMER_STACKSIZE];
void handle_synchro_timeout(socket_internal_t *current_socket)
{
msg_t send;
@ -160,4 +157,3 @@ void tcp_general_timer(void)
thread_sleep();
}
}
#endif