Commit: 916c9dd705307497cf53e8253123e3f6f192c3f1 - libnet-dhcp6-perl (git)

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

Commit MetaInfo

• Revision: 916c9dd705307497cf53e8253123e3f6f192c3f1 (tree)
• Time: 2021-08-14 06:12:11
• Author: dyknon <dyknon@user...>
• Commiter: dyknon

Log Message

AbstructOption::Numeric

Change Summary

• modified: Net/DHCP6/AbstractOption/DUID.pm
• add: Net/DHCP6/AbstractOption/Numeric.pm
• add: Net/DHCP6/AbstractOption/U16.pm
• add: Net/DHCP6/AbstractOption/U32.pm
• modified: Net/DHCP6/Option/DnsServer.pm
• modified: Net/DHCP6/Option/DomainList.pm
• modified: Net/DHCP6/Option/ElapsedTime.pm

Incremental Difference

--- a/Net/DHCP6/AbstractOption/DUID.pm
+++ b/Net/DHCP6/AbstractOption/DUID.pm
@@ -11,6 +11,8 @@ use Net::DHCP6::Option;
 our $VERSION = "0.001";
 our @ISA = qw/Net::DHCP6::Option/;
 
+use constant verify => 1;
+
 sub new {
     my $class = shift;
     my $self;

--- /dev/null
+++ b/Net/DHCP6/AbstractOption/Numeric.pm
@@ -0,0 +1,46 @@
+package Net::DHCP6::AbstractOption::Numeric;
+# base class for option
+
+use strict;
+use warnings;
+use Net::DHCP6::AbstractOption::FixedLength;
+
+our $VERSION = "0.001";
+our @ISA = qw/Net::DHCP6::AbstractOption::FixedLength/;
+
+sub template { ... }
+sub range { (undef, undef) }
+
+sub value {
+    my $self = shift;
+    $$self;
+}
+
+sub len {
+    my $self = shift;
+    length pack($self->template, 0);
+}
+
+sub verify {
+    my $self = shift;
+    my $who = shift;
+    my ($from, $to) = $self->range;
+    return 0 if(defined $from && $from > $self->value);
+    return 0 if(defined $to && $to <= $self->value);
+    1;
+}
+
+sub data {
+    my $self = shift;
+    die "out of range" unless($self->value >= 0 && $self->value < 2**16);
+    pack($self->template, $self->value);
+}
+
+sub parse_data {
+    my $class = shift;
+    my $data = shift;
+    my ($value) = unpack($self->template, $data);
+    \$value;
+}
+
+1;

--- /dev/null
+++ b/Net/DHCP6/AbstractOption/U16.pm
@@ -0,0 +1,14 @@
+package Net::DHCP6::AbstractOption::U16;
+# base class for option
+
+use strict;
+use warnings;
+use Net::DHCP6::AbstractOption::Numeric;
+
+our $VERSION = "0.001";
+our @ISA = qw/Net::DHCP6::AbstractOption::Numeric/;
+
+use constant template => "S>";
+use constant len    => 2;
+
+1;

--- /dev/null
+++ b/Net/DHCP6/AbstractOption/U32.pm
@@ -0,0 +1,14 @@
+package Net::DHCP6::AbstractOption::U32;
+# base class for option
+
+use strict;
+use warnings;
+use Net::DHCP6::AbstractOption::Numeric;
+
+our $VERSION = "0.001";
+our @ISA = qw/Net::DHCP6::AbstractOption::Numeric/;
+
+use constant template => "L>";
+use constant len    => 4;
+
+1;

--- a/Net/DHCP6/Option/DnsServer.pm
+++ b/Net/DHCP6/Option/DnsServer.pm
@@ -11,6 +11,7 @@ our @ISA = qw/Net::DHCP6::AbstractOption::Ipv6AddrList/;
 
 use constant code   => DHCP6_OPT_DNS_SERVERS;
 use constant name   => "DnsServer";
+use constant verify => 1;
 
 __PACKAGE__->register_option;
 1;

--- a/Net/DHCP6/Option/DomainList.pm
+++ b/Net/DHCP6/Option/DomainList.pm
@@ -11,6 +11,7 @@ our @ISA = qw/Net::DHCP6::AbstractOption::DomainNameList/;
 
 use constant code   => DHCP6_OPT_DOMAIN_LIST;
 use constant name   => "DomainList";
+use constant verify => 1;
 
 __PACKAGE__->register_option;
 1;

--- a/Net/DHCP6/Option/ElapsedTime.pm
+++ b/Net/DHCP6/Option/ElapsedTime.pm
@@ -3,15 +3,15 @@ package Net::DHCP6::Option::ElapsedTime;
 
 use strict;
 use warnings;
-use Net::DHCP6::AbstractOption::FixedLength;
+use Net::DHCP6::AbstractOption::U16;
 use Net::DHCP6::Parameters qw/DHCP6_OPT_ELAPSED_TIME/;
 
 our $VERSION = "0.001";
-our @ISA = qw/Net::DHCP6::AbstractOption::FixedLength/;
+our @ISA = qw/Net::DHCP6::AbstractOption::U16/;
 
 use constant code   => DHCP6_OPT_ELAPSED_TIME;
 use constant name   => "ElapsedTime";
-use constant len    => 2;
+use constant verify => 1;
 
 sub new_special {
     my $class = shift;
@@ -20,15 +20,9 @@ sub new_special {
     bless $self, $class;
 }
 
-sub data {
-    my $self = shift;
-    die "out of range" unless($self->time >= 0 && $self->time < 2**16);
-    pack("S>", $self->time);
-}
-
 sub time {
     my $self = shift;
-    $$self;
+    $self->value;
 }
 
 sub sec {
@@ -36,13 +30,6 @@ sub sec {
     $self->time / 100;
 }
 
-sub parse_data {
-    my $class = shift;
-    my $data = shift;
-    my ($time) = unpack("S>", $data);
-    \$time;
-}
-
 sub data_str {
     my $self = shift;
     $self->sec . "s";