Changeset 385

Timestamp:

Apr 24, 2019, 4:26:08 PM (6 years ago)

Author:

g7moreau

Message:

• Add other mac address case (and update copyright)

File:

• trunk/ddt/ddt (modified) (5 diffs)

trunk/ddt/ddt

@@ -1 +1 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2006-2018, LEGI UMR 5519 / CNRS UGA G-INP, Grenoble, France
+# Copyright (C) 2006-2019, LEGI UMR 5519 / CNRS UGA G-INP, Grenoble, France
 # License GNU GPL version 2 or later and Perl equivalent
 #
@@ -21 +21 @@
 use strict;
 #use warnings;
-use version; our $VERSION = version->declare('0.12.0');
+use version; our $VERSION = version->declare('0.12.1');
 
 use Getopt::Long qw(GetOptions);
@@ -361 +361 @@
    my $mac_address = shift;
 
-   # D07E-28D1-7AB8 or d07e28-d17ab8
+   # D07E-28D1-7AB8 or d07e28-d17ab8 or D07E.28D1.7AB8
    if ($mac_address =~ m{^ (?: [0-9A-Fa-f]{4} -){2} [0-9A-Fa-f]{4} $}xms
       or $mac_address =~ m{^ [0-9A-Fa-f]{6} - [0-9A-Fa-f]{6} $}xms) {
       $mac_address =~ s/-//g;
+      return join q{:}, unpack('(A2)*', uc($mac_address));
+      }
+
+   if ($mac_address =~ m{^ (?: [0-9A-Fa-f]{4} \.){2} [0-9A-Fa-f]{4} $}xms) {
+      $mac_address =~ s/\.//g;
       return join q{:}, unpack('(A2)*', uc($mac_address));
       }
@@ -3309 +3314 @@
    print <<'END';
 ddt - management of computer names and IP addresses
-Copyright (C) 2006-2018, LEGI UMR 5519 / CNRS UGA G-INP, Grenoble, France
+Copyright (C) 2006-2019, LEGI UMR 5519 / CNRS UGA G-INP, Grenoble, France
 Main author Gabriel Moreau <Gabriel.Moreau(A)univ-grenoble-alpes.fr>
 License GNU GPL version 2 or later and Perl equivalent
@@ -3656 +3661 @@
 License GNU GPL version 2 or later and Perl equivalent
 
-Copyright (C) 2006-2018, LEGI UMR 5519 / CNRS UGA G-INP, Grenoble, France
+Copyright (C) 2006-2019, LEGI UMR 5519 / CNRS UGA G-INP, Grenoble, France