Author: dylan
Date: 2005-07-26 16:43:10 -0400 (Tue, 26 Jul 2005)
New Revision: 894
Modified:
trunk/
trunk/perl/server/lib/Haver/Server/Talker.pm
trunk/perl/server/lib/Haver/Server/Wheel/Auth.pm
trunk/perl/server/lib/Haver/Server/Wheel/Login.pm
trunk/perl/server/lib/Haver/Server/Wheel/Main.pm
trunk/perl/server/lib/Haver/Server/Wheel/Reg.pm
Log:
we call instead of yielding.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/winch/trunk:43192
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1314
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
+ 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/winch/trunk:43192
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1316
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
Modified: trunk/perl/server/lib/Haver/Server/Talker.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Talker.pm 2005-07-26 20:13:00 UTC
(rev 893)
+++ trunk/perl/server/lib/Haver/Server/Talker.pm 2005-07-26 20:43:10 UTC
(rev 894)
@@ -68,7 +68,7 @@
post('shutdown');
} else {
Log('warning', "Client isseud unknown command $cmd");
- post('fail', 'unknown.cmd');
+ call('fail', 'unknown.cmd');
}
}
Modified: trunk/perl/server/lib/Haver/Server/Wheel/Auth.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Wheel/Auth.pm 2005-07-26 20:13:00 UTC
(rev 893)
+++ trunk/perl/server/lib/Haver/Server/Wheel/Auth.pm 2005-07-26 20:43:10 UTC
(rev 894)
@@ -51,7 +51,7 @@
$user->name($name);
unless (exists $digests->{$digest}) {
- $kernel->yield('fail', 'unknown.digest');
+ call('fail', 'unknown.digest');
return;
}
my $hasher = Digest->new($digests->{$digest});
@@ -63,7 +63,7 @@
if ($need eq $resp) {
$kernel->yield('auth_ok', $user);
} else {
- $kernel->yield('fail', 'auth.fail', $name, $digest);
+ call('fail', 'auth.fail', $name, $digest);
}
}
Modified: trunk/perl/server/lib/Haver/Server/Wheel/Login.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Wheel/Login.pm 2005-07-26 20:13:00 UTC
(rev 893)
+++ trunk/perl/server/lib/Haver/Server/Wheel/Login.pm 2005-07-26 20:43:10 UTC
(rev 894)
@@ -44,18 +44,18 @@
my $ns = 'user';
if ($lobby->contains($ns, $name)) {
- $kernel->yield('fail', "exists.$ns", $name);
+ call('fail', "exists.$ns", $name);
} elsif (not is_valid_name($name)) {
- $kernel->yield('fail', "invalid.name", $name);
+ call('fail', "invalid.name", $name);
} elsif ($ns eq 'user' and is_reserved_name($name)) {
- $kernel->yield('fail', "reserved.$ns", $name);
+ call('fail', "reserved.$ns", $name);
} elsif ($store->exists($ns, $name)) {
$heap->{name} = $name;
if (exists $heap->{extensions}{auth}) {
$heap->{client}->put(['AUTH:TYPES', 'AUTH:BASIC']);
$heap->{loader}->load_wheel('Haver::Server::Wheel::Auth');
} else {
- $kernel->yield('fail', 'auth.impossible');
+ call('fail', 'auth.impossible');
}
} else {
my $user = new Haver::Server::Entity::User (
Modified: trunk/perl/server/lib/Haver/Server/Wheel/Main.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Wheel/Main.pm 2005-07-26 20:13:00 UTC
(rev 893)
+++ trunk/perl/server/lib/Haver/Server/Wheel/Main.pm 2005-07-26 20:43:10 UTC
(rev 894)
@@ -53,15 +53,15 @@
my $chan = $lobby->get('channel', $name);
unless (is_valid_name($name)) {
- $kernel->yield('fail', "invalid.name", $name);
+ call('fail', "invalid.name", $name);
return;
}
unless ($chan) {
- $kernel->yield('fail', 'unknown.channel', $name);
+ call('fail', 'unknown.channel', $name);
return;
}
if ($chan->contains('user', $user->name)) {
- $kernel->yield('fail', 'already.joined', $name);
+ call('fail', 'already.joined', $name);
return;
}
@@ -75,11 +75,11 @@
my ($name) = @$args;
unless (is_valid_name($name)) {
- $kernel->yield('fail', "invalid.name", $name);
+ call('fail', "invalid.name", $name);
return;
}
if ($lobby->contains('channel', $name)) {
- $kernel->yield('fail', 'exists.channel');
+ call('fail', 'exists.channel');
return;
}
@@ -102,15 +102,15 @@
my $chan = $lobby->get('channel', $name);
unless (is_valid_name($name)) {
- $kernel->yield('fail', 'invalid.name', $name);
+ call('fail', 'invalid.name', $name);
return;
}
unless ($chan) {
- $kernel->yield('fail', 'unknown.channel', $name);
+ call('fail', 'unknown.channel', $name);
return;
}
unless ($chan->contains('user', $user->name)) {
- $kernel->yield('fail', 'already.parted', $name);
+ call('fail', 'already.parted', $name);
return;
}
@@ -128,15 +128,15 @@
unless (is_valid_name($name)) {
- $kernel->yield('fail', "invalid.name", $name);
+ call('fail', "invalid.name", $name);
return;
}
unless ($targ) {
- $kernel->yield('fail', 'unknown.user', $name);
+ call('fail', 'unknown.user', $name);
return;
}
unless (defined $type) {
- $kernel->yield('fail', 'invalid.type');
+ call('fail', 'invalid.type');
return;
}
@@ -153,15 +153,15 @@
unless (is_valid_name($name)) {
- $kernel->yield('fail', "invalid.name", $name);
+ call('fail', "invalid.name", $name);
return;
}
unless ($chan) {
- $kernel->yield('fail', 'unknown.channel', $name);
+ call('fail', 'unknown.channel', $name);
return;
}
unless (defined $type) {
- $kernel->yield('fail', 'invalid.type');
+ call('fail', 'invalid.type');
return;
}
@@ -174,15 +174,15 @@
my ($name, $ns) = @$args;
unless (is_valid_name($name)) {
- $kernel->yield('fail', "invalid.name", $name);
+ call('fail', "invalid.name", $name);
return;
}
unless ($lobby->contains('channel', $name)) {
- $kernel->yield('fail', 'unknown.channel', $name);
+ call('fail', 'unknown.channel', $name);
return;
}
unless (is_known_namespace($ns)) {
- $kernel->yield('fail', 'unknown.namespace', $ns);
+ call('fail', 'unknown.namespace', $ns);
return;
}
my $chan = $lobby->get('channel', $name);
@@ -196,15 +196,15 @@
my $lobby = $heap->{lobby};
unless (is_valid_name($name)) {
- $kernel->yield('fail', "invalid.name", $name);
+ call('fail', "invalid.name", $name);
return;
}
unless ($lobby->contains($ns, $name)) {
- $kernel->yield('fail', "unknown.$ns", $name);
+ call('fail', "unknown.$ns", $name);
return;
}
unless (is_known_namespace($ns)) {
- $kernel->yield('fail', 'unknown.namespace', $ns);
+ call('fail', 'unknown.namespace', $ns);
return;
}
Modified: trunk/perl/server/lib/Haver/Server/Wheel/Reg.pm
===================================================================
--- trunk/perl/server/lib/Haver/Server/Wheel/Reg.pm 2005-07-26 20:13:00 UTC
(rev 893)
+++ trunk/perl/server/lib/Haver/Server/Wheel/Reg.pm 2005-07-26 20:43:10 UTC
(rev 894)
@@ -25,11 +25,11 @@
my $user = $heap->{user};
unless ($email =~ /[EMAIL PROTECTED]/) {
- $kernel->yield('fail', 'invalid.email', $email);
+ call('fail', 'invalid.email', $email);
return;
}
if ($store->exists('user', $user->name)) {
- $kernel->yield('fail', 'registered.user', $user->name);
+ call('fail', 'registered.user', $user->name);
return;
}
