r271@brr: dpavlin | 2007-11-25 21:32:49 +0100

[perl-cwmp.git] / lib / CWMP / Vendor.pm

diff --git a/lib/CWMP/Vendor.pm b/lib/CWMP/Vendor.pm
index cc055da..e0cb1d3 100644 (file)
--- a/lib/CWMP/Vendor.pm
+++ b/lib/CWMP/Vendor.pm
@@ -39,7 +39,7 @@ sub new {
        return $self;
 }
 
-my $cpe_faulty;
+our $cpe_faulty;
 
 my $serial2ip = {
        'CP0636JT3SH' => '10.0.0.1',
@@ -58,8 +58,14 @@ my ( $last_ip, $last_serial );
 sub state2serial {
        my $state = shift;
 
-       my $serial = $state->{DeviceID}->{SerialNumber} || die "no serial?";
-       my $ip = $state->{Parameter}->{'.ExternalIPAddress'} || die "no ip?";
+       my $serial = $state->{DeviceID}->{SerialNumber} || die "no DeviceID.SerialNumber in ",dump($state);
+       my $ip =
+               $state->{Parameter}->{'.ExternalIPAddress'} ||
+               $state->{Parameter}->{
+                       # fix for firmware 5.3.3.4 which returns full path
+                       ( grep { m/\.ExternalIPAddress/ } keys %{ $state->{Parameter} } )[0]
+               } ||
+               die "no .ExternalIPAddress in ",dump($state);
 
        warn "## state2serial $serial $ip\n" if $debug;