shadowsocksr-libev: refresh patch
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
parent
7a44cee1e6
commit
deee25aa0d
@ -1,6 +1,6 @@
|
||||
--- a/completions/bash/ss-redir
|
||||
+++ b/completions/bash/ss-redir
|
||||
@@ -2,7 +2,7 @@
|
||||
@@ -2,7 +2,7 @@ _ss_redir()
|
||||
{
|
||||
local cur prev opts ciphers
|
||||
ciphers='rc4-md5 table rc4 aes-128-cfb aes-192-cfb aes-256-cfb aes-128-ctr aes-192-ctr aes-256-ctr bf-cfb camellia-128-cfb camellia-192-cfb camellia-256-cfb cast5-cfb des-cfb idea-cfb rc2-cfb seed-cfb salsa20 chacha20 and chacha20-ietf'
|
||||
@ -11,7 +11,7 @@
|
||||
case "$prev" in
|
||||
--- a/src/jconf.c
|
||||
+++ b/src/jconf.c
|
||||
@@ -338,7 +338,11 @@
|
||||
@@ -338,7 +338,11 @@ read_jconf(const char *file)
|
||||
check_json_value_type(value, json_boolean,
|
||||
"invalid config file: option 'ipv6_first' must be a boolean");
|
||||
conf.ipv6_first = value->u.boolean;
|
||||
@ -26,7 +26,7 @@
|
||||
} else {
|
||||
--- a/src/jconf.h
|
||||
+++ b/src/jconf.h
|
||||
@@ -105,6 +105,7 @@
|
||||
@@ -105,6 +105,7 @@ typedef struct {
|
||||
int mtu;
|
||||
int mptcp;
|
||||
int ipv6_first;
|
||||
@ -51,7 +51,7 @@
|
||||
#include "includeobfs.h" // I don't want to modify makefile
|
||||
#include "jconf.h"
|
||||
|
||||
@@ -101,18 +109,28 @@
|
||||
@@ -101,18 +109,28 @@ static struct cork_dllist inactive_profi
|
||||
static listen_ctx_t *current_profile;
|
||||
static struct cork_dllist all_connections;
|
||||
|
||||
@ -86,7 +86,7 @@
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -164,6 +182,23 @@
|
||||
@@ -164,6 +182,23 @@ create_and_bind(const char *addr, const
|
||||
if (err == 0) {
|
||||
LOGI("tcp port reuse enabled");
|
||||
}
|
||||
@ -110,7 +110,7 @@
|
||||
|
||||
s = bind(listen_sock, rp->ai_addr, rp->ai_addrlen);
|
||||
if (s == 0) {
|
||||
@@ -1094,7 +1129,7 @@
|
||||
@@ -1094,7 +1129,7 @@ main(int argc, char **argv)
|
||||
|
||||
USE_TTY();
|
||||
|
||||
@ -119,7 +119,7 @@
|
||||
"O:o:G:g:",
|
||||
long_options, &option_index)) != -1) {
|
||||
switch (c) {
|
||||
@@ -1169,6 +1204,9 @@
|
||||
@@ -1169,6 +1204,9 @@ main(int argc, char **argv)
|
||||
case 'U':
|
||||
mode = UDP_ONLY;
|
||||
break;
|
||||
@ -129,7 +129,7 @@
|
||||
case 'v':
|
||||
verbose = 1;
|
||||
break;
|
||||
@@ -1255,6 +1293,9 @@
|
||||
@@ -1255,6 +1293,9 @@ main(int argc, char **argv)
|
||||
if (mode == TCP_ONLY) {
|
||||
mode = conf->mode;
|
||||
}
|
||||
@ -141,7 +141,7 @@
|
||||
}
|
||||
--- a/src/utils.c
|
||||
+++ b/src/utils.c
|
||||
@@ -342,6 +342,10 @@
|
||||
@@ -342,6 +342,10 @@ usage()
|
||||
#endif
|
||||
printf(
|
||||
" [-U] Enable UDP relay and disable TCP relay.\n");
|
||||
|
Loading…
Reference in New Issue
Block a user