Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-31 14:33:50 +00:00
Code Releases Activity

Refine the UDP response header

Browse Source
This commit is contained in:
Max Lv
2018-01-12 22:15:33 +08:00
parent c11e70aa8a
commit 9ca33a64c7
1 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udprelay.c
+5 -21
View File
@@ -734,12 +734,6 @@ remote_recv_cb(EV_P_ ev_io *w, int revents)
goto CLEAN_UP;
}
if (remote_ctx->addr_header_len != len
|| memcmp(buf->data, remote_ctx->addr_header, len) != 0) {
// mismatched header
LOGE("[udp] mismatched header from %s:%s", host, port);
}
// server may return using a different address type other than the type we
// have used during sending
#if defined(MODULE_TUNNEL) || defined(MODULE_REDIR)
@@ -764,14 +758,10 @@ remote_recv_cb(EV_P_ ev_io *w, int revents)
rx += buf->len;
char *addr_header = remote_ctx->addr_header;
int addr_header_len = remote_ctx->addr_header_len;
// Reconstruct UDP response header
char addr_header_buf[512];
if (remote_ctx->af == AF_INET || remote_ctx->af == AF_INET6) {
addr_header_len = construct_udprelay_header(&src_addr, addr_header_buf);
addr_header = addr_header_buf;
}
int addr_header_len = construct_udprelay_header(&src_addr, addr_header_buf);
char *addr_header = addr_header_buf;
// Construct packet
brealloc(buf, buf->len + addr_header_len, buf_size);
@@ -1222,14 +1212,8 @@ server_recv_cb(EV_P_ ev_io *w, int revents)
if (remote_ctx != NULL) {
cache_hit = 1;
// detect destination mismatch
if (remote_ctx->addr_header_len != addr_header_len
|| memcmp(addr_header, remote_ctx->addr_header, addr_header_len) != 0) {
remote_ctx->addr_header_len = addr_header_len;
memcpy(remote_ctx->addr_header, addr_header, addr_header_len);
if (dst_addr.ss_family != AF_INET && dst_addr.ss_family != AF_INET6) {
need_query = 1;
}
if (dst_addr.ss_family != AF_INET && dst_addr.ss_family != AF_INET6) {
need_query = 1;
} else {
memcpy(&dst_addr, &remote_ctx->dst_addr, sizeof(struct sockaddr_storage));
}