shadowsocks-go
shadowsocks-go copied to clipboard
New develop version
supported aead cipher and udp tunnel
awsome work
Best regards ✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️✉️
Arthur lee Sent from my iPhone
On 12 Dec 2017, at 10:29 AM, Gordon Yau [email protected] wrote:
supported aead cipher and udp tunnel
You can view, comment on, or merge this pull request online at:
https://github.com/shadowsocks/shadowsocks-go/pull/260
Commit Summary
reconstruct crypto structure reconstruct project structure reconstruct project structure removed iv generation from encrypt module abstract packet handling process function and add new logger for making easy debug removed some commented code fixed chacha20 init error divide encrypt into stram and aead add color to logger info message added doe flag to identify action encrypt or decrypt clear some dirty code in general cipher change pack and unpack processing from conn to cipher change pack and unpack processing from conn to cipher fixed reading header error fixed reading header error split pipe to encrypt and decrypt parts split pipe to encrypt and decrypt parts split pipe to stream and aead parts integrate encrypt and decrypt to pipe processing abstract pack and unpack code copy stream processing structure to aead support aead crypto removed testing code put all request into packet processing logic fixed read packet size error removed testing code and move pipe processing to pipe.go clean some fields no use in packet logic split cipher to stream and aead parts a temp version rewrite packing logic server temp version removed some unused code updated leakybuf logic removed unused code removed unused code split aead packet logic from conn removed unused code and copy tcp_aead code to tcp_stream adjust buffer logic done tcp_stream removed unused files fixed read error recover udp and leakybuf make pack and unpack generic added line and file info to logger removed setnonce from tcp_aead rewrite cipher and conn logic seems working adjust code format and remove some useless files done stream cryptor done aead cryptor done server removed testing code done udp tunnel remove some files useless add debug log add aes-gcm method remove some code in cipher logic useless packed original cipher cryption remove useless code remove debug code remove local socket handle code remove socket handling code from server fixed udp timeout error File Changes
M .gitignore (5) M cmd/shadowsocks-httpget/httpget.go (2) M cmd/shadowsocks-local/local.go (344) M cmd/shadowsocks-server/server.go (259) A cmd/test_aead.go (50) A cmd/test_stream.go (77) A shadowsocks/cipher.go (105) A shadowsocks/cipher_aead.go (116) A shadowsocks/cipher_stream.go (197) R shadowsocks/cipher_test.go (153) M shadowsocks/config.go (27) M shadowsocks/conn.go (135) D shadowsocks/encrypt.go (262) D shadowsocks/leakybuf.go (45) D shadowsocks/log.go (24) A shadowsocks/log_formatter.go (162) A shadowsocks/logger.go (316) D shadowsocks/mergesort.go (32) A shadowsocks/packet_cryptor.go (26) A shadowsocks/packet_cryptor_aead.go (256) A shadowsocks/packet_cryptor_stream.go (209) M shadowsocks/pipe.go (83) D shadowsocks/proxy.go (84) A shadowsocks/socks.go (190) A shadowsocks/stream_cryptor.go (22) A shadowsocks/stream_cryptor_aead.go (351) A shadowsocks/stream_cryptor_stream.go (201) M shadowsocks/udp.go (58) M shadowsocks/udprelay.go (276) M shadowsocks/util.go (19) Patch Links:
https://github.com/shadowsocks/shadowsocks-go/pull/260.patch https://github.com/shadowsocks/shadowsocks-go/pull/260.diff — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub, or mute the thread.
would you like to fix the CI?
yes. I thought it should be your job, sorry for that. will be done in the next few days
@qunxyz I mean your PR should pass the CI
This really a big PR, and will be pending(just like mine PR and others) after I get some idea about how to do the reconstruction on this repo
got it. and I also changed some code for cow project, I will make a pr for cow till you merged this branch
About cow, u'd contact the author for more help
I tried doing some minor change to support aead, but then I realized that seems impossible. so it is this branch. anyway, maybe you would liked this branch
never mind cow, though it's the reason I developed this branch. I just waiting. take your time
yep, and I'm sorry cause this PR will not be merged in this way. I will make a plan how we do the reconstruct on this repo, and welcome you to join.
never mind. but anyway, I would made a new pr once done the parts of passing CI. merge or not, it's all your call, I would accepted that. I just want to share it, and I appreciate you creating this project.
@qunxyz dude, would you like to merge this fella into another branch I create for you? That would be a better way for others to test
so sorry, @arthurkiller. I forgot it, will be done this weekend
Great! And Now I will create a new branch called dev-qunxyz
for your merge request
maybe after two days? I would made a new pr on Sunday afternoon
never mind
and you don't need new PR, I will change this one
solve conflicts and change the dependencies into shadowsocks-go
oh, man, you already done that. thanks very much, I really appreciate it. then I don't need to make a new pr for it. just let you know, I fixed it too
@qunxyz still get some conflicts, rebase the master
still here?@qunxyz
Any updates on this PR?