mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-03 20:27:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

introduce a function to distinguish between IPv4 and IPv6 addresses

Browse source
This commit is contained in:
Marten Seemann 2020-08-10 16:50:58 +07:00
parent fa4f0a9e7a
commit 876ab1d531
5 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/utils/ip.go Normal file
View file

@ -0,0 +1,10 @@
package utils
import "net"
func IsIPv4(ip net.IP) bool {
// If ip is not an IPv4 address, To4 returns nil.
// Note that there might be some corner cases, where this is not correct.
// See https://stackoverflow.com/questions/22751035/golang-distinguish-ipv4-ipv6.
return ip.To4() != nil
}

17
internal/utils/ip_test.go Normal file
View file

@ -0,0 +1,17 @@
package utils
import (
"net"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
var _ = Describe("IP", func() {
It("tells IPv4 and IPv6 addresses apart", func() {
Expect(IsIPv4(net.IPv4(127, 0, 0, 1))).To(BeTrue())
Expect(IsIPv4(net.IPv4zero)).To(BeTrue())
Expect(IsIPv4(net.IPv6zero)).To(BeFalse())
Expect(IsIPv4(net.IPv6loopback)).To(BeFalse())
})
})

11
metrics/metrics.go
View file

@ -6,6 +6,8 @@ import (
"net"
"time"
"github.com/lucas-clemente/quic-go/internal/utils"
"github.com/lucas-clemente/quic-go/internal/protocol"
"github.com/lucas-clemente/quic-go/logging"
@ -118,13 +120,10 @@ func (t *connTracer) StartedConnection(local, _ net.Addr, _ logging.VersionNumbe
var ipVersionTag tag.Mutator
if udpAddr, ok := local.(*net.UDPAddr); ok {
// If ip is not an IPv4 address, To4 returns nil.
// Note that there might be some corner cases, where this is not correct.
// See https://stackoverflow.com/questions/22751035/golang-distinguish-ipv4-ipv6.
if udpAddr.IP.To4() == nil {
ipVersionTag = tag.Upsert(keyIPVersion, "IPv6")
} else {
if utils.IsIPv4(udpAddr.IP) {
ipVersionTag = tag.Upsert(keyIPVersion, "IPv4")
} else {
ipVersionTag = tag.Upsert(keyIPVersion, "IPv6")
}
} else {
ipVersionTag = tag.Upsert(keyIPVersion, "unknown")

9
packet_packer.go
View file

@ -110,13 +110,10 @@ func getMaxPacketSize(addr net.Addr) protocol.ByteCount {
// If this is not a UDP address, we don't know anything about the MTU.
// Use the minimum size of an Initial packet as the max packet size.
if udpAddr, ok := addr.(*net.UDPAddr); ok {
// If ip is not an IPv4 address, To4 returns nil.
// Note that there might be some corner cases, where this is not correct.
// See https://stackoverflow.com/questions/22751035/golang-distinguish-ipv4-ipv6.
if udpAddr.IP.To4() == nil {
maxSize = protocol.MaxPacketSizeIPv6
} else {
if utils.IsIPv4(udpAddr.IP) {
maxSize = protocol.MaxPacketSizeIPv4
} else {
maxSize = protocol.MaxPacketSizeIPv6
}
}
return maxSize

12
qlog/event.go
View file

@ -5,6 +5,8 @@ import (
"net"
"time"
"github.com/lucas-clemente/quic-go/internal/utils"
"github.com/lucas-clemente/quic-go/internal/protocol"
"github.com/lucas-clemente/quic-go/logging"
@ -75,14 +77,10 @@ func (e eventConnectionStarted) Name() string { return "connection_started
func (e eventConnectionStarted) IsNil() bool { return false }
func (e eventConnectionStarted) MarshalJSONObject(enc *gojay.Encoder) {
// If ip is not an IPv4 address, To4 returns nil.
// Note that there might be some corner cases, where this is not correct.
// See https://stackoverflow.com/questions/22751035/golang-distinguish-ipv4-ipv6.
isIPv6 := e.SrcAddr.IP.To4() == nil
if isIPv6 {
enc.StringKey("ip_version", "ipv6")
} else {
if utils.IsIPv4(e.SrcAddr.IP) {
enc.StringKey("ip_version", "ipv4")
} else {
enc.StringKey("ip_version", "ipv6")
}
enc.StringKey("src_ip", e.SrcAddr.IP.String())
enc.IntKey("src_port", e.SrcAddr.Port)