-
-
Notifications
You must be signed in to change notification settings - Fork 13.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
set CompatibilityMode for android (#4091)
- Loading branch information
Showing
8 changed files
with
98 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
// Copyright 2024 The frp Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
//go:build !android | ||
|
||
package system | ||
|
||
// EnableCompatibilityMode enables compatibility mode for different system. | ||
// For example, on Android, the inability to obtain the correct time zone will result in incorrect log time output. | ||
func EnableCompatibilityMode() { | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
// Copyright 2024 The frp Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package system | ||
|
||
import ( | ||
"context" | ||
"net" | ||
"os/exec" | ||
"strings" | ||
"time" | ||
) | ||
|
||
func EnableCompatibilityMode() { | ||
fixTimezone() | ||
fixDNSResolver() | ||
} | ||
|
||
// fixTimezone is used to try our best to fix timezone issue on some Android devices. | ||
func fixTimezone() { | ||
out, err := exec.Command("/system/bin/getprop", "persist.sys.timezone").Output() | ||
if err != nil { | ||
return | ||
} | ||
loc, err := time.LoadLocation(strings.TrimSpace(string(out))) | ||
if err != nil { | ||
return | ||
} | ||
time.Local = loc | ||
} | ||
|
||
// fixDNSResolver will first attempt to resolve google.com to check if the current DNS is available. | ||
// If it is not available, it will default to using 8.8.8.8 as the DNS server. | ||
// This is a workaround for the issue that golang can't get the default DNS servers on Android. | ||
func fixDNSResolver() { | ||
// First, we attempt to resolve a domain. If resolution is successful, no modifications are necessary. | ||
// In real-world scenarios, users may have already configured /etc/resolv.conf, or compiled directly | ||
// in the Android environment instead of using cross-platform compilation, so this issue does not arise. | ||
if net.DefaultResolver != nil { | ||
timeoutCtx, cancel := context.WithTimeout(context.Background(), time.Second) | ||
defer cancel() | ||
_, err := net.DefaultResolver.LookupHost(timeoutCtx, "google.com") | ||
if err == nil { | ||
return | ||
} | ||
} | ||
// If the resolution fails, use 8.8.8.8 as the DNS server. | ||
// Note: If there are other methods to obtain the default DNS servers, the default DNS servers should be used preferentially. | ||
net.DefaultResolver = &net.Resolver{ | ||
PreferGo: true, | ||
Dial: func(ctx context.Context, network, _ string) (net.Conn, error) { | ||
return net.Dial(network, "8.8.8.8:53") | ||
}, | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters