void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix tcp-proxy build.

Browse source
This commit is contained in:
Adam Ierymenko 2017-01-26 21:54:55 +00:00
parent 9a475eeff9
commit c111bf3080
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
tcp-proxy/tcp-proxy Executable file
View file

Binary file not shown.

10
tcp-proxy/tcp-proxy.cpp
View file

@ -120,7 +120,7 @@ struct TcpProxyService
return (PhySocket *)0; 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) if (!*uptr)
return; return;
@ -134,7 +134,7 @@ struct TcpProxyService
if ((c.tcpWritePtr + 5 + mlen) <= sizeof(c.tcpWriteBuf)) { if ((c.tcpWritePtr + 5 + mlen) <= sizeof(c.tcpWriteBuf)) {
if (!c.tcpWritePtr) 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++] = 0x17; // look like TLS data
c.tcpWriteBuf[c.tcpWritePtr++] = 0x03; // look like TLS 1.2 c.tcpWriteBuf[c.tcpWritePtr++] = 0x03; // look like TLS 1.2
@ -257,13 +257,13 @@ struct TcpProxyService
{ {
Client &c = *((Client *)*uptr); Client &c = *((Client *)*uptr);
if (c.tcpWritePtr) { if (c.tcpWritePtr) {
long n = phy->tcpSend(sock,c.tcpWriteBuf,c.tcpWritePtr); long n = phy->streamSend(sock,c.tcpWriteBuf,c.tcpWritePtr);
if (n > 0) { if (n > 0) {
memmove(c.tcpWriteBuf,c.tcpWriteBuf + n,c.tcpWritePtr -= (unsigned long)n); memmove(c.tcpWriteBuf,c.tcpWriteBuf + n,c.tcpWritePtr -= (unsigned long)n);
if (!c.tcpWritePtr) if (!c.tcpWritePtr)
phy->tcpSetNotifyWritable(sock,false); phy->setNotifyWritable(sock,false);
} }
} else phy->tcpSetNotifyWritable(sock,false); } else phy->setNotifyWritable(sock,false);
} }
void doHousekeeping() void doHousekeeping()