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

source cosmetics

Browse Source
This commit is contained in:
bol-van
2021-11-12 12:36:25 +03:00
parent 38475db45a
commit 37e3a11a77
12 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tpws/hostlist.c
View File

@@ -3,7 +3,7 @@
#include "gzip.h"
#include "params.h"
static bool addpool(strpool **hostlist, char **s, char *end)
static bool addpool(strpool **hostlist, char **s, const char *end)
{
char *p;

6
tpws/tamper.c
View File

@@ -16,7 +16,7 @@ bool find_host(char **pHost,char *buf,size_t bs)
if (*pHost)
{
(*pHost)++;
VPRINT("Found Host: at pos %zu",*pHost - buf)
VPRINT("Found Host: at pos %td",*pHost - buf)
}
}
return !!*pHost;
@@ -73,7 +73,7 @@ void modify_tcp_segment(char *segment,size_t segment_buffer_size,size_t *size,si
if (pp == (p - 1))
{
// probably end of http headers
VPRINT("Found double EOL at pos %zu. Stop replacing.", pp - segment)
VPRINT("Found double EOL at pos %td. Stop replacing.", pp - segment)
break;
}
pp = p;
@@ -141,7 +141,7 @@ void modify_tcp_segment(char *segment,size_t segment_buffer_size,size_t *size,si
}
if (params.hostcase && find_host(&pHost,segment,*size))
{
VPRINT("Changing 'Host:' => '%c%c%c%c:' at pos %zu", params.hostspell[0], params.hostspell[1], params.hostspell[2], params.hostspell[3], pHost - segment)
VPRINT("Changing 'Host:' => '%c%c%c%c:' at pos %td", params.hostspell[0], params.hostspell[1], params.hostspell[2], params.hostspell[3], pHost - segment)
memcpy(pHost, params.hostspell, 4);
}
if (params.hostpad && find_host(&pHost,segment,*size))

2
tpws/tpws.c
View File

@@ -629,7 +629,7 @@ static bool set_ulimit()
DBGPRINT("set_ulimit : current system file-max=%ju",(uintmax_t)cur_lim)
if (cur_lim<fdmin_system)
{
DBGPRINT("set_ulimit : system fd limit is too low. trying to increase to %jd",(uintmax_t)fdmin_system)
DBGPRINT("set_ulimit : system fd limit is too low. trying to increase to %ju",(uintmax_t)fdmin_system)
if (!write_system_maxfiles(fdmin_system))
{
fprintf(stderr,"could not set system-wide max file descriptors\n");

10
tpws/tpws_conn.c
View File

@@ -178,7 +178,7 @@ static ssize_t send_buffer_send(send_buffer_t *sb, int fd)
}
static ssize_t send_buffers_send(send_buffer_t *sb_array, int count, int fd, size_t *real_wr)
{
ssize_t wr=0,twr=0;
ssize_t wr,twr=0;
for (int i=0;i<count;i++)
{
@@ -596,7 +596,7 @@ static bool epoll_set_flow_pair(tproxy_conn_t *conn)
static bool handle_unsent(tproxy_conn_t *conn)
{
ssize_t wr=0,twr=0;
ssize_t wr;
DBGPRINT("+handle_unsent, fd=%d has_unsent=%d has_unsent_partner=%d",conn->fd,conn_has_unsent(conn),conn_partner_alive(conn) ? conn_has_unsent(conn->partner) : false)
@@ -610,7 +610,6 @@ static bool handle_unsent(tproxy_conn_t *conn)
if (errno==EAGAIN) wr=0;
else return false;
}
twr += wr;
conn->twr += wr;
conn->wr_unsent -= wr;
}
@@ -620,7 +619,6 @@ static bool handle_unsent(tproxy_conn_t *conn)
wr=conn_buffers_send(conn);
DBGPRINT("conn_buffers_send wr=%zd",wr)
if (wr<0) return false;
twr += wr;
}
return epoll_set_flow_pair(conn);
}
@@ -1006,7 +1004,7 @@ static bool remove_closed_connections(int efd, struct tailhead *close_list)
shutdown(conn->fd,SHUT_RDWR);
epoll_del(conn);
VPRINT("Socket fd=%d (partner_fd=%d, remote=%d) closed, connection removed. total_read=%zu total_write=%zu event_count=%d",
VPRINT("Socket fd=%d (partner_fd=%d, remote=%d) closed, connection removed. total_read=%zu total_write=%zu event_count=%u",
conn->fd, conn->partner ? conn->partner->fd : 0, conn->remote, conn->trd, conn->twr, conn->event_count)
if (conn->remote) legs_remote--; else legs_local--;
free_conn(conn);
@@ -1102,7 +1100,7 @@ static void conn_close_with_partner_check(struct tailhead *conn_list, struct tai
}
}
int event_loop(int *listen_fd, size_t listen_fd_ct)
int event_loop(const int *listen_fd, size_t listen_fd_ct)
{
int retval = 0, num_events = 0;
int tmp_fd = 0; //Used to temporarily hold the accepted file descriptor

2
tpws/tpws_conn.h
View File

@@ -11,7 +11,7 @@
#define DEFAULT_MAX_CONN 512
#define DEFAULT_MAX_ORPHAN_TIME 5
int event_loop(int *listen_fd, size_t listen_fd_ct);
int event_loop(const int *listen_fd, size_t listen_fd_ct);
//Three different states of a connection
enum{