mirrors/byedpi
1
0
Fork 0
mirror of https://github.com/hufrea/byedpi.git synced 2024-12-22 14:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create run func

Browse Source
This commit is contained in:
ruti 2024-02-27 18:34:02 +03:00
parent 4914491fe4
commit 511b0ae4f7
3 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.c
View File

@ -443,7 +443,7 @@ int main(int argc, char **argv)
return -1; return -1;
} }
} }
int status = listener(s); int status = run(&s);
#ifdef _WIN32 #ifdef _WIN32
WSACleanup(); WSACleanup();
#endif #endif

44
proxy.c
View File

@ -546,7 +546,7 @@ static inline int on_tunnel(struct poolhd *pool, struct eval *val,
} }
int big_loop(int srvfd) int event_loop(int srvfd)
{ {
size_t bfsize = params.bfsize; size_t bfsize = params.bfsize;
@ -587,7 +587,8 @@ int big_loop(int srvfd)
} }
switch (val->type) { switch (val->type) {
case EV_ACCEPT: case EV_ACCEPT:
if (on_accept(pool, val)) if ((etype & POLLHUP) ||
on_accept(pool, val))
NOT_EXIT = 0; NOT_EXIT = 0;
continue; continue;
@ -598,12 +599,14 @@ int big_loop(int srvfd)
continue; continue;
case EV_TUNNEL: case EV_TUNNEL:
if (on_tunnel(pool, val, buffer, bfsize, etype & POLLOUT)) if (on_tunnel(pool, val,
buffer, bfsize, etype & POLLOUT))
del_event(pool, val); del_event(pool, val);
continue; continue;
case EV_CONNECT: case EV_CONNECT:
if (on_connect(pool, val, buffer, bfsize, etype & POLLERR)) if (on_connect(pool, val,
buffer, bfsize, etype & POLLERR))
del_event(pool, val); del_event(pool, val);
continue; continue;
@ -617,22 +620,16 @@ int big_loop(int srvfd)
NOT_EXIT = 0; NOT_EXIT = 0;
} }
} }
LOG(LOG_E, "exit\n"); LOG(LOG_S, "exit\n");
free(buffer); free(buffer);
destroy_pool(pool); destroy_pool(pool);
return 0; return 0;
} }
int listener(struct sockaddr_ina srv) int listen_socket(struct sockaddr_ina *srv)
{ {
#ifdef SIGPIPE int srvfd = nb_socket(srv->sa.sa_family, SOCK_STREAM);
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
uniperror("signal SIGPIPE!");
#endif
signal(SIGINT, on_cancel);
int srvfd = nb_socket(srv.sa.sa_family, SOCK_STREAM);
if (srvfd < 0) { if (srvfd < 0) {
uniperror("socket"); uniperror("socket");
return -1; return -1;
@ -644,7 +641,7 @@ int listener(struct sockaddr_ina srv)
close(srvfd); close(srvfd);
return -1; return -1;
} }
if (bind(srvfd, &srv.sa, sizeof(srv)) < 0) { if (bind(srvfd, &srv->sa, sizeof(*srv)) < 0) {
uniperror("bind"); uniperror("bind");
close(srvfd); close(srvfd);
return -1; return -1;
@ -654,5 +651,22 @@ int listener(struct sockaddr_ina srv)
close(srvfd); close(srvfd);
return -1; return -1;
} }
return big_loop(srvfd); return srvfd;
} }
int run(struct sockaddr_ina *srv)
{
#ifdef SIGPIPE
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
uniperror("signal SIGPIPE!");
#endif
signal(SIGINT, on_cancel);
int fd = listen_socket(srv);
if (fd < 0) {
return -1;
}
return event_loop(fd);
}

4
proxy.h
View File

@ -94,4 +94,6 @@ enum s4_rep {
#define S_SIZE_I6 22 #define S_SIZE_I6 22
#define S_SIZE_ID 7 #define S_SIZE_ID 7
int listener(struct sockaddr_ina srv); int listen_socket(struct sockaddr_ina *srv);
int event_loop(int srvfd);
int run(struct sockaddr_ina *srv);