Network Map

From 9e0a879dcde3505643837ec0844216cf95a42cc2 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Fri, 26 Jan 2018 12:06:07 +0100 Subject: [PATCH] show MAC in extra column, correct MAC for TRB3sc --- web/htdocs/network/map.htm | 113 ------------------------------------- web/htdocs/network/map.pl | 12 ++-- 2 files changed, 8 insertions(+), 117 deletions(-) delete mode 100644 web/htdocs/network/map.htm diff --git a/web/htdocs/network/map.htm b/web/htdocs/network/map.htm deleted file mode 100644 index e2762bf..0000000 --- a/web/htdocs/network/map.htm +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - -Network Map - - - - -

Network Map

Configuration -
	-

- - -

Register	Values

- - - - - diff --git a/web/htdocs/network/map.pl b/web/htdocs/network/map.pl index f86e908..9e0707c 100755 --- a/web/htdocs/network/map.pl +++ b/web/htdocs/network/map.pl @@ -63,7 +63,7 @@ if($ENV{'QUERY_STRING'} =~ /getmap/) { } - print "

Board

Hardware

Design

Compile Time

Temperature

UID - Endp (MAC)

serial\n"; + print "

Board	Hardware	Design	Compile Time	Temperature	UID - Endp	MAC	serial\n"; printlist(0,1); print "

"; @@ -215,8 +215,8 @@ if($ENV{'QUERY_STRING'} =~ /getmap/) { my $serial = GetSerial($uids->{$addr},$hardware->{$addr}>>24&0xff); my $mac = ''; - $mac = GetMac($uids->{$addr}) if $feat =~ /GbE/; - printf("

0x%04x

%.1fÂ°C

%016x - %i

%s\n", + $mac = GetMac($uids->{$addr},$btype) if $feat =~ /GbE/; + printf("

0x%04x

%.1fÂ°C

%016x - %i

%s\n", $layer, ($layer!=$lastlayer?' newlevel':' oldlevel'), $p, @@ -230,9 +230,9 @@ if($ENV{'QUERY_STRING'} =~ /getmap/) { $ctime->{$addr}, time2str('%Y-%m-%d %H:%M',$ctime->{$addr}), ($temp->{$addr}>>20)/16, - $mac, $uids->{$addr}, $endpid->{$addr}, + $mac, $serial); $lastlayer = $layer; @@ -316,8 +316,12 @@ sub GetSerial { sub GetMac { my $id = shift @_; + my $btype = shift @_; $id = sprintf('%08x',$id); my $r = 'da:7a:3'.substr($id,7,1).':'.substr($id,8,2).':'.substr($id,10,2).':'.substr($id,12,2); + if ($btype =~ /TRB3sc/) { + $r = 'da:7a:0'.substr($id,7,1).':'.substr($id,8,2).':'.substr($id,10,2).':'.substr($id,12,2); + } return $r; } -- 2.43.0