Permalink
Browse files

Updates from Master (#69)

* Fix on Model/OS Report

* Default OS fix for Model/OS Report

* New feature for User Role:
- show IP Address

* ensure remaining nibbles get pushed onto the resulting address

If the prefix length for an ip6.arpa zone is not a multiple of 16, then
remaining nibbles will get silently dropped.

* tests for _dot_arpa_to_ip subroutine

* dependency for new unit tests

* standardize IPv6 address formatting to RFC 5952

* use the correct A vs AAAA label for ip.html page

* MAC formatting (#68)

* allow custom formatting of displayed MAC addresses
* Make unit tests pass
  • Loading branch information...
cvicente committed May 16, 2017
1 parent 4df92ca commit 9eaa7b3e27aa7402295a40a797bb98b6f4cb3419
View
@@ -15,7 +15,7 @@ MAKE ?= make
SED ?= sed
usage:
@echo
@echo "usage: make install|installdb|upgrade [ PARAMETER=value ]"
@echo "usage: make install|installdb|upgrade|test [ PARAMETER=value ]"
@echo
@echo "You can either specify parameter values on the command"
@echo "line or you can modify them in the Makefile."
@@ -143,3 +143,6 @@ defragdb:
oui:
cd bin ; $(MAKE) oui
unit:
prove t/
View
@@ -7,6 +7,7 @@ include $(SRCROOT)/etc/utility-Makefile
PERL = /usr/bin/perl
PREFIX = `cat ../.prefix`
FMOD = 755
OUI_URL = http://standards-oui.ieee.org/oui/oui.txt
FILES := $(shell ls *.pl)
@@ -34,5 +35,5 @@ _defragdb:
oui:
rm -f oui.txt
wget -t 1 http://standards.ieee.org/regauth/oui/oui.txt || cp oui.txt.default oui.txt
wget -t 1 -T 10 $(OUI_URL) || cp oui.txt.default oui.txt
$(PERL) initdb oui
View
@@ -69,7 +69,7 @@
print "--------------------\n";
if ( $address =~ /^$MAC$/ ){
$address = PhysAddr->format_address($address);
$address = PhysAddr->format_address_db($address);
if ( $self{FORCE_LIVE} ){
&search_live(mac=>$address, vlan=>$self{VLAN});
}else{
@@ -141,7 +141,7 @@ sub show_ip {
my $mac = PhysAddr->retrieve($macid)->address;
$latest_mac = $mac unless defined $latest_mac;
if ( $self{ARP_LIMIT} ){
print $tstamp, " ", $mac, " ", (join ', ', @{$tstamps{$tstamp}{$macid}}), "\n";
print $tstamp, " ", PhysAddr->format_address(address => $mac), " ", (join ', ', @{$tstamps{$tstamp}{$macid}}), "\n";
}
}
}
Oops, something went wrong.

0 comments on commit 9eaa7b3

Please sign in to comment.