diff --git a/tpws/helpers.c b/tpws/helpers.c index c25fd4f..801b213 100644 --- a/tpws/helpers.c +++ b/tpws/helpers.c @@ -11,6 +11,10 @@ #include #include +#ifdef __linux__ +#include +#endif + #ifdef __ANDROID__ #include "andr/ifaddrs.h" #else @@ -34,9 +38,9 @@ static int cmp_size_t(const void * a, const void * b) { return *(size_t*)a < *(size_t*)b ? -1 : *(size_t*)a > *(size_t*)b; } -void qsort_size_t(size_t *array,size_t ct) +void qsort_size_t(size_t *array, size_t ct) { - qsort(array,ct,sizeof(*array),cmp_size_t); + qsort(array, ct, sizeof(*array), cmp_size_t); } @@ -48,10 +52,10 @@ void rtrim(char *s) void replace_char(char *s, char from, char to) { - for(;*s;s++) if (*s==from) *s=to; + for (; *s; s++) if (*s == from) *s = to; } -char *strncasestr(const char *s,const char *find, size_t slen) +char *strncasestr(const char *s, const char *find, size_t slen) { char c, sc; size_t len; @@ -92,9 +96,9 @@ bool load_file(const char *filename, void *buffer, size_t *buffer_size) bool append_to_list_file(const char *filename, const char *s) { - FILE *F = fopen(filename,"at"); + FILE *F = fopen(filename, "at"); if (!F) return false; - bool bOK = fprintf(F,"%s\n",s)>0; + bool bOK = fprintf(F, "%s\n", s) > 0; fclose(F); return bOK; } @@ -102,7 +106,7 @@ bool append_to_list_file(const char *filename, const char *s) void ntop46(const struct sockaddr *sa, char *str, size_t len) { if (!len) return; - *str=0; + *str = 0; switch (sa->sa_family) { case AF_INET: @@ -112,50 +116,50 @@ void ntop46(const struct sockaddr *sa, char *str, size_t len) inet_ntop(sa->sa_family, &((struct sockaddr_in6*)sa)->sin6_addr, str, len); break; default: - snprintf(str,len,"UNKNOWN_FAMILY_%d",sa->sa_family); + snprintf(str, len, "UNKNOWN_FAMILY_%d", sa->sa_family); } } void ntop46_port(const struct sockaddr *sa, char *str, size_t len) { char ip[40]; - ntop46(sa,ip,sizeof(ip)); + ntop46(sa, ip, sizeof(ip)); switch (sa->sa_family) { case AF_INET: - snprintf(str,len,"%s:%u",ip,ntohs(((struct sockaddr_in*)sa)->sin_port)); + snprintf(str, len, "%s:%u", ip, ntohs(((struct sockaddr_in*)sa)->sin_port)); break; case AF_INET6: - snprintf(str,len,"[%s]:%u",ip,ntohs(((struct sockaddr_in6*)sa)->sin6_port)); + snprintf(str, len, "[%s]:%u", ip, ntohs(((struct sockaddr_in6*)sa)->sin6_port)); break; default: - snprintf(str,len,"%s",ip); + snprintf(str, len, "%s", ip); } } void print_sockaddr(const struct sockaddr *sa) { char ip_port[48]; - ntop46_port(sa,ip_port,sizeof(ip_port)); - printf("%s",ip_port); + ntop46_port(sa, ip_port, sizeof(ip_port)); + printf("%s", ip_port); } // -1 = error, 0 = not local, 1 = local bool check_local_ip(const struct sockaddr *saddr) { - struct ifaddrs *addrs,*a; + struct ifaddrs *addrs, *a; if (is_localnet(saddr)) return true; - if (getifaddrs(&addrs)<0) return false; - a = addrs; + if (getifaddrs(&addrs) < 0) return false; + a = addrs; - bool bres=false; + bool bres = false; while (a) { - if (a->ifa_addr && sacmp(a->ifa_addr,saddr)) + if (a->ifa_addr && sacmp(a->ifa_addr, saddr)) { - bres=true; + bres = true; break; } a = a->ifa_next; @@ -177,7 +181,7 @@ void print_addrinfo(const struct addrinfo *ai) break; case AF_INET6: if (inet_ntop(ai->ai_family, &((struct sockaddr_in6*)ai->ai_addr)->sin6_addr, str, sizeof(str))) - printf( "%s\n", str); + printf("%s\n", str); break; } ai = ai->ai_next; @@ -189,23 +193,23 @@ void print_addrinfo(const struct addrinfo *ai) bool saismapped(const struct sockaddr_in6 *sa) { // ::ffff:1.2.3.4 - return !memcmp(sa->sin6_addr.s6_addr,"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff",12); + return !memcmp(sa->sin6_addr.s6_addr, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff", 12); } -bool samappedcmp(const struct sockaddr_in *sa1,const struct sockaddr_in6 *sa2) +bool samappedcmp(const struct sockaddr_in *sa1, const struct sockaddr_in6 *sa2) { - return saismapped(sa2) && !memcmp(sa2->sin6_addr.s6_addr+12,&sa1->sin_addr.s_addr,4); + return saismapped(sa2) && !memcmp(sa2->sin6_addr.s6_addr + 12, &sa1->sin_addr.s_addr, 4); } -bool sacmp(const struct sockaddr *sa1,const struct sockaddr *sa2) +bool sacmp(const struct sockaddr *sa1, const struct sockaddr *sa2) { - return (sa1->sa_family==AF_INET && sa2->sa_family==AF_INET && !memcmp(&((struct sockaddr_in*)sa1)->sin_addr,&((struct sockaddr_in*)sa2)->sin_addr,sizeof(struct in_addr))) || - (sa1->sa_family==AF_INET6 && sa2->sa_family==AF_INET6 && !memcmp(&((struct sockaddr_in6*)sa1)->sin6_addr,&((struct sockaddr_in6*)sa2)->sin6_addr,sizeof(struct in6_addr))) || - (sa1->sa_family==AF_INET && sa2->sa_family==AF_INET6 && samappedcmp((struct sockaddr_in*)sa1,(struct sockaddr_in6*)sa2)) || - (sa1->sa_family==AF_INET6 && sa2->sa_family==AF_INET && samappedcmp((struct sockaddr_in*)sa2,(struct sockaddr_in6*)sa1)); + return (sa1->sa_family == AF_INET && sa2->sa_family == AF_INET && !memcmp(&((struct sockaddr_in*)sa1)->sin_addr, &((struct sockaddr_in*)sa2)->sin_addr, sizeof(struct in_addr))) || + (sa1->sa_family == AF_INET6 && sa2->sa_family == AF_INET6 && !memcmp(&((struct sockaddr_in6*)sa1)->sin6_addr, &((struct sockaddr_in6*)sa2)->sin6_addr, sizeof(struct in6_addr))) || + (sa1->sa_family == AF_INET && sa2->sa_family == AF_INET6 && samappedcmp((struct sockaddr_in*)sa1, (struct sockaddr_in6*)sa2)) || + (sa1->sa_family == AF_INET6 && sa2->sa_family == AF_INET && samappedcmp((struct sockaddr_in*)sa2, (struct sockaddr_in6*)sa1)); } uint16_t saport(const struct sockaddr *sa) { - return htons(sa->sa_family==AF_INET ? ((struct sockaddr_in*)sa)->sin_port : - sa->sa_family==AF_INET6 ? ((struct sockaddr_in6*)sa)->sin6_port : 0); + return htons(sa->sa_family == AF_INET ? ((struct sockaddr_in*)sa)->sin_port : + sa->sa_family == AF_INET6 ? ((struct sockaddr_in6*)sa)->sin6_port : 0); } bool saconvmapped(struct sockaddr_storage *a) { @@ -223,16 +227,16 @@ bool saconvmapped(struct sockaddr_storage *a) void sacopy(struct sockaddr_storage *sa_dest, const struct sockaddr *sa) { - switch(sa->sa_family) + switch (sa->sa_family) { - case AF_INET: - memcpy(sa_dest,sa,sizeof(struct sockaddr_in)); - break; - case AF_INET6: - memcpy(sa_dest,sa,sizeof(struct sockaddr_in6)); - break; - default: - sa_dest->ss_family = 0; + case AF_INET: + memcpy(sa_dest, sa, sizeof(struct sockaddr_in)); + break; + case AF_INET6: + memcpy(sa_dest, sa, sizeof(struct sockaddr_in6)); + break; + default: + sa_dest->ss_family = 0; } } void sa46copy(sockaddr_in46 *sa_dest, const struct sockaddr *sa) @@ -243,17 +247,17 @@ void sa46copy(sockaddr_in46 *sa_dest, const struct sockaddr *sa) bool is_localnet(const struct sockaddr *a) { // match 127.0.0.0/8, 0.0.0.0, ::1, ::0, :ffff:127.0.0.0/104, :ffff:0.0.0.0 - return (a->sa_family==AF_INET && (IN_LOOPBACK(ntohl(((struct sockaddr_in *)a)->sin_addr.s_addr)) || - INADDR_ANY == ntohl((((struct sockaddr_in *)a)->sin_addr.s_addr)))) || - (a->sa_family==AF_INET6 && (IN6_IS_ADDR_LOOPBACK(&((struct sockaddr_in6 *)a)->sin6_addr) || - IN6_IS_ADDR_UNSPECIFIED(&((struct sockaddr_in6 *)a)->sin6_addr) || - (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)a)->sin6_addr) && (IN_LOOPBACK(ntohl(IN6_EXTRACT_MAP4(((struct sockaddr_in6*)a)->sin6_addr.s6_addr))) || - INADDR_ANY == ntohl(IN6_EXTRACT_MAP4(((struct sockaddr_in6*)a)->sin6_addr.s6_addr)))))); + return (a->sa_family == AF_INET && (IN_LOOPBACK(ntohl(((struct sockaddr_in *)a)->sin_addr.s_addr)) || + INADDR_ANY == ntohl((((struct sockaddr_in *)a)->sin_addr.s_addr)))) || + (a->sa_family == AF_INET6 && (IN6_IS_ADDR_LOOPBACK(&((struct sockaddr_in6 *)a)->sin6_addr) || + IN6_IS_ADDR_UNSPECIFIED(&((struct sockaddr_in6 *)a)->sin6_addr) || + (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)a)->sin6_addr) && (IN_LOOPBACK(ntohl(IN6_EXTRACT_MAP4(((struct sockaddr_in6*)a)->sin6_addr.s6_addr))) || + INADDR_ANY == ntohl(IN6_EXTRACT_MAP4(((struct sockaddr_in6*)a)->sin6_addr.s6_addr)))))); } bool is_linklocal(const struct sockaddr_in6 *a) { // fe80::/10 - return a->sin6_addr.s6_addr[0]==0xFE && (a->sin6_addr.s6_addr[1] & 0xC0)==0x80; + return a->sin6_addr.s6_addr[0] == 0xFE && (a->sin6_addr.s6_addr[1] & 0xC0) == 0x80; } bool is_private6(const struct sockaddr_in6* a) { @@ -265,23 +269,23 @@ bool is_private6(const struct sockaddr_in6* a) bool set_keepalive(int fd) { - int yes=1; - return setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &yes, sizeof(int))!=-1; + int yes = 1; + return setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &yes, sizeof(int)) != -1; } bool set_ttl(int fd, int ttl) { - return setsockopt(fd, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl))!=-1; + return setsockopt(fd, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl)) != -1; } bool set_hl(int fd, int hl) { - return setsockopt(fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &hl, sizeof(hl))!=-1; + return setsockopt(fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &hl, sizeof(hl)) != -1; } bool set_ttl_hl(int fd, int ttl) { - bool b1,b2; + bool b1, b2; // try to set both but one may fail if family is wrong - b1=set_ttl(fd, ttl); - b2=set_hl(fd, ttl); + b1 = set_ttl(fd, ttl); + b2 = set_hl(fd, ttl); return b1 || b2; } int get_so_error(int fd) @@ -289,8 +293,8 @@ int get_so_error(int fd) // getsockopt(SO_ERROR) clears error int errn; socklen_t optlen = sizeof(errn); - if(getsockopt(fd, SOL_SOCKET, SO_ERROR, &errn, &optlen) == -1) - errn=errno; + if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &errn, &optlen) == -1) + errn = errno; return errn; } @@ -300,53 +304,53 @@ int fprint_localtime(FILE *F) time_t now; time(&now); - localtime_r(&now,&t); + localtime_r(&now, &t); return fprintf(F, "%02d.%02d.%04d %02d:%02d:%02d", t.tm_mday, t.tm_mon + 1, t.tm_year + 1900, t.tm_hour, t.tm_min, t.tm_sec); } time_t file_mod_time(const char *filename) { struct stat st; - return stat(filename,&st)==-1 ? 0 : st.st_mtime; + return stat(filename, &st) == -1 ? 0 : st.st_mtime; } bool pf_in_range(uint16_t port, const port_filter *pf) { - return port && (((!pf->from && !pf->to) || (port>=pf->from && port<=pf->to)) ^ pf->neg); + return port && (((!pf->from && !pf->to) || (port >= pf->from && port <= pf->to)) ^ pf->neg); } bool pf_parse(const char *s, port_filter *pf) { - unsigned int v1,v2; + unsigned int v1, v2; char c; if (!s) return false; - if (*s=='*' && s[1]==0) + if (*s == '*' && s[1] == 0) { - pf->from=1; pf->to=0xFFFF; + pf->from = 1; pf->to = 0xFFFF; return true; } - if (*s=='~') + if (*s == '~') { - pf->neg=true; + pf->neg = true; s++; } else - pf->neg=false; - if (sscanf(s,"%u-%u%c",&v1,&v2,&c)==2) + pf->neg = false; + if (sscanf(s, "%u-%u%c", &v1, &v2, &c) == 2) { - if (v1>65535 || v2>65535 || v1>v2) return false; - pf->from=(uint16_t)v1; - pf->to=(uint16_t)v2; + if (v1 > 65535 || v2 > 65535 || v1 > v2) return false; + pf->from = (uint16_t)v1; + pf->to = (uint16_t)v2; } - else if (sscanf(s,"%u%c",&v1,&c)==1) + else if (sscanf(s, "%u%c", &v1, &c) == 1) { - if (v1>65535) return false; - pf->to=pf->from=(uint16_t)v1; + if (v1 > 65535) return false; + pf->to = pf->from = (uint16_t)v1; } else return false; // deny all case - if (!pf->from && !pf->to) pf->neg=true; + if (!pf->from && !pf->to) pf->neg = true; return true; } bool pf_is_empty(const port_filter *pf) @@ -357,12 +361,12 @@ bool pf_is_empty(const port_filter *pf) bool set_env_exedir(const char *argv0) { - char *s,*d; - bool bOK=false; + char *s, *d; + bool bOK = false; if ((s = strdup(argv0))) { if ((d = dirname(s))) - setenv("EXEDIR",s,1); + setenv("EXEDIR", s, 1); free(s); } return bOK; @@ -372,23 +376,23 @@ bool set_env_exedir(const char *argv0) static void mask_from_preflen6_make(uint8_t plen, struct in6_addr *a) { if (plen >= 128) - memset(a->s6_addr,0xFF,16); + memset(a->s6_addr, 0xFF, 16); else { uint8_t n = plen >> 3; - memset(a->s6_addr,0xFF,n); - memset(a->s6_addr+n,0x00,16-n); + memset(a->s6_addr, 0xFF, n); + memset(a->s6_addr + n, 0x00, 16 - n); a->s6_addr[n] = (uint8_t)(0xFF00 >> (plen & 7)); } } struct in6_addr ip6_mask[129]; void mask_from_preflen6_prepare(void) { - for (int plen=0;plen<=128;plen++) mask_from_preflen6_make(plen, ip6_mask+plen); + for (int plen = 0; plen <= 128; plen++) mask_from_preflen6_make(plen, ip6_mask + plen); } #if defined(__GNUC__) && !defined(__llvm__) -__attribute__((optimize ("no-strict-aliasing"))) +__attribute__((optimize("no-strict-aliasing"))) #endif void ip6_and(const struct in6_addr * restrict a, const struct in6_addr * restrict b, struct in6_addr * restrict result) { @@ -400,64 +404,116 @@ void ip6_and(const struct in6_addr * restrict a, const struct in6_addr * restric void str_cidr4(char *s, size_t s_len, const struct cidr4 *cidr) { char s_ip[16]; - *s_ip=0; + *s_ip = 0; inet_ntop(AF_INET, &cidr->addr, s_ip, sizeof(s_ip)); - snprintf(s,s_len,cidr->preflen<32 ? "%s/%u" : "%s", s_ip, cidr->preflen); + snprintf(s, s_len, cidr->preflen < 32 ? "%s/%u" : "%s", s_ip, cidr->preflen); } void print_cidr4(const struct cidr4 *cidr) { char s[19]; - str_cidr4(s,sizeof(s),cidr); - printf("%s",s); + str_cidr4(s, sizeof(s), cidr); + printf("%s", s); } void str_cidr6(char *s, size_t s_len, const struct cidr6 *cidr) { char s_ip[40]; - *s_ip=0; + *s_ip = 0; inet_ntop(AF_INET6, &cidr->addr, s_ip, sizeof(s_ip)); - snprintf(s,s_len,cidr->preflen<128 ? "%s/%u" : "%s", s_ip, cidr->preflen); + snprintf(s, s_len, cidr->preflen < 128 ? "%s/%u" : "%s", s_ip, cidr->preflen); } void print_cidr6(const struct cidr6 *cidr) { char s[44]; - str_cidr6(s,sizeof(s),cidr); - printf("%s",s); + str_cidr6(s, sizeof(s), cidr); + printf("%s", s); } bool parse_cidr4(char *s, struct cidr4 *cidr) { - char *p,d; + char *p, d; bool b; unsigned int plen; if ((p = strchr(s, '/'))) { - if (sscanf(p + 1, "%u", &plen)!=1 || plen>32) + if (sscanf(p + 1, "%u", &plen) != 1 || plen > 32) return false; cidr->preflen = (uint8_t)plen; - d=*p; *p=0; // backup char + d = *p; *p = 0; // backup char } else cidr->preflen = 32; - b = (inet_pton(AF_INET, s, &cidr->addr)==1); - if (p) *p=d; // restore char + b = (inet_pton(AF_INET, s, &cidr->addr) == 1); + if (p) *p = d; // restore char return b; } bool parse_cidr6(char *s, struct cidr6 *cidr) { - char *p,d; + char *p, d; bool b; unsigned int plen; if ((p = strchr(s, '/'))) { - if (sscanf(p + 1, "%u", &plen)!=1 || plen>128) + if (sscanf(p + 1, "%u", &plen) != 1 || plen > 128) return false; cidr->preflen = (uint8_t)plen; - d=*p; *p=0; // backup char + d = *p; *p = 0; // backup char } else cidr->preflen = 128; - b = (inet_pton(AF_INET6, s, &cidr->addr)==1); - if (p) *p=d; // restore char + b = (inet_pton(AF_INET6, s, &cidr->addr) == 1); + if (p) *p = d; // restore char return b; } + + +void msleep(unsigned int ms) +{ + struct timespec time = { + .tv_nsec = (ms % 1000) * 1000000, + .tv_sec = ms / 1000 + }; + nanosleep(&time, 0); +} + +#ifdef __linux__ +bool socket_has_notsent(int sfd) +{ + struct tcp_info tcpi; + socklen_t ts = sizeof(tcpi); + + if (getsockopt(sfd, IPPROTO_TCP, TCP_INFO, (char *)&tcpi, &ts) < 0) + return false; + if (tcpi.tcpi_state != 1) + return false; + size_t s = (char *)&tcpi.tcpi_notsent_bytes - (char *)&tcpi.tcpi_state; + if (ts < s) + return false; + return !!tcpi.tcpi_notsent_bytes; +} +bool socket_wait_notsent(int sfd, unsigned int delay_ms, unsigned int *wasted_ms) +{ + struct timespec tres; + unsigned int mtick; + + if (wasted_ms) *wasted_ms=0; + if (!socket_has_notsent(sfd)) return true; + + if (clock_getres(CLOCK_MONOTONIC,&tres)) + { + tres.tv_nsec = 10000000; + tres.tv_sec = 0; + } + mtick = (unsigned int)(tres.tv_sec*1000) + (unsigned int)(tres.tv_nsec/1000000); + if (mtick<1) mtick=1; + for(;;) + { + msleep(mtick); + if (wasted_ms) *wasted_ms+=mtick; + if (!socket_has_notsent(sfd)) return true; + if (delay_ms<=mtick) break; + delay_ms-=mtick; + } + return false; +} +#endif diff --git a/tpws/helpers.h b/tpws/helpers.h index ed84f5b..f8b0e3a 100644 --- a/tpws/helpers.h +++ b/tpws/helpers.h @@ -117,3 +117,9 @@ static inline const struct in6_addr *mask_from_preflen6(uint8_t preflen) { return ip6_mask+preflen; } + +void msleep(unsigned int ms); +#ifdef __linux__ +bool socket_has_notsent(int sfd); +bool socket_wait_notsent(int sfd, unsigned int delay_ms, unsigned int *wasted_ms); +#endif diff --git a/tpws/params.h b/tpws/params.h index acf9f4a..3cbcb81 100644 --- a/tpws/params.h +++ b/tpws/params.h @@ -104,6 +104,7 @@ struct params_s uint8_t proxy_type; bool no_resolve; bool skip_nodelay; + bool fix_seg; bool droproot; uid_t uid; gid_t gid; diff --git a/tpws/tpws.c b/tpws/tpws.c index 8d30561..eae386f 100644 --- a/tpws/tpws.c +++ b/tpws/tpws.c @@ -169,6 +169,9 @@ static void exithelp(void) " --uid=uid[:gid]\t\t\t; drop root privs\n" #if defined(__FreeBSD__) " --enable-pf\t\t\t\t; enable PF redirector support. required in FreeBSD when used with PF firewall.\n" +#endif +#if defined(__linux__) + " --fix-seg\t\t\t\t; fix segmentation failures at the cost of possible slowdown\n" #endif " --debug=0|1|2|syslog|@\t; 1 and 2 means log to console and set debug level. for other targets use --debug-level.\n" " --debug-level=0|1|2\t\t\t; specify debug level\n" @@ -635,8 +638,9 @@ void parse_params(int argc, char *argv[]) { "local-tcp-user-timeout",required_argument,0,0 }, // optidx=62 { "remote-tcp-user-timeout",required_argument,0,0 }, // optidx=63 { "mss",required_argument,0,0 }, // optidx=64 + { "fix-seg",no_argument,0,0 }, // optidx=65 #ifdef SPLICE_PRESENT - { "nosplice",no_argument,0,0 }, // optidx=65 + { "nosplice",no_argument,0,0 }, // optidx=66 #endif #endif { "hostlist-auto-retrans-threshold",optional_argument,0,0}, // ignored. for nfqws command line compatibility @@ -1228,8 +1232,11 @@ void parse_params(int argc, char *argv[]) exit_clean(1); } break; + case 65: /* fix-seg */ + params.fix_seg = true; + break; #ifdef SPLICE_PRESENT - case 65: /* nosplice */ + case 66: /* nosplice */ params.nosplice = true; break; #endif diff --git a/tpws/tpws_conn.c b/tpws/tpws_conn.c index a979bf0..daeb644 100644 --- a/tpws/tpws_conn.c +++ b/tpws/tpws_conn.c @@ -1244,7 +1244,21 @@ static bool handle_epoll(tproxy_conn_t *conn, struct tailhead *conn_list, uint32 if (wr>0) conn->partner->twr += wr; break; } - +#ifdef __linux__ + if (params.fix_seg) + { + unsigned int wasted; + if (!socket_wait_notsent(conn->partner->fd, 20, &wasted)) + DLOG_ERR("WARNING ! segmentation failed\n"); + if (wasted) + VPRINT("WARNING ! wasted %u ms to fix segmenation\n", wasted); + } + else + { + if (socket_has_notsent(conn->partner->fd)) + DLOG_ERR("WARNING ! segmentation failed\n"); + } +#endif from = to; } }