Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-26 18:53:41 +00:00
Code Releases Activity

refine udp header constructor

Browse Source
This commit is contained in:
Max Lv
2015-07-12 21:51:31 +08:00
parent 78c2ab9166
commit 415da01dcd
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udprelay.c
+30 -18
View File
@@ -181,6 +181,34 @@ static char *hash_key(const int af, const struct sockaddr_storage *addr)
return (char *)enc_md5((const uint8_t *)key, key_len, NULL);
}
#if defined(UDPRELAY_REDIR)
static int construct_udprealy_header(const struct sockaddr_storage *in_addr,
char *addr_header) {
int addr_header_len = 0;
if (in_addr->ss_family == AF_INET) {
struct sockaddr_in *addr = (struct sockaddr_in *)in_addr;
size_t addr_len = sizeof(struct in_addr);
addr_header[addr_header_len++] = 1;
memcpy(addr_header + addr_header_len, &addr->sin_addr, addr_len);
addr_header_len += addr_len;
memcpy(addr_header + addr_header_len, &addr->sin_port, 2);
addr_header_len += 2;
} else if (in_addr->ss_family == AF_INET6) {
struct sockaddr_in6 *addr = (struct sockaddr_in6 *)in_addr;
size_t addr_len = sizeof(struct in6_addr);
addr_header[addr_header_len++] = 4;
memcpy(addr_header + addr_header_len, &addr->sin6_addr, addr_len);
addr_header_len += addr_len;
memcpy(addr_header + addr_header_len, &addr->sin6_port, 2);
addr_header_len += 2;
} else {
return 0;
}
return addr_header_len;
}
#endif
static int parse_udprealy_header(const char * buf, const int buf_len,
char *host, char *port,
struct sockaddr_storage *storage)
@@ -846,25 +874,9 @@ static void server_recv_cb(EV_P_ ev_io *w, int revents)
#ifdef UDPRELAY_REDIR
char addr_header[256] = { 0 };
int addr_header_len = 0;
int addr_header_len = construct_udprealy_header(&dst_addr, addr_header);
if (dst_addr.ss_family == AF_INET) {
struct sockaddr_in *addr = (struct sockaddr_in *)&dst_addr;
size_t addr_len = sizeof(struct in_addr);
addr_header[addr_header_len++] = 1;
memcpy(addr_header + addr_header_len, &addr->sin_addr, addr_len);
addr_header_len += addr_len;
memcpy(addr_header + addr_header_len, &addr->sin_port, 2);
addr_header_len += 2;
} else if (dst_addr.ss_family == AF_INET6) {
struct sockaddr_in6 *addr = (struct sockaddr_in6 *)&dst_addr;
size_t addr_len = sizeof(struct in6_addr);
addr_header[addr_header_len++] = 4;
memcpy(addr_header + addr_header_len, &addr->sin6_addr, addr_len);
addr_header_len += addr_len;
memcpy(addr_header + addr_header_len, &addr->sin6_port, 2);
addr_header_len += 2;
} else {
if (addr_header_len == 0) {
LOGE("[udp] failed to parse tproxy addr");
goto CLEAN_UP;
}