diff options
author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-01-26 21:54:55 +0000 |
---|---|---|
committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-01-26 21:54:55 +0000 |
commit | c111bf3080a91d4acd242419b0ab1263dfd939f3 (patch) | |
tree | 273eabcf193512f6e12eb014c237de68b2b75040 /tcp-proxy | |
parent | 9a475eeff90a181af0661b87b09af7337e39167a (diff) | |
download | infinitytier-c111bf3080a91d4acd242419b0ab1263dfd939f3.tar.gz infinitytier-c111bf3080a91d4acd242419b0ab1263dfd939f3.zip |
Fix tcp-proxy build.
Diffstat (limited to 'tcp-proxy')
-rwxr-xr-x | tcp-proxy/tcp-proxy | bin | 0 -> 30208 bytes | |||
-rw-r--r-- | tcp-proxy/tcp-proxy.cpp | 10 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tcp-proxy/tcp-proxy b/tcp-proxy/tcp-proxy Binary files differnew file mode 100755 index 00000000..d6376382 --- /dev/null +++ b/tcp-proxy/tcp-proxy diff --git a/tcp-proxy/tcp-proxy.cpp b/tcp-proxy/tcp-proxy.cpp index 2fe500d1..a7906aae 100644 --- a/tcp-proxy/tcp-proxy.cpp +++ b/tcp-proxy/tcp-proxy.cpp @@ -120,7 +120,7 @@ struct TcpProxyService return (PhySocket *)0; } - void phyOnDatagram(PhySocket *sock,void **uptr,const struct sockaddr *from,void *data,unsigned long len) + void phyOnDatagram(PhySocket *sock,void **uptr,const struct sockaddr *localAddr,const struct sockaddr *from,void *data,unsigned long len) { if (!*uptr) return; @@ -134,7 +134,7 @@ struct TcpProxyService if ((c.tcpWritePtr + 5 + mlen) <= sizeof(c.tcpWriteBuf)) { if (!c.tcpWritePtr) - phy->tcpSetNotifyWritable(c.tcp,true); + phy->setNotifyWritable(c.tcp,true); c.tcpWriteBuf[c.tcpWritePtr++] = 0x17; // look like TLS data c.tcpWriteBuf[c.tcpWritePtr++] = 0x03; // look like TLS 1.2 @@ -257,13 +257,13 @@ struct TcpProxyService { Client &c = *((Client *)*uptr); if (c.tcpWritePtr) { - long n = phy->tcpSend(sock,c.tcpWriteBuf,c.tcpWritePtr); + long n = phy->streamSend(sock,c.tcpWriteBuf,c.tcpWritePtr); if (n > 0) { memmove(c.tcpWriteBuf,c.tcpWriteBuf + n,c.tcpWritePtr -= (unsigned long)n); if (!c.tcpWritePtr) - phy->tcpSetNotifyWritable(sock,false); + phy->setNotifyWritable(sock,false); } - } else phy->tcpSetNotifyWritable(sock,false); + } else phy->setNotifyWritable(sock,false); } void doHousekeeping() |