fix init and rinit stuff

diff --git a/Changes b/Changes
index 0282bb591b3a7b64ade690b4921eca491ff51d67..d359471a5f0a0835f2697a508b4d6c04dcad6235 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+13Jun01=======================================================================
+1. fix init cnd rinit cmds
 10Jun01=======================================================================
 1. fix set/here and unset/here
 2. fix indirect routing to users two hops away

diff --git a/cmd/init.pl b/cmd/init.pl
index 2d0a38fc867185f9be2e65267ecdf99e835a3e0f..7f5896f41b2774fe95d89b283b2e590ccc4d60c8 100644 (file)
--- a/cmd/init.pl
+++ b/cmd/init.pl
@@ -18,11 +18,10 @@ foreach $call (@calls) {
        my $dxchan = DXChannel->get($call);
        if ($dxchan) {
                if ($dxchan->is_node) {
-                       
                        # first clear out any nodes on this dxchannel
-                       my $node = Route::Node::get($self->{call});
-                       my @rout = $node->del_nodes if $node;
-                       DXProt::route_pc21($self, @rout);
+                       my $parent = Route::Node::get($call);
+                       my @rout = $parent->del_nodes;
+                       $dxchan->route_pc21($self, @rout) if @rout;
                        $dxchan->send(DXProt::pc18());
                        $dxchan->state('init');
                        push @out, $self->msg('init1', $call);

diff --git a/cmd/rinit.pl b/cmd/rinit.pl
index b49b2dbedc53a64ed5f75fa85ba7080fb59b022f..953a30a92e318fe297f0066f92847d57ed78a713 100644 (file)
--- a/cmd/rinit.pl
+++ b/cmd/rinit.pl
@@ -18,13 +18,10 @@ foreach $call (@calls) {
        my $dxchan = DXChannel->get($call);
        if ($dxchan) {
                if ($dxchan->is_node) {
-                       
-                       # first clear out any nodes on this dxchannel
-                       my $node = Route::Node::get($self->{call});
-                       my @rout = $node->del_nodes if $node;
-                       DXProt::route_pc21($self, @rout);
-                       $dxchan->send(DXProt::pc20());
+                       my $parent = Route::Node::get($call);
                        $dxchan->state('init');
+                       $dxchan->send_local_config;
+                       $dxchan->send(DXProt::pc20());
                        push @out, $self->msg('init1', $call);
                } 
        } else {

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index dfb571b280c3333d91cc8502090a0659040fab4a..fc08f5423649450372262ac068a072d5d2bebdf9 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -610,11 +610,7 @@ sub normal
 
                        # first clear out any nodes on this dxchannel
                        my $parent = Route::Node::get($self->{call});
-                       my @rout;
-                       for ($parent->nodes) {
-                               my $r = Route::Node::get($_);
-                               push @rout, $r->del_node if $r;
-                       }
+                       my @rout = $parent->del_nodes;
                        $self->route_pc21(@rout, $parent);
                        $self->send_local_config();
                        $self->send(pc20());