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

fix the segfault

Browse Source
This commit is contained in:
Max Lv
2014-04-19 20:50:08 +08:00
parent 93a7b5ccfa
commit c09b38eba2
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server.c
+1 -4
View File
@@ -357,7 +357,6 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents)
server->query = query;
ev_io_stop(EV_A_ &server_recv_ctx->io);
ev_timer_start(EV_A_ &server->send_ctx->watcher);
return;
}
@@ -468,8 +467,7 @@ static void server_resolve_cb(EV_P_ ev_io *w, int revents)
}
asyncns_query_t *query = asyncns_getnext(asyncns);
struct server_ctx *server_ctx = (struct server_ctx *) asyncns_getuserdata(asyncns, query);
struct server *server = server_ctx->server;
struct server *server= (struct server*) asyncns_getuserdata(asyncns, query);
if (!asyncns_isdone(asyncns, query))
{
@@ -860,7 +858,6 @@ void close_and_free_server(EV_P_ struct server *server)
}
ev_io_stop(EV_A_ &server->send_ctx->io);
ev_io_stop(EV_A_ &server->recv_ctx->io);
ev_timer_stop(EV_A_ &server->send_ctx->watcher);
ev_timer_stop(EV_A_ &server->recv_ctx->watcher);
close(server->fd);
free_server(server);
src/server.h
+2 -2
View File
@@ -32,17 +32,17 @@ struct server_ctx
struct server
{
int fd;
int stage;
int buf_len;
int buf_idx;
char *buf; // server send from, remote recv into
char stage;
asyncns_query_t *query;
struct enc_ctx *e_ctx;
struct enc_ctx *d_ctx;
struct server_ctx *recv_ctx;
struct server_ctx *send_ctx;
struct listen_ctx *listen_ctx;
struct remote *remote;
asyncns_query_t *query;
};
struct remote_ctx