xsteadfastx/dsnet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

detect IPv6 and IPv4 for server

Browse Source
This commit is contained in:
Callan Bryant 2020-10-26 08:27:22 +00:00
parent 7bbe28a145
commit d58b2f5a54
No known key found for this signature in database
GPG Key ID: C31FA9DF3ACBFFAA
2 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configtypes.go
View File

@ -37,6 +37,7 @@ type DsnetConfig struct {
// domain to append to hostnames. Relies on separate DNS server for // domain to append to hostnames. Relies on separate DNS server for
// resolution. Informational only. // resolution. Informational only.
ExternalIP net.IP `validate:"required"` ExternalIP net.IP `validate:"required"`
ExternalIP6 net.IP
ListenPort int `validate:"gte=1024,lte=65535"` ListenPort int `validate:"gte=1024,lte=65535"`
Domain string `validate:"required,gte=1,lte=255"` Domain string `validate:"required,gte=1,lte=255"`
InterfaceName string `validate:"required,gte=1,lte=255"` InterfaceName string `validate:"required,gte=1,lte=255"`

53
init.go
View File

@ -27,6 +27,7 @@ func Init() {
Domain: "dsnet", Domain: "dsnet",
ReportFile: DEFAULT_REPORT_FILE, ReportFile: DEFAULT_REPORT_FILE,
ExternalIP: getExternalIP(), ExternalIP: getExternalIP(),
ExternalIP6: getExternalIP6(),
InterfaceName: DEFAULT_INTERFACE_NAME, InterfaceName: DEFAULT_INTERFACE_NAME,
Networks: []JSONIPNet{}, Networks: []JSONIPNet{},
} }
@ -70,19 +71,23 @@ func getULANet() JSONIPNet {
} }
} }
// TODO support IPv6 // TODO factor getExternalIP + getExternalIP6
func getExternalIP() net.IP { func getExternalIP() net.IP {
conn, err := net.Dial("udp", "8.8.8.8:80") var IP net.IP
check(err, "Could not detect internet connection") // arbitrary external IP is used (one that's guaranteed to route outside.
defer conn.Close() // In this case, Google's DNS server. Doesn't actually need to be online.)
conn, err := net.Dial("udp", "8.8.8.8:53")
if err != nil {
defer conn.Close()
localAddr := conn.LocalAddr().String() localAddr := conn.LocalAddr().String()
IP := net.ParseIP(strings.Split(localAddr, ":")[0]) IP = net.ParseIP(strings.Split(localAddr, ":")[0])
IP = IP.To4() IP = IP.To4()
if !(IP[0] == 10 || (IP[0] == 172 && IP[1] >= 16 && IP[1] <= 31) || (IP[0] == 192 && IP[1] == 168)) { if !(IP[0] == 10 || (IP[0] == 172 && IP[1] >= 16 && IP[1] <= 31) || (IP[0] == 192 && IP[1] == 168)) {
// not private, so public // not private, so public
return IP return IP
}
} }
// detect private IP and use icanhazip.com instead // detect private IP and use icanhazip.com instead
@ -102,3 +107,31 @@ func getExternalIP() net.IP {
return net.IP{} return net.IP{}
} }
func getExternalIP6() net.IP {
var IP net.IP
conn, err := net.Dial("udp", "2001:4860:4860::8888:53")
if err != nil {
defer conn.Close()
localAddr := conn.LocalAddr().String()
IP = net.ParseIP(strings.Split(localAddr, ":")[0])
return IP
}
client := http.Client{
Timeout: 5 * time.Second,
}
resp, err := client.Get("https://ipv6.icanhazip.com/")
check(err)
defer resp.Body.Close()
if resp.StatusCode == http.StatusOK {
body, err := ioutil.ReadAll(resp.Body)
check(err)
IP = net.ParseIP(strings.TrimSpace(string(body)))
return IP
}
return net.IP{}
}