diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2015-01-31 19:18:47 +0900 |
---|---|---|
committer | Lorenzo Colitti <lorenzo@google.com> | 2015-02-03 17:48:28 +0900 |
commit | 49454814a0a714189916cb2aea1922bc8784b13b (patch) | |
tree | b7de5a5f6943490c92980b11938b97e438888164 | |
parent | 9353be2a5f1b4fd00b04e4c826f7f3c3ec6c5d46 (diff) | |
download | android_external_android-clat-49454814a0a714189916cb2aea1922bc8784b13b.tar.gz android_external_android-clat-49454814a0a714189916cb2aea1922bc8784b13b.tar.bz2 android_external_android-clat-49454814a0a714189916cb2aea1922bc8784b13b.zip |
Make the raw socket and the tun fd nonblocking.
Change-Id: I29a3d510ba0b766488bbd66d57829d9aaf70d21d
-rw-r--r-- | clatd.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -214,7 +214,7 @@ void drop_root() { * mark - the socket mark to use for the sending raw socket */ void open_sockets(struct tun_data *tunnel, uint32_t mark) { - int rawsock = socket(AF_INET6, SOCK_RAW, IPPROTO_RAW); + int rawsock = socket(AF_INET6, SOCK_RAW | SOCK_NONBLOCK, IPPROTO_RAW); if (rawsock < 0) { logmsg(ANDROID_LOG_FATAL, "raw socket failed: %s", strerror(errno)); exit(1); @@ -276,6 +276,12 @@ void configure_interface(const char *uplink_interface, const char *plat_prefix, exit(1); } + error = set_nonblocking(tunnel->fd4); + if (error < 0) { + logmsg(ANDROID_LOG_FATAL, "set_nonblocking failed: %s", strerror(errno)); + exit(1); + } + configure_tun_ip(tunnel); } @@ -292,7 +298,9 @@ void read_packet(int read_fd, int write_fd, int to_ipv6) { readlen = read(read_fd, buf, PACKETLEN); if(readlen < 0) { - logmsg(ANDROID_LOG_WARN,"read_packet/read error: %s", strerror(errno)); + if (errno != EAGAIN) { + logmsg(ANDROID_LOG_WARN,"read_packet/read error: %s", strerror(errno)); + } return; } else if(readlen == 0) { logmsg(ANDROID_LOG_WARN,"read_packet/tun interface removed"); |