X-Git-Url: http://git.rot13.org/?p=perl-cwmp.git;a=blobdiff_plain;f=lib%2FCWMP%2FRequest.pm;h=ef8c322d07625017cad900dcdb200f797c53478f;hp=4ded128bca6a91f88828f5403268d0f73a65ff40;hb=31dabd16eb4ed16aab62454da2aa17fb8158185b;hpb=d491716e0bc3f8b8d87bc16f708f21f806718cdf

diff --git a/lib/CWMP/Request.pm b/lib/CWMP/Request.pm
index 4ded128..ef8c322 100644
--- a/lib/CWMP/Request.pm
+++ b/lib/CWMP/Request.pm
@@ -4,83 +4,25 @@ use warnings;
 use strict;
 
 use XML::Rules;
-use CWMP::Tree;
 use Data::Dump qw/dump/;
 use Carp qw/confess cluck/;
+use Class::Trigger;
+
+#use Devel::LeakTrace::Fast;
 
 =head1 NAME
 
 CWMP::Request - parse SOAP request metods
 
-=head1 METHODS
-
-=head2 _tag
-
-Get value of tag. Tag name is case insensitive (don't ask why),
-we ignore namespaces and can take optional C<sub_key>
-(usually C<_content>).
-
-  _tag( $tag_hash, $name, $sub_key )
-
-=cut
-
-sub _tag {
-	my ( $tag_hash, $name, $sub_key ) = @_;
-	confess "need hash as first argument" unless ( ref $tag_hash eq 'HASH' );
-	$name = (grep { m/^(?:\w+:)*$name$/i } keys %$tag_hash )[0];
-#	$name =~ s/^\w+://;
-	if ( defined $tag_hash->{$name} ) {
-		if ( ! defined $sub_key ) {
-			return $tag_hash->{$name};
-		} elsif ( defined $tag_hash->{$name}->{$sub_key} ) {
-			return $tag_hash->{$name}->{$sub_key};
-		} else {
-			return if ( $name =~ m/^value$/i );
-			warn "can't find '$name/$sub_key' in ", dump( $tag_hash );
-			return;
-		}
-	} else {
-		warn "can't find '$name' in ", dump( $tag_hash );
-		return;
-	}
-}
-
-=head2 parse
-
-  my $state = CWMP::Request->parse( "<soap>request</soap>" );
-
-=cut
-
-sub parse {
-	my $self = shift;
-
-	my $xml = shift || confess "no xml?";
-
-	$state = {};
-	$parser->parsestring( $xml );
-	return $state;
-}
-
 =head1 CPE metods
 
+All methods described below call triggers with same name
+
 =cut
 
 our $state;	# FIXME check this!
 
-my $tree = CWMP::Tree->new({ debug => 0 });
-
-my $parser = XML::Rules->new(
-#	start_rules => [
-#		'^division_name,fax' => 'skip',
-#	],
-	namespaces => {
-		'http://schemas.xmlsoap.org/soap/envelope/' => 'soapenv',
-		'http://schemas.xmlsoap.org/soap/encoding/' => 'soap',
-		'http://www.w3.org/2001/XMLSchema' => 'xsd',
-		'http://www.w3.org/2001/XMLSchema-instance' => 'xsi',
-		'urn:dslforum-org:cwmp-1-0' => '',
-	},
-	rules => [
+our $rules =  [
 		#_default => 'content trim',
 		x_default => sub {
 			my ($tag_name, $tag_hash, $context, $parent_data) = @_;
@@ -91,15 +33,6 @@ my $parser = XML::Rules->new(
 			$state->{ID} = $tag_hash->{_content};
 		},
 
-=head2 Inform
-
-Generate InformResponse to CPE
-
-=cut
-
-		'Inform' => sub {
-			$state->{_dispatch} = 'InformResponse';		# what reponse to call
-		},
 		'DeviceId' => sub {
 			my ($tag_name, $tag_hash, $context, $parent_data) = @_;
 			foreach my $name ( keys %$tag_hash ) {
@@ -122,21 +55,40 @@ Generate InformResponse to CPE
 			# Name/Value tags must be case insnesitive
 			my $value = (grep( /value/i, keys %$tag_hash ))[0];
 			$state->{Parameter}->{ _tag($tag_hash, 'Name', '_content') } = _tag($tag_hash, 'Value', '_content' );
+			$state->{_trigger} = 'ParameterValue';
 		},
 
+];
+
+=head2 Inform
+
+Generate InformResponse to CPE
+
+=cut
+
+push @$rules,
+	'Inform' => sub {
+		$state->{_dispatch} = 'InformResponse';		# what reponse to call
+		$state->{_trigger} = 'Inform';
+	};
+
 =head2 GetRPCMethodsResponse
 
 =cut
+
+push @$rules,
 		qr/^(?:^\w+:)*string$/ => 'content array',
 		'MethodList' => sub {
 			my ($tag_name, $tag_hash, $context, $parent_data) = @_;
 			$state->{MethodList} = _tag( $tag_hash, 'string' );
-		},
+			$state->{_trigger} = 'GetRPCMethodsResponse';
+		};
 
 =head2 GetParameterNamesResponse
 
 =cut
 
+push @$rules,
 		'ParameterInfoStruct' => sub {
 			my ($tag_name, $tag_hash, $context, $parent_data) = @_;
 			my $name = _tag($tag_hash, 'Name', '_content');
@@ -144,18 +96,18 @@ Generate InformResponse to CPE
 
 			confess "need state" unless ( $state );	# don't remove!
 
-			# XXX dragons ahead: convert name to tree rewriting it into perl
-			my $s = '$state->{ParameterInfo}->' . $tree->name2perl( $name ) . "->{writable} = $writable;";
-			eval "$s";
-			confess "can't eval $s : $@" if ($@);
+			$state->{ParameterInfo}->{$name} = $writable;
 
 			#warn "## state = dump( $state ), "\n";
-		},
+
+			$state->{_trigger} = 'GetParameterNamesResponse';
+		};
 	
 =head2 Fault
 
 =cut
 
+push @$rules,
 		'Fault' => sub {
 			my ($tag_name, $tag_hash, $context, $parent_data) = @_;
 			$state->{Fault} = {
@@ -163,8 +115,82 @@ Generate InformResponse to CPE
 				FaultString => _tag( $tag_hash, 'FaultString', '_content' ),
 			};
 			warn "FAULT: ", $state->{Fault}->{FaultCode}, " ", $state->{Fault}->{FaultString}, "\n";
+			$state->{_trigger} = 'Fault';
+		};
+
+=head1 METHODS
+
+=head2 parse
+
+  my $state = CWMP::Request->parse( "<soap>request</soap>" );
+
+=cut
+
+sub parse {
+	my $self = shift;
+
+	my $xml = shift || confess "no xml?";
+
+	$state = {};
+
+	my $parser = XML::Rules->new(
+#		start_rules => [
+#			'^division_name,fax' => 'skip',
+#		],
+		namespaces => {
+			'http://schemas.xmlsoap.org/soap/envelope/' => 'soapenv',
+			'http://schemas.xmlsoap.org/soap/encoding/' => 'soap',
+			'http://www.w3.org/2001/XMLSchema' => 'xsd',
+			'http://www.w3.org/2001/XMLSchema-instance' => 'xsi',
+			'urn:dslforum-org:cwmp-1-0' => '',
+		},
+		rules => $rules,
+	);
+
+#	warn "## created $parser\n";
+
+	$parser->parsestring( $xml );
+
+	undef $parser;
+
+	if ( my $trigger = $state->{_trigger} ) {
+		warn "### call_trigger( $trigger )\n";
+		$self->call_trigger( $trigger, $state );
+	}
+	# XXX propagate _trigger (useful for symlinks)
+
+	return $state;
+}
+
+=head2 _tag
+
+Get value of tag. Tag name is case insensitive (don't ask why),
+we ignore namespaces and can take optional C<sub_key>
+(usually C<_content>).
+
+  _tag( $tag_hash, $name, $sub_key )
+
+=cut
+
+sub _tag {
+	my ( $tag_hash, $name, $sub_key ) = @_;
+	confess "need hash as first argument" unless ( ref $tag_hash eq 'HASH' );
+	$name = (grep { m/^(?:\w+:)*$name$/i } keys %$tag_hash )[0];
+#	$name =~ s/^\w+://;
+	if ( defined $tag_hash->{$name} ) {
+		if ( ! defined $sub_key ) {
+			return $tag_hash->{$name};
+		} elsif ( defined $tag_hash->{$name}->{$sub_key} ) {
+			return $tag_hash->{$name}->{$sub_key};
+		} else {
+			return if ( $name =~ m/^value$/i );
+			warn "can't find '$name/$sub_key' in ", dump( $tag_hash );
+			return;
 		}
-	]
-);
+	} else {
+		warn "can't find '$name' in ", dump( $tag_hash );
+		return;
+	}
+}
 
 1;