From: minima <minima>
Date: Tue, 2 Jan 2007 21:36:44 +0000 (+0000)
Subject: implement PC92 config changes
X-Git-Tag: 1.54~80
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=c6428493a82dbc2c59d92ba12d288975e2b936ba;p=spider.git

implement PC92 config changes
---

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 6ff479c1..58b5982d 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1146,7 +1146,7 @@ sub broadcast_route_pc9x
 		$line = &$generate(@_);
 	} 
 
-	$line =~ /\^H(\d+)\^$/;
+	$line =~ /\^H(\d+)\^\~?$/;
 	unless ($1 > 0 && $self->{isolate}) {
 		foreach $dxchan (@dxchan) {
 			next if $dxchan == $self;
diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 5eb35f6b..98218047 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -1262,14 +1262,14 @@ sub _encode_pc92_call
 	my $call = $ref->call; 
 	my $extra = '';
 	$flag |= $ref->here ? 1 : 0;
-	if ($ext && ($ref->isa('Route::Node') || $ref->isa('DXProt'))) {
+	if ($ref->isa('Route::Node') || $ref->isa('DXProt')) {
 		$flag |= 4;
-#		if ($ref->version || $ref->build) {
-		if ($ref->version) {
-			my $version = $ref->version || 1.0;
-			$version =  $version * 100 + 5300 if $version < 50;
-			$extra .= ":" . $version;
-#			$extra .= (":" . ($ref->build ? $ref->build : '')) if $ref->build;
+		if ($ext) {
+			if ($ref->version) {
+				my $version = $ref->version || 1.0;
+				$version =  $version * 100 + 5300 if $version < 50;
+				$extra .= ":" . $version;
+			}
 		}
 	}
 	return "$flag$call$extra";
@@ -1348,23 +1348,56 @@ sub handle_92
 	$parent->lastid->{92} = $t;
 	$parent->build($build) if $build;
 
+	my (@radd, @rdel);
+	
 	if ($sort eq 'A') {
 		if ($_[4]) {
-			_add_thingy($parent, $_[4]);
+			if (@radd = _add_thingy($parent, $_[4])) {
+			}
 		}
 	} elsif ($sort eq 'D') {
 		if ($_[4]) {
-			_del_thingy($parent, $_[4]);
+			if (@rdel = _del_thingy($parent, $_[4])) {
+			}
 		}
 	} elsif ($sort eq 'C') {
 		my $i;
-		$parent->del_nodes;
-		$parent->_del_users;
+		my (@nodes, @users);
+		for ($i = 4; $_[$i]; $i++) {
+			my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_[$i]);
+			if ($call) {
+				if ($is_node) {
+					push @nodes, $call;
+				} else {
+					push @users, $call;
+				}
+			} else {
+				dbg("DXPROT: pc92 call entry '$_[$i]' not decoded, ignored") if isdbg('chanerr'); 
+			}
+		}
+
+		my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users);
+
 		for ($i = 4; $_[$i]; $i++) {
-			_add_thingy($parent, $_[$i]);
+			my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_[$i]);
+			if ($call) {
+				push @radd,_add_thingy($parent, $_[$i]) if grep $call eq $_, (@$nnodes, @$nusers);
+				push @rdel,_del_thingy($parent, $_[$i]) if grep $call eq $_, (@$dnodes, @$dusers);
+			}
 		}
 	} else {
 		dbg("PCPROT: unknown action '$sort', ignored") if isdbg('chanerr');
+		return;
+	}
+
+	$self->broadcast_route_pc9x($origin, undef, $line, 0);
+	foreach my $r (@rdel) {
+		$self->route_pc21($pcall, undef, $r) if $r->isa('Route::Node');
+		$self->route_pc17($pcall, undef, $parent, $r) if $r->isa('Route::User');
+	}
+	foreach my $r (@radd) {
+		$self->route_pc19($pcall, undef, $r) if $r->isa('Route::Node');
+		$self->route_pc16($pcall, undef, $parent, $r) if $r->isa('Route::User');
 	}
 }
 
diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index b6667849..67e32a00 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -211,6 +211,24 @@ sub rnodes
 	return @out;
 }
 
+# this takes in a list of node and user calls (not references) from 
+# a config type update for a node and returns
+# the differences as lists of things that have gone away
+# and things that have been added. 
+sub calc_config_changes
+{
+	my $self = shift;
+	my %nodes = map {$_ => 1} @{$self->{nodes}};
+	my %users = map {$_ => 1} @{$self->{users}};
+	my $cnodes = shift;
+	my $cusers = shift;
+	my (@dnodes, @dusers, @nnodes, @nusers);
+	push @nnodes, map {my @r = $nodes{$_} ? () : $_; delete $nodes{$_}; @r} @$cnodes;
+	push @dnodes, keys %nodes;
+	push @nusers, map {my @r = $users{$_} ? () : $_; delete $users{$_}; @r} @$cusers;
+	push @dusers, keys %users;
+	return (\@dnodes, \@dusers, \@nnodes, \@nusers);
+}
 
 sub new
 {
@@ -221,8 +239,8 @@ sub new
 	
 	my $self = $pkg->SUPER::new($call);
 	$self->{parent} = ref $pkg ? [ $pkg->{call} ] : [ ];
-	$self->{version} = shift;
-	$self->{flags} = shift;
+	$self->{version} = shift || 5000;
+	$self->{flags} = shift || Route::here(1);
 	$self->{users} = [];
 	$self->{nodes} = [];
 	$self->{lastid} = {};
diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index b9862e6d..46ee36d0 100644
--- a/perl/Route/User.pm
+++ b/perl/Route/User.pm
@@ -53,7 +53,7 @@ sub new
 	
 	my $self = $pkg->SUPER::new($call);
 	$self->{parent} = [ $ncall ];
-	$self->{flags} = $flags;
+	$self->{flags} = $flags || Route::here(1);
 	$list{$call} = $self;
 
 	return $self;