Commit: 11500c928ed92f1a0ba7b31598088c776de0ab66 - libnet-dhcp6-perl (git)

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

Commit MetaInfo

• Révision: 11500c928ed92f1a0ba7b31598088c776de0ab66 (tree)
• l'heure: 2021-08-12 21:46:20
• Auteur: dyknon <dyknon@user...>
• Commiter: dyknon

Message de Log

Leave option body unparsed if error

Change Summary

• modified: Net/DHCP6/Exchange/InfoReq.pm
• modified: Net/DHCP6/Option.pm

Modification

--- a/Net/DHCP6/Exchange/InfoReq.pm
+++ b/Net/DHCP6/Exchange/InfoReq.pm
@@ -51,9 +51,13 @@ sub new {
 
     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}});
+    if(@{$opts{request}}){
+        die if(!$ooro[0]->isa(Net::DHCP6::Option::OptionRequest));
+        @{$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}};

--- a/Net/DHCP6/Option.pm
+++ b/Net/DHCP6/Option.pm
@@ -51,8 +51,9 @@ sub parse {
     die "end of buffer" if(length $data != $len);
     $$buf = substr($$buf, 4 + $len);
 
-    $class = $class->find_subclass($code);
-    $class->new(code => $code, data => $data);
+    my $subclass = $class->find_subclass($code);
+    eval{$subclass->new(code => $code, data => $data)}
+        // $class->new(code => $code, data => $data);
 }
 
 sub register_option {