--- AnyEvent-MP/MP/Transport.pm 2009/08/01 15:04:31 1.4 +++ AnyEvent-MP/MP/Transport.pm 2009/08/02 14:44:37 1.5 @@ -132,7 +132,7 @@ $arg{tls_ctx} ||= { sslv2 => 0, sslv3 => 0, tlsv1 => 1, verify => 1 }; } - $arg{secret} = AnyEvent::MP::default_secret () + $arg{secret} = AnyEvent::MP::Base::default_secret () unless exists $arg{secret}; $self->{hdl} = new AnyEvent::Handle @@ -154,9 +154,9 @@ # send greeting my $lgreeting = "aemp;$PROTOCOL_VERSION;$PROTOCOL_VERSION" # version, min - . ";$AnyEvent::MP::UNIQ" - . ";$AnyEvent::MP::NODE" - . ";" . (MIME::Base64::encode_base64 AnyEvent::MP::Util::nonce 33, "") + . ";$AnyEvent::MP::Base::UNIQ" + . ";$AnyEvent::MP::Base::NODE" + . ";" . (MIME::Base64::encode_base64 AnyEvent::MP::Base::nonce (33), "") . ";hmac_md6_64_256" # hardcoded atm. . ";json" # hardcoded atm. . ";$self->{peerhost};$self->{peerport}" @@ -231,7 +231,7 @@ my $rmsg; $rmsg = sub { $_[0]->push_read ($r_framing => $rmsg); - AnyEvent::MP::_inject ($_[1]); + AnyEvent::MP::Base::_inject ($_[1]); }; $hdl->push_read ($r_framing => $rmsg); }); @@ -254,7 +254,7 @@ sub connected { my ($self) = @_; - my $node = AnyEvent::MP::add_node ($self->{remote_node}); + my $node = AnyEvent::MP::Base::add_node ($self->{remote_node}); Scalar::Util::weaken ($self->{node} = $node); $node->set_transport ($self); }