search

tladesignz / IPtProxy

Obfs4proxy and Snowflake Pluggable Transports for iOS
MIT License
45 stars 11 forks source link

initial support for starting snowflake proxy and some android tweaks #3

Closed n8fr8 closed 3 years ago

n8fr8 commented 3 years ago

My updates .patch files include some redundant commits I think, but otherwise, the main change is the use of InitClient() InitProxy() method names instead of Main(), and some arguments to provide for obfs4

n8fr8 commented 3 years ago

(unfortunately obfs4 via IPtProxy is still crashing right away on android)

n8fr8 commented 3 years ago

These fixes make Obfs4 and Snowflake Proxy mode work

n8fr8 commented 3 years ago

and Meek is working now as well...

tladesignz commented 3 years ago

Sorry, @n8fr8, there were slightly too many problems with this patch to just merge it.

To name a few:

So I took all of your patches, modified it to my liking and released a new version 0.2.0.

However, the Snowflake stuff is still missing. Can you please send me a new pull request which is based on the latest version?

Thank you very much!

P.S.: I understand why you don't like "Main", I did neither. However, there's going to be a "Stop", so "Init" doesn't seem right, and it also clashes with Go internals. I renamed the "main" to "Start"! I hope you can live with that?

n8fr8 commented 3 years ago

Will take a look, but all sounds good, and will work on a clean separate snowflake patch.

On Fri, Oct 23, 2020, at 8:01 AM, Benjamin Erhart wrote:

Sorry, @n8fr8 https://github.com/n8fr8, there were slightly too many problems with this patch to just merge it.

To name a few:

  • Method naming was seemingly done by the department of redundancy department.
  • I love spaces. Spaces make stuff readable.
  • I couldn't apply the Snowflake patch, it seemed broken against the latest Snowflake.
  • The TOR_PT_STATE_LOCATION meddling is prone to race conditions but having it in a method signature makes it look like it doesn't have problems at all. So I took all of your patches, modified it to my liking at released a new version 0.2.0.

However, the Snowflake stuff is still missing. Can you please send me a new pull request which is based on the latest version?

Thank you very much!

P.S.: I understand why you don't like "Main", I did neither. However, there's going to be a "Stop", so "Init" doesn't seem right, and it also clashes with Go internals. I renamed the "main" to "Start"! I hope you can live with that?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/tladesignz/IPtProxy/pull/3#issuecomment-715299091, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAAHRAYF62FP6F52VH3TJRTSMFWCNANCNFSM4S3SGCOQ.

tladesignz commented 3 years ago

Ok, as spoken: I tried to understand your modified snowflake.patch.

There was a lot of noise in it, due to patches from upstream getting applied and removed and reapplied.

Please don't do that. The idea is, that the git submodule references a certain commit and the patch file only applies patches to make it work on mobile. Just do a git diff > ../snowflake.patch, no fancy git patch listings!

I think I figured it out. Please inspect! If good, it's already released as v0.3.0!

n8fr8 commented 3 years ago

Please don't do that. The idea is, that the git submodule references a certain commit and the patch file only applies patches to >make it work on mobile.

Yes, it was unintentional and then I realized to far along to redeem myself what had happened.