From 79f0e3c68d00eea2456f1e668b00bea93ce673ce Mon Sep 17 00:00:00 2001 From: Max Lv Date: Tue, 28 Nov 2017 10:33:26 +0800 Subject: [PATCH] Fix uninitialized variables --- src/local.c | 2 +- src/redir.c | 3 +-- src/server.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/local.c b/src/local.c index 71a55e7e..11a7d07c 100644 --- a/src/local.c +++ b/src/local.c @@ -369,7 +369,7 @@ server_recv_cb(EV_P_ ev_io *w, int revents) ev_io_start(EV_A_ & remote->send_ctx->io); ev_timer_start(EV_A_ & remote->send_ctx->watcher); } else { - int s; + int s = -1; #if defined(MSG_FASTOPEN) && !defined(TCP_FASTOPEN_CONNECT) s = sendto(remote->fd, remote->buf->data, remote->buf->len, MSG_FASTOPEN, (struct sockaddr *)&(remote->addr), remote->addr_len); diff --git a/src/redir.c b/src/redir.c index b1bebca0..08416845 100644 --- a/src/redir.c +++ b/src/redir.c @@ -552,10 +552,9 @@ remote_send_cb(EV_P_ ev_io *w, int revents) return; } else { // has data to send - int s; + int s = -1; if (remote->addr != NULL) { - #if defined(TCP_FASTOPEN_CONNECT) int optval = 1; if(setsockopt(remote->fd, IPPROTO_TCP, TCP_FASTOPEN_CONNECT, diff --git a/src/server.c b/src/server.c index c80bf80e..2719e7b8 100644 --- a/src/server.c +++ b/src/server.c @@ -507,8 +507,7 @@ connect_to_remote(EV_P_ struct addrinfo *res, remote_t *remote = new_remote(sockfd); if (fast_open) { - - int s; + int s = -1; #if defined(MSG_FASTOPEN) && !defined(TCP_FASTOPEN_CONNECT) s = sendto(sockfd, server->buf->data, server->buf->len, MSG_FASTOPEN, res->ai_addr, res->ai_addrlen);