diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-09-10 15:56:15 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-09-10 15:56:15 -0700 |
| commit | 8d82ac5cc8826e2352e710c579a173f4b4309cd1 (patch) | |
| tree | a38a20b9403cee9653393dd22f6a2b9f3e8ac5c0 /service | |
| parent | b11d429bc0ea848d5559c9720846c6101d6c2a13 (diff) | |
| parent | 9dc2ef554997f5598c9cf2c4d3ca041c3152a962 (diff) | |
| download | infinitytier-8d82ac5cc8826e2352e710c579a173f4b4309cd1.tar.gz infinitytier-8d82ac5cc8826e2352e710c579a173f4b4309cd1.zip | |
Merge branch 'adamierymenko-dev' into netcon
Diffstat (limited to 'service')
| -rw-r--r-- | service/OneService.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 4e9fb8e7..4fdc60f5 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -787,7 +787,7 @@ public: tc->writeBuf.push_back((char)ZEROTIER_ONE_VERSION_MINOR); tc->writeBuf.push_back((char)((ZEROTIER_ONE_VERSION_REVISION >> 8) & 0xff)); tc->writeBuf.push_back((char)(ZEROTIER_ONE_VERSION_REVISION & 0xff)); - _phy.tcpSetNotifyWritable(sock,true); + _phy.setNotifyWritable(sock,true); _tcpFallbackTunnel = tc; } @@ -922,12 +922,12 @@ public: TcpConnection *tc = reinterpret_cast<TcpConnection *>(*uptr); Mutex::Lock _l(tc->writeBuf_m); if (tc->writeBuf.length() > 0) { - long sent = (long)_phy.tcpSend(sock,tc->writeBuf.data(),(unsigned long)tc->writeBuf.length(),true); + long sent = (long)_phy.streamSend(sock,tc->writeBuf.data(),(unsigned long)tc->writeBuf.length(),true); if (sent > 0) { tc->lastActivity = OSUtils::now(); if ((unsigned long)sent >= (unsigned long)tc->writeBuf.length()) { tc->writeBuf = ""; - _phy.tcpSetNotifyWritable(sock,false); + _phy.setNotifyWritable(sock,false); if (!tc->shouldKeepAlive) _phy.close(sock); // will call close handler to delete from _tcpConnections } else { @@ -935,7 +935,7 @@ public: } } } else { - _phy.tcpSetNotifyWritable(sock,false); + _phy.setNotifyWritable(sock,false); } } @@ -1126,7 +1126,7 @@ public: if (_tcpFallbackTunnel) { Mutex::Lock _l(_tcpFallbackTunnel->writeBuf_m); if (!_tcpFallbackTunnel->writeBuf.length()) - _phy.tcpSetNotifyWritable(_tcpFallbackTunnel->sock,true); + _phy.setNotifyWritable(_tcpFallbackTunnel->sock,true); unsigned long mlen = len + 7; _tcpFallbackTunnel->writeBuf.push_back((char)0x17); _tcpFallbackTunnel->writeBuf.push_back((char)0x03); @@ -1229,7 +1229,7 @@ public: tc->writeBuf.append(data); } - _phy.tcpSetNotifyWritable(tc->sock,true); + _phy.setNotifyWritable(tc->sock,true); } inline void onHttpResponseFromClient(TcpConnection *tc) |