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

Refine #495

Browse Source
This commit is contained in:
Max Lv
2015-12-25 14:48:23 +08:00
parent 96690ea08c
commit 52739f7a14
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udprelay.c
+7 -10
View File
@@ -572,7 +572,7 @@ static void query_resolve_cb(struct sockaddr *addr, void *data)
// Lookup in the conn cache
if (remote_ctx == NULL) {
char *key = hash_key(0, &query_ctx->src_addr);
char *key = hash_key(AF_UNSPEC, &query_ctx->src_addr);
cache_lookup(query_ctx->server_ctx->conn_cache, key, HASH_KEY_LEN, (void *)&remote_ctx);
}
@@ -617,7 +617,7 @@ static void query_resolve_cb(struct sockaddr *addr, void *data)
} else {
if (!cache_hit) {
// Add to conn cache
char *key = hash_key(0, &remote_ctx->src_addr);
char *key = hash_key(AF_UNSPEC, &remote_ctx->src_addr);
cache_insert(query_ctx->server_ctx->conn_cache, key, HASH_KEY_LEN, (void *)remote_ctx);
ev_io_start(EV_A_ & remote_ctx->io);
ev_timer_start(EV_A_ & remote_ctx->watcher);
@@ -932,8 +932,6 @@ static void server_recv_cb(EV_P_ ev_io *w, int revents)
memcpy(buf->array, addr_header, addr_header_len);
buf->len += addr_header_len;
char *key = hash_key(dst_addr.ss_family, &src_addr);
#elif MODULE_TUNNEL
char addr_header[256] = { 0 };
@@ -988,8 +986,6 @@ static void server_recv_cb(EV_P_ ev_io *w, int revents)
memcpy(buf->array, addr_header, addr_header_len);
buf->len += addr_header_len;
char *key = hash_key(ip.version == 4 ? AF_INET : AF_INET6, &src_addr);
#else
char host[256] = { 0 };
@@ -1006,11 +1002,12 @@ static void server_recv_cb(EV_P_ ev_io *w, int revents)
}
char *addr_header = buf->array + offset;
#ifdef MODULE_LOCAL
char *key = hash_key(server_ctx->remote_addr->sa_family, &src_addr);
#else
char *key = hash_key(dst_addr.ss_family, &src_addr);
#endif
#ifdef MODULE_LOCAL
char *key = hash_key(server_ctx->remote_addr->sa_family, &src_addr);
#else
char *key = hash_key(dst_addr.ss_family, &src_addr);
#endif
struct cache *conn_cache = server_ctx->conn_cache;