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

Merge pull request #151 from madeye/v1.5.3 

Fix log on Win32.
pull/154/head v1.5.3
Max Lv 10 years ago
parent
2a879bcb2e 5114f43dbf
commit
dcf5a39b62
9 changed files with 25 additions and 31 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      README.md
  2. 20
      configure
  3. 2
      configure.ac
  4. 6
      debian/changelog
  5. 2
      openwrt/Makefile
  6. 7
      src/local.c
  7. 5
      src/redir.c
  8. 7
      src/server.c
  9. 5
      src/tunnel.c

2
README.md
View File

@ -11,7 +11,7 @@ It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks)
created by [@clowwindy](https://github.com/clowwindy) maintained by created by [@clowwindy](https://github.com/clowwindy) maintained by
[@madeye](https://github.com/madeye) and [@linusyang](https://github.com/linusyang). [@madeye](https://github.com/madeye) and [@linusyang](https://github.com/linusyang).
Current version: 1.5.2 | [![Build Status](https://travis-ci.org/madeye/shadowsocks-libev.png?branch=master)](https://travis-ci.org/madeye/shadowsocks-libev) | [Changelog](Changes)
Current version: 1.5.3 | [![Build Status](https://travis-ci.org/madeye/shadowsocks-libev.png?branch=master)](https://travis-ci.org/madeye/shadowsocks-libev) | [Changelog](Changes)
Features Features
-------- --------

20
configure
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for shadowsocks 1.5.2.
# Generated by GNU Autoconf 2.68 for shadowsocks 1.5.3.
# #
# Report bugs to <max.c.lv@gmail.com>. # Report bugs to <max.c.lv@gmail.com>.
# #
@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='shadowsocks' PACKAGE_NAME='shadowsocks'
PACKAGE_TARNAME='shadowsocks' PACKAGE_TARNAME='shadowsocks'
PACKAGE_VERSION='1.5.2'
PACKAGE_STRING='shadowsocks 1.5.2'
PACKAGE_VERSION='1.5.3'
PACKAGE_STRING='shadowsocks 1.5.3'
PACKAGE_BUGREPORT='max.c.lv@gmail.com' PACKAGE_BUGREPORT='max.c.lv@gmail.com'
PACKAGE_URL='' PACKAGE_URL=''
@ -1307,7 +1307,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures shadowsocks 1.5.2 to adapt to many kinds of systems.
\`configure' configures shadowsocks 1.5.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1377,7 +1377,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of shadowsocks 1.5.2:";;
short | recursive ) echo "Configuration of shadowsocks 1.5.3:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1494,7 +1494,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
shadowsocks configure 1.5.2
shadowsocks configure 1.5.3
generated by GNU Autoconf 2.68 generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc. Copyright (C) 2010 Free Software Foundation, Inc.
@ -2016,7 +2016,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by shadowsocks $as_me 1.5.2, which was
It was created by shadowsocks $as_me 1.5.3, which was
generated by GNU Autoconf 2.68. Invocation command line was generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@ $ $0 $@
@ -2837,7 +2837,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='shadowsocks' PACKAGE='shadowsocks'
VERSION='1.5.2'
VERSION='1.5.3'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -15533,7 +15533,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by shadowsocks $as_me 1.5.2, which was
This file was extended by shadowsocks $as_me 1.5.3, which was
generated by GNU Autoconf 2.68. Invocation command line was generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -15599,7 +15599,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
shadowsocks config.status 1.5.2
shadowsocks config.status 1.5.3
configured by $0, generated by GNU Autoconf 2.68, configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

2
configure.ac
View File

@ -2,7 +2,7 @@ dnl -*- Autoconf -*-
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.67]) AC_PREREQ([2.67])
AC_INIT([shadowsocks], [1.5.2], [max.c.lv@gmail.com])
AC_INIT([shadowsocks], [1.5.3], [max.c.lv@gmail.com])
AC_CONFIG_SRCDIR([src/encrypt.c]) AC_CONFIG_SRCDIR([src/encrypt.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(auto) AC_CONFIG_AUX_DIR(auto)

6
debian/changelog
View File

@ -1,3 +1,9 @@
shadowsocks (1.5.3-1) unstable; urgency=low
* Fix log on Win32.
-- Max Lv <max.c.lv@gmail.com> Fri, 14 Nov 2014 09:10:06 +0800
shadowsocks (1.5.2-1) unstable; urgency=low shadowsocks (1.5.2-1) unstable; urgency=low
* Handle SIGTERM and SIGKILL nicely. * Handle SIGTERM and SIGKILL nicely.

2
openwrt/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=shadowsocks-libev PKG_NAME:=shadowsocks-libev
PKG_VERSION:=1.5.2
PKG_VERSION:=1.5.3
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_URL:=https://github.com/madeye/shadowsocks-libev/archive PKG_SOURCE_URL:=https://github.com/madeye/shadowsocks-libev/archive

7
src/local.c
View File

@ -154,7 +154,6 @@ int create_and_bind(const char *addr, const char *port)
int opt = 1; int opt = 1;
setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
setsockopt(listen_sock, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE #ifdef SO_NOSIGPIPE
setsockopt(listen_sock, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); setsockopt(listen_sock, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif #endif
@ -793,7 +792,6 @@ static void close_and_free_server(EV_P_ struct server *server)
static struct remote * connect_to_remote(struct listen_ctx *listener, static struct remote * connect_to_remote(struct listen_ctx *listener,
const char *host, const char *port) const char *host, const char *port)
{ {
int opt = 1;
int sockfd; int sockfd;
struct addrinfo *remote_res; struct addrinfo *remote_res;
@ -829,8 +827,8 @@ static struct remote * connect_to_remote(struct listen_ctx *listener,
return NULL; return NULL;
} }
setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE #ifdef SO_NOSIGPIPE
int opt = 1;
setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif #endif
@ -868,9 +866,8 @@ void accept_cb(EV_P_ ev_io *w, int revents)
return; return;
} }
setnonblocking(serverfd); setnonblocking(serverfd);
int opt = 1;
setsockopt(serverfd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE #ifdef SO_NOSIGPIPE
int opt = 1;
setsockopt(serverfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); setsockopt(serverfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif #endif

5
src/redir.c
View File

@ -127,7 +127,6 @@ int create_and_bind(const char *addr, const char *port)
int opt = 1; int opt = 1;
setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
setsockopt(listen_sock, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE #ifdef SO_NOSIGPIPE
setsockopt(listen_sock, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); setsockopt(listen_sock, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif #endif
@ -588,9 +587,8 @@ static void accept_cb(EV_P_ ev_io *w, int revents)
} }
setnonblocking(clientfd); setnonblocking(clientfd);
int opt = 1;
setsockopt(clientfd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE #ifdef SO_NOSIGPIPE
int opt = 1;
setsockopt(clientfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); setsockopt(clientfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif #endif
@ -615,7 +613,6 @@ static void accept_cb(EV_P_ ev_io *w, int revents)
return; return;
} }
setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE #ifdef SO_NOSIGPIPE
setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif #endif

7
src/server.c
View File

@ -154,7 +154,6 @@ int create_and_bind(const char *host, const char *port)
int opt = 1; int opt = 1;
setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
setsockopt(listen_sock, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE #ifdef SO_NOSIGPIPE
setsockopt(listen_sock, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); setsockopt(listen_sock, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif #endif
@ -198,7 +197,6 @@ static struct remote *connect_to_remote(struct addrinfo *res,
struct server *server) struct server *server)
{ {
int sockfd; int sockfd;
int opt = 1;
#ifdef SET_INTERFACE #ifdef SET_INTERFACE
const char *iface = server->listen_ctx->iface; const char *iface = server->listen_ctx->iface;
#endif #endif
@ -211,8 +209,8 @@ static struct remote *connect_to_remote(struct addrinfo *res,
return NULL; return NULL;
} }
setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE #ifdef SO_NOSIGPIPE
int opt = 1;
setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif #endif
@ -889,9 +887,8 @@ static void accept_cb(EV_P_ ev_io *w, int revents)
} }
setnonblocking(serverfd); setnonblocking(serverfd);
int opt = 1;
setsockopt(serverfd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE #ifdef SO_NOSIGPIPE
int opt = 1;
setsockopt(serverfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); setsockopt(serverfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif #endif

5
src/tunnel.c
View File

@ -131,7 +131,6 @@ int create_and_bind(const char *addr, const char *port)
int opt = 1; int opt = 1;
setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
setsockopt(listen_sock, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE #ifdef SO_NOSIGPIPE
setsockopt(listen_sock, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); setsockopt(listen_sock, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif #endif
@ -573,9 +572,8 @@ static void accept_cb(EV_P_ ev_io *w, int revents)
return; return;
} }
setnonblocking(serverfd); setnonblocking(serverfd);
int opt = 1;
setsockopt(serverfd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE #ifdef SO_NOSIGPIPE
int opt = 1;
setsockopt(serverfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); setsockopt(serverfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif #endif
@ -603,7 +601,6 @@ static void accept_cb(EV_P_ ev_io *w, int revents)
return; return;
} }
setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt));
#ifdef SO_NOSIGPIPE #ifdef SO_NOSIGPIPE
setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt)); setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
#endif #endif

Write Preview
Loading…
Cancel
Save