mirror of https://github.com/aredn/aredn.git
Merge branch 'MeshBugfix' into release-3.15.1.0
bugfix: fixes AREDN->ticket:128
This commit is contained in:
commit
0dc37a82de
|
@ -346,6 +346,7 @@ foreach $ip (keys %hosts)
|
||||||
$nodeiface = "dtd";
|
$nodeiface = "dtd";
|
||||||
if ( $midcount{$ip} ) { $midcount{$ip} -= 1; } # extra mid entry matching and with dtdlink in hosts_olsrd
|
if ( $midcount{$ip} ) { $midcount{$ip} -= 1; } # extra mid entry matching and with dtdlink in hosts_olsrd
|
||||||
}
|
}
|
||||||
|
if ( $hosts{$ip}{tactical} ) { $midcount{$ip} -= 1; } # extra mid entry if tactical name defined
|
||||||
if ( $midcount{$ip} ) { $nodeiface = $nodeiface ? "dtd," . "tun*$midcount{$ip}" : "tun*$midcount{$ip}" ; }
|
if ( $midcount{$ip} ) { $nodeiface = $nodeiface ? "dtd," . "tun*$midcount{$ip}" : "tun*$midcount{$ip}" ; }
|
||||||
if ( $wangateway{$ip} ) { $nodeiface = $nodeiface ? $nodeiface . ",wan" : "wan" ; }
|
if ( $wangateway{$ip} ) { $nodeiface = $nodeiface ? $nodeiface . ",wan" : "wan" ; }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue