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

Add container_of

Browse Source
This commit is contained in:
Max Lv
2016-12-08 14:48:40 +08:00
parent baff29e970
commit a63a33861f
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/local.c
+2 -2
View File
@@ -744,8 +744,8 @@ stat_update_cb()
static void
remote_timeout_cb(EV_P_ ev_timer *watcher, int revents)
{
remote_ctx_t *remote_ctx = (remote_ctx_t *)(((char *)watcher)
- sizeof(ev_io));
remote_ctx_t *remote_ctx
= (remote_ctx_t *)container_of(watcher, remote_ctx_t, watcher);
remote_t *remote = remote_ctx->remote;
server_t *server = remote->server;
src/redir.c
+3 -2
View File
@@ -328,8 +328,9 @@ server_send_cb(EV_P_ ev_io *w, int revents)
static void
remote_timeout_cb(EV_P_ ev_timer *watcher, int revents)
{
remote_ctx_t *remote_ctx = (remote_ctx_t *)(((char *)watcher)
- sizeof(ev_io));
remote_ctx_t *remote_ctx
= (remote_ctx_t *)container_of(watcher, remote_ctx_t, watcher);
remote_t *remote = remote_ctx->remote;
server_t *server = remote->server;
src/server.c
+2 -2
View File
@@ -1049,8 +1049,8 @@ block_list_clear_cb(EV_P_ ev_timer *watcher, int revents)
static void
server_timeout_cb(EV_P_ ev_timer *watcher, int revents)
{
server_ctx_t *server_ctx = (server_ctx_t *)(((char *)watcher)
- sizeof(ev_io));
server_ctx_t *server_ctx
= (server_ctx_t *)container_of(watcher, server_ctx_t, watcher);
server_t *server = server_ctx->server;
remote_t *remote = server->remote;
src/tunnel.c
+3 -2
View File
@@ -284,8 +284,9 @@ server_send_cb(EV_P_ ev_io *w, int revents)
static void
remote_timeout_cb(EV_P_ ev_timer *watcher, int revents)
{
remote_ctx_t *remote_ctx = (remote_ctx_t *)(((char *)watcher)
- sizeof(ev_io));
remote_ctx_t *remote_ctx
= (remote_ctx_t *)container_of(watcher, remote_ctx_t, watcher);
remote_t *remote = remote_ctx->remote;
server_t *server = remote->server;
src/udprelay.c
+2 -2
View File
@@ -549,8 +549,8 @@ close_and_free_remote(EV_P_ remote_ctx_t *ctx)
static void
remote_timeout_cb(EV_P_ ev_timer *watcher, int revents)
{
remote_ctx_t *remote_ctx = (remote_ctx_t *)(((char *)watcher)
- sizeof(ev_io));
remote_ctx_t *remote_ctx
= (remote_ctx_t *)container_of(watcher, remote_ctx_t, watcher);
if (verbose) {
LOGI("[udp] connection timeout");
src/utils.h
+5
View File
@@ -228,4 +228,9 @@ void *ss_realloc(void *ptr, size_t new_size);
ptr = NULL; \
} while (0)
#ifndef container_of
#define container_of(ptr, type, member) \
((type *) ((char *)(ptr) - offsetof(type, member)))
#endif
#endif // _UTILS_H