Commit: bd4448817d5eef5328d76c5ec06fe60ac5319f99 - libnet-dhcp6-perl (git)

恥ずかしい勘違いから生まれた、DHCP6の不要かつ部分的な実装

Commit MetaInfo

• Revision: bd4448817d5eef5328d76c5ec06fe60ac5319f99 (tree)
• Zeit: 2021-08-11 17:41:17
• Autor: dyknon <dyknon@user...>
• Commiter: dyknon

Log Message

refactor

Ändern Zusammenfassung

• modified: Net/DHCP6/Message.pm
• modified: Net/DHCP6/Option/ClientId.pm
• modified: Net/DHCP6/Option/ElapsedTime.pm
• modified: Net/DHCP6/Option/ServerId.pm
• add: Net/DHCP6/OptionList.pm
• delete: Net/DHCP6/{Option => AbstractOption}/DUID.pm
• delete: Net/DHCP6/{Option => AbstractOption}/FixedLength.pm

Diff

--- a/Net/DHCP6/Option/DUID.pm
+++ b/Net/DHCP6/AbstractOption/DUID.pm
@@ -1,4 +1,4 @@
-package Net::DHCP6::Option::DUID;
+package Net::DHCP6::AbstractOption::DUID;
 # base class for DUID options
 # RFC8415 11.
 # RFC8415 21.2.

--- a/Net/DHCP6/Option/FixedLength.pm
+++ b/Net/DHCP6/AbstractOption/FixedLength.pm
@@ -1,4 +1,4 @@
-package Net::DHCP6::Option::FixedLength;
+package Net::DHCP6::AbstractOption::FixedLength;
 # base class for fixed length options
 
 use strict;

--- a/Net/DHCP6/Message.pm
+++ b/Net/DHCP6/Message.pm
@@ -4,7 +4,11 @@ package Net::DHCP6::Message;
 use strict;
 use warnings;
 
+use Net::DHCP6::Option;
+use Net::DHCP6::OptionList;
+
 our $VERSION = "0.0.1";
+our @ISA = qw/Net::DHCP6::OptionList/;
 
 # TODO: should be crypto-safe RNG?
 our $RNG = sub{ int rand shift };
@@ -38,35 +42,9 @@ sub xid {
     $self->{xid};
 }
 
-sub option {
-    my $self = shift;
-    my $key = shift;
-    my @hit = $self->options($key);
-    if(@hit == 0){
-        undef;
-    }elsif(@hit == 1){
-        pop @hit;
-    }else{
-        die "multiple options";
-    }
-}
-
-sub options {
+sub all_options {
     my $self = shift;
-    return @{$self->{options}} if(@_ == 0);
-    my %index;
-    my @opts = $self->options;
-    return () unless(@opts);
-    for my $key(@_){
-        if($key =~ /^[0-9]+$/){
-            %index = (%index,
-                map{$_, 1}grep{$opts[$_]->code == $key}(0 .. $#opts));
-        }else{
-            %index = (%index,
-                map{$_, 1}grep{$opts[$_]->isa($key)}(0 .. $#opts));
-        }
-    }
-    @opts[keys %index];
+    @{$self->{options}};
 }
 
 sub serialize {

--- a/Net/DHCP6/Option/ClientId.pm
+++ b/Net/DHCP6/Option/ClientId.pm
@@ -3,11 +3,11 @@ package Net::DHCP6::Option::ClientId;
 
 use strict;
 use warnings;
-use Net::DHCP6::Option::DUID;
+use Net::DHCP6::AbstractOption::DUID;
 use Net::DHCP6::Parameters qw/DHCP6_OPT_CLIENTID/;
 
 our $VERSION = "0.0.1";
-our @ISA = qw/Net::DHCP6::Option::DUID/;
+our @ISA = qw/Net::DHCP6::AbstractOption::DUID/;
 
 use constant code   => DHCP6_OPT_CLIENTID;
 use constant name   => "ClientId";

--- a/Net/DHCP6/Option/ElapsedTime.pm
+++ b/Net/DHCP6/Option/ElapsedTime.pm
@@ -3,11 +3,11 @@ package Net::DHCP6::Option::ElapsedTime;
 
 use strict;
 use warnings;
-use Net::DHCP6::Option::FixedLength;
+use Net::DHCP6::AbstractOption::FixedLength;
 use Net::DHCP6::Parameters qw/DHCP6_OPT_ELAPSED_TIME/;
 
 our $VERSION = "0.0.1";
-our @ISA = qw/Net::DHCP6::Option::FixedLength/;
+our @ISA = qw/Net::DHCP6::AbstractOption::FixedLength/;
 
 use constant code   => DHCP6_OPT_ELAPSED_TIME;
 use constant name   => "ElapsedTime";

--- a/Net/DHCP6/Option/ServerId.pm
+++ b/Net/DHCP6/Option/ServerId.pm
@@ -3,11 +3,11 @@ package Net::DHCP6::Option::ServerId;
 
 use strict;
 use warnings;
-use Net::DHCP6::Option::DUID;
+use Net::DHCP6::AbstractOption::DUID;
 use Net::DHCP6::Parameters qw/DHCP6_OPT_SERVERID/;
 
 our $VERSION = "0.0.1";
-our @ISA = qw/Net::DHCP6::Option::DUID/;
+our @ISA = qw/Net::DHCP6::AbstractOption::DUID/;
 
 use constant code   => DHCP6_OPT_SERVERID;
 use constant name   => "ServerId";

--- /dev/null
+++ b/Net/DHCP6/OptionList.pm
@@ -0,0 +1,36 @@
+package Net::DHCP6::OptionList;
+
+use strict;
+use warnings;
+
+our $VERSION = "0.0.1";
+
+sub option {
+    my $self = shift;
+    my $key = shift;
+    my @hit = $self->options($key);
+    if(@hit == 0){
+        undef;
+    }elsif(@hit == 1){
+        pop @hit;
+    }else{
+        die "multiple options";
+    }
+}
+
+sub options {
+    my $self = shift;
+    return $self->all_options if(@_ == 0);
+    my %index;
+    my @opts = $self->all_options;
+    for my $key(@_){
+        if($key =~ /^[0-9]+$/){
+            %index = (%index,
+                map{$_, 1}grep{$opts[$_]->code == $key}(0 .. $#opts));
+        }else{
+            %index = (%index,
+                map{$_, 1}grep{$opts[$_]->isa($key)}(0 .. $#opts));
+        }
+    }
+    @opts[keys %index];
+}