mirror of
https://github.com/golang/go
synced 2024-10-05 10:31:22 -06:00
322214cf54
This CL reduces unnecessary network facility lookups introduced by recent changes below. changeset: 15798:53a4da6a4f4a net: return correct point-to-point interface address on linux changeset: 15799:a81ef8e0cc05 net: set up IPv6 scoped addressing zone for network facilities Also adds a test case for issue 4839. Benchmark results on linux/amd64, virtual machine: benchmark old ns/op new ns/op delta BenchmarkInterfaces-2 80487 80382 -0.13% BenchmarkInterfaceByIndex-2 72013 71391 -0.86% BenchmarkInterfaceByName-2 79865 80101 +0.30% BenchmarkInterfaceAddrs-2 42071 829677 +1872.09% BenchmarkInterfacesAndAddrs-2 35016 607622 +1635.27% BenchmarkInterfacesAndMulticastAddrs-2 169849 169082 -0.45% old: 15797:9c3930413c1b, new: tip Benchmark results on linux/amd64, virtual machine: benchmark old ns/op new ns/op delta BenchmarkInterfaces-2 80487 81459 +1.21% BenchmarkInterfaceByIndex-2 72013 71512 -0.70% BenchmarkInterfaceByName-2 79865 80567 +0.88% BenchmarkInterfaceAddrs-2 42071 120108 +185.49% BenchmarkInterfacesAndAddrs-2 35016 33259 -5.02% BenchmarkInterfacesAndMulticastAddrs-2 169849 82391 -51.49% old: 15797:9c3930413c1b, new: tip+CL7400055 Benchmark results on darwin/amd64: benchmark old ns/op new ns/op delta BenchmarkInterfaces-2 34402 34231 -0.50% BenchmarkInterfaceByIndex-2 13192 12956 -1.79% BenchmarkInterfaceByName-2 34791 34388 -1.16% BenchmarkInterfaceAddrs-2 36565 63906 +74.77% BenchmarkInterfacesAndAddrs-2 17497 31068 +77.56% BenchmarkInterfacesAndMulticastAddrs-2 25276 66711 +163.93% old: 15797:9c3930413c1b, new: tip Benchmark results on darwin/amd64: benchmark old ns/op new ns/op delta BenchmarkInterfaces-2 34402 31854 -7.41% BenchmarkInterfaceByIndex-2 13192 12950 -1.83% BenchmarkInterfaceByName-2 34791 31926 -8.23% BenchmarkInterfaceAddrs-2 36565 42144 +15.26% BenchmarkInterfacesAndAddrs-2 17497 17329 -0.96% BenchmarkInterfacesAndMulticastAddrs-2 25276 24870 -1.61% old: 15797:9c3930413c1b, new: tip+CL7400055 Update #4234. Fixes #4839 (again). Fixes #4866. R=golang-dev, fullung CC=golang-dev https://golang.org/cl/7400055
65 lines
1.8 KiB
Go
65 lines
1.8 KiB
Go
// Copyright 2011 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package net
|
|
|
|
import (
|
|
"os"
|
|
"syscall"
|
|
)
|
|
|
|
// interfaceMulticastAddrTable returns addresses for a specific
|
|
// interface.
|
|
func interfaceMulticastAddrTable(ifi *Interface) ([]Addr, error) {
|
|
tab, err := syscall.RouteRIB(syscall.NET_RT_IFMALIST, ifi.Index)
|
|
if err != nil {
|
|
return nil, os.NewSyscallError("route rib", err)
|
|
}
|
|
msgs, err := syscall.ParseRoutingMessage(tab)
|
|
if err != nil {
|
|
return nil, os.NewSyscallError("route message", err)
|
|
}
|
|
var ifmat []Addr
|
|
for _, m := range msgs {
|
|
switch m := m.(type) {
|
|
case *syscall.InterfaceMulticastAddrMessage:
|
|
if ifi.Index == int(m.Header.Index) {
|
|
ifma, err := newMulticastAddr(ifi, m)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
ifmat = append(ifmat, ifma...)
|
|
}
|
|
}
|
|
}
|
|
return ifmat, nil
|
|
}
|
|
|
|
func newMulticastAddr(ifi *Interface, m *syscall.InterfaceMulticastAddrMessage) ([]Addr, error) {
|
|
sas, err := syscall.ParseRoutingSockaddr(m)
|
|
if err != nil {
|
|
return nil, os.NewSyscallError("route sockaddr", err)
|
|
}
|
|
var ifmat []Addr
|
|
for _, sa := range sas {
|
|
switch sa := sa.(type) {
|
|
case *syscall.SockaddrInet4:
|
|
ifma := &IPAddr{IP: IPv4(sa.Addr[0], sa.Addr[1], sa.Addr[2], sa.Addr[3])}
|
|
ifmat = append(ifmat, ifma.toAddr())
|
|
case *syscall.SockaddrInet6:
|
|
ifma := &IPAddr{IP: make(IP, IPv6len)}
|
|
copy(ifma.IP, sa.Addr[:])
|
|
// NOTE: KAME based IPv6 protcol stack usually embeds
|
|
// the interface index in the interface-local or link-
|
|
// local address as the kernel-internal form.
|
|
if ifma.IP.IsInterfaceLocalMulticast() || ifma.IP.IsLinkLocalMulticast() {
|
|
ifma.Zone = ifi.Name
|
|
ifma.IP[2], ifma.IP[3] = 0, 0
|
|
}
|
|
ifmat = append(ifmat, ifma.toAddr())
|
|
}
|
|
}
|
|
return ifmat, nil
|
|
}
|