drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-05-24 22:32:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

autottl, datanoack, oob, postnat

Browse Source
This commit is contained in:
bol-van
2024-03-02 17:53:37 +03:00
parent 2157fed592
commit 8a161f1f49
48 changed files with 597 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tpws/params.h
View File

@@ -49,7 +49,7 @@ struct params_s
int tlsrec_pos;
bool split_any_protocol;
int split_pos;
bool disorder;
bool disorder, oob;
int ttl_default;
char pidfile[256];

93
tpws/tpws.c
View File

@@ -176,6 +176,7 @@ static void exithelp(void)
#else
" --disorder\t\t\t\t; when splitting simulate sending second fragment first\n"
#endif
" --oob\t\t\t\t\t; when splitting send out of band zero byte\n"
" --hostcase\t\t\t\t; change Host: => host:\n"
" --hostspell\t\t\t\t; exact spelling of \"Host\" header. must be 4 chars. default is \"host\"\n"
" --hostdot\t\t\t\t; add \".\" after Host: name\n"
@@ -294,29 +295,30 @@ void parse_params(int argc, char *argv[])
{ "split-pos",required_argument,0,0 },// optidx=24
{ "split-any-protocol",optional_argument,0,0},// optidx=25
{ "disorder",no_argument,0,0 },// optidx=26
{ "methodspace",no_argument,0,0 },// optidx=27
{ "methodeol",no_argument,0,0 },// optidx=28
{ "hosttab",no_argument,0,0 },// optidx=29
{ "unixeol",no_argument,0,0 },// optidx=30
{ "tlsrec",required_argument,0,0 },// optidx=31
{ "tlsrec-pos",required_argument,0,0 },// optidx=32
{ "hostlist",required_argument,0,0 },// optidx=33
{ "hostlist-exclude",required_argument,0,0 },// optidx=34
{ "hostlist-auto",required_argument,0,0}, // optidx=35
{ "hostlist-auto-fail-threshold",required_argument,0,0}, // optidx=36
{ "hostlist-auto-fail-time",required_argument,0,0}, // optidx=37
{ "hostlist-auto-debug",required_argument,0,0}, // optidx=38
{ "pidfile",required_argument,0,0 },// optidx=39
{ "debug",optional_argument,0,0 },// optidx=40
{ "local-rcvbuf",required_argument,0,0 },// optidx=41
{ "local-sndbuf",required_argument,0,0 },// optidx=42
{ "remote-rcvbuf",required_argument,0,0 },// optidx=43
{ "remote-sndbuf",required_argument,0,0 },// optidx=44
{ "socks",no_argument,0,0 },// optidx=45
{ "no-resolve",no_argument,0,0 },// optidx=46
{ "skip-nodelay",no_argument,0,0 },// optidx=47
{ "oob",no_argument,0,0 },// optidx=27
{ "methodspace",no_argument,0,0 },// optidx=28
{ "methodeol",no_argument,0,0 },// optidx=29
{ "hosttab",no_argument,0,0 },// optidx=30
{ "unixeol",no_argument,0,0 },// optidx=31
{ "tlsrec",required_argument,0,0 },// optidx=32
{ "tlsrec-pos",required_argument,0,0 },// optidx=33
{ "hostlist",required_argument,0,0 },// optidx=34
{ "hostlist-exclude",required_argument,0,0 },// optidx=35
{ "hostlist-auto",required_argument,0,0}, // optidx=36
{ "hostlist-auto-fail-threshold",required_argument,0,0}, // optidx=37
{ "hostlist-auto-fail-time",required_argument,0,0}, // optidx=38
{ "hostlist-auto-debug",required_argument,0,0}, // optidx=39
{ "pidfile",required_argument,0,0 },// optidx=40
{ "debug",optional_argument,0,0 },// optidx=41
{ "local-rcvbuf",required_argument,0,0 },// optidx=42
{ "local-sndbuf",required_argument,0,0 },// optidx=43
{ "remote-rcvbuf",required_argument,0,0 },// optidx=44
{ "remote-sndbuf",required_argument,0,0 },// optidx=45
{ "socks",no_argument,0,0 },// optidx=46
{ "no-resolve",no_argument,0,0 },// optidx=47
{ "skip-nodelay",no_argument,0,0 },// optidx=48
#if defined(BSD) && !defined(__OpenBSD__) && !defined(__APPLE__)
{ "enable-pf",no_argument,0,0 },// optidx=48
{ "enable-pf",no_argument,0,0 },// optidx=49
#endif
{ "hostlist-auto-retrans-threshold",optional_argument,0,0}, // ignored. for nfqws command line compatibility
{ NULL,0,NULL,0 }
@@ -505,23 +507,26 @@ void parse_params(int argc, char *argv[])
params.disorder = true;
save_default_ttl();
break;
case 27: /* methodspace */
case 27: /* oob */
params.oob = true;
break;
case 28: /* methodspace */
params.methodspace = true;
params.tamper = true;
break;
case 28: /* methodeol */
case 29: /* methodeol */
params.methodeol = true;
params.tamper = true;
break;
case 29: /* hosttab */
case 30: /* hosttab */
params.hosttab = true;
params.tamper = true;
break;
case 30: /* unixeol */
case 31: /* unixeol */
params.unixeol = true;
params.tamper = true;
break;
case 31: /* tlsrec */
case 32: /* tlsrec */
if (!strcmp(optarg, "sni"))
params.tlsrec = tlsrec_sni;
else
@@ -531,7 +536,7 @@ void parse_params(int argc, char *argv[])
}
params.tamper = true;
break;
case 32: /* tlsrec-pos */
case 33: /* tlsrec-pos */
if ((params.tlsrec_pos = atoi(optarg))>0)
params.tlsrec = tlsrec_pos;
else
@@ -541,7 +546,7 @@ void parse_params(int argc, char *argv[])
}
params.tamper = true;
break;
case 33: /* hostlist */
case 34: /* hostlist */
if (!strlist_add(&params.hostlist_files, optarg))
{
fprintf(stderr, "strlist_add failed\n");
@@ -549,7 +554,7 @@ void parse_params(int argc, char *argv[])
}
params.tamper = true;
break;
case 34: /* hostlist-exclude */
case 35: /* hostlist-exclude */
if (!strlist_add(&params.hostlist_exclude_files, optarg))
{
fprintf(stderr, "strlist_add failed\n");
@@ -557,7 +562,7 @@ void parse_params(int argc, char *argv[])
}
params.tamper = true;
break;
case 35: /* hostlist-auto */
case 36: /* hostlist-auto */
if (*params.hostlist_auto_filename)
{
fprintf(stderr, "only one auto hostlist is supported\n");
@@ -589,7 +594,7 @@ void parse_params(int argc, char *argv[])
params.hostlist_auto_filename[sizeof(params.hostlist_auto_filename) - 1] = '\0';
params.tamper = true; // need to detect blocks and update autohostlist. cannot just slice.
break;
case 36: /* hostlist-auto-fail-threshold */
case 37: /* hostlist-auto-fail-threshold */
params.hostlist_auto_fail_threshold = (uint8_t)atoi(optarg);
if (params.hostlist_auto_fail_threshold<1 || params.hostlist_auto_fail_threshold>20)
{
@@ -597,7 +602,7 @@ void parse_params(int argc, char *argv[])
exit_clean(1);
}
break;
case 37: /* hostlist-auto-fail-time */
case 38: /* hostlist-auto-fail-time */
params.hostlist_auto_fail_time = (uint8_t)atoi(optarg);
if (params.hostlist_auto_fail_time<1)
{
@@ -605,7 +610,7 @@ void parse_params(int argc, char *argv[])
exit_clean(1);
}
break;
case 38: /* hostlist-auto-debug */
case 39: /* hostlist-auto-debug */
{
FILE *F = fopen(optarg,"a+t");
if (!F)
@@ -620,36 +625,36 @@ void parse_params(int argc, char *argv[])
params.hostlist_auto_debuglog[sizeof(params.hostlist_auto_debuglog) - 1] = '\0';
}
break;
case 39: /* pidfile */
case 40: /* pidfile */
strncpy(params.pidfile,optarg,sizeof(params.pidfile));
params.pidfile[sizeof(params.pidfile)-1]='\0';
break;
case 40:
case 41:
params.debug = optarg ? atoi(optarg) : 1;
break;
case 41: /* local-rcvbuf */
case 42: /* local-rcvbuf */
params.local_rcvbuf = atoi(optarg)/2;
break;
case 42: /* local-sndbuf */
case 43: /* local-sndbuf */
params.local_sndbuf = atoi(optarg)/2;
break;
case 43: /* remote-rcvbuf */
case 44: /* remote-rcvbuf */
params.remote_rcvbuf = atoi(optarg)/2;
break;
case 44: /* remote-sndbuf */
case 45: /* remote-sndbuf */
params.remote_sndbuf = atoi(optarg)/2;
break;
case 45: /* socks */
case 46: /* socks */
params.proxy_type = CONN_TYPE_SOCKS;
break;
case 46: /* no-resolve */
case 47: /* no-resolve */
params.no_resolve = true;
break;
case 47: /* skip-nodelay */
case 48: /* skip-nodelay */
params.skip_nodelay = true;
break;
#if defined(BSD) && !defined(__OpenBSD__) && !defined(__APPLE__)
case 48: /* enable-pf */
case 49: /* enable-pf */
params.pf_enable = true;
break;
#endif

27
tpws/tpws_conn.c
View File

@@ -134,7 +134,7 @@ ssize_t send_with_ttl(int fd, const void *buf, size_t len, int flags, int ttl)
}
static bool send_buffer_create(send_buffer_t *sb, const void *data, size_t len, int ttl)
static bool send_buffer_create(send_buffer_t *sb, const void *data, size_t len, int flags, int ttl)
{
if (sb->data)
{
@@ -151,6 +151,7 @@ static bool send_buffer_create(send_buffer_t *sb, const void *data, size_t len,
sb->len = len;
sb->pos = 0;
sb->ttl = ttl;
sb->flags = flags;
return true;
}
static void send_buffer_free(send_buffer_t *sb)
@@ -185,7 +186,7 @@ static ssize_t send_buffer_send(send_buffer_t *sb, int fd)
{
ssize_t wr;
wr = send_with_ttl(fd, sb->data + sb->pos, sb->len - sb->pos, 0, sb->ttl);
wr = send_with_ttl(fd, sb->data + sb->pos, sb->len - sb->pos, sb->flags, sb->ttl);
DBGPRINT("send_buffer_send len=%zu pos=%zu wr=%zd err=%d",sb->len,sb->pos,wr,errno)
if (wr>0)
{
@@ -259,16 +260,16 @@ static bool conn_has_unsent_pair(tproxy_conn_t *conn)
}
static ssize_t send_or_buffer(send_buffer_t *sb, int fd, const void *buf, size_t len, int ttl)
static ssize_t send_or_buffer(send_buffer_t *sb, int fd, const void *buf, size_t len, int flags, int ttl)
{
ssize_t wr=0;
if (len)
{
wr = send_with_ttl(fd, buf, len, 0, ttl);
wr = send_with_ttl(fd, buf, len, flags, ttl);
if (wr<0 && errno==EAGAIN) wr=0;
if (wr>=0 && wr<len)
{
if (!send_buffer_create(sb, buf+wr, len-wr, ttl))
if (!send_buffer_create(sb, buf+wr, len-wr, flags, ttl))
wr=-1;
}
}
@@ -1007,20 +1008,28 @@ static bool handle_epoll(tproxy_conn_t *conn, struct tailhead *conn_list, uint32
if (split_pos)
{
uint8_t oob;
VPRINT("Splitting at pos %zu", split_pos)
wr = send_or_buffer(conn->partner->wr_buf, conn->partner->fd, buf, split_pos, params.disorder ? 1 : 0);
if (params.oob)
{
oob = buf[split_pos];
buf[split_pos] = 0;
}
wr = send_or_buffer(conn->partner->wr_buf, conn->partner->fd, buf, split_pos+1, params.oob ? MSG_OOB : 0, params.disorder ? 1 : 0);
if (params.oob) buf[split_pos] = oob;
DBGPRINT("send_or_buffer(1) fd=%d wr=%zd err=%d",conn->partner->fd,wr,errno)
if (wr >= 0)
{
conn->partner->twr += wr;
wr = send_or_buffer(conn->partner->wr_buf + 1, conn->partner->fd, buf + split_pos, bs - split_pos, 0);
wr = send_or_buffer(conn->partner->wr_buf + 1, conn->partner->fd, buf + split_pos, bs - split_pos, 0, 0);
DBGPRINT("send_or_buffer(2) fd=%d wr=%zd err=%d",conn->partner->fd,wr,errno)
if (wr>0) conn->partner->twr += wr;
}
}
else
{
wr = send_or_buffer(conn->partner->wr_buf, conn->partner->fd, buf, bs, 0);
wr = send_or_buffer(conn->partner->wr_buf, conn->partner->fd, buf, bs, 0, 0);
DBGPRINT("send_or_buffer(3) fd=%d wr=%zd err=%d",conn->partner->fd,wr,errno)
if (wr>0) conn->partner->twr += wr;
}
@@ -1080,7 +1089,7 @@ static bool read_all_and_buffer(tproxy_conn_t *conn, int buffer_number)
DBGPRINT("read_all_and_buffer(%d) numbytes=%d",buffer_number,numbytes)
if (numbytes>0)
{
if (send_buffer_create(conn->partner->wr_buf+buffer_number, NULL, numbytes, 0))
if (send_buffer_create(conn->partner->wr_buf+buffer_number, NULL, numbytes, 0, 0))
{
ssize_t rd = recv(conn->fd, conn->partner->wr_buf[buffer_number].data, numbytes, MSG_DONTWAIT);
if (rd>0)

2
tpws/tpws_conn.h
View File

@@ -30,7 +30,7 @@ struct send_buffer
{
uint8_t *data;
size_t len,pos;
int ttl;
int ttl, flags;
};
typedef struct send_buffer send_buffer_t;