taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Add ipv6 support to ipinfo (#885)

Browse Source
This commit is contained in:
Adriano 2020-05-02 10:05:49 -04:00 committed by GitHub
parent ad650d3822
commit e035f3a15a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/ipaddresses/ipinfo/widget.go
View File

@ -4,6 +4,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"net"
"net/http"
"text/template"
@ -50,7 +51,15 @@ func (widget *Widget) Refresh() {
//this method reads the config and calls ipinfo for ip information
func (widget *Widget) ipinfo() {
client := &http.Client{}
req, err := http.NewRequest("GET", "https://ipinfo.io/", nil)
var url string
ip, ipv6 := getMyIP()
if ipv6 {
url = fmt.Sprintf("https://ipinfo.io/%s", ip.String())
} else {
url = "https://ipinfo.io/"
}
req, err := http.NewRequest("GET", url, nil)
if err != nil {
widget.result = err.Error()
return
@ -109,3 +118,21 @@ func (widget *Widget) setResult(info *ipinfo) {
func formatableText(key, value string) string {
return fmt.Sprintf(" [{{.subheadingColor}}]%8s[-:-:-] [{{.valueColor}}]{{.%s}}\n", key, value)
}
// getMyIP provides this system's default IPv4 or IPv6 IP address for routing WAN requests.
// It does so by dialing out to a site known to have both an A and AAAA DNS records (IPv6)
// The 'net' package is allowed to decide how to connect, connecting to both IPv4 or IPv6 address
// depending on the availbility of IP protocols.
func getMyIP() (ip net.IP, v6 bool) {
conn, err := net.Dial("tcp", "fast.com:80")
if err != nil {
return
}
defer conn.Close()
addr := conn.LocalAddr().(*net.TCPAddr)
ip = addr.IP
v6 = ip.To4() == nil
return
}