Skip to content

Conversation

@madeye
Copy link
Contributor

@madeye madeye commented May 7, 2020

  1. Fix the return value of acl::check_ip_in_proxy_list.
  2. Fix the condition order in context::check_ip_in_proxy_list
  3. Keep the value whether the qname is resolved by remote or local in add_to_reverse_lookup_cache

Tested locally, all routes in Android client should work now.

@madeye madeye requested a review from Mygod May 7, 2020 05:46
Copy link
Contributor

@Mygod Mygod left a comment

Choose a reason for hiding this comment

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

Something doesn't make sense to me yet, see detailed comments.

@madeye madeye merged commit e388c35 into shadowsocks:master May 7, 2020
@madeye
Copy link
Contributor Author

madeye commented May 7, 2020

Oops, it seems I pushed to the wrong repo...

@madeye
Copy link
Contributor Author

madeye commented May 7, 2020

@zonyitoo you may want to do a force push to redo my merge...

@Mygod
Copy link
Contributor

Mygod commented May 7, 2020

b6c3fb0...master

So I guess the real bug is flipping proxy/bypass list it seems.

@madeye
Copy link
Contributor Author

madeye commented May 7, 2020

@Mygod Okay, I think you're right.

@madeye madeye mentioned this pull request May 7, 2020
@zonyitoo
Copy link
Collaborator

zonyitoo commented May 7, 2020

WHAT happened...

@Mygod
Copy link
Contributor

Mygod commented May 7, 2020

@zonyitoo You didn't see anything.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants