From c111bf3080a91d4acd242419b0ab1263dfd939f3 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 26 Jan 2017 21:54:55 +0000 Subject: [PATCH] Fix tcp-proxy build. --- tcp-proxy/tcp-proxy | Bin 0 -> 30208 bytes tcp-proxy/tcp-proxy.cpp | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) create mode 100755 tcp-proxy/tcp-proxy diff --git a/tcp-proxy/tcp-proxy b/tcp-proxy/tcp-proxy new file mode 100755 index 0000000000000000000000000000000000000000..d6376382ac748211a5f75c0aa04a597e82a78c31 GIT binary patch literal 30208 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

_?hL$86DF zZ*Fg5CkTA3)Ej7uEcEe(l#-^i?lS~W8h<%I^Z;>NKl|!JatY{udvP^=s?h1b29UuF zC6N;!Cm12~*A6wMn8VU%AN;M!wgpCjzK)Uju0V1z=#vR)K4dW>d;T?y44*|vj;>$S zpQ02dgyCBYNn%jLQrePJ(ElqXQ~t>Ys02f(ZiDDU9K*vU)d?GTC9j{xHYjxDHz1OV zqkj*=@Z|^owSv^*;Bye1B#c1Prxy^$zgM7t-XJ+SOd7tLFigW&3fSilhAH&10{S#V zGKGBzK_3qEwcP*YNhch%B;?Ec#QB=|E}VETK;*%fj{=o0g%4XziS#vDPGETXo-?#D zZ1^Ge0R_bYk1@THr=^p}(^vbt66X%_^=Ya?(-c!*rT~^^I zsN!c#-^tHKJ9&CmXhQ<=FBJlAN=?uAe>yMF6V*>KB!*X{6VylHG3GDM58j=l$G|pY zl1pvBn-NOsh5p5U`5;ffKPmOd{2xzAFV1bn_Y1eCq)*L%TS|Iyz8fgj6V{|85cMzE z_NJs4=Y)Ia=`q+%`64o43Onf#Xw+2rc6s8wSbPsLHNRAx{;kGhNH5OYv`P@+QsbxM z#}J3~FY*`Xw}WSx{sW{HeGA^iIkos+rKniZzD53`9StFkF@JHMJ+y?lWtLy?IfXdJ z^oeutDwbU8p+JKZ=>(+znlh#r=i@y$>WNb8D-|Dy#KcSJPn^4K;^_wsd6U5RDOdxA#LTCHQ9+>U+|DD5E&y$Sn8 W{X1R$J+%mc`!!FmW5aR_{J#JPpMOXI literal 0 HcmV?d00001 diff --git a/tcp-proxy/tcp-proxy.cpp b/tcp-proxy/tcp-proxy.cpp index 2fe500d18..a7906aae7 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()