Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

win32 nonblocking mode problem : reported to madeye and fixed #24

Open
wants to merge 501 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
501 commits
Select commit Hold shift + click to select a range
b517ec2
fix a corner case
madeye Jul 12, 2015
09152d4
refine the handling of dest addr
madeye Jul 13, 2015
e4a795d
fix an issue of TPROXY
madeye Jul 13, 2015
8283e51
enlarge the default timeout
madeye Jul 14, 2015
025ea58
Change 'scoks' to 'socks'
hosiet Jul 14, 2015
e762723
Merge pull request #347 from hosiet/fix-grammar
madeye Jul 14, 2015
53ddb3b
enlarge min UDP relay timeout
madeye Jul 14, 2015
2b1eef1
fix #356, disable TLS for uClibc
madeye Jul 19, 2015
a132e84
refine a function name
madeye Jul 23, 2015
feed7cc
add android ipc function
madeye Jul 24, 2015
2c0dd4a
fix some issues
madeye Jul 24, 2015
1501001
protect udp relay socket
madeye Jul 24, 2015
87fb636
fix some issues
madeye Jul 24, 2015
6800075
fix a build issue
madeye Jul 24, 2015
94a1c4f
use blocking IPC
madeye Jul 24, 2015
3d2b980
add android vpn mode option
madeye Jul 24, 2015
3af591c
Merge pull request #359 from shadowsocks/android-ipc
madeye Jul 24, 2015
1d5a3b9
fix #357
madeye Jul 28, 2015
23ff3bf
fix a build issue
madeye Jul 28, 2015
60bdea5
update a marco of detecting linux
madeye Jul 30, 2015
d2794c0
disable TCP_FASTOPEN for EI Capitan
madeye Jul 30, 2015
2e65cca
bump version
madeye Jul 30, 2015
6c9ad95
fix a typo
madeye Jul 30, 2015
a9f8b2b
drop large UDP packets
madeye Jul 31, 2015
b3911fc
fix a build issue
madeye Jul 31, 2015
7260153
add log for possible ip fragmentation
madeye Jul 31, 2015
aaf7284
avoid protect socket every time
madeye Jul 31, 2015
e81b205
Add mbed TLS support for shadowsocks-libev
wongsyrone Jul 31, 2015
5424cbe
Merge pull request #365 from wongsyrone/master
madeye Aug 1, 2015
56daf99
Add more mbed TLS cipher check
wongsyrone Aug 1, 2015
bde0d26
Merge pull request #366 from wongsyrone/master
madeye Aug 1, 2015
ac18674
clean up
madeye Aug 1, 2015
b232d3b
generate config.h.in for mbed TLS support
wongsyrone Aug 1, 2015
9173026
Merge pull request #367 from wongsyrone/patch-1
madeye Aug 1, 2015
a135d9c
libsodium: Fix _FORTIFY_SOURCE redefined issue
wongsyrone Aug 2, 2015
cd3e20f
Merge pull request #368 from wongsyrone/fix-libsodium-redefined-marco
madeye Aug 2, 2015
35297b6
clean up
madeye Aug 2, 2015
5d4db4f
use abstract namespace
madeye Aug 4, 2015
e3ed222
Revert "use abstract namespace"
madeye Aug 5, 2015
a8059f4
Fix typo in encrypt.c
wongsyrone Aug 10, 2015
e2654bf
Merge pull request #370 from wongsyrone/patch-1
madeye Aug 10, 2015
5f3c2e1
Add ss-manager for multi-user control and traffic statistics.
madeye Aug 6, 2015
07a8bb1
Merge pull request #371 from shadowsocks/manager-int
madeye Aug 11, 2015
7f9e158
fix a build issue
madeye Aug 12, 2015
4c508e1
add ip addr support
madeye Aug 12, 2015
096e1ec
fix a build issue
madeye Aug 12, 2015
8cc32a1
Update README.md
madeye Aug 28, 2015
ea2326e
Update utils.c
madeye Aug 28, 2015
a50e00c
refine conn cache
madeye Aug 30, 2015
491d22f
remove md5 in conn cache
madeye Aug 30, 2015
5a52a97
fix typo
madeye Sep 2, 2015
e686d65
fix iv cache
madeye Sep 2, 2015
42ee808
add onetime authentication
madeye Sep 3, 2015
9d2c14b
encode auth flag in atyp
madeye Sep 3, 2015
656c97e
fix auth flag in tunnel and redir
madeye Sep 3, 2015
20bc7fa
fix auth issue of tunnel and redir
madeye Sep 3, 2015
c78610a
bump version
madeye Sep 3, 2015
f45f7f2
update README
madeye Sep 4, 2015
4daab0e
disable iv check for rc4
madeye Sep 4, 2015
7672e5f
Fix mistake in pkgconfig .pc file
hosiet Sep 7, 2015
aced168
Merge pull request #390 from hosiet/fix-pkgconfig
madeye Sep 7, 2015
9f4c495
fix #391
madeye Sep 8, 2015
f193907
fix #393
madeye Sep 8, 2015
226cfa2
tune udp conn pool size
madeye Sep 9, 2015
d8e83f6
update openssl m4
madeye Sep 9, 2015
1b04b52
update pthread lib configs
madeye Sep 9, 2015
889e4b9
apply onetime auth to the first packet
madeye Sep 9, 2015
915bcff
add newly arranged man pages
hosiet Sep 9, 2015
59b6fd9
Revert "apply onetime auth to the first packet"
madeye Sep 9, 2015
0f742a2
Merge pull request #396 from hosiet/add-manpage
madeye Sep 9, 2015
f50b30f
clean up
madeye Sep 10, 2015
a2e4c02
fix a typo
madeye Sep 13, 2015
8dcd097
bump version
madeye Sep 13, 2015
9e021aa
add CRC8 for payload authentication
madeye Sep 15, 2015
58e6dbd
refine the protocol document
madeye Sep 15, 2015
2feb417
refine log
madeye Sep 16, 2015
703374c
fix a buf issue
madeye Sep 16, 2015
5c98a84
refine log
madeye Sep 16, 2015
6d79387
use crc16
madeye Sep 16, 2015
de8041b
fix a buffer issue
madeye Sep 16, 2015
8d13b2d
fix #398
madeye Sep 17, 2015
53c2900
refine onetime auth
madeye Sep 17, 2015
50b5038
fix the protocol document
GangZhuo Sep 17, 2015
71100cf
Merge pull request #399 from GangZhuo/master
madeye Sep 17, 2015
b49edb9
fix a buffer overflow
madeye Sep 17, 2015
8834118
Merge branch 'master' of github.com:shadowsocks/shadowsocks-libev
madeye Sep 17, 2015
7e23ae7
bump version
madeye Sep 18, 2015
5ae4df9
Update the hash function
madeye Sep 21, 2015
3042dd6
fix an issue of ACL
madeye Sep 21, 2015
643d579
Improve Debian packaging script.
hosiet Sep 22, 2015
6d5c9bd
Merge pull request #401 from hosiet/update-debian-dir
madeye Sep 22, 2015
1e10661
Refine the authentication for true CCA
madeye Sep 22, 2015
441ac45
Use one time key for BLAKE2b
madeye Sep 22, 2015
d3e43e0
Refine the authentication for true CCA
madeye Sep 22, 2015
552fca1
Use one time key for BLAKE2b
madeye Sep 22, 2015
5a02b74
Merge branch 'auth' of github.com:shadowsocks/shadowsocks-libev into …
madeye Sep 22, 2015
9f55353
Use IV + Chunk id as key of BLAKE2b
madeye Sep 22, 2015
f368642
fix typos
madeye Sep 22, 2015
0987fb3
fix an issue of endian
madeye Sep 23, 2015
f0f23b4
replace poly1305 with hmac-sha1
madeye Sep 23, 2015
0e79c93
add auth to udprelay
madeye Sep 23, 2015
4301ded
fix a typo
madeye Sep 23, 2015
c1db81d
fix a buffer overflow
madeye Sep 23, 2015
8d46ced
fix auth in udprelay
madeye Sep 24, 2015
5292700
update documents
madeye Sep 24, 2015
b8e282b
use OpenSSL's HMAC by default
madeye Sep 24, 2015
a76fae5
fix missing hmac-sha1
madeye Sep 24, 2015
529eab2
fix a typo
madeye Sep 24, 2015
224bc51
bump version
madeye Sep 24, 2015
5be0c9c
fix #404
madeye Sep 24, 2015
ac90abf
update symbols
madeye Sep 24, 2015
cf395b9
fix debian pkg script
hosiet Sep 24, 2015
6aa45df
Merge pull request #405 from hosiet/master
madeye Sep 24, 2015
032c609
truncate HMAC-SHA1 to 10 bytes
madeye Sep 24, 2015
65a15b1
make Debian systemd service use /etc/default conf.
hosiet Sep 27, 2015
04c5f97
Merge pull request #409 from hosiet/master
madeye Sep 27, 2015
9014578
add auth to config
madeye Sep 27, 2015
88b9063
update rpm spec file.
librehat Sep 27, 2015
227272b
using macros where possible
librehat Sep 27, 2015
ad4fdeb
Merge pull request #410 from librehat/master
madeye Sep 27, 2015
4aeb4ee
fix rpm spec
librehat Sep 28, 2015
bb55d5c
Merge pull request #412 from librehat/master
madeye Sep 28, 2015
14c611a
fix debian packaging
hosiet Sep 29, 2015
9bb8979
Merge pull request #413 from hosiet/master
madeye Sep 29, 2015
f65c19a
使其和默认安装包的路径一致
s7lx Sep 30, 2015
c06e962
Merge pull request #417 from s7lx/master
madeye Sep 30, 2015
095aa74
bump version
madeye Oct 2, 2015
a192b91
add systemd service templates for debian
hosiet Oct 13, 2015
938ccd9
fixes debian/copyright
hosiet Oct 14, 2015
f457626
add option in configure to use shared libraries
hosiet Oct 14, 2015
f5f7ada
update debug symbols
hosiet Oct 14, 2015
6f775d0
Merge pull request #429 from hosiet/master
madeye Oct 14, 2015
55ae226
add ubuntu dist
madeye Oct 15, 2015
e18f733
enable udp relay by default in debian service
madeye Oct 16, 2015
ecad0f9
remove symbol file
madeye Oct 18, 2015
22fb756
ignore symbol files
madeye Oct 18, 2015
75b5561
don't configure libsodium when using system libs
hosiet Oct 22, 2015
f00a4e2
Merge pull request #437 from hosiet/master
madeye Oct 23, 2015
e51dda2
update Makefile
madeye Oct 23, 2015
99633b9
fix #441
madeye Oct 29, 2015
c1959ca
refine the log
madeye Oct 29, 2015
03ac9aa
remove the error log of incomplete udp packet
madeye Oct 29, 2015
91316b2
bump version
madeye Oct 29, 2015
6d52f0a
refine the header length check
madeye Oct 29, 2015
33ff3b8
Merge branch 'master' of github.com:shadowsocks/shadowsocks-libev
madeye Oct 29, 2015
25c575c
clean up
madeye Oct 29, 2015
a65c162
fix a typo
madeye Oct 29, 2015
12ff6c8
fix a buffer corruption
madeye Oct 29, 2015
d5f77c4
fix #444
madeye Oct 30, 2015
7331acc
try to recover socks5 connection on buggy proxy client
pagxir Oct 31, 2015
4fe15c4
Merge pull request #446 from pagxir/master
madeye Oct 31, 2015
6728943
Readme cleanup
sparanoid Nov 2, 2015
6d39930
Merge pull request #449 from sparanoid/patch-1
madeye Nov 2, 2015
581c92f
Update README.md
madeye Nov 4, 2015
47adb69
update README for Debian/Ubuntu/Archlinux
hosiet Nov 4, 2015
4f01d2f
fix a typo
hosiet Nov 4, 2015
9f7146a
Merge pull request #452 from hosiet/master
madeye Nov 4, 2015
bfbcd4d
fix genrpm.sh
huiyiqun Nov 5, 2015
41b1146
update Version to 2.4.1
huiyiqun Nov 5, 2015
3c2ec0e
Merge pull request #454 from huiyiqun/master
madeye Nov 5, 2015
8c03bd9
Add example ss-manager usage in man page
hosiet Nov 6, 2015
890e880
Merge pull request #455 from hosiet/master
madeye Nov 6, 2015
772de6f
fix #444
madeye Nov 8, 2015
6bdd927
WAR for some AOSPs
madeye Nov 15, 2015
69e5392
Revert "WAR for some AOSPs"
madeye Nov 15, 2015
befbe94
try to support solaris
madeye Nov 16, 2015
e4c0bc9
use the proper header for solaris
madeye Nov 16, 2015
48cb9ad
use sched_yield on Solaris
madeye Nov 16, 2015
5225efe
fix getpwnam
madeye Nov 16, 2015
10c265b
refine configure scripts
madeye Nov 16, 2015
551b152
enforce GNU source and enable POSIX entension
madeye Nov 16, 2015
6a6c128
reorder the header file
madeye Nov 16, 2015
73e374d
add stack-protector.m4
madeye Nov 16, 2015
5d83a5e
disable stack protector on Solaris
madeye Nov 16, 2015
fe1cbb5
Refine the Solaris config
madeye Nov 16, 2015
fa8dc5c
allow to disable ssp
madeye Nov 16, 2015
f5160d4
fix missing semicolon
madeye Nov 16, 2015
c9e0cb6
add traffic stat IPC calls
madeye Nov 19, 2015
f226d47
fix build error
madeye Nov 19, 2015
4bdfc9f
Triger timer only if there are packets received
madeye Nov 21, 2015
778ccb2
Revert "Triger timer only if there are packets received"
madeye Nov 21, 2015
d462e4c
Fix the traffic update timer
madeye Nov 21, 2015
99f4c9e
fix #461
madeye Nov 22, 2015
7dd1f30
Fix a few typos in the README.
jlund Nov 27, 2015
fd28e82
Merge pull request #465 from jlund/master
madeye Nov 27, 2015
f4fa30d
Refine buffer handling
madeye Nov 29, 2015
b0600a8
Refine buffer handling
madeye Nov 29, 2015
ef0c87e
fix travis build
madeye Nov 30, 2015
dbbaae6
bump version
madeye Dec 1, 2015
d57b63f
fix #466
madeye Dec 1, 2015
2f6cc1f
Update hmac-sha1.c
madeye Dec 1, 2015
c5155e4
fix typo
madeye Dec 3, 2015
eccc91d
Refine ACL support
madeye Dec 3, 2015
eeac81e
Refine doc
madeye Dec 3, 2015
16a6e8c
Fix #469
madeye Dec 5, 2015
156223a
Fix a potential timing attack by @swordfeng
madeye Dec 6, 2015
0f4db65
use mbed TLS provided sha1-hmac function
wongsyrone Dec 6, 2015
496b1a9
Merge pull request #470 from wongsyrone/mbedtls-hmac
madeye Dec 6, 2015
c7ad107
do not undefine TCP_FASTOPEN on Darwin
crvv Dec 6, 2015
002e3e5
client side TCP fast open support on Darwin
crvv Dec 6, 2015
3d6528a
server side TCP fast open support on Darwin
crvv Dec 6, 2015
4656a8f
Merge pull request #471 from crvv/master
madeye Dec 7, 2015
e7a1d1e
Refine TCP fastopen
madeye Dec 7, 2015
d0cd1b4
Also refine TCP fastopen
crvv Dec 7, 2015
a436e39
Merge pull request #472 from crvv/master
madeye Dec 7, 2015
125cce3
Remove internal hmac-sha1
madeye Dec 8, 2015
06eef7f
use sha1_hmac function directly for PolarSSL
wongsyrone Dec 8, 2015
223bef5
Merge pull request #473 from wongsyrone/pr-for-madeye
madeye Dec 8, 2015
1164dc2
fix a typo for #474
madeye Dec 9, 2015
f3428e6
update Makefile.in
madeye Dec 11, 2015
596f036
Refine buffer allocation
madeye Dec 12, 2015
d2ef245
Refine buffer allocation (2)
madeye Dec 13, 2015
5c3ed5c
add IETF-compatible Chacha20 cipher support
wongsyrone Dec 13, 2015
be20711
Update libsodium
madeye Dec 13, 2015
11a4b73
Revert "Update libsodium"
madeye Dec 13, 2015
6b51cbb
Update libsodium
madeye Dec 13, 2015
616df26
Remove version.h
madeye Dec 13, 2015
96f750f
Merge pull request #481 from wongsyrone/chacha20-ietf
madeye Dec 13, 2015
72ea070
Clean up
madeye Dec 14, 2015
47f984e
Refine nofile option
madeye Dec 14, 2015
52ff163
Fix a build error
madeye Dec 15, 2015
48a063e
Bump version
madeye Dec 19, 2015
e3a4179
Update ax_pthread
madeye Dec 20, 2015
e52767b
Clean up
madeye Dec 20, 2015
f3117e2
Fix #484
madeye Dec 20, 2015
5ddf786
Refine ax_pthread
madeye Dec 21, 2015
98ea49e
man: fix a typo.
hosiet Dec 21, 2015
b7618dc
man: update info about cipher.
hosiet Dec 21, 2015
665217a
readme: update minor information.
hosiet Dec 21, 2015
0d58018
man: update info of arguments.
hosiet Dec 21, 2015
3d487d5
readme: refine structure; add info about mbedTLS.
hosiet Dec 21, 2015
6703e47
Merge pull request #485 from hosiet/dev
madeye Dec 22, 2015
fe6096c
readme: fix typo in 3d487d51.
hosiet Dec 22, 2015
2178c40
Merge pull request #486 from hosiet/dev
madeye Dec 22, 2015
bc91533
Merge branch 'master' of github.com:shadowsocks/shadowsocks-libev
madeye Dec 25, 2015
e921f40
Fix #493
madeye Dec 25, 2015
c18ae5f
Fix #494
madeye Dec 25, 2015
e73aab2
Fix #495
kery Dec 25, 2015
96690ea
Merge pull request #496 from kery/issue_495
madeye Dec 25, 2015
52739f7
Refine #495
madeye Dec 25, 2015
c065e9a
Update configure script for clang
madeye Dec 25, 2015
05a15aa
Support OTA in library interface
librehat Dec 25, 2015
44f3ae0
Merge pull request #498 from librehat/master
madeye Dec 25, 2015
68eaf3b
Reduce battery usage - transmit traffic stat with binary
Mygod Dec 26, 2015
bc14591
Merge pull request #499 from Mygod/battery-opt
madeye Dec 26, 2015
b86ecbb
add check to avoid Segmentation fault
aipsel Dec 27, 2015
c77c1c5
Merge pull request #500 from aipsel/fix
madeye Dec 27, 2015
cd0b5c8
Fix to avoid memory leak.
aipsel Dec 28, 2015
948ee68
Merge pull request #501 from aipsel/fix
madeye Dec 28, 2015
4746475
nonblocking mode fix
zyCwind Dec 30, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 8 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ build/
/Makefile
src/Makefile
libev/Makefile
libasyncns/Makefile
libudns/Makefile
libcork/Makefile
libipset/Makefile
autom4te.cache/
Expand All @@ -12,16 +12,20 @@ config.log
config.status
libtool
pid
ss*
ss.*
ss-*
stamp-h1
.libs
.pc
debian/shadowsocks/
debian/shadowsocks-libev/
debian/patches/
debian/files
debian/shadowsocks.substvars
debian/shadowsocks-libev.substvars
debian/*.debhelper*
.dirstamp
shadowsocks-libev.pc
debian/libshadowsocks1.symbols
libsodium/src/libsodium/include/sodium/version.h

# Ignore garbage of OS X
*.DS_Store
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: c
compiler:
- gcc
- clang
script: "sudo apt-get install libev-dev && ./configure && make"
script: "./configure && make"
branches:
only:
- master
Expand Down
1,376 changes: 1,376 additions & 0 deletions .uncrustify.cfg

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
if BUILD_WINCOMPAT
SUBDIRS = libcork libipset libev src
if USE_SYSTEM_SHARED_LIB
SUBDIRS = libcork libipset src
else
SUBDIRS = libcork libipset libasyncns libev src
SUBDIRS = libsodium libcork libipset libudns libev src
endif

ACLOCAL_AMFLAGS = -I m4
man_MANS = shadowsocks.8
man_MANS = man/shadowsocks-libev.8 man/ss-server.1 man/ss-local.1 man/ss-redir.1\
man/ss-manager.1 man/ss-tunnel.1

pkgconfiglibdir = $(libdir)/pkgconfig
pkgconfiglib_DATA = shadowsocks-libev.pc
Loading