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.

Sign up for GitHub

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

Jump to bottom

Plugin 2.0.0 #2585

Merged
merged 6 commits into from
Oct 20, 2020
Merged

Plugin 2.0.0 #2585

merged 6 commits into from
Oct 20, 2020

Conversation

Mygod
Copy link
Contributor

@Mygod Mygod commented Oct 2, 2020 •
edited
Loading

@madeye Please help finish this implementation, thanks! You can read isV2 here:

shadowsocks-android/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt

Line 105 in 1783420

plugin?.let { (path, opts) ->

Fixes #2576.

@Mygod Mygod added the plugin label Oct 2, 2020
@madeye madeye marked this pull request as ready for review October 2, 2020 02:03
@Mygod
Copy link
Contributor Author

Mygod commented Oct 2, 2020

@madeye Do you think we should use a less hacky name, like __android_vpn instead of V?

@madeye
Copy link
Contributor

madeye commented Oct 2, 2020

yeah, but it requires updating a lot of plugins...

@madeye
Copy link
Contributor

madeye commented Oct 2, 2020

tested with simple-obfs, it should work now.

@Mygod
Copy link
Contributor Author

Mygod commented Oct 2, 2020

yeah, but it requires updating a lot of plugins...

We already break a lot of plugins anyway so why not do it properly this time?

@madeye
Copy link
Contributor

madeye commented Oct 2, 2020

PR is welcome... I will help merge them...

@Mygod
Copy link
Contributor Author

Mygod commented Oct 2, 2020

No hurry. 🤣

@Mygod Mygod mentioned this pull request Oct 4, 2020
Merged
@Mygod Mygod unassigned madeye Oct 4, 2020
@Mygod Mygod requested a review from madeye October 4, 2020 21:34
@Mygod
Copy link
Contributor Author

Mygod commented Oct 19, 2020

Why force push over my commit?

@madeye madeye force-pushed the plugin-2.0.0 branch 2 times, most recently from f38d828 to 292fc89 Compare October 19, 2020 02:36
@madeye
Copy link
Contributor

madeye commented Oct 19, 2020

My bad, reverted.

@Mygod
Copy link
Contributor Author

Mygod commented Oct 19, 2020

It looks like it still does not contain cd6a1f1 and f9a80ac.

@madeye
Copy link
Contributor

madeye commented Oct 19, 2020

Can you push it again? It looks I did something wrong here.

@madeye madeye force-pushed the plugin-2.0.0 branch 2 times, most recently from e2c130f to f9a80ac Compare October 19, 2020 02:57
@madeye
Copy link
Contributor

madeye commented Oct 19, 2020

Everything should be reverted now. 😅

madeye
madeye approved these changes Oct 19, 2020
View reviewed changes
Copy link
Contributor

@madeye madeye left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@Mygod
Copy link
Contributor Author

Mygod commented Oct 19, 2020

Merge and do a release? Also I think shadowsocks-rust updated plugin-arg (string) to plugin-args (array) in master so when we update shadowsocks-rust we need to implement that change too...

@madeye madeye merged commit 95a740c into master Oct 20, 2020
@loyess loyess mentioned this pull request Oct 21, 2020
Closed
@Mygod Mygod deleted the plugin-2.0.0 branch October 27, 2020 04:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@madeye madeye madeye approved these changes

Assignees
No one assigned
Labels
plugin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

DNS bugs on 5.13 pls fix it.
2 participants
@Mygod @madeye