ffhb/yanic
ffhb
/
yanic
mirror of https://github.com/FreifunkBremen/yanic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[TASK] improve autoselect ip_address (#137)

This commit is contained in:
Martin/Geno 2018-05-08 17:15:49 +02:00 committed by Geno
parent 10f58a72ea
commit 7e97b691eb
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/docs_configuration.md
View File

@ -120,6 +120,7 @@ ifname = "br-ffhb"
{% method %}
ip address is the own address which is used for sending.
If not set or set with empty string it will take an address of ifname.
(If `multicast_address` is not set the link local address otherwise a global unicast address)
{% sample lang="toml" %}
```toml
ip_address = "fe80::..."

10
respond/collector.go
View File

@ -65,7 +65,7 @@ func (coll *Collector) listenUDP(iface InterfaceConfig) {
if iface.IPAddress != "" {
addr = net.ParseIP(iface.IPAddress)
} else {
addr, err = getUnicastAddr(iface.InterfaceName)
addr, err = getUnicastAddr(iface.InterfaceName, iface.MulticastAddress == "")
if err != nil {
log.Panic(err)
}
@ -97,8 +97,8 @@ func (coll *Collector) listenUDP(iface InterfaceConfig) {
go coll.receiver(conn)
}
// Returns a unicast address of given interface (prefer global unicast address over link local address)
func getUnicastAddr(ifname string) (net.IP, error) {
// Returns a unicast address of given interface (linklocal or global unicast address)
func getUnicastAddr(ifname string, linklocal bool) (net.IP, error) {
iface, err := net.InterfaceByName(ifname)
if err != nil {
return nil, err
@ -115,9 +115,7 @@ func getUnicastAddr(ifname string) (net.IP, error) {
if !ok {
continue
}
if ipnet.IP.IsGlobalUnicast() {
ip = ipnet.IP
} else if ipnet.IP.IsLinkLocalUnicast() && ip == nil {
if (!linklocal && ipnet.IP.IsGlobalUnicast()) || (linklocal && ipnet.IP.IsLinkLocalUnicast()) {
ip = ipnet.IP
}
}