try to fix init problems

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index f4074ade0470dfeebfea3dfe68c03ad7cf569edc..152a5fe05bdb84510ae764028d57ce59106d0524 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -652,13 +652,15 @@ sub normal
                                        my $ar;
                                        if ($call ne $parent->call) {
                                                if ($self->in_filter_route($r)) {
-                                                       $ar = $parent->add($r);
+                                                       $ar = $parent->add($call, $ver, $flags);
                                                        push @rout, $ar if $ar;
+                                               } else {
+                                                       next;
                                                }
                                        }
                                        if ($r->version ne $ver || $r->flags != $flags) {
                                                $r->version($ver);
-                                               $r->flags(Route::here($here)|Route::conf($conf));
+                                               $r->flags($flags);
                                                push @rout, $r unless $ar;
                                        }
                                } else {
@@ -668,6 +670,8 @@ sub normal
                                    if ($self->in_filter_route($new)) {
                                                my $r = $parent->add($call, $ver, $flags);
                                                push @rout, $r;
+                                       } else {
+                                               next;
                                        }
                                }
 
@@ -785,6 +789,7 @@ sub normal
                        $ref->here($field[2]) if $ref;
                        $ref = Route::User::get($call);
                        $ref->here($field[2]) if $ref;
+                       $ref ||= Route->new($call);
                        
                        # input filter if required
                        return unless $self->in_filter_route($ref);
@@ -927,7 +932,7 @@ sub normal
                        }
                        $user->lastoper($main::systime);   # to cut down on excessive for/opers being generated
                        $user->put;
-                       my $ref = Route::get($call);
+                       my $ref = Route::get($call) || Route->new($call);
 
                        # input filter if required
                        return unless $self->in_filter_route($ref);
@@ -1444,7 +1449,7 @@ sub send_local_config
                # and are not themselves isolated, this to make sure that isolated nodes
         # don't appear outside of this node
                my @dxchan = grep { $_->call ne $main::mycall && $_->call ne $self->{call} } DXChannel::get_all_nodes();
-               @localnodes = map { Route::Node::get($_->{call}) or die "connot find node $_->{call}" } @dxchan if @dxchan;
+               @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
                my @intcalls = map { $_->nodes } @localnodes if @localnodes;
                my $ref = Route::Node::get($self->{call});
                my @rnodes = $ref->nodes;
@@ -1483,7 +1488,7 @@ sub route
        # always send it down the local interface if available
        my $dxchan = DXChannel->get($call);
        unless ($dxchan) {
-               my $cl = Route::Node::get($call);
+               my $cl = Route::get($call);
                $dxchan = $cl->dxchan if $cl;
                if (ref $dxchan) {
                        if (ref $self && $dxchan eq $self) {