Commit Graph

379 Commits

Author SHA1 Message Date
wangyu-
698ff33892 Merge branch 'master' of https://github.com/wangyu-/udp2raw-tunnel 2017-08-23 10:49:33 -05:00
wangyu-
1293b95335 bug fix and improve for conf 2017-08-23 10:47:09 -05:00
wangyu-
7e74b40977 Update README.zh-cn.md 2017-08-23 06:48:21 -07:00
wangyu-
d1e9bdc5da Update README.zh-cn.md 2017-08-23 06:47:05 -07:00
wangyu-
2b9d5c6db6 Update README.md 2017-08-23 06:24:46 -07:00
wangyu-
b86d475f1f moved cmakeLists 2017-08-23 07:23:02 -05:00
wangyu-
0a7f9b5cc6 fixed conf bugs and refactor 2017-08-23 07:01:21 -05:00
wangyu-
eb9633ed59 Update README.md 2017-08-22 22:08:51 -07:00
wangyu-
c0b464aeaf Update README.md 2017-08-22 22:08:04 -07:00
wangyu-
020242b73d Merge pull request #30 from PeterCxy/patch-config-file
Allow loading options from configuration files
2017-08-22 22:01:28 -07:00
Peter Cai
2269879a2e
doc: note about comments 2017-08-23 11:22:33 +08:00
Peter Cai
057f81007d
main: don't warn config-file as 'unknown' 2017-08-23 11:16:41 +08:00
Peter Cai
1f2f0d96fd
main: fix missing includes 2017-08-23 11:09:46 +08:00
Peter Cai
01e0e51b9b
config: treat TABs as spaces 2017-08-23 11:03:27 +08:00
Peter Cai
6ef38709a6
config: trim spaces and tabs 2017-08-23 11:03:24 +08:00
Peter Cai
57b874ee6d
main: ignore empty lines in configuration 2017-08-23 11:03:21 +08:00
Peter Cai
ab0ce3ade3
main: merge cli/config arguments and check for duplications 2017-08-23 11:03:18 +08:00
Peter Cai
32f344fd3c
README: document configuration files 2017-08-23 11:03:16 +08:00
Peter Cai
968d35178a
main: allow loading configuration files (--config-file) 2017-08-23 11:03:12 +08:00
wangyu-
f8e268769c trival 2017-08-22 21:10:32 -05:00
wangyu-
b9030fe81d deleted useless headers 2017-08-22 11:00:44 -05:00
wangyu-
e6f0ed035c Update README.md 2017-08-22 00:58:04 -07:00
wangyu-
00e1ddfecc Update README.md 2017-08-21 21:20:24 -07:00
wangyu-
15e1790f73 Update README.md 2017-08-21 21:05:50 -07:00
wangyu-
763b0b7342 Update README.md 2017-08-21 21:03:16 -07:00
wangyu-
c716d617a0 Update README.md 2017-08-21 20:34:05 -07:00
wangyu-
60393d24d8 Merge pull request #33 from YUChoe/master
Fix Typo TCP over TCP
2017-08-21 20:04:30 -07:00
Yong-uk Choe
9e7ed280fc Fix Typo TCP over TCP 2017-08-22 09:44:19 +09:00
root
532693edc6 Merge branch 'master' of https://github.com/wangyu-/udp2raw-tunnel 2017-08-21 23:32:21 +08:00
root
033fa830f7 trival 2017-08-21 23:31:55 +08:00
wangyu-
51464ecbfe Update README.zh-cn.md 2017-08-21 08:07:06 -07:00
root
dd8539e420 fixed --lower-level auto bug 2017-08-21 21:49:29 +08:00
wangyu
19ce820813 added new options to help page 2017-08-21 20:42:59 +08:00
root
b30a347c23 implemented --lower-level auto for server 2017-08-21 20:26:55 +08:00
wangyu-
3a35c5ce5b Update build_guide.md 2017-08-21 02:51:00 -07:00
wangyu-
bab98d8356 Update build_guide.md 2017-08-21 02:50:49 -07:00
wangyu-
283167802c Update build_guide.zh-cn.md 2017-08-21 02:39:43 -07:00
wangyu-
1db6509373 Update build_guide.zh-cn.md 2017-08-21 02:38:07 -07:00
wangyu-
a29cbf3779 Update openvpn_guide.md 2017-08-20 10:55:55 -07:00
wangyu-
da26c5047b Update README.md 2017-08-20 09:11:03 -07:00
wangyu-
38d98b5b37 Update README.md 2017-08-20 09:01:25 -07:00
root
497320e446 added --keep-rule --gen-add option 2017-08-20 16:28:23 +08:00
wangyu
19da7b6972 added -simple rule option,added mips_asm_aes target 2017-08-19 18:17:39 +08:00
wangyu-
687666cf05 Merge pull request #24 from linusyang/md5
Use md5 hash from PolarSSL
2017-08-19 02:59:34 -07:00
Linus Yang
20f8aa743b Use md5 hash from PolarSSL 2017-08-19 17:51:17 +08:00
wangyu-
8ce51fde50 Merge pull request #22 from linusyang/sep
Separate encryption and decryption
2017-08-18 22:45:19 -07:00
Linus Yang
b9d7a91cae Separate en/decryption 2017-08-19 13:22:31 +08:00
wangyu-
63dd25a0b5 Update README.zh-cn.md 2017-08-18 21:40:03 -07:00
wangyu-
c894596e06 Update README.zh-cn.md 2017-08-18 21:39:12 -07:00
wangyu-
558865f52d Update README.zh-cn.md 2017-08-18 21:37:46 -07:00