ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-08-31 16:14:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix ipv6/ipv4 name resolution

Browse Source
This commit is contained in:
9seconds
2018-07-27 10:04:10 +03:00
parent 0d0bdd9fde
commit a00408562f
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gopkg.lock
Generated
+8 -8
View File
@@ -3,7 +3,7 @@
[[projects]] [[projects]]
branch = "master" branch = "master"
digest = "1:45a787c1adea69a03a5384865b307c7a72bb28bd5844bd57679d889a726a588b" digest = "1:315c5f2f60c76d89b871c73f9bd5fe689cad96597afd50fb9992228ef80bdd34"
name = "github.com/alecthomas/template" name = "github.com/alecthomas/template"
packages = [ packages = [
".", ".",
@@ -46,11 +46,11 @@
[[projects]] [[projects]]
branch = "master" branch = "master"
digest = "1:70107cf7ee5eb9e3c3dabe65bcb220bff22ee42e32d9b7fca988e16b8727cacc" digest = "1:53bd4347b151fcbedcdda527f7ebf4924f0e21d672131812f857175d8c7a1051"
name = "github.com/juju/errors" name = "github.com/juju/errors"
packages = ["."] packages = ["."]
pruneopts = "UT" pruneopts = "UT"
revision = "c7d06af17c68cd34c835053720b21f6549d9b0ee" revision = "812b06ada1776ad4dd95d575e18ffffe3a9ac34a"
[[projects]] [[projects]]
digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe"
@@ -93,7 +93,7 @@
version = "v1.1.0" version = "v1.1.0"
[[projects]] [[projects]]
digest = "1:e6d865f90ef1178c14bdb49ea9f244bfcb28c06ea9773dc077492032632de0b8" digest = "1:d9a420eae5f76973feeb733fbf58f6a89173255b63b27a7ae4b2124a73dc6c5b"
name = "go.uber.org/zap" name = "go.uber.org/zap"
packages = [ packages = [
".", ".",
@@ -104,12 +104,12 @@
"zapcore", "zapcore",
] ]
pruneopts = "UT" pruneopts = "UT"
revision = "eeedf312bc6c57391d84767a4cd413f02a917974" revision = "4d45f9617f7d90f7a663ff21c7a4321dbe78098b"
version = "v1.8.0" version = "v1.9.0"
[[projects]] [[projects]]
branch = "master" branch = "master"
digest = "1:656046288ed20c53157025a0915f176cad9340ac515501c427806a6f76023d75" digest = "1:becb2131aece71c64ebca5ddfd38cf631784fbb3a678d73ead3b42107c9f41ce"
name = "golang.org/x/net" name = "golang.org/x/net"
packages = [ packages = [
"bpf", "bpf",
@@ -118,7 +118,7 @@
"ipv4", "ipv4",
] ]
pruneopts = "UT" pruneopts = "UT"
revision = "d0887baf81f4598189d4e12a37c6da86f0bba4d0" revision = "3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd"
[[projects]] [[projects]]
digest = "1:c06d9e11d955af78ac3bbb26bd02e01d2f61f689e1a3bce2ef6fb683ef8a7f2d" digest = "1:c06d9e11d955af78ac3bbb26bd02e01d2f61f689e1a3bce2ef6fb683ef8a7f2d"
config/global_ips.go
+17 -4
View File
@@ -1,6 +1,7 @@
package config package config
import ( import (
"context"
"io/ioutil" "io/ioutil"
"net" "net"
"net/http" "net/http"
@@ -9,16 +10,28 @@ import (
"github.com/juju/errors" "github.com/juju/errors"
) )
const ifconfigAddress = "https://ifconfig.co/ip"
func getGlobalIPv4() (net.IP, error) { func getGlobalIPv4() (net.IP, error) {
return fetchIP("https://v4.ifconfig.co/ip") return fetchIP("tcp4")
} }
func getGlobalIPv6() (net.IP, error) { func getGlobalIPv6() (net.IP, error) {
return fetchIP("https://v6.ifconfig.co/ip") return fetchIP("tcp6")
} }
func fetchIP(url string) (net.IP, error) { func fetchIP(network string) (net.IP, error) {
resp, err := http.Get(url) dialer := &net.Dialer{DualStack: false}
client := &http.Client{
Jar: nil,
Transport: &http.Transport{
DialContext: func(ctx context.Context, _, addr string) (net.Conn, error) {
return dialer.DialContext(ctx, network, addr)
},
},
}
resp, err := client.Get(ifconfigAddress)
if err != nil { if err != nil {
return nil, err return nil, err
} }