richard
/
shadowsocks-libev
mirror of https://github.com/shadowsocks/shadowsocks-libev.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix the issue where the program exits when the operating system does not support TCP_FASTOPEN_CONNECT. 

If the operating system does not support TCP_FASTOPEN_CONNECT or in a container environment, the service should still function normally, albeit with lower performance.
pull/2978/head
nfalse 1 year ago
parent
d83ace0f0d
commit
29b0a3345e
5 changed files with 51 additions and 4 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/local.c
  2. 2
      src/redir.c
  3. 2
      src/server.c
  4. 2
      src/tunnel.c
  5. 47
      src/utils.h

2
src/local.c
View File

@ -714,7 +714,7 @@ server_stream(EV_P_ ev_io *w, buffer_t *buf)
int optval = 1; int optval = 1;
if (setsockopt(remote->fd, IPPROTO_TCP, TCP_FASTOPEN_CONNECT, if (setsockopt(remote->fd, IPPROTO_TCP, TCP_FASTOPEN_CONNECT,
(void *)&optval, sizeof(optval)) < 0) (void *)&optval, sizeof(optval)) < 0)
FATAL("failed to set TCP_FASTOPEN_CONNECT");
LOGW("failed to set TCP_FASTOPEN_CONNECT");
s = connect(remote->fd, (struct sockaddr *)&(remote->addr), remote->addr_len); s = connect(remote->fd, (struct sockaddr *)&(remote->addr), remote->addr_len);
#else #else
FATAL("fast open is not enabled in this build"); FATAL("fast open is not enabled in this build");

2
src/redir.c
View File

@ -551,7 +551,7 @@ remote_send_cb(EV_P_ ev_io *w, int revents)
int optval = 1; int optval = 1;
if (setsockopt(remote->fd, IPPROTO_TCP, TCP_FASTOPEN_CONNECT, if (setsockopt(remote->fd, IPPROTO_TCP, TCP_FASTOPEN_CONNECT,
(void *)&optval, sizeof(optval)) < 0) (void *)&optval, sizeof(optval)) < 0)
FATAL("failed to set TCP_FASTOPEN_CONNECT");
LOGW("failed to set TCP_FASTOPEN_CONNECT");
s = connect(remote->fd, remote->addr, get_sockaddr_len(remote->addr)); s = connect(remote->fd, remote->addr, get_sockaddr_len(remote->addr));
if (s == 0) if (s == 0)
s = send(remote->fd, remote->buf->data, remote->buf->len, 0); s = send(remote->fd, remote->buf->data, remote->buf->len, 0);

2
src/server.c
View File

@ -789,7 +789,7 @@ connect_to_remote(EV_P_ struct addrinfo *res,
int optval = 1; int optval = 1;
if (setsockopt(sockfd, IPPROTO_TCP, TCP_FASTOPEN_CONNECT, if (setsockopt(sockfd, IPPROTO_TCP, TCP_FASTOPEN_CONNECT,
(void *)&optval, sizeof(optval)) < 0) (void *)&optval, sizeof(optval)) < 0)
FATAL("failed to set TCP_FASTOPEN_CONNECT");
LOGW("failed to set TCP_FASTOPEN_CONNECT");
s = connect(sockfd, res->ai_addr, res->ai_addrlen); s = connect(sockfd, res->ai_addr, res->ai_addrlen);
#elif defined(CONNECT_DATA_IDEMPOTENT) #elif defined(CONNECT_DATA_IDEMPOTENT)
struct sockaddr_in sa; struct sockaddr_in sa;

2
src/tunnel.c
View File

@ -534,7 +534,7 @@ remote_send_cb(EV_P_ ev_io *w, int revents)
int optval = 1; int optval = 1;
if (setsockopt(remote->fd, IPPROTO_TCP, TCP_FASTOPEN_CONNECT, if (setsockopt(remote->fd, IPPROTO_TCP, TCP_FASTOPEN_CONNECT,
(void *)&optval, sizeof(optval)) < 0) (void *)&optval, sizeof(optval)) < 0)
FATAL("failed to set TCP_FASTOPEN_CONNECT");
LOGW("failed to set TCP_FASTOPEN_CONNECT");
s = connect(remote->fd, remote->addr, get_sockaddr_len(remote->addr)); s = connect(remote->fd, remote->addr, get_sockaddr_len(remote->addr));
if (s == 0) if (s == 0)
s = send(remote->fd, remote->buf->data, remote->buf->len, 0); s = send(remote->fd, remote->buf->data, remote->buf->len, 0);

47
src/utils.h
View File

@ -40,6 +40,9 @@
#define LOGI(...) \ #define LOGI(...) \
((void)__android_log_print(ANDROID_LOG_DEBUG, "shadowsocks", \ ((void)__android_log_print(ANDROID_LOG_DEBUG, "shadowsocks", \
__VA_ARGS__)) __VA_ARGS__))
#define LOGW(...) \
((void)__android_log_print(ANDROID_LOG_WARN, "shadowsocks", \
__VA_ARGS__))
#define LOGE(...) \ #define LOGE(...) \
((void)__android_log_print(ANDROID_LOG_ERROR, "shadowsocks", \ ((void)__android_log_print(ANDROID_LOG_ERROR, "shadowsocks", \
__VA_ARGS__)) __VA_ARGS__))
@ -74,6 +77,17 @@ extern FILE *logfile;
fflush(logfile); } \ fflush(logfile); } \
} \ } \
while (0) while (0)
#define LOGW(format, ...) \
do { \
if (logfile != NULL) { \
time_t now = time(NULL); \
char timestr[20]; \
strftime(timestr, 20, TIME_FORMAT, localtime(&now)); \
fprintf(logfile, " %s WARNNING: " format "\n", timestr, \
## __VA_ARGS__); \
fflush(logfile); } \
} \
while (0)
#define LOGE(format, ...) \ #define LOGE(format, ...) \
do { \ do { \
if (logfile != NULL) { \ if (logfile != NULL) { \
@ -107,6 +121,19 @@ extern FILE *logfile;
} \ } \
while (0) while (0)
#define LOGW(format, ...) \
do { \
time_t now = time(NULL); \
char timestr[20]; \
strftime(timestr, 20, TIME_FORMAT, localtime(&now)); \
ss_color_error(); \
fprintf(stderr, " %s WARNNING: ", timestr); \
ss_color_reset(); \
fprintf(stderr, format "\n", ## __VA_ARGS__); \
fflush(stderr); \
} \
while (0)
#define LOGE(format, ...) \ #define LOGE(format, ...) \
do { \ do { \
time_t now = time(NULL); \ time_t now = time(NULL); \
@ -165,6 +192,26 @@ extern int use_syslog;
} \ } \
while (0) while (0)
#define LOGW(format, ...) \
do { \
if (use_syslog) { \
syslog(LOG_ERR, format, ## __VA_ARGS__); \
} else { \
time_t now = time(NULL); \
char timestr[20]; \
strftime(timestr, 20, TIME_FORMAT, localtime(&now)); \
if (use_tty) { \
fprintf(stderr, "\e[01;35m %s WARNNING: \e[0m" format "\n", timestr, \
## __VA_ARGS__); \
fflush(stderr); \
} else { \
fprintf(stderr, " %s WARNNING: " format "\n", timestr, \
## __VA_ARGS__); \
fflush(stderr); \
} \
} } \
while (0)
#define LOGE(format, ...) \ #define LOGE(format, ...) \
do { \ do { \
if (use_syslog) { \ if (use_syslog) { \

Write Preview
Loading…
Cancel
Save