コミット: 88d6ccca92ba93399efae9d65e5f631af818a92a - libnet-dhcp6-perl (git)

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

コミットメタ情報

• リビジョン: 88d6ccca92ba93399efae9d65e5f631af818a92a (tree)
• 日時: 2021-08-12 19:43:39
• 作者: dyknon <dyknon@user...>
• コミッター: dyknon

ログメッセージ

Rename + changes on InfoReq

MessageExchange -> Exchange
Stateless -> Exchange::InfoReq

変更サマリ

• modified: Net/DHCP6/AbstractOption/DUID.pm
• delete: Net/DHCP6/{MessageExchange.pm => Exchange.pm}
• delete: Net/DHCP6/{Stateless.pm => Exchange/InfoReq.pm}
• modified: query_dns_servers.pl

差分

--- a/Net/DHCP6/AbstractOption/DUID.pm
+++ b/Net/DHCP6/AbstractOption/DUID.pm
@@ -20,9 +20,16 @@ sub new {
         die "invalid data length"
             unless(length $opts{data} >= 1+2 && length $opts{data} <= 128+2);
         $self = \$opts{data};
+    }elsif(@_ == 1 && ref $_[0] eq "ARRAY" && !eval{$_[0]->isa("ARRAY")}){
+        my $self2 = shift;
+        return $class->new(@$self2);
     }elsif(@_ == 1){
-        $self = shift;
-        $self = \$self if(!length ref $self);
+        my $self2 = shift;
+        if(ref $self2 == ""){
+            $self = \$self2;
+        }else{
+            $self = $self2;
+        }
     }elsif(lc($_[0]) eq "llt" && @_ == 4){
         shift;  #llt
         $self = \(pack("S>S>L>", 1, shift, shift) . shift);

--- a/Net/DHCP6/MessageExchange.pm
+++ b/Net/DHCP6/Exchange.pm
@@ -1,4 +1,4 @@
-package Net::DHCP6::MessageExchange;
+package Net::DHCP6::Exchange;
 # RFC8415 15.
 
 use strict;

--- a/Net/DHCP6/Stateless.pm
+++ b/Net/DHCP6/Exchange/InfoReq.pm
@@ -1,23 +1,25 @@
-package Net::DHCP6::Stateless;
+package Net::DHCP6::Exchange::InfoReq;
 # RFC8415 6.1.
 # RFC8415 18.2.6.
 
 use strict;
 use warnings;
 
-use Net::DHCP6::MessageExchange qw/NEXT LAST/;
+use Net::DHCP6::Exchange qw/NEXT LAST/;
 
 use Net::DHCP6::Parameters qw(
     DHCP6_MT_REPLY
     DHCP6_MT_INFORMATION_REQUEST
+    DHCP6_OPT_CLIENTID
+    DHCP6_OPT_ORO
     DHCP6_OPT_INF_MAX_RT
     DHCP6_OPT_INFORMATION_REFRESH_TIME
 );
 use Net::DHCP6::Message;
-use Net::DHCP6::Option qw/ElapsedTime OptionRequest/;
+use Net::DHCP6::Option qw/ElapsedTime OptionRequest ClientId/;
 
 our $VERSION = "0.0.1";
-our @ISA = qw/Net::DHCP6::MessageExchange/;
+our @ISA = qw/Net::DHCP6::Exchange/;
 
 use constant irt => 1;
 use constant mrc => 0;
@@ -35,8 +37,9 @@ sub add_elements_if_not_exists {
 sub new {
     my $class = shift;
     my %opts = @_;
-    die "requesting options are not given" if(ref $opts{request} ne "ARRAY");
 
+    $opts{request} //= [];
+    $opts{options} //= [];
     $opts{mrt} //= 3600;
     if($opts{auto_request} // 1){
         add_elements_if_not_exists($opts{request},
@@ -45,10 +48,28 @@ sub new {
         );
     }
     delete $opts{auto_request};
+
+    my @ooro = grep{$_->code == DHCP6_OPT_ORO}@{$opts{options}};
+    die "there are multiple option request options" if(@ooro >= 2);
+    @{$opts{options}} = grep{$_->code != DHCP6_OPT_ORO}@{$opts{options}};
+    push @{$opts{request}}, $ooro[0]->all_elems if(@ooro);
+    push @{$opts{options}}, d6opt_new_option_request(list => @{$opts{request}});
+    delete $opts{request};
+
+    my $ocid = grep{$_->code == DHCP6_OPT_CLIENTID}@{$opts{options}};
+    die "2 client ids given" if($ocid && defined $opts{client_id});
+    if(!$ocid && !exists $opts{client_id}){
+        die "no client id given (To send no client ids, specify undef)"
+    }
+    if(defined $opts{client_id}){
+        push @{$opts{options}}, d6opt_new_client_id($opts{client_id});
+    }
+    delete $opts{client_id};
+
     $opts{failed} //= sub{};
     $opts{recved} //= sub{ 1; };
 
-    Net::DHCP6::MessageExchange::new($class, %opts);
+    Net::DHCP6::Exchange::new($class, %opts);
 }
 
 sub mrt {
@@ -70,12 +91,7 @@ sub recved {
 
 sub options {
     my $self = shift;
-    $self->{options} ? @{$self->{options}} : ();
-}
-
-sub requests {
-    my $self = shift;
-    @{$self->{request}}
+    @{$self->{options}};
 }
 
 sub message {
@@ -83,7 +99,6 @@ sub message {
     Net::DHCP6::Message->new(DHCP6_MT_INFORMATION_REQUEST,
         $self->xid,
         $self->options,
-        d6opt_new_option_request($self->requests),
         d6opt_new_elapsed_time($self->elapsed // 0),
     );
 }

--- a/query_dns_servers.pl
+++ b/query_dns_servers.pl
@@ -11,7 +11,7 @@ use Net::DHCP6::Parameters qw(
     DHCP6_OPT_DNS_SERVERS
 );
 use Net::DHCP6::Option qw/:all/;
-use Net::DHCP6::Stateless;
+use Net::DHCP6::Exchange::InfoReq;
 use Socket qw/getaddrinfo AF_INET6 SOCK_DGRAM AI_PASSIVE/;
 
 use constant IF => "eth1";
@@ -43,11 +43,9 @@ my $bind_address_packed = $gai[1]->{addr};
 
 my $ll_packed = pack "C*", map{hex $_}split(/[:.-]/, $ll_str);
 
-my $client = Net::DHCP6::Stateless->new(
+my $client = Net::DHCP6::Exchange::InfoReq->new(
     local   => $bind_address_packed,
-    options => [
-        d6opt_new_client_id(LL => 1, $ll_packed)
-    ],
+    client_id => [ LL => 1, $ll_packed ],
     request => [
         DHCP6_OPT_DNS_SERVERS,
     ],