Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
7eb1b10
doing add auth_chain_b
Akkariiin Jul 30, 2017
74bca7f
doing auth_chain_b
Akkariiin Jul 30, 2017
70f8e53
doing auth_chain_b
Akkariiin Jul 30, 2017
73ae847
doing auth_chain_b
Akkariiin Jul 30, 2017
6c0a085
adding auth_chain_c and auth_chain_d
Akkariiin Aug 2, 2017
e5cfb60
add auth_chain_c and auth_chain_d
Akkariiin Aug 2, 2017
01dc504
add auth_chain_c and auth_chain_d ok. need code review
Akkariiin Aug 2, 2017
bf0b476
fix typo
Akkariiin Aug 2, 2017
840e4fc
fix issue in auth_chain_c: cannot find payload data issue which case …
Akkariiin Aug 3, 2017
6263872
notice developer dont change algorithm magic number
Akkariiin Aug 3, 2017
3e88d38
add a todo
Akkariiin Aug 5, 2017
bf2cab0
Finish 2.5.0
Akkariiin Aug 7, 2017
77db777
change auth_chain_d_check_and_patch_data_size to loop version
Akkariiin Aug 7, 2017
db600c2
tls1.2: macro argument should be enclosed in parentheses
Akkariiin Aug 8, 2017
ab0b274
tls1.2: format code
Akkariiin Aug 8, 2017
726734a
local.c : format code and change `_server_info.overhead` init code an…
Akkariiin Aug 8, 2017
39713ec
auth_chain.c : change the server ref to &self->server to avoid the ab…
Akkariiin Aug 8, 2017
800f5ad
dont reset server->overhead in the set_server_info function
Akkariiin Aug 8, 2017
9a2365c
Finish 2.5.1
Akkariiin Aug 8, 2017
91c7216
auth_chain_e
Akkariiin Aug 14, 2017
a0a4137
doing auth_chain_f
Akkariiin Sep 22, 2017
a6e92c4
add auth_chain_f
Akkariiin Sep 22, 2017
2b50ea7
fix auth_chain_f
Akkariiin Sep 24, 2017
146fd02
Finish 2.5.2
Akkariiin Sep 24, 2017
d490456
fix auth_chain_f
Akkariiin Sep 24, 2017
bc1bbec
fix auth_chain_e & auth_chain_f
AkaneAkaza Jan 20, 2018
81e0a62
Update local.c
timwa0669 Jan 20, 2018
f7b499d
Update udprelay.c
timwa0669 Jan 20, 2018
24db646
Update redir.c
timwa0669 Jan 20, 2018
694467d
fix the error "rm: libtoolT: No such file or directory" when build to…
Akkariiin Mar 7, 2018
57e5285
complete cmake file list to make clion running good
Akkariiin Mar 7, 2018
93fb475
Merge remote-tracking branch 'origin/Akkariiin/develop' into Akkariii…
Akkariiin Mar 7, 2018
e9d4d8f
Merge pull request #23 from nevesti/Akkariiin/develop
Akkariiin Mar 7, 2018
138fd46
Merge remote-tracking branch 'origin/Akkariiin/develop' into Akkariii…
Akkariiin Mar 7, 2018
d63ff86
Finish 2.5.3 ... fix some small build issue in last version
Akkariiin Mar 7, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -17958,8 +17958,8 @@ $as_echo X"$file" |
fi

cfgfile="${ofile}T"
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
trap "$RM -f \"$cfgfile\"; exit 1" 1 2 15
$RM -f "$cfgfile"

cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
Expand Down
70 changes: 68 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,58 +1,124 @@

set(CMAKE_C_STANDARD 99)

set(SOURCE_FILES_SNI
http.c
http.h
tls.c
rule.c)
tls.h
rule.c
rule.h)

set(SOURCE_FILES_OBFS
obfs/verify.c
obfs/verify.h
obfs/tls1.2_ticket.c
obfs/tls1.2_ticket.h
obfs/obfsutil.c
obfs/obfsutil.h
obfs/obfs.c
obfs/obfs.h
obfs/http_simple.c
obfs/http_simple.h
obfs/crc32.c
obfs/crc32.h
obfs/base64.c
obfs/base64.h
obfs/auth_chain.c
obfs/auth_chain.h
obfs/auth.c
obfs/auth.h)

set(SOURCE_FILES_LOCAL
utils.c
utils.h
jconf.c
jconf.h
json.c
json.h
encrypt.c
encrypt.h
udprelay.c
udprelay.h
cache.c
cache.h
acl.c
acl.h
netutils.c
netutils.h
local.c
local.h
${SOURCE_FILES_OBFS}
${SOURCE_FILES_SNI})

set(SOURCE_FILES_TUNNEL
utils.c
utils.h
jconf.c
jconf.h
json.c
json.h
encrypt.c
encrypt.h
udprelay.c
udprelay.h
cache.c
cache.h
netutils.c
tunnel.c)
netutils.h
tunnel.c
tunnel.h)

set(SOURCE_FILES_SERVER
utils.c
utils.h
jconf.c
jconf.h
json.c
json.h
encrypt.c
encrypt.h
udprelay.c
udprelay.h
cache.c
cache.h
acl.c
acl.h
resolv.c
resolv.h
netutils.c
netutils.h
server.c
server.h
${SOURCE_FILES_OBFS}
${SOURCE_FILES_SNI})

set(SOURCE_FILES_MANAGER
utils.c
utils.h
jconf.c
jconf.h
json.c
json.h
manager.c)

set(SOURCE_FILES_REDIR
utils.c
utils.h
jconf.c
jconf.h
json.c
json.h
encrypt.c
encrypt.h
netutils.c
netutils.h
cache.c
cache.h
udprelay.c
udprelay.h
redir.c
redir.h
${SOURCE_FILES_SNI})

include_directories(${CMAKE_CURRENT_SOURCE_DIR})
Expand Down
Loading