[ViewVC] Diff of: cvs/AnyEvent-MP/MP/Transport.pm

Comparing AnyEvent-MP/MP/Transport.pm (file contents):
Revision 1.22 by root, Wed Aug 5 19:55:58 2009 UTC vs.
Revision 1.23 by root, Wed Aug 5 22:40:51 2009 UTC

       $greeting_kv->{"tls"} = "1.0"
          if $arg{tls_ctx};
       $greeting_kv->{provider} = "AE-$VERSION";
       $greeting_kv->{peeraddr} = AnyEvent::Socket::format_hostport $self->{peerhost}, $self->{peerport};
+      $self->{local_node} = $AnyEvent::MP::Base::NODE;
       # send greeting
       my $lgreeting1 = "aemp;$PROTOCOL_VERSION"
                      . ";$AnyEvent::MP::Base::UNIQ"
                      . ";$AnyEvent::MP::Base::NODE"
                      . ";" . (join ",", @AUTH_RCV)
                $self->connected;
                my $src_node = $self->{node};
-               $hdl->push_write ($self->{s_framing} => $_)
+               $self->send ($_)
                   for @$queue;
                my $rmsg; $rmsg = sub {
                   $_[0]->push_read ($r_framing => $rmsg);
 }
 sub connected {
    my ($self) = @_;
+   if (ref $AnyEvent::MP::Base::SLAVE) {
+      # first connect with a master node
+      $AnyEvent::MP::Base::NODE .= "\@$self->{remote_node}";
+      $AnyEvent::MP::Base::NODE{$AnyEvent::MP::Base::NODE} = $AnyEvent::MP::Base::NODE{""};
+      $AnyEvent::MP::Base::SLAVE->();
+   }
+   if ($self->{local_node} ne $AnyEvent::MP::Base::NODE) {
+      # node changed its name since first greeting
+      $self->send (["", iam => $AnyEvent::MP::Base::NODE]);
+   }
    my $node = AnyEvent::MP::Base::add_node ($self->{remote_node});
    Scalar::Util::weaken ($self->{node} = $node);
    $node->set_transport ($self);
 }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines