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.

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

Trojan fallback: support alpn address #31

Merged
merged 0 commits into from
Aug 25, 2022
Merged

Trojan fallback: support alpn address #31

merged 0 commits into from
Aug 25, 2022

Conversation

zakuwaki
Copy link
Collaborator

No description provided.

@nekohasekai
Copy link
Member

Why not get alpn in fallbackConnection?

@zakuwaki
Copy link
Collaborator Author

Yes I tried, but the conn is over wrapped and alpn cannot be fetched

@nekohasekai
Copy link
Member

Also, always rebase instead of merging new changes.

@nekohasekai
Copy link
Member

Why not get alpn in fallbackConnection?

Use common.Cast

@zakuwaki
Copy link
Collaborator Author

I'll fix all of this and submit a new pr. Thank you

@zakuwaki zakuwaki closed this Aug 25, 2022
@nekohasekai nekohasekai reopened this Aug 25, 2022
@nekohasekai
Copy link
Member

I'll fix all of this and submit a new pr. Thank you

Keep force commit here is just enough.

inbound.fallbackAddr = options.Fallback.Build()
fallbackAddrs := make(map[string]M.Socksaddr)
for _, fallback := range options.Fallbacks {
if fallback.Server != "" {
Copy link
Member

Choose a reason for hiding this comment

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

If empty, it is better to return error.

Copy link
Member

Choose a reason for hiding this comment

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

Here, not in fallback.

@zakuwaki
Copy link
Collaborator Author

All done. Thanks for your patient guiding! I'm new in golang and really learn a lot.

@nekohasekai nekohasekai merged commit fd5ac69 into SagerNet:dev Aug 25, 2022
@nekohasekai
Copy link
Member

pushed by mistake :(

nekohasekai pushed a commit that referenced this pull request Aug 25, 2022
nekohasekai pushed a commit that referenced this pull request Aug 25, 2022
@nekohasekai
Copy link
Member

nekohasekai commented Aug 25, 2022

It appears that you cannot be included as a contributor in GitHub because you are using an invalid email.

H1JK pushed a commit to H1JK/sing-box that referenced this pull request Aug 25, 2022
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.

2 participants