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

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.3 by root, Sat Dec 23 06:21:02 2006 UTC vs.
Revision 1.10 by root, Fri Jan 5 20:04:02 2007 UTC

 use Fcntl;
 use Coro::AIO;
 my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir;
-# testbed for coroutines in crossfire :
+# paranoia function to overwrite a string-in-place
+sub nuke_str {
+   substr $_[0], 0, (length $_[0]), "x" x length $_[0]
+}
 sub query {
    my ($ns, $flags, $text) = @_;
    my $current = $Coro::current;
    system "cd \Q$PLAYERDIR\E "
         . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
         . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
 }
-sub on_addme {
+sub addme {
    my ($ns) = @_;
    $ns->destroy if $ns->pl;
-   $ns->coro (sub {
+   $ns->async (sub {
       my ($user, $pass);
       $ns->send_packet ("addme_success");
       for (;;) {
             0 < aio_read $fh, 0, 16384, my $buf, 0 or next;
             $buf =~ /^password (\S+)$/m            or next;
             my $hash = $1;
             if ($hash eq crypt $pass, $hash) {
+               nuke_str $pass;
                # password matches, wonderful
                my $pl = cf::player::load $plfile or next;
                $pl->enable_save (1);
                $pl->connect ($ns);
                last;
                 . "please try again. If not, you can now decide to take over this account "
                 . "because it has not been in-use for some time.",
                   cf::NDI_RED
                );
+               #TODO: nuke_str
                (query $ns, cf::CS_QUERY_SINGLECHAR, "Delete existing account and create a new one (Y/N)?") =~ /^[yY]/
                   or next;
                # check if the file hasn't changed
                aio_stat $plfile and next;
                nuke_playerdir $user;
                # fall through to creation
             } else {
+               nuke_str $pass;
                Coro::Timer::sleep 1;
                $ns->send_drawinfo (
                   "Wrong username or password. Please try again "
                 . "(check for Numlock and other semi-obvious error sources).",
          nuke_playerdir $user;
          my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
          if ($pass2 ne $pass) {
+            nuke_str $pass;
+            nuke_str $pass2;
             $ns->send_drawinfo (
                "The passwords do not match, please try again.",
                cf::NDI_RED
             );
             next;
          }
+         nuke_str $pass2;
          my $pl = cf::player::create;
          $pl->ob->name ($user);
          $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
+         nuke_str $pass;
          $pl->connect ($ns);
          my $ob = $pl->ob;
          while () {
       return cf::override 0 unless $ob->type == cf::PLAYER;
       # update respawn position
       $ob->contr->savebed ($bed->map->path, $bed->x, $bed->y);
-      #TODO?
-      #strcpy (pl->contr->killer, "left");
+      $ob->contr->killer ("left");
-      #check_score (pl);             /* Always check score */
+      $ob->check_score;
       $ob->reply (undef, "In the future, you will wake up here when you die.");
-      $ob->contr->save ();
+      $ob->contr->save (1);
       $ob->contr->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
-          if ($_[0] !~ /^[yY]/) {
+         if ($_[0] !~ /^[yY]/) {
-             $ob->contr->save (1);
+            $ob->contr->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
-             $ob->contr->ns->destroy ();
+            $ob->contr->ns->destroy;
+         } else {
+            $ob->contr->enable_save (1);
-          }
+         }
       });
    },
 );
-cf::client->attach (package => __PACKAGE__);
+cf::player->attach (
+   on_login  => sub {
+      my ($pl) = @_;
+      my $name = $pl->ob->name;
+      $_->ob->message ("$name has entered the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
+   },
+   on_logout => sub {
+      my ($pl, $cleanly) = @_;
+      my $name = $pl->ob->name;
+      if ($cleanly) {
+         $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
+      } else {
+         $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
+      }
+   },
+);
+cf::client->attach (
+   on_addme => \&addme,
+);

Diff Legend

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

Comparing deliantra/server/ext/login.ext (file contents): Revision 1.3 by root, Sat Dec 23 06:21:02 2006 UTC vs. Revision 1.10 by root, Fri Jan 5 20:04:02 2007 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.3 by root, Sat Dec 23 06:21:02 2006 UTC vs.
Revision 1.10 by root, Fri Jan 5 20:04:02 2007 UTC