ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/AnyEvent-MP/MP/Transport.pm
(Generate patch)

Comparing AnyEvent-MP/MP/Transport.pm (file contents):
Revision 1.4 by root, Sat Aug 1 15:04:31 2009 UTC vs.
Revision 1.5 by root, Sun Aug 2 14:44:37 2009 UTC

130 if (exists $arg{connect}) { 130 if (exists $arg{connect}) {
131 $arg{tls} ||= "connect"; 131 $arg{tls} ||= "connect";
132 $arg{tls_ctx} ||= { sslv2 => 0, sslv3 => 0, tlsv1 => 1, verify => 1 }; 132 $arg{tls_ctx} ||= { sslv2 => 0, sslv3 => 0, tlsv1 => 1, verify => 1 };
133 } 133 }
134 134
135 $arg{secret} = AnyEvent::MP::default_secret () 135 $arg{secret} = AnyEvent::MP::Base::default_secret ()
136 unless exists $arg{secret}; 136 unless exists $arg{secret};
137 137
138 $self->{hdl} = new AnyEvent::Handle 138 $self->{hdl} = new AnyEvent::Handle
139 fh => delete $arg{fh}, 139 fh => delete $arg{fh},
140 rbuf_max => 64 * 1024, 140 rbuf_max => 64 * 1024,
152 if exists $arg{tls} && $arg{tls_ctx}; 152 if exists $arg{tls} && $arg{tls_ctx};
153 $greeting_kv->{provider} = "AE-$VERSION"; 153 $greeting_kv->{provider} = "AE-$VERSION";
154 154
155 # send greeting 155 # send greeting
156 my $lgreeting = "aemp;$PROTOCOL_VERSION;$PROTOCOL_VERSION" # version, min 156 my $lgreeting = "aemp;$PROTOCOL_VERSION;$PROTOCOL_VERSION" # version, min
157 . ";$AnyEvent::MP::UNIQ" 157 . ";$AnyEvent::MP::Base::UNIQ"
158 . ";$AnyEvent::MP::NODE" 158 . ";$AnyEvent::MP::Base::NODE"
159 . ";" . (MIME::Base64::encode_base64 AnyEvent::MP::Util::nonce 33, "") 159 . ";" . (MIME::Base64::encode_base64 AnyEvent::MP::Base::nonce (33), "")
160 . ";hmac_md6_64_256" # hardcoded atm. 160 . ";hmac_md6_64_256" # hardcoded atm.
161 . ";json" # hardcoded atm. 161 . ";json" # hardcoded atm.
162 . ";$self->{peerhost};$self->{peerport}" 162 . ";$self->{peerhost};$self->{peerport}"
163 . (join "", map ";$_=$greeting_kv->{$_}", keys %$greeting_kv); 163 . (join "", map ";$_=$greeting_kv->{$_}", keys %$greeting_kv);
164 164
229 for @$queue; 229 for @$queue;
230 230
231 my $rmsg; $rmsg = sub { 231 my $rmsg; $rmsg = sub {
232 $_[0]->push_read ($r_framing => $rmsg); 232 $_[0]->push_read ($r_framing => $rmsg);
233 233
234 AnyEvent::MP::_inject ($_[1]); 234 AnyEvent::MP::Base::_inject ($_[1]);
235 }; 235 };
236 $hdl->push_read ($r_framing => $rmsg); 236 $hdl->push_read ($r_framing => $rmsg);
237 }); 237 });
238 }); 238 });
239 } 239 }
252} 252}
253 253
254sub connected { 254sub connected {
255 my ($self) = @_; 255 my ($self) = @_;
256 256
257 my $node = AnyEvent::MP::add_node ($self->{remote_node}); 257 my $node = AnyEvent::MP::Base::add_node ($self->{remote_node});
258 Scalar::Util::weaken ($self->{node} = $node); 258 Scalar::Util::weaken ($self->{node} = $node);
259 $node->set_transport ($self); 259 $node->set_transport ($self);
260} 260}
261 261
262sub send { 262sub send {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines