fixed ipv6 dectection error

This commit is contained in:
2021-07-08 19:42:41 +04:00
parent 6f6072f598
commit 28620b61ad
3 changed files with 34 additions and 26 deletions

View File

@@ -2,8 +2,15 @@
"ip_address": [
{
"ipv4": "",
"ipv6": "2001:8f8:172d:ee93:8105:563b:dc98:6dbf",
"latency": 567539,
"ipv6": "2001:8f8:172d:7e27:f1ba:1531:413f:1177",
"latency": 435699,
"download": 0,
"upload": 0
},
{
"ipv4": "172.104.44.195",
"ipv6": "",
"latency": 0,
"download": 0,
"upload": 0
}

View File

@@ -2,7 +2,6 @@ package p2p
import (
"encoding/json"
"errors"
"fmt"
"git.sr.ht/~akilan1999/p2p-rendering-computation/config"
"io/ioutil"
@@ -175,23 +174,25 @@ func GetCurrentIPV6()(string,error){
if err != nil {
return "",err
}
byNameInterface, err := net.InterfaceByName(Config.NetworkInterface)
if err != nil {
return "",err
}
addresses, err := byNameInterface.Addrs()
if err != nil {
return "",err
}
if addresses[1].String() == "" {
return "",errors.New("IPV6 address not detected")
}
IP,_,err := net.ParseCIDR(addresses[Config.NetworkInterfaceIPV6Index].String())
if err != nil {
return "",err
}
return IP.String(), nil
// Fix in future release
//byNameInterface, err := net.InterfaceByName(Config.NetworkInterface)
//if err != nil {
// return "",err
//}
//addresses, err := byNameInterface.Addrs()
//if err != nil {
// return "",err
//}
//if addresses[1].String() == "" {
// return "",errors.New("IPV6 address not detected")
//}
//IP,_,err := net.ParseCIDR(addresses[Config.NetworkInterfaceIPV6Index].String())
//if err != nil {
// return "",err
//}
return Config.IPV6Address, nil
}
// ViewNetworkInterface This function is created to view the network interfaces available
@@ -230,6 +231,6 @@ func Ip4or6(s string) string {
return "version 6"
}
}
return "unknown"
return "version 6"
}