deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #899 from g-oikonomou/tcp-sock-max-seg

Browse source 
Allow specifying a max outgoing segment size per TCP socket
This commit is contained in:
Adam Dunkels 2014-12-09 08:15:30 +01:00
parent ce914b3173 0dbed5b919
commit 47ecc8b5a6
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/net/ip/tcp-socket.c
View file

@ -56,10 +56,10 @@ call_event(struct tcp_socket *s, tcp_socket_event_t event)
static void static void
senddata(struct tcp_socket *s) senddata(struct tcp_socket *s)
{ {
int len; int len = MIN(s->output_data_max_seg, uip_mss());
if(s->output_data_len > 0) { if(s->output_data_len > 0) {
len = MIN(s->output_data_len, uip_mss()); len = MIN(s->output_data_len, len);
s->output_data_send_nxt = len; s->output_data_send_nxt = len;
uip_send(s->output_data_ptr, len); uip_send(s->output_data_ptr, len);
} }
@ -255,6 +255,7 @@ tcp_socket_register(struct tcp_socket *s, void *ptr,
s->input_data_maxlen = input_databuf_len; s->input_data_maxlen = input_databuf_len;
s->output_data_ptr = output_databuf; s->output_data_ptr = output_databuf;
s->output_data_maxlen = output_databuf_len; s->output_data_maxlen = output_databuf_len;
s->output_data_max_seg = uip_mss();
s->input_callback = input_callback; s->input_callback = input_callback;
s->event_callback = event_callback; s->event_callback = event_callback;
list_add(socketlist, s); list_add(socketlist, s);

1
core/net/ip/tcp-socket.h
View file

@ -95,6 +95,7 @@ struct tcp_socket {
uint16_t output_data_maxlen; uint16_t output_data_maxlen;
uint16_t output_data_len; uint16_t output_data_len;
uint16_t output_data_send_nxt; uint16_t output_data_send_nxt;
uint16_t output_data_max_seg;
uint8_t flags; uint8_t flags;
uint16_t listen_port; uint16_t listen_port;