bol-van/zapret
1
1
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-12-18 22:11:31 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpws: simplify tcp_info compat code

Browse Source
This commit is contained in:
bol-van 2024-12-14 17:00:26 +03:00
parent fef64e8849
commit 2be5f1221a
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tpws/helpers.c
View File

@ -478,7 +478,7 @@ void msleep(unsigned int ms)
bool socket_supports_notsent() bool socket_supports_notsent()
{ {
int sfd; int sfd;
union my_tcp_info tcpi; struct tcp_info_new tcpi;
sfd = socket(AF_INET,SOCK_STREAM,0); sfd = socket(AF_INET,SOCK_STREAM,0);
if (sfd<0) return false; if (sfd<0) return false;
@ -491,22 +491,22 @@ bool socket_supports_notsent()
} }
close(sfd); close(sfd);
return ts>=((char *)&tcpi.ti.tcpi_notsent_bytes - (char *)&tcpi.ti + sizeof(tcpi.ti.tcpi_notsent_bytes)); return ts>=((char *)&tcpi.tcpi_notsent_bytes - (char *)&tcpi + sizeof(tcpi.tcpi_notsent_bytes));
} }
bool socket_has_notsent(int sfd) bool socket_has_notsent(int sfd)
{ {
union my_tcp_info tcpi; struct tcp_info_new tcpi;
socklen_t ts = sizeof(tcpi); socklen_t ts = sizeof(tcpi);
if (getsockopt(sfd, IPPROTO_TCP, TCP_INFO, (char *)&tcpi, &ts) < 0) if (getsockopt(sfd, IPPROTO_TCP, TCP_INFO, (char *)&tcpi, &ts) < 0)
return false; return false;
if (tcpi.ti.tcpi_state != 1) // TCP_ESTABLISHED if (tcpi.tcpi_state != 1) // TCP_ESTABLISHED
return false; return false;
size_t s = (char *)&tcpi.ti.tcpi_notsent_bytes - (char *)&tcpi.ti + sizeof(tcpi.ti.tcpi_notsent_bytes); size_t s = (char *)&tcpi.tcpi_notsent_bytes - (char *)&tcpi + sizeof(tcpi.tcpi_notsent_bytes);
if (ts < s) if (ts < s)
// old structure version // old structure version
return false; return false;
return !!tcpi.ti.tcpi_notsent_bytes; return !!tcpi.tcpi_notsent_bytes;
} }
bool socket_wait_notsent(int sfd, unsigned int delay_ms, unsigned int *wasted_ms) bool socket_wait_notsent(int sfd, unsigned int delay_ms, unsigned int *wasted_ms)
{ {

6
tpws/linux_compat.h
View File

@ -96,10 +96,4 @@ struct tcp_info_new {
*/ */
}; };
union my_tcp_info
{
struct tcp_info ti_native;
struct tcp_info_new ti;
};
#endif #endif