Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bugfix: ".local.mesh" being added to already qualified domain names. 

fixes AREDN->ticket:127
This commit is contained in:
AE6XE 2015-07-01 23:10:13 -07:00 committed by Conrad Lara - KG6JEI
parent 2482af260c
commit 305dbb143e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/www/cgi-bin/mesh
View File

@ -116,7 +116,7 @@ foreach(`cat /etc/hosts`)
chomp; chomp;
($ip, $name, $tactical) = split /\s+/, $_; ($ip, $name, $tactical) = split /\s+/, $_;
next if $name =~ /^(localhost|localnode|localap|dtdlink\..*)$/; next if $name =~ /^(localhost|localnode|localap|dtdlink\..*)$/;
if ( $name !~ /\.local\.mesh$/ ) { $name="${name}.local.mesh"; } if ( $name !~ /\./ ) { $name="${name}.local.mesh"; }
if($ip eq $my_ip) if($ip eq $my_ip)
{ {
$tactical = "" unless $tactical; $tactical = "" unless $tactical;
@ -135,7 +135,7 @@ foreach(`cat /var/run/hosts_olsr 2>/dev/null`)
next unless $originator; next unless $originator;
next if $originator eq "myself"; next if $originator eq "myself";
if ( $name !~ /\.local\.mesh$/ ) { $name="${name}.local.mesh"; } if (( $name !~ /\./ ) || ( $name =~ /^mid\.[^\.]*$/ )) { $name="${name}.local.mesh"; }
if ( $ip eq $originator ) if ( $ip eq $originator )
{ {
@ -181,8 +181,6 @@ foreach(`cat /var/run/services_olsr 2>/dev/null`)
if ( $host !~ /\./ ) { $host="${host}.local.mesh"; } if ( $host !~ /\./ ) { $host="${host}.local.mesh"; }
#$host = $originator eq " my own service" ? $node : $hosts{$originator}{name};
# attempt to work around olsr never forgetting defunct services # attempt to work around olsr never forgetting defunct services
# assume that the first entry in the file by this name is the most recent, ignore the rest # assume that the first entry in the file by this name is the most recent, ignore the rest
next if $services{$host}{$name}; next if $services{$host}{$name};