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

General socket init for TCP and UDP

Browse Source
This commit is contained in:
ruti 2024-10-22 18:30:08 +03:00
parent bbe9522242
commit c3c196e741
1 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
proxy.c
View File

@ -334,30 +334,27 @@ int s5_set_addr(char *buffer, size_t n,
} }
int create_conn(struct poolhd *pool, static int remote_sock(struct sockaddr_ina *dst, int type)
struct eval *val, struct sockaddr_ina *dst, int next)
{ {
struct sockaddr_ina addr = *dst;
if (params.baddr.sin6_family == AF_INET6) { if (params.baddr.sin6_family == AF_INET6) {
map_fix(&addr, 6); map_fix(dst, 6);
} else { } else {
map_fix(&addr, 0); map_fix(dst, 0);
} }
if (addr.sa.sa_family != params.baddr.sin6_family) { if (dst->sa.sa_family != params.baddr.sin6_family) {
LOG(LOG_E, "different addresses family\n"); LOG(LOG_E, "different addresses family\n");
return -1; return -1;
} }
int sfd = nb_socket(addr.sa.sa_family, SOCK_STREAM); int sfd = nb_socket(dst->sa.sa_family, type);
if (sfd < 0) { if (sfd < 0) {
uniperror("socket"); uniperror("socket");
return -1; return -1;
} }
if (socket_mod(sfd, &addr.sa) < 0) { if (socket_mod(sfd, &dst->sa) < 0) {
close(sfd); close(sfd);
return -1; return -1;
} }
if (addr.sa.sa_family == AF_INET6) { if (dst->sa.sa_family == AF_INET6) {
int no = 0; int no = 0;
if (setsockopt(sfd, IPPROTO_IPV6, if (setsockopt(sfd, IPPROTO_IPV6,
IPV6_V6ONLY, (char *)&no, sizeof(no))) { IPV6_V6ONLY, (char *)&no, sizeof(no))) {
@ -372,6 +369,19 @@ int create_conn(struct poolhd *pool,
close(sfd); close(sfd);
return -1; return -1;
} }
return sfd;
}
int create_conn(struct poolhd *pool,
struct eval *val, struct sockaddr_ina *dst, int next)
{
struct sockaddr_ina addr = *dst;
int sfd = remote_sock(&addr, SOCK_STREAM);
if (sfd < 0) {
return -1;
}
#ifdef __linux__ #ifdef __linux__
int syn_count = 1; int syn_count = 1;
if (setsockopt(sfd, IPPROTO_TCP, if (setsockopt(sfd, IPPROTO_TCP,
@ -440,25 +450,8 @@ int udp_associate(struct poolhd *pool,
{ {
struct sockaddr_ina addr = *dst; struct sockaddr_ina addr = *dst;
int ufd = nb_socket(params.baddr.sin6_family, SOCK_DGRAM); int ufd = remote_sock(&addr, SOCK_DGRAM);
if (ufd < 0) { if (ufd < 0) {
uniperror("socket");
return -1;
}
if (params.baddr.sin6_family == AF_INET6) {
int no = 0;
if (setsockopt(ufd, IPPROTO_IPV6,
IPV6_V6ONLY, (char *)&no, sizeof(no))) {
uniperror("setsockopt IPV6_V6ONLY");
close(ufd);
return -1;
}
map_fix(&addr, 6);
}
if (bind(ufd, (struct sockaddr *)&params.baddr,
SA_SIZE(&params.baddr)) < 0) {
uniperror("bind");
close(ufd);
return -1; return -1;
} }
struct eval *pair = add_event(pool, EV_UDP_TUNNEL, ufd, POLLIN); struct eval *pair = add_event(pool, EV_UDP_TUNNEL, ufd, POLLIN);
@ -467,10 +460,6 @@ int udp_associate(struct poolhd *pool,
return -1; return -1;
} }
if (dst->in6.sin6_port != 0) { if (dst->in6.sin6_port != 0) {
if (socket_mod(ufd, &addr.sa) < 0) {
del_event(pool, pair);
return -1;
}
if (connect(ufd, &addr.sa, SA_SIZE(&addr)) < 0) { if (connect(ufd, &addr.sa, SA_SIZE(&addr)) < 0) {
uniperror("connect"); uniperror("connect");
del_event(pool, pair); del_event(pool, pair);
@ -763,9 +752,6 @@ int on_udp_tunnel(struct eval *val, char *buffer, size_t bfsize)
if (params.baddr.sin6_family != addr.sa.sa_family) { if (params.baddr.sin6_family != addr.sa.sa_family) {
return -1; return -1;
} }
if (socket_mod(pair->fd, &addr.sa) < 0) {
return -1;
}
if (connect(pair->fd, &addr.sa, SA_SIZE(&addr)) < 0) { if (connect(pair->fd, &addr.sa, SA_SIZE(&addr)) < 0) {
uniperror("connect"); uniperror("connect");
return -1; return -1;