mirrors/byedpi
1
0
Fork 0
mirror of https://github.com/hufrea/byedpi.git synced 2025-03-30 05:09:12 +03:00
Code Issues Projects Releases Packages Wiki Activity

Handle POLLOUT if connection is closed

Browse source
This commit is contained in:
ruti 2024-05-17 14:06:29 +03:00
parent e9c5cf1033
commit 4b13c2127a
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
proxy.c
View file

@ -536,16 +536,22 @@ static inline int on_accept(struct poolhd *pool, struct eval *val)
int on_tunnel(struct poolhd *pool, struct eval *val, int on_tunnel(struct poolhd *pool, struct eval *val,
char *buffer, size_t bfsize, int out) char *buffer, size_t bfsize, int etype)
{ {
ssize_t n = 0; ssize_t n = 0;
struct eval *pair = val->pair; struct eval *pair = val->pair;
if (pair->buff.data && out) { if (etype & POLLOUT) {
pair = val; LOG(LOG_S, "pollout (fd=%d)\n", val->fd);
val = val->pair; val = pair;
pair = val->pair;
}
if (val->buff.data) {
if (etype & POLLHUP) {
return -1;
}
n = val->buff.size - val->buff.offset; n = val->buff.size - val->buff.offset;
ssize_t sn = send(pair->fd, ssize_t sn = send(pair->fd,
val->buff.data + val->buff.offset, n, 0); val->buff.data + val->buff.offset, n, 0);
if (sn != n) { if (sn != n) {
@ -570,8 +576,9 @@ int on_tunnel(struct poolhd *pool, struct eval *val,
} }
do { do {
n = recv(val->fd, buffer, bfsize, 0); n = recv(val->fd, buffer, bfsize, 0);
if (n < 0 && get_e() == EAGAIN) if (n < 0 && get_e() == EAGAIN) {
break; break;
}
if (n < 1) { if (n < 1) {
if (n) uniperror("recv"); if (n) uniperror("recv");
return -1; return -1;
@ -587,15 +594,15 @@ int on_tunnel(struct poolhd *pool, struct eval *val,
} }
sn = 0; sn = 0;
} }
LOG(LOG_S, "EAGAIN, set POLLOUT (fd: %d)\n", pair->fd); LOG(LOG_S, "send: %ld != %ld (fd: %d)\n", sn, n, pair->fd);
assert(!(val->buff.data || val->buff.offset)); assert(!(val->buff.size || val->buff.offset));
val->buff.size = n - sn; val->buff.size = n - sn;
if (!(val->buff.data = malloc(val->buff.size))) { if (!(val->buff.data = malloc(n - sn))) {
uniperror("malloc"); uniperror("malloc");
return -1; return -1;
} }
memcpy(val->buff.data, buffer + sn, val->buff.size); memcpy(val->buff.data, buffer + sn, n - sn);
if (mod_etype(pool, val, 0) || if (mod_etype(pool, val, 0) ||
mod_etype(pool, pair, POLLOUT)) { mod_etype(pool, pair, POLLOUT)) {
@ -838,8 +845,7 @@ int event_loop(int srvfd)
continue; continue;
case EV_TUNNEL: case EV_TUNNEL:
if (on_tunnel(pool, val, if (on_tunnel(pool, val, buffer, bfsize, etype))
buffer, bfsize, etype & POLLOUT))
del_event(pool, val); del_event(pool, val);
continue; continue;