Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

desktop: setup TCP sockets as non-blocking 

the sendto() blocks unexpectedly on MacOS
This commit is contained in:
Andrew Tridgell 2011-11-28 13:10:58 +11:00
parent 833f5f5895
commit af075b6ab0
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/Desktop/support/FastSerial.cpp
View File

@ -45,6 +45,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include "desktop.h" #include "desktop.h"
#include "util.h"
#define LISTEN_BASE_PORT 5760 #define LISTEN_BASE_PORT 5760
#define BUFFER_SIZE 128 #define BUFFER_SIZE 128
@ -129,6 +130,9 @@ static void tcp_start_connection(unsigned int serial_port, bool wait_for_connect
} }
setsockopt(s->fd, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one)); setsockopt(s->fd, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));
s->connected = true; s->connected = true;
if (!desktop_state.slider) {
set_nonblocking(s->fd);
}
} }
} }
@ -171,6 +175,9 @@ static void check_connection(struct tcp_state *s)
s->connected = true; s->connected = true;
setsockopt(s->fd, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one)); setsockopt(s->fd, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));
printf("New connection on serial port %u\n", s->serial_port); printf("New connection on serial port %u\n", s->serial_port);
if (!desktop_state.slider) {
set_nonblocking(s->fd);
}
} }
} }
} }