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

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.35 by root, Wed Apr 4 02:07:19 2007 UTC vs.
Revision 1.70 by root, Sun Sep 2 12:37:10 2007 UTC

…		…
1	#! perl # MANDATORY	1	#! perl # mandatory
2		2
3	# login handling	3	# login handling
4		4
5	use Fcntl;	5	use Fcntl;
6	use Coro::AIO;	6	use Coro::AIO;
7	use List::Util qw(min max);
8		7
9	my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir;	8	our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} \|\| 3600;
10		9
11	# paranoia function to overwrite a string-in-place	10	# paranoia function to overwrite a string-in-place
12	sub nuke_str {	11	sub nuke_str {
13	substr $_[0], 0, (length $_[0]), "x" x length $_[0]	12	substr $_[0], 0, (length $_[0]), "x" x length $_[0]
14	}	13	}
15		14
16	sub query {	15	sub query {
17	my ($ns, $flags, $text) = @_;	16	my ($ns, $flags, $text) = @_;
18		17
19	my $current = $Coro::current;	18	my $current = $Coro::current;
20	$ns->query ($flags, $text, sub { $current->ready; $current = $_[0]; });	19	$ns->query ($flags, $text, sub { $current->ready; $current = $_[0] });
21	Coro::schedule while ref $current;	20	Coro::schedule while ref $current;
22		21
23	$current	22	$current
24	}	23	}
25		24
41	return unless cf::player::find_active $user;	40	return unless cf::player::find_active $user;
42		41
43	$ns->send_drawinfo (	42	$ns->send_drawinfo (
44	"That player is already logged in on this server. "	43	"That player is already logged in on this server. "
45	. "If you want to create a new player, choose another name. "	44	. "If you want to create a new player, choose another name. "
46	. "If you are already a registered player, make sure nobody "	45	. "If you have already a registered, make sure nobody "
47	. "else is using your account at this time. If you lost your conenction "	46	. "else is using your account at this time. If you lost your connection "
48	. "then the server will likely timeout within a minute. If you still "	47	. "then the server will likely timeout within a minute. If you still "
49	. "cannot log-in after a minute, you are still logged in. Make sure "	48	. "cannot log-in after a minute, you are still logged in. Make sure "
50	. "you do not have another client running. If you use windows, reboot, "	49	. "you do not have another client running. If you use windows, reboot, "
51	. "this will fix anything.",	50	. "this will fix anything.",
52	cf::NDI_RED	51	cf::NDI_RED
53	);	52	);
54		53
55	1	54	1
56	}	55	}
57		56
58	sub check_clean_save {	57	sub enter_map {
59	my ($pl) = @_;	58	my ($pl) = @_;
60		59
		60	my $ob = $pl->ob;
		61
		62	my ($map, $x, $y)
		63	= $ob->{_link_pos}
		64	? @{delete $ob->{_link_pos}}
		65	: ($pl->maplevel, $ob->x, $ob->y);
		66
		67	$ob->enter_link;
		68
61	if (my $time = delete $pl->{unclean_save}) {	69	if (my $time = delete $pl->{unclean_save}) {
62	$pl->ns->send_drawinfo (	70	if (my $m = cf::map::find $map) {
		71	if ($time < $m->{instantiate_time}) {
		72	# the map was reset in the meantime
		73	my $age = $cf::RUNTIME - $time;
		74
		75	warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
		76
		77	# for now, just go back to savebed
		78	($map, $x, $y) = $pl->savebed;
		79
		80	if ($age >= $MAX_DISCONNECT_TIME) {
		81	$ob->message (
		82	"You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
		83	. "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
		84	. "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
		85	. "H<You disconnected too long without having used a savebed.>",
		86	cf::NDI_RED
		87	);
		88	# kill them.
		89	# reminds me of the famous badness 10000 syndrome...
		90	$ob->stats->hp (-10000); #] if they survive this they deserved to live
		91	$pl->killer ("a cave-in");
		92	} else {
		93	$ob->message (
		94	"You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
		95	. "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
		96	. "Better use a savebed next time, much worse things could have happened... "
		97	. "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
		98	cf::NDI_RED
		99	);
		100	}
		101	} else {
		102	$ob->message (
63	"You didn't use a savebed to leave this realm. This is very dangerous, "	103	"You didn't use a bed to reality to leave this realm. This is very dangerous, "
64	. "as lots of things could happen when you leave by other means, such as cave-ins, "	104	. "as lots of things could happen when you leave by other means, such as cave-ins, "
65	. "or monsters suddenly snapping your body. Better use a savebed next time.",	105	. "or monsters suddenly snapping your body. Better use a savebed next time. "
		106	. "H<Always apply a bed of reality to disconnect from the server.>",
66	cf::NDI_RED	107	cf::NDI_RED
		108	);
		109	}
67	);	110	}
68	#d#TODO
69	}	111	}
		112
		113	$ob->goto ($map, $x, $y);
70	}	114	}
71		115
72	# delete a player directory, be non-blocking AND synchronous...	116	# delete a player directory, be non-blocking AND synchronous...
73	# (thats hard, so we crap out and fork).	117	# (thats hard, so we crap out and fork).
74	sub nuke_playerdir {	118	sub nuke_playerdir {
75	my ($user) = @_;	119	my ($user) = @_;
76		120
77	aio_stat "$PLAYERDIR/$user";	121	aio_rename "$PLAYERDIR/$user", "$PLAYERDIR/~$Coro::current~deleting~";
78	system "cd \Q$PLAYERDIR\E "	122	system "rm -rf \Q$PLAYERDIR/~$Coro::current~deleting~\E &";
79	. "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
80	. "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
81	}	123	}
82		124
83	sub send_capabilities {	125	cf::client->attach (on_addme => sub {
84	my ($ns) = @_;	126	my ($ns) = @_;
85		127
86	return unless $ns->extcmd;
87
88	$ns->ext_event (capabilities =>
89	# id, name, flags (1 == 2d), edge length
90	tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
91	);
92	}
93
94	sub setup {
95	my ($ns, $args) = @_;
96
97	# run through the cmds of setup
98	# syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
99	#
100	# we send the status of the cmd back, or a FALSE is the cmd is the server unknown
101	# The client then must sort this out
102
103	my %setup = split / +/, $args;
104	while (my ($k, $v) = each %setup) {
105	if ($k eq "sound") {
106	$ns->sound ($v);
107
108	} elsif ($k eq "exp64") {
109	$setup{$k} = 1;
110
111	} elsif ($k eq "spellmon") {
112	$ns->monitor_spells ($v);
113
114	} elsif ($k eq "darkness") {
115	$ns->darkness ($v);
116
117	} elsif ($k eq "map1cmd") {
118	$ns->mapmode (cf::Map1Cmd) if $v > 0;
119
120	} elsif ($k eq "map1acmd") {
121	$ns->mapmode (cf::Map1aCmd) if $v > 0;
122
123	} elsif ($k eq "map2cmd") {
124	# gcfclient bug, map1acmd is sent too late
125	$ns->mapmode (cf::Map1aCmd);
126	$setup{$k} = "FALSE";
127
128	} elsif ($k eq "newmapcmd") {
129	$ns->newmapcmd ($v);
130
131	} elsif ($k eq "mapinfocmd") {
132	$ns->mapinfocmd ($v);
133
134	} elsif ($k eq "extcmd") {
135	$ns->extcmd ($v > 0);
136	send_capabilities $ns;
137
138	} elsif ($k eq "extmap") {
139	$ns->extmap ($v);
140
141	} elsif ($k eq "facecache") {
142	$ns->facecache ($v);
143
144	} elsif ($k eq "faceset") {
145	$ns->faceset (0);
146	$setup{$k} = 0;
147	# $ns->image2 (1)
148
149	} elsif ($k eq "tileset") {
150	$setup{$k} = $ns->faceset ($v & 1);
151
152	} elsif ($k eq "itemcmd") {
153	# Version of the item protocol command to use. Currently,
154	# only supported versions are 1 and 2. Using a numeric
155	# value will make it very easy to extend this in the future.
156	$ns->itemcmd ($v) if $v >= 1 && $v <= 2;
157
158	$setup{$k} = $ns->itemcmd;
159
160	} elsif ($k eq "mapsize") {
161	my ($x, $y) = split /x/, $v;
162
163	$ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, $x);
164	$ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, $y);
165
166	$setup{$k} = "${x}x${y}";
167
168	} elsif ($k eq "extendedMapInfos") {
169	$ns->ext_mapinfos ($v);
170
171	} elsif ($k eq "extendedTextInfos") {
172	$ns->has_readable_type ($v);
173
174	} elsif ($k eq "fxix") {
175	$ns->fxix ($v);
176
177	} else {
178	# other commands:
179	# sexp: no idea, probably for oudated servers
180	# tick: more stupidity, server should sned a tick per tick
181
182	$setup{$k} = "FALSE";
183	}
184	}
185
186	$ns->send_packet (join " ", setup => %setup);
187
188	cf::datalog setup =>
189	request => $args,
190	reply => \%setup,
191	client => $ns->version,
192	;
193	}
194
195	sub addme {
196	my ($ns) = @_;
197
198	if (!$ns->facecache)	128	if (!$ns->facecache)
199	{	129	{
200	$ns->send_drawinfo (<<EOF, cf::NDI_RED);	130	$ns->send_drawinfo (<<EOF, cf::NDI_RED);
201		131
202		132
203	***	133	***
204	*** WARNING:	134	*** WARNING:
205	*** Your client does not support face/image caching,	135	*** Your client does not support face/image caching,
…		…
210	***	140	***
211	*** CFPlus: all known versions automatically enable the facecache.	141	*** CFPlus: all known versions automatically enable the facecache.
212	*** cfclient: use the -cache commandline option.	142	*** cfclient: use the -cache commandline option.
213	*** cfclient: map will not redraw automatically (bug).	143	*** cfclient: map will not redraw automatically (bug).
214	*** gcfclient: use -cache commandline option, or enable	144	*** gcfclient: use -cache commandline option, or enable
215	*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.	145	*** gcfclient: Client => Configure => Map & Image => Cache Images.
216	*** jcrossclient: your client is broken, use CFPlus or gcfclient.	146	*** jcrossclient: your client is broken, use CFPlus or gcfclient.
217	***	147	***
218	***	148	***
219	EOF	149	EOF
220	if ($ns->version =~ /jcrossclient/) {	150	if ($ns->version =~ /jcrossclient/) {
…		…
273	. "(only a-z, A-Z and 0-9 are allowed), "	203	. "(only a-z, A-Z and 0-9 are allowed), "
274	. "or is not between 3 and 18 characters in length.",	204	. "or is not between 3 and 18 characters in length.",
275	cf::NDI_RED	205	cf::NDI_RED
276	);	206	);
277	}	207	}
		208	Coro::Timer::sleep 0.4;
278	}	209	}
279		210
280	check_playing $ns, $user and next;	211	check_playing $ns, $user and next;
281		212
282	$ns->send_drawinfo (	213	$ns->send_drawinfo (
…		…
293	$ns->send_drawinfo (	224	$ns->send_drawinfo (
294	"Try to use at least three characters as your password please, "	225	"Try to use at least three characters as your password please, "
295	. "that cannot be too much to ask for :)",	226	. "that cannot be too much to ask for :)",
296	cf::NDI_RED	227	cf::NDI_RED
297	);	228	);
		229	Coro::Timer::sleep 0.4;
298	}	230	}
299		231
300	# lock this username for the remainder of this login session	232	# lock this username for the remainder of this login session
301	if ($cf::LOGIN_LOCK{$user}) {	233	if ($cf::LOGIN_LOCK{$user}) {
302	$ns->send_drawinfo (	234	$ns->send_drawinfo (
…		…
319	if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {	251	if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
320	nuke_str $pass;	252	nuke_str $pass;
321	# password matches, wonderful	253	# password matches, wonderful
322	my $pl = cf::player::find $user or next;	254	my $pl = cf::player::find $user or next;
323	$pl->connect ($ns);	255	$pl->connect ($ns);
324	check_clean_save $pl;	256	enter_map $pl;
325	last;	257	last;
326	} elsif (can_cleanup $pl, $mtime) {	258	} elsif (can_cleanup $pl, $mtime) {
327	Coro::Timer::sleep 1;	259	Coro::Timer::sleep 1;
328		260
329	$ns->send_drawinfo (	261	$ns->send_drawinfo (
…		…
350	Coro::Timer::sleep 1;	282	Coro::Timer::sleep 1;
351		283
352	$ns->send_drawinfo (	284	$ns->send_drawinfo (
353	"Wrong username or password. Please try again "	285	"Wrong username or password. Please try again "
354	. "(check for Numlock and other semi-obvious error sources).",	286	. "(check for Numlock and other semi-obvious error sources).",
		287	cf::NDI_RED
		288	);
		289	next;
		290	}
		291	} else {
		292	# unable to load the playerfile:
		293	# check wether the player dir exists, which means the file is corrupted or
		294	# something very similar.
		295	if (!aio_stat cf::player::playerdir $user) {
		296	$ns->send_drawinfo (
		297	"Unable to retrieve this player. It might be a locked or broken account. "
		298	. "If this is your account, ask a dungeon master for assistance. "
		299	. "Otherwise choose a different login name.",
355	cf::NDI_RED	300	cf::NDI_RED
356	);	301	);
357	next;	302	next;
358	}	303	}
359	}	304	}
…		…
370	nuke_str $pass2;	315	nuke_str $pass2;
371	$ns->send_drawinfo (	316	$ns->send_drawinfo (
372	"The passwords do not match, please try again.",	317	"The passwords do not match, please try again.",
373	cf::NDI_RED	318	cf::NDI_RED
374	);	319	);
		320	Coro::Timer::sleep 0.5;
375	next;	321	next;
376	}	322	}
377		323
378	nuke_str $pass2;	324	nuke_str $pass2;
379		325
380	my $pl = cf::player::new $user;	326	my $pl = cf::player::new $user;
381	$pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);	327	$pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
382	nuke_str $pass;	328	nuke_str $pass;
383	$pl->connect ($ns);	329	$pl->connect ($ns);
384
385	my $ob = $pl->ob;	330	my $ob = $pl->ob;
		331
		332	$ob->goto ($pl->maplevel, $ob->x, $ob->y);
386		333
387	while () {	334	while () {
388	$ob->update_stats;	335	$ob->update_stats;
389	$pl->save_stats;	336	$pl->save_stats;
390		337
…		…
400	$ob->swap_stats ($res - 1, $swap - 1);	347	$ob->swap_stats ($res - 1, $swap - 1);
401	}	348	}
402	} else {	349	} else {
403	$ob->roll_stats;	350	$ob->roll_stats;
404	}	351	}
		352
		353	Coro::Timer::sleep 0.2;
405	}	354	}
406		355
407	$ob->set_animation (2);	356	$ob->set_animation (2);
408	$ob->add_statbonus;	357	$ob->add_statbonus;
409		358
410	$ns->send_drawinfo ($ob->msg, cf::NDI_BLUE);	359	while () {
411	$ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR,	360	$ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
		361	my $msg = $ob->msg;
		362	$msg =~ s/(?<=\S)\n(?=\S)/ /g;
		363	$ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
		364
		365	my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
412	"Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");	366	"Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
413		367
414	$ns->state (cf::ST_CHANGE_CLASS);	368	last if $res =~ /[dD]/;
		369
		370	$pl->chargen_race_next;
		371	Coro::Timer::sleep 0.2;
		372	}
		373
		374	$pl->chargen_race_done;
		375
		376	while () {
		377	my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
		378	"Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
		379
		380	if ($res =~ /^[fF]/) {
		381	$pl->gender (1);
		382	last;
		383	} elsif ($res =~ /^[mM]/) {
		384	$pl->gender (0);
		385	last;
		386	}
		387	Coro::Timer::sleep 0.2;
		388	}
		389
		390	$ob->reply (undef, "Welcome to Crossfire!");
		391
415	delete $pl->{deny_save};#d# too early	392	delete $pl->{deny_save};
416		393
417	last;	394	last;
418	}	395	}
419	});	396	});
420	}	397	});
421		398
422	cf::register_command quit => sub {	399	cf::register_command quit => sub {
423	my ($ob, $arg) = @_;	400	my ($ob, $arg) = @_;
424		401
425	$ob->reply (undef,	402	$ob->reply (undef,
…		…
496	$pl->{unclean_save} = $cf::RUNTIME;	473	$pl->{unclean_save} = $cf::RUNTIME;
497	}	474	}
498	},	475	},
499	);	476	);
500		477
501	cf::client->attach (
502	on_addme => \&addme,
503	on_setup => \&setup,
504	);
505
506	#############################################################################	478	#############################################################################
507		479
508	our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs	480	our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} \|\| 10; # time the player scheduler sleeps between runs
509	our $SAVE_TIMEOUT = 20; # save players every n seconds	481	our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} \|\| 20; # save players every n seconds
510		482
511	our $SCHEDULER = cf::async_ext {	483	our $SCHEDULER = cf::async_ext {
512	my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);	484	my $schedule_interval = Coro::Event->timer (after => 1);
513	while () {	485	while () {
		486	$schedule_interval->interval ($SCHEDULE_INTERVAL);
514	$schedule_interval->next;	487	$schedule_interval->next;
515		488
516	# this weird form of iteration over values is used because	489	# this weird form of iteration over values is used because
517	# the hash changes underneath us frequently, and for	490	# the hash changes underneath us frequently, and for
518	# keeps a direct reference to the value without (in 5.8 perls)	491	# keeps a direct reference to the value without (in 5.8 perls)
…		…
523	or next;	496	or next;
524	$pl->valid or next;	497	$pl->valid or next;
525		498
526	eval {	499	eval {
527	if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {	500	if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
528	$cf::WAIT_FOR_TICK_ONE->wait;
529	$pl->save;	501	$pl->save;
530		502
531	unless ($pl->active) {	503	unless ($pl->active \|\| $pl->ns) {
532	# check refcounts, this is tricky and needs to be adjusted to fit server internals	504	# check refcounts, this is tricky and needs to be adjusted to fit server internals
533	my $ob = $pl->ob;	505	my $ob = $pl->ob;
534	Scalar::Util::weaken $pl;	506
535	Scalar::Util::weaken $ob;
536	my $a_ = $pl->refcnt;#d#
537	my $b_ = $ob->refcnt;#d#
538	my $pl_ref = $pl->refcnt_cnt;	507	my $pl_ref = $pl->refcnt_cnt;
539	my $ob_ref = $ob->refcnt_cnt;	508	my $ob_ref = $ob->refcnt_cnt;
540		509
541	## pl_ref == one from object + one from cf::PLAYER	510	## pl_ref == $pl + ob->contr + %cf::PLAYER
542	## ob_ref == one from simply being an object	511	## ob_ref == $ob + pl->observe + simply being an object
543	if ($pl_ref == 2 && $ob_ref == 1) {	512	if ($pl_ref == 3 && $ob_ref == 3) {
544	warn "player-scheduler destroy ", $ob->name;#d#	513	warn "player-scheduler destroy ", $ob->name;#d#
545		514
546	# remove from sight and get fresh "copies"	515	# remove from sight and get fresh "copies"
547	$pl = delete $cf::PLAYER{$ob->name};	516	$pl = delete $cf::PLAYER{$ob->name};
548	$ob = $pl->ob;	517	$ob = $pl->ob;
549		518
550	$ob->destroy;
551	$pl->destroy;	519	$pl->destroy; # destroys $ob
552	} else {	520	} else {
		521	my $a_ = $pl->refcnt;#d#
		522	my $b_ = $ob->refcnt;#d#
		523
553	warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d#	524	warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
554	}	525	}
555	}	526	}
556	}	527	}
557	};	528	};
558	warn $@ if $@;	529	warn $@ if $@;

Diff Legend

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

Comparing deliantra/server/ext/login.ext (file contents): Revision 1.35 by root, Wed Apr 4 02:07:19 2007 UTC vs. Revision 1.70 by root, Sun Sep 2 12:37:10 2007 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.35 by root, Wed Apr 4 02:07:19 2007 UTC vs.
Revision 1.70 by root, Sun Sep 2 12:37:10 2007 UTC