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

minor adjustment to interfaces and hosts (change to array)

This commit is contained in:
Darryl Quinn 2015-12-12 17:19:52 -06:00
parent a98213f080
commit 839718cc89
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
files/www/cgi-bin/sysinfo.json
View File

@ -127,20 +127,20 @@ foreach $ik (keys %info)
} }
############## INTERFACES ############## INTERFACES
print "\"interfaces\":{"; print "\"interfaces\":[";
$mystr=""; $mystr="";
foreach(`ifconfig -a`) foreach(`ifconfig -a`)
{ {
next unless /^(\S+) .*HWaddr (\S+)/; next unless /^(\S+) .*HWaddr (\S+)/;
$mystr .= sprintf "\"%s\":{", $1; $mystr .= sprintf "{\"name\":\"%s\",", $1;
($ip, $mask, $bcast, $net, $cidr) = &get_my_ip($1); ($ip, $mask, $bcast, $net, $cidr) = &get_my_ip($1);
$mystr .= sprintf "\"ip\":\"%s\",",$ip; $mystr .= sprintf "\"ip\":\"%s\",",$ip;
$mystr .= sprintf "\"mac\":\"%s\"",$2; $mystr .= sprintf "\"mac\":\"%s\"}",$2;
$mystr .= sprintf "},"; $mystr .= sprintf ",";
} }
chop($mystr); chop($mystr);
print $mystr; print $mystr;
print "}"; print "]";
############## INTERFACES ############## INTERFACES
if($parms{"hosts"} ) if($parms{"hosts"} )
@ -158,7 +158,7 @@ if($parms{"hosts"} )
} }
} }
print ",\"hosts\":{"; print ",\"hosts\":[";
$mystr=""; $mystr="";
foreach(`cat /var/run/hosts_olsr`) foreach(`cat /var/run/hosts_olsr`)
{ {
@ -166,13 +166,13 @@ if($parms{"hosts"} )
next unless /^(\d+\.\d+\.\d+\.\d+)\s*(\S+)/; next unless /^(\d+\.\d+\.\d+\.\d+)\s*(\S+)/;
if ( not $services{$2} and $line !~ /dtdlink|mid1\./ ) { if ( not $services{$2} and $line !~ /dtdlink|mid1\./ ) {
#if ( not $services{$2} and $line !~ /dtdlink/ ) { #if ( not $services{$2} and $line !~ /dtdlink/ ) {
$mystr .= sprintf "\"%s\":\"%s\",",$2,$1; $mystr .= sprintf "{\"name\":\"%s\",\"ip\":\"%s\"},",$2,$1;
} }
} }
chop($mystr); chop($mystr);
print $mystr; print $mystr;
print "}"; print "]";
############## HOSTS ############## HOSTS
} }