forked from fatedier/frp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
frpc: support nathole discover (fatedier#3381)
- Loading branch information
Showing
13 changed files
with
520 additions
and
16 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| // Copyright 2023 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 sub | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net" | ||
| "os" | ||
| "strconv" | ||
|
|
||
| "github.com/spf13/cobra" | ||
|
|
||
| "github.com/fatedier/frp/pkg/config" | ||
| "github.com/fatedier/frp/pkg/nathole" | ||
| ) | ||
|
|
||
| func init() { | ||
| RegisterCommonFlags(natholeCmd) | ||
|
|
||
| rootCmd.AddCommand(natholeCmd) | ||
| natholeCmd.AddCommand(natholeDiscoveryCmd) | ||
| } | ||
|
|
||
| var natholeCmd = &cobra.Command{ | ||
| Use: "nathole", | ||
| Short: "Actions about nathole", | ||
| } | ||
|
|
||
| var natholeDiscoveryCmd = &cobra.Command{ | ||
| Use: "discover", | ||
| Short: "Discover nathole information by frps and stun server", | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| cfg, _, _, err := config.ParseClientConfig(cfgFile) | ||
| if err != nil { | ||
| fmt.Println(err) | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| if err := validateForNatHoleDiscovery(cfg); err != nil { | ||
| fmt.Println(err) | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| addresses, err := nathole.Discover( | ||
| net.JoinHostPort(cfg.ServerAddr, strconv.Itoa(cfg.ServerUDPPort)), | ||
| []string{cfg.NatHoleSTUNServer}, | ||
| []byte(cfg.Token), | ||
| ) | ||
| if err != nil { | ||
| fmt.Println("discover error:", err) | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| natType, behavior, err := nathole.ClassifyNATType(addresses) | ||
| if err != nil { | ||
| fmt.Println("classify nat type error:", err) | ||
| os.Exit(1) | ||
| } | ||
| fmt.Println("Your NAT type is:", natType) | ||
| fmt.Println("Behavior is:", behavior) | ||
| fmt.Println("External address is:", addresses) | ||
| return nil | ||
| }, | ||
| } | ||
|
|
||
| func validateForNatHoleDiscovery(cfg config.ClientCommonConf) error { | ||
| if cfg.NatHoleSTUNServer == "" { | ||
| return fmt.Errorf("nat_hole_stun_server can not be empty") | ||
| } | ||
| if cfg.ServerUDPPort == 0 { | ||
| return fmt.Errorf("server udp port can not be empty") | ||
| } | ||
| return nil | ||
| } |
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 |
|---|---|---|
|
|
@@ -260,6 +260,7 @@ func Test_LoadClientCommonConf(t *testing.T) { | |
| }, | ||
| ServerAddr: "0.0.0.9", | ||
| ServerPort: 7009, | ||
| NatHoleSTUNServer: "stun.easyvoip.com:3478", | ||
| DialServerTimeout: 10, | ||
| DialServerKeepAlive: 7200, | ||
| HTTPProxy: "http://user:[email protected]:8080", | ||
|
|
||
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,74 @@ | ||
| // Copyright 2023 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 nathole | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net" | ||
| ) | ||
|
|
||
| const ( | ||
| EasyNAT = "EasyNAT" | ||
| HardNAT = "HardNAT" | ||
|
|
||
| BehaviorNoChange = "BehaviorNoChange" | ||
| BehaviorIPChanged = "BehaviorIPChanged" | ||
| BehaviorPortChanged = "BehaviorPortChanged" | ||
| BehaviorBothChanged = "BehaviorBothChanged" | ||
| ) | ||
|
|
||
| // ClassifyNATType classify NAT type by given addresses. | ||
| func ClassifyNATType(addresses []string) (string, string, error) { | ||
| if len(addresses) <= 1 { | ||
| return "", "", fmt.Errorf("not enough addresses") | ||
| } | ||
| ipChanged := false | ||
| portChanged := false | ||
|
|
||
| var baseIP, basePort string | ||
| for _, addr := range addresses { | ||
| ip, port, err := net.SplitHostPort(addr) | ||
| if err != nil { | ||
| return "", "", err | ||
| } | ||
| if baseIP == "" { | ||
| baseIP = ip | ||
| basePort = port | ||
| continue | ||
| } | ||
|
|
||
| if baseIP != ip { | ||
| ipChanged = true | ||
| } | ||
| if basePort != port { | ||
| portChanged = true | ||
| } | ||
|
|
||
| if ipChanged && portChanged { | ||
| break | ||
| } | ||
| } | ||
|
|
||
| switch { | ||
| case ipChanged && portChanged: | ||
| return HardNAT, BehaviorBothChanged, nil | ||
| case ipChanged: | ||
| return HardNAT, BehaviorIPChanged, nil | ||
| case portChanged: | ||
| return HardNAT, BehaviorPortChanged, nil | ||
| default: | ||
| return EasyNAT, BehaviorNoChange, nil | ||
| } | ||
| } |
Oops, something went wrong.