提交: 9b7108f06524751cd2d59521a550dcd5b92639e1 - libnet-dhcp6-perl (git)

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

Commit MetaInfo

• 修訂: 9b7108f06524751cd2d59521a550dcd5b92639e1 (tree)
• 時間: 2021-08-12 22:21:25
• 作者: dyknon <dyknon@user...>
• Commiter: dyknon

Log Message

emit error if unparsed option is required by class

Change Summary

• modified: Net/DHCP6/OptionList.pm
• modified: query_dns_servers.pl

差異

--- a/Net/DHCP6/OptionList.pm
+++ b/Net/DHCP6/OptionList.pm
@@ -28,8 +28,16 @@ sub options {
             %index = (%index,
                 map{$_, 1}grep{$opts[$_]->code == $key}(0 .. $#opts));
         }else{
-            %index = (%index,
-                map{$_, 1}grep{$opts[$_]->isa($key)}(0 .. $#opts));
+            my $code = eval{$key->code};
+            my %hits = map{$_, 1}grep{$opts[$_]->isa($key)}(0 .. $#opts);
+            if(defined $code){
+                my $error = join "",
+                    grep{!exists $hits{$_}}
+                    grep{$opts[$_]->code == $code}
+                    (0 .. $#opts);
+                die "the required option is left unparsed" if($error);
+            }
+            %index = (%index, %hits);
         }
     }
     @opts[keys %index];

--- a/query_dns_servers.pl
+++ b/query_dns_servers.pl
@@ -50,14 +50,14 @@ my $client = Net::DHCP6::Exchange::InfoReq->new(
         DHCP6_OPT_DNS_SERVERS,
     ],
     failed  => sub{print("timeout\n");},
-    recved  => sub{
+    recved  => sub{ eval{
         my $recved = shift;
         print("message: $recved\n");
-        for($recved->option(DHCP6_OPT_DNS_SERVERS)->all_elems){
+        for($recved->option("Net::DHCP6::Option::DnsServer")->all_elems){
             print("DNS-server: $_\n");
         }
         1;
-    },
+    }},
 );
 
 local $| = 1;