gsd
/
zapret
mirror of https://github.com/bol-van/zapret/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

tpws : do not rely on shutdown(). --debug

pull/33/head
bolvan 6 years ago
parent
35b429c155
commit
be9368e5c7
12 changed files with 63 additions and 47 deletions
Split View
  1. BIN
      binaries/aarch64/tpws
  2. BIN
      binaries/armhf/tpws
  3. BIN
      binaries/mips32r1-lsb/tpws
  4. BIN
      binaries/mips32r1-msb/tpws
  5. BIN
      binaries/mips64r2-msb/tpws
  6. BIN
      binaries/ppc/tpws
  7. BIN
      binaries/x86/tpws
  8. BIN
      binaries/x86_64/tpws
  9. 3
      tpws/params.h
  10. 5
      tpws/tpws.c
  11. 100
      tpws/tpws_conn.c
  12. 2
      tpws/tpws_conn.h

BIN
binaries/aarch64/tpws
View File

Binary file not shown.

BIN
binaries/armhf/tpws
View File

Binary file not shown.

BIN
binaries/mips32r1-lsb/tpws
View File

Binary file not shown.

BIN
binaries/mips32r1-msb/tpws
View File

Binary file not shown.

BIN
binaries/mips64r2-msb/tpws
View File

Binary file not shown.

BIN
binaries/ppc/tpws
View File

Binary file not shown.

BIN
binaries/x86/tpws
View File

Binary file not shown.

BIN
binaries/x86_64/tpws
View File

Binary file not shown.

3
tpws/params.h
View File

@ -25,6 +25,9 @@ struct params_s
char hostfile[256];
char pidfile[256];
strpool *hostlist;
bool debug;
};
extern struct params_s params;
#define DBGPRINT(format, ...) { if (params.debug) printf(format "\n", ##__VA_ARGS__); }

5
tpws/tpws.c
View File

@ -126,6 +126,7 @@ void exithelp()
" --pidfile=<filename>\t\t; write pid to file\n"
" --user=<username>\t\t; drop root privs\n"
" --uid=uid[:gid]\t\t; drop root privs\n"
" --debug\t\t\t; print debug messages\n"
);
exit(1);
}
@ -183,6 +184,7 @@ void parse_params(int argc, char *argv[])
{ "unixeol",no_argument,0,0 },// optidx=23
{ "hostlist",required_argument,0,0 },// optidx=24
{ "pidfile",required_argument,0,0 },// optidx=25
{ "debug",no_argument,0,0 },// optidx=26
{ NULL,0,NULL,0 }
};
while ((v = getopt_long_only(argc, argv, "", long_options, &option_index)) != -1)
@ -328,6 +330,9 @@ void parse_params(int argc, char *argv[])
strncpy(params.pidfile,optarg,sizeof(params.pidfile));
params.pidfile[sizeof(params.pidfile)-1]='\0';
break;
case 26:
params.debug = true;
break;
}
}
if (!params.port)

100
tpws/tpws_conn.c
View File

@ -107,6 +107,10 @@ ssize_t send_buffers_send(send_buffer_t *sb_array, int count, int fd, size_t *re
if (real_wr) *real_wr = twr;
return twr;
}
bool conn_partner_alive(tproxy_conn_t *conn)
{
return conn->partner && conn->partner->state!=CONN_CLOSED;
}
bool conn_buffers_present(tproxy_conn_t *conn)
{
return send_buffers_present(conn->wr_buf,sizeof(conn->wr_buf)/sizeof(conn->wr_buf[0]));
@ -122,9 +126,15 @@ bool conn_has_unsent(tproxy_conn_t *conn)
{
return !conn->remote && conn->wr_unsent || conn_buffers_present(conn);
}
int conn_bytes_unread(tproxy_conn_t *conn)
{
int numbytes=-1;
ioctl(conn->fd, FIONREAD, &numbytes)!=-1;
return numbytes;
}
bool conn_has_unsent_pair(tproxy_conn_t *conn)
{
return conn_has_unsent(conn) || (conn->partner && conn_has_unsent(conn->partner));
return conn_has_unsent(conn) || (conn_partner_alive(conn) && conn_has_unsent(conn->partner));
}
@ -365,7 +375,7 @@ bool epoll_update_flow(tproxy_conn_t *conn)
uint32_t evtmask = (conn->state==CONN_RDHUP ? 0 : EPOLLRDHUP)|(conn->bFlowIn?EPOLLIN:0)|(conn->bFlowOut?EPOLLOUT:0);
if (!epoll_set(conn, evtmask))
return false;
//printf("SET FLOW fd=%d to in=%d out=%d state_rdhup=%d\n",conn->fd,conn->bFlowIn,conn->bFlowOut,conn->state==CONN_RDHUP);
DBGPRINT("SET FLOW fd=%d to in=%d out=%d state_rdhup=%d",conn->fd,conn->bFlowIn,conn->bFlowOut,conn->state==CONN_RDHUP);
conn->bFlowInPrev = conn->bFlowIn;
conn->bFlowOutPrev = conn->bFlowOut;
conn->bPrevRdhup = (conn->state==CONN_RDHUP);
@ -496,16 +506,21 @@ bool check_connection_attempt(tproxy_conn_t *conn, int efd)
bool epoll_set_flow_pair(tproxy_conn_t *conn)
{
bool bHasUnsent = conn_has_unsent(conn);
bool bHasUnsentPartner = conn->partner ? conn_has_unsent(conn->partner) : false;
bool bHasUnsentPartner = conn_partner_alive(conn) ? conn_has_unsent(conn->partner) : false;
if (!epoll_set_flow(conn, !bHasUnsentPartner, bHasUnsent))
DBGPRINT("epoll_set_flow_pair fd=%d partner_fd=%d bHasUnsent=%d bHasUnsentPartner=%d state_rdhup=%d",
conn->fd , conn_partner_alive(conn) ? conn->partner->fd : 0, bHasUnsent, bHasUnsentPartner, conn->state==CONN_RDHUP);
if (!epoll_set_flow(conn, !bHasUnsentPartner && (conn->state!=CONN_RDHUP), bHasUnsent || conn->state==CONN_RDHUP))
return false;
if (conn->partner)
if (!epoll_set_flow(conn->partner, !bHasUnsent, bHasUnsentPartner))
if (conn_partner_alive(conn))
{
if (!epoll_set_flow(conn->partner, !bHasUnsent && (conn->partner->state!=CONN_RDHUP), conn->partner->bFlowOut = bHasUnsentPartner || conn->partner->state==CONN_RDHUP))
return false;
}
return true;
}
@ -513,7 +528,7 @@ bool handle_unsent(tproxy_conn_t *conn)
{
ssize_t wr=0,twr=0;
//printf("+handle_unsent, fd=%d has_unsent=%d has_unsent_partner=%d\n",conn->fd,conn_has_unsent(conn),conn->partner ? conn_has_unsent(conn->partner) : false);
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);
// its possible to have unsent data both in the pipe and in buffers
// but we initialize pipe only on local leg
@ -522,7 +537,7 @@ bool handle_unsent(tproxy_conn_t *conn)
if (conn->wr_unsent)
{
wr = splice(conn->splice_pipe[0], NULL, conn->fd, NULL, conn->wr_unsent, SPLICE_F_MOVE | SPLICE_F_NONBLOCK);
//printf("splice unsent=%zd wr=%zd err=%d\n",conn->wr_unsent,wr,errno);
DBGPRINT("splice unsent=%zd wr=%zd err=%d",conn->wr_unsent,wr,errno);
if (wr<0)
{
if (errno==EAGAIN) wr=0;
@ -536,6 +551,7 @@ bool handle_unsent(tproxy_conn_t *conn)
if (!conn->wr_unsent && conn_buffers_present(conn))
{
wr=conn_buffers_send(conn);
DBGPRINT("conn_buffers_send wr=%zd",wr);
if (wr<0) return false;
twr += wr;
}
@ -552,17 +568,17 @@ bool handle_epoll(tproxy_conn_t *conn, uint32_t evt)
size_t bs;
//printf("+handle_epoll\n");
DBGPRINT("+handle_epoll");
if (!handle_unsent(conn))
return false; // error
if (!conn->partner && !conn_has_unsent(conn))
if (!conn_partner_alive(conn) && !conn_has_unsent(conn))
return false; // when no partner, we only waste read and send unsent
if (!(evt & EPOLLIN))
return true; // nothing to read
if (!conn->partner)
if (!conn_partner_alive(conn))
{
// throw it to a black hole
char waste[1448];
@ -573,18 +589,16 @@ bool handle_epoll(tproxy_conn_t *conn, uint32_t evt)
rd+=rrd;
conn->trd+=rrd;
}
//printf("wasted recv=%zd all_rd=%zd err=%d\n",rrd,rd,errno);
DBGPRINT("wasted recv=%zd all_rd=%zd err=%d",rrd,rd,errno);
return true;
}
// do not receive new until old is sent
if (conn_has_unsent(conn->partner))
return true;
numbytes=-1;
ioctl(conn->fd, FIONREAD, &numbytes)!=-1;
//printf("numbytes=%d\n",numbytes);
numbytes=conn_bytes_unread(conn);
DBGPRINT("numbytes=%d",numbytes);
if (numbytes>0)
{
if (conn->remote)
@ -593,14 +607,14 @@ bool handle_epoll(tproxy_conn_t *conn, uint32_t evt)
// pipe is in the local leg, so its in conn->partner->splice_pipe
rd = splice(conn->fd, NULL, conn->partner->splice_pipe[1], NULL, SPLICE_LEN, SPLICE_F_MOVE | SPLICE_F_NONBLOCK);
//printf("splice len=%d rd=%zd err=%d\n",SPLICE_LEN,rd,errno);
DBGPRINT("splice len=%d rd=%zd err=%d",SPLICE_LEN,rd,errno);
if (rd<0 && errno==EAGAIN) rd=0;
if (rd>0)
{
conn->trd += rd;
conn->partner->wr_unsent += rd;
wr = splice(conn->partner->splice_pipe[0], NULL, conn->partner->fd, NULL, conn->partner->wr_unsent, SPLICE_F_MOVE | SPLICE_F_NONBLOCK);
//printf("splice wr=%zd err=%d\n",wr,errno);
DBGPRINT("splice wr=%zd err=%d",wr,errno);
if (wr<0 && errno==EAGAIN) wr=0;
if (wr>0)
{
@ -648,7 +662,7 @@ bool handle_epoll(tproxy_conn_t *conn, uint32_t evt)
return false;
}
//printf("-handle_epoll rd=%zd wr=%zd\n",rd,wr);
DBGPRINT("-handle_epoll rd=%zd wr=%zd",rd,wr);
return rd != -1 && wr != -1;
}
@ -664,8 +678,8 @@ bool remove_closed_connections(int efd, struct tailhead *close_list)
shutdown(conn->fd,SHUT_RDWR);
epoll_del(conn);
printf("Socket fd=%d (partner_fd=%d, remote=%d) closed, connection removed. total_read=%zu total_write=%zu\n",
conn->fd, conn->partner ? conn->partner->fd : 0, conn->remote, conn->trd, conn->twr);
printf("Socket fd=%d (partner_fd=%d, remote=%d) closed, connection removed. total_read=%zu total_write=%zu event_count=%d\n",
conn->fd, conn->partner ? conn->partner->fd : 0, conn->remote, conn->trd, conn->twr, conn->event_count);
free_conn(conn);
bRemoved = true;
}
@ -683,11 +697,10 @@ void close_tcp_conn(tproxy_conn_t *conn, struct tailhead *conn_list, struct tail
bool read_all_and_buffer(tproxy_conn_t *conn)
{
if (conn->partner)
if (conn_partner_alive(conn))
{
//printf("read_all_and_buffer\n");
int numbytes=-1;
ioctl(conn->fd, FIONREAD, &numbytes);
int numbytes=conn_bytes_unread(conn);
DBGPRINT("read_all_and_buffer numbytes=%d",numbytes);
if (numbytes>0)
{
if (send_buffer_create(conn->partner->wr_buf+2, NULL, numbytes))
@ -740,20 +753,14 @@ void print_legs(struct tailhead *conn_list)
if (conn->state!=CONN_CLOSED) close_tcp_conn(conn, &conn_list, &close_list); \
}
#define CONN_CLOSE_BOTH(conn) { \
if (conn->partner) CONN_CLOSE(conn->partner); \
if (conn_partner_alive(conn)) CONN_CLOSE(conn->partner); \
CONN_CLOSE(conn); \
}
#define CONN_CLOSE_WITH_PARTNER_SHUTDOWN(conn) { \
#define CONN_CLOSE_WITH_PARTNER_CHECK(conn) { \
CONN_CLOSE(conn); \
if (conn->partner) conn_shutdown(conn->partner); \
}
bool conn_shutdown(tproxy_conn_t *conn)
{
// after shutdown we must receive data remainder and send unsent
// if we dont receive data, connectin can be stalled because of "TCP window full"
return !shutdown(conn->fd,SHUT_RD) && epoll_set_flow(conn, true, true);
if (conn_partner_alive(conn) && !conn_has_unsent(conn->partner)) \
CONN_CLOSE(conn->partner); \
}
int event_loop(int listen_fd)
@ -789,7 +796,7 @@ int event_loop(int listen_fd)
while (1)
{
//printf("\nepoll_wait\n");
DBGPRINT("epoll_wait");
if ((num_events = epoll_wait(efd, events, MAX_EPOLL_EVENTS, -1)) == -1)
{
@ -832,8 +839,9 @@ int event_loop(int listen_fd)
else
{
conn = (tproxy_conn_t*)events[i].data.ptr;
conn->event_count++;
//printf("\nEVENT mask %08X fd=%d fd_partner=%d\n",events[i].events,conn->fd,conn->partner ? conn->partner->fd : 0);
DBGPRINT("\nEVENT mask %08X fd=%d fd_partner=%d",events[i].events,conn->fd,conn_partner_alive(conn) ? conn->partner->fd : 0);
if (conn->state != CONN_CLOSED)
{
@ -847,7 +855,7 @@ int event_loop(int listen_fd)
{
if (!check_connection_attempt(conn, efd))
{
fprintf(stderr, "Connection attempt failed for %d\n", conn->fd);
fprintf(stderr, "Connection attempt failed for fd=%d\n", conn->fd);
CONN_CLOSE_BOTH(conn);
continue;
}
@ -858,15 +866,14 @@ int event_loop(int listen_fd)
if (conn_has_unsent(conn))
{
//printf("conn fd=%d has unsent, not closing\n", conn->fd);
conn_shutdown(conn);
if (conn->partner) conn_shutdown(conn->partner);
DBGPRINT("conn fd=%d has unsent, not closing", conn->fd);
conn->state = CONN_RDHUP; // only writes
epoll_set_flow(conn,false,true);
}
else
{
//printf("conn fd=%d has no unsent, closing\n", conn->fd);
CONN_CLOSE_WITH_PARTNER_SHUTDOWN(conn);
DBGPRINT("conn fd=%d has no unsent, closing", conn->fd);
CONN_CLOSE_WITH_PARTNER_CHECK(conn);
}
continue;
}
@ -876,8 +883,8 @@ int event_loop(int listen_fd)
// will not receive this until successful check_connection_attempt()
if (!handle_epoll(conn, events[i].events))
{
//printf("handle_epoll false\n");
CONN_CLOSE_WITH_PARTNER_SHUTDOWN(conn);
DBGPRINT("handle_epoll false");
CONN_CLOSE_WITH_PARTNER_CHECK(conn);
continue;
}
}
@ -896,4 +903,3 @@ int event_loop(int listen_fd)
return retval;
}

2
tpws/tpws_conn.h
View File

@ -43,6 +43,8 @@ struct tproxy_conn
// total read,write
size_t trd,twr;
// number of epoll_wait events
unsigned int event_count;
// connection is either spliced or send/recv
// spliced connection have pipe buffering but also can have send_buffer's

Write Preview
Loading…
Cancel
Save