[ViewVC] Diff of: cvs/deliantra/server/ext/login.ext

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.128 by root, Sat Nov 17 12:02:43 2012 UTC vs.
Revision 1.129 by root, Sun Nov 18 09:53:46 2012 UTC

 use Deliantra::Util ();
 CONF MAX_DISCONNECT_TIME = 3600;
 our $VALID_LOGIN = qr<^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z>;
+our %LOGIN_LOCK;
+# HACK: remove when done
+sub cf::client::send_drawinfo {
+   my ($self, $text, $flags) = @_;
+   utf8::encode $text;
+   $self->send_packet (sprintf "msg %d log %s", $flags || cf::NDI_BLACK, $text);
+}
 sub query {
    my ($ns, $flags, $text) = @_;
    $ns->query ($flags, $text, Coro::rouse_cb);
    || ($level <= 9 && $age > 90 * 86400)        # 3 months for level 4..9
    || ($level <= 20 && $age > 180 * 86400)      # 6 months for level 10..20
    || $age > 700 * 86400                        # 2 years for everybody else
 }
-sub check_playing {
+# return a guard object for a lock on the given username, if available
+sub login_guard {
-   my ($ns, $user) = @_;
+   my ($user) = @_;
+   exists $LOGIN_LOCK{$user}
+      and return undef;
-   return unless cf::player::find_active $user;
+   cf::player::find_active $user
+      and return undef;
-   $ns->send_drawinfo (
+   undef $LOGIN_LOCK{$user};
-      "That player is already logged in on this server. "
+   Guard::guard { delete $LOGIN_LOCK{$user} }
-    . "If you want to create a new player, choose another name. "
-    . "If you have already a registered, make sure nobody "
-    . "else is using your account at this time. If you lost your connection "
-    . "then the server will likely timeout within a minute. If you still "
-    . "cannot log-in after a minute, you are still logged in. Make sure "
-    . "you do not have another client running. If you use windows, reboot, "
-    . "this will fix anything.",
-      cf::NDI_RED
-   );
-   1
 }
 sub safe_spot($) {
    my ($pl) = @_;
    # the rest of this function is character creation
    my $ns = $pl->ns;
    my $ob = $pl->ob;
-   $Coro::current->{desc} = "addme(" . $ob->name . ") login";
    if ($pl->{chargen} eq "init") {
       $ob->goto ($pl->maplevel, $ob->x, $ob->y);
       # create the playerdir, if necessary, as chargen_race_done did it before
       # presumably because of unique maps
 }
 sub chargen {
    my ($ns, $user, $hash) = @_;
-   # lock again, too lazy to make this nicer
-   local $cf::LOGIN_LOCK{$user} = 1;
    # just to make sure nothing is left over
    # normally, nothing is there.
    nuke_playerdir $user;
    my $pl = cf::player::new $user;
       my ($user, $pass);
       $ns->send_packet ("addme_success");
       for (;;) {
+         delete $ns->{login_guard};
          $ns->send_drawinfo (
             "Please enter your username now. If you are a new user, "
           . "make one up that describes your character best. "
           . "Only letters and digits are allowed, though.",
             cf::NDI_BLUE
          # read username
          while () {
             $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
-            if ($cf::LOGIN_LOCK{$user}) {
-               $ns->send_drawinfo (
-                  "That username is currently used in another login session. "
-                . "Chose another, or wait till the other session has ended.",
-                  cf::NDI_RED
-               );
-            } elsif ($user =~ $VALID_LOGIN) {
+            if ($user =~ $VALID_LOGIN) {
                last;
             } else {
                $ns->send_drawinfo (
                   "Your username contains illegal characters "
                 . "(only a-z, A-Z and 0-9 are allowed), "
                );
             }
             Coro::Timer::sleep 0.4;
          }
-         check_playing $ns, $user and next;
-         $Coro::current->{desc} = "addme($user) pass";
+         $Coro::current->{desc} = "addme($user)";
          $ns->send_drawinfo (
             "Welcome $user, please enter your password now. "
           . "New users should now choose a password. "
           . "Anything your client lets you enter is fine.",
                cf::NDI_RED
             );
             Coro::Timer::sleep 0.4;
          }
-         # lock this username for the remainder of this login session
+         $ns->{login_guard} = login_guard $user
-         if ($cf::LOGIN_LOCK{$user}) {
+            or do {
-            $ns->send_drawinfo (
+               $ns->send_drawinfo (
-               "That username is currently used in another login session. "
+                  "That user is already logged in (or is logging in)."
-             . "Chose another, or wait till the other session has ended.",
+                . "Chose another, or wait till the other session has ended.",
-               cf::NDI_RED
+                  cf::NDI_RED
+               );
+               next;
-            );
+            };
-            next;
-         }
-         local $cf::LOGIN_LOCK{$user} = 1;
-         check_playing $ns, $user and next;
-         $Coro::current->{desc} = "addme($user) check";
          # try to read the user file and check the password
          if (my $pl = cf::player::find $user) {
             aio_stat $pl->path and next;
             my $mtime = (stat _)[9];
          or return $fail (
                "Your username contains illegal characters (only a-z, A-Z and 0-9 are allowed), "
              . "or is not between 3 and 20 characters in length."
             );
+      $ns->{login_guard} = login_guard $user
+         or return $fail->("User name '$user' is in use - try another login name.");
       cf::player::find $user
-         and return $fail->("User '$user' already exists - choose another login name.");
+         and return $fail->("User name '$user' is already registered - choose another login name.");
       $reply->(1, "Account Created");
       chargen $ns, $user, $pass;
    });
    my ($ns, $reply, $user, $hash) = @_;
    $ns->{addme}++ and return $ns->destroy;
    $ns->async (sub {
-      local $cf::LOGIN_LOCK{$user} = 1;
-      $Coro::current->{desc} = "login($user) check";
+      $Coro::current->{desc} = "login($user)";
       my $fail = sub {
          $reply->(0, $_[0]);
          $ns->flush; # does not ensure that the data reaches the client - TODO
          # need to do this in another thread, as this one gets canceled
             Coro::AnyEvent::sleep 0.1; # TODO, see above, extra hack
             $ns->destroy if $ns->valid;
          };
          Coro::schedule; # do the destroy, should not return
       };
+      $ns->{login_guard} = login_guard $user
+         or return $fail->("User '$user' is currently playing or logging in in another session. If that is your "
+                           . "user name, make sure you are not running two clients. When in doubt, reboot.");
       # try to read the user file and check the password
       my $pl = cf::player::find $user
          or return $fail->("User '$user' does not exist - wrong spelling?");

Diff Legend

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

Comparing deliantra/server/ext/login.ext (file contents): Revision 1.128 by root, Sat Nov 17 12:02:43 2012 UTC vs. Revision 1.129 by root, Sun Nov 18 09:53:46 2012 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.128 by root, Sat Nov 17 12:02:43 2012 UTC vs.
Revision 1.129 by root, Sun Nov 18 09:53:46 2012 UTC