[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.228 by root, Mon Mar 26 16:53:33 2007 UTC vs.
Revision 1.264 by root, Sun May 6 05:44:48 2007 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Symbol;	6	use Symbol;
7	use List::Util;	7	use List::Util;
		8	use Socket;
8	use Storable;	9	use Storable;
9	use Event;	10	use Event;
10	use Opcode;	11	use Opcode;
11	use Safe;	12	use Safe;
12	use Safe::Hole;	13	use Safe::Hole;
13		14
14	use Coro 3.52 ();	15	use Coro 3.61 ();
15	use Coro::State;	16	use Coro::State;
		17	use Coro::Handle;
16	use Coro::Event;	18	use Coro::Event;
17	use Coro::Timer;	19	use Coro::Timer;
18	use Coro::Signal;	20	use Coro::Signal;
19	use Coro::Semaphore;	21	use Coro::Semaphore;
20	use Coro::AIO;	22	use Coro::AIO;
		23	use Coro::Storable;
21		24
22	use BDB ();	25	use BDB ();
23	use Data::Dumper;	26	use Data::Dumper;
24	use Digest::MD5;	27	use Digest::MD5;
25	use Fcntl;	28	use Fcntl;
…		…
28	use Time::HiRes;	31	use Time::HiRes;
29	use Compress::LZF;	32	use Compress::LZF;
30		33
31	# configure various modules to our taste	34	# configure various modules to our taste
32	#	35	#
		36	$Storable::canonical = 1; # reduce rsync transfers
33	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator	37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later	38	Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35		39
36	$Event::Eval = 1; # no idea why this is required, but it is	40	$Event::Eval = 1; # no idea why this is required, but it is
37		41
…		…
50	our %EXT_CORO = (); # coroutines bound to extensions	54	our %EXT_CORO = (); # coroutines bound to extensions
51	our %EXT_MAP = (); # pluggable maps	55	our %EXT_MAP = (); # pluggable maps
52		56
53	our $RELOAD; # number of reloads so far	57	our $RELOAD; # number of reloads so far
54	our @EVENT;	58	our @EVENT;
55	our $LIBDIR = datadir . "/ext";
56		59
57	our $TICK = MAX_TIME * 1e-6;	60	our $CONFDIR = confdir;
		61	our $DATADIR = datadir;
		62	our $LIBDIR = "$DATADIR/ext";
		63	our $PODDIR = "$DATADIR/pod";
		64	our $MAPDIR = "$DATADIR/" . mapdir;
		65	our $LOCALDIR = localdir;
		66	our $TMPDIR = "$LOCALDIR/" . tmpdir;
		67	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
		68	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
		69	our $RANDOMDIR = "$LOCALDIR/random";
		70	our $BDBDIR = "$LOCALDIR/db";
		71
		72	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
58	our $TICK_WATCHER;	73	our $TICK_WATCHER;
59	our $AIO_POLL_WATCHER;	74	our $AIO_POLL_WATCHER;
60	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	75	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61	our $NEXT_TICK;	76	our $NEXT_TICK;
62	our $NOW;	77	our $NOW;
…		…
71	our $RUNTIME;	86	our $RUNTIME;
72		87
73	our %PLAYER; # all users	88	our %PLAYER; # all users
74	our %MAP; # all maps	89	our %MAP; # all maps
75	our $LINK_MAP; # the special {link} map, which is always available	90	our $LINK_MAP; # the special {link} map, which is always available
76	our $RANDOM_MAPS = cf::localdir . "/random";
77	our $BDB_ENV_DIR = cf::localdir . "/db";
78
79	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;
80	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;
81		91
82	# used to convert map paths into valid unix filenames by replacing / by ∕	92	# used to convert map paths into valid unix filenames by replacing / by ∕
83	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84		94
85	binmode STDOUT;	95	binmode STDOUT;
86	binmode STDERR;	96	binmode STDERR;
87		97
88	# read virtual server time, if available	98	# read virtual server time, if available
89	unless ($RUNTIME \|\| !-e cf::localdir . "/runtime") {	99	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {
90	open my $fh, "<", cf::localdir . "/runtime"	100	open my $fh, "<", "$LOCALDIR/runtime"
91	or die "unable to read runtime file: $!";	101	or die "unable to read runtime file: $!";
92	$RUNTIME = <$fh> + 0.;	102	$RUNTIME = <$fh> + 0.;
93	}	103	}
94		104
95	mkdir cf::localdir;	105	mkdir $_
96	mkdir cf::localdir . "/" . cf::playerdir;	106	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
97	mkdir cf::localdir . "/" . cf::tmpdir;
98	mkdir cf::localdir . "/" . cf::uniquedir;
99	mkdir $RANDOM_MAPS;
100	mkdir $BDB_ENV_DIR;
101		107
102	our $EMERGENCY_POSITION;	108	our $EMERGENCY_POSITION;
103		109
104	sub cf::map::normalise;	110	sub cf::map::normalise;
105		111
…		…
116	=item $cf::RUNTIME	122	=item $cf::RUNTIME
117		123
118	The time this server has run, starts at 0 and is increased by $cf::TICK on	124	The time this server has run, starts at 0 and is increased by $cf::TICK on
119	every server tick.	125	every server tick.
120		126
121	=item $cf::LIBDIR	127	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
		128	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
		129	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
122		130
123	The perl library directory, where extensions and cf-specific modules can	131	Various directories - "/etc", read-only install directory, perl-library
124	be found. It will be added to C<@INC> automatically.	132	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
		133	unique-items directory, player file directory, random maps directory and
		134	database environment.
125		135
126	=item $cf::NOW	136	=item $cf::NOW
127		137
128	The time of the last (current) server tick.	138	The time of the last (current) server tick.
129		139
…		…
134	=item %cf::CFG	144	=item %cf::CFG
135		145
136	Configuration for the server, loaded from C</etc/crossfire/config>, or	146	Configuration for the server, loaded from C</etc/crossfire/config>, or
137	from wherever your confdir points to.	147	from wherever your confdir points to.
138		148
139	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	149	=item cf::wait_for_tick, cf::wait_for_tick_begin
140		150
141	These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)	151	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
142	or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick	152	returns directly I<after> the tick processing (and consequently, can only wake one process
143	processing has been done. Call C<< ->wait >> on them to maximise the	153	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
144	window of cpu time available, or simply to synchronise to the server tick.
145		154
146	=back	155	=back
147		156
148	=cut	157	=cut
149		158
150	BEGIN {	159	BEGIN {
151	*CORE::GLOBAL::warn = sub {	160	*CORE::GLOBAL::warn = sub {
152	my $msg = join "", @_;	161	my $msg = join "", @_;
153	utf8::encode $msg;
154		162
155	$msg .= "\n"	163	$msg .= "\n"
156	unless $msg =~ /\n$/;	164	unless $msg =~ /\n$/;
157		165
		166	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		167
		168	utf8::encode $msg;
158	LOG llevError, $msg;	169	LOG llevError, $msg;
159	};	170	};
160	}	171	}
161		172
162	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	173	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
232	returned.	243	returned.
233		244
234	Lock names should begin with a unique identifier (for example, cf::map::find	245	Lock names should begin with a unique identifier (for example, cf::map::find
235	uses map_find and cf::map::load uses map_load).	246	uses map_find and cf::map::load uses map_load).
236		247
		248	=item $locked = cf::lock_active $string
		249
		250	Return true if the lock is currently active, i.e. somebody has locked it.
		251
237	=cut	252	=cut
238		253
239	our %LOCK;	254	our %LOCK;
240		255
241	sub lock_wait($) {	256	sub lock_wait($) {
…		…
258		273
259	Coro::guard {	274	Coro::guard {
260	# wake up all waiters, to be on the safe side	275	# wake up all waiters, to be on the safe side
261	$_->ready for @{ delete $LOCK{$key} };	276	$_->ready for @{ delete $LOCK{$key} };
262	}	277	}
		278	}
		279
		280	sub lock_active($) {
		281	my ($key) = @_;
		282
		283	! ! $LOCK{$key}
263	}	284	}
264		285
265	sub freeze_mainloop {	286	sub freeze_mainloop {
266	return unless $TICK_WATCHER->is_active;	287	return unless $TICK_WATCHER->is_active;
267		288
…		…
346		367
347	$coro	368	$coro
348	}	369	}
349		370
350	sub write_runtime {	371	sub write_runtime {
		372	my $runtime = "$LOCALDIR/runtime";
		373
		374	# first touch the runtime file to show we are still running:
		375	# the fsync below can take a very very long time.
		376
		377	warn "touching runtime...\n";#d#
		378	if (my $fh = aio_open $runtime, O_WRONLY, 0) {
		379	utime undef, undef, $fh;
		380	}
		381
351	my $guard = cf::lock_acquire "write_runtime";	382	my $guard = cf::lock_acquire "write_runtime";
352		383
353	my $runtime = cf::localdir . "/runtime";	384	warn "starting to write runtime...\n";#d#
354
355	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	385	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
356	or return;	386	or return;
357		387
358	my $value = $cf::RUNTIME + 90 + 10;	388	my $value = $cf::RUNTIME + 90 + 10;
359	# 10 is the runtime save interval, for a monotonic clock	389	# 10 is the runtime save interval, for a monotonic clock
…		…
364		394
365	# always fsync - this file is important	395	# always fsync - this file is important
366	aio_fsync $fh	396	aio_fsync $fh
367	and return;	397	and return;
368		398
		399	# touch it again to show we are up-to-date
		400	utime undef, undef, $fh;
		401
369	close $fh	402	close $fh
370	or return;	403	or return;
371		404
372	aio_rename "$runtime~", $runtime	405	aio_rename "$runtime~", $runtime
373	and return;	406	and return;
374		407
		408	warn "... done writing runtime.\n";#d#
		409
375	1	410	1
		411	}
		412
		413	=item cf::datalog type => key => value, ...
		414
		415	Log a datalog packet of the given type with the given key-value pairs.
		416
		417	=cut
		418
		419	sub datalog($@) {
		420	my ($type, %kv) = @_;
		421	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
376	}	422	}
377		423
378	=back	424	=back
379		425
380	=cut	426	=cut
…		…
942	Returns the given player object, loading it if necessary (might block).	988	Returns the given player object, loading it if necessary (might block).
943		989
944	=cut	990	=cut
945		991
946	sub playerdir($) {	992	sub playerdir($) {
947	cf::localdir	993	"$PLAYERDIR/"
948	. "/"
949	. cf::playerdir
950	. "/"
951	. (ref $_[0] ? $_[0]->ob->name : $_[0])	994	. (ref $_[0] ? $_[0]->ob->name : $_[0])
952	}	995	}
953		996
954	sub path($) {	997	sub path($) {
955	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	998	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
956		999
957	(playerdir $login) . "/$login.pl"	1000	(playerdir $login) . "/playerdata"
958	}	1001	}
959		1002
960	sub find_active($) {	1003	sub find_active($) {
961	$cf::PLAYER{$_[0]}	1004	$cf::PLAYER{$_[0]}
962	and $cf::PLAYER{$_[0]}->active	1005	and $cf::PLAYER{$_[0]}->active
…		…
975	my $login = $_[0];	1018	my $login = $_[0];
976		1019
977	my $guard = cf::lock_acquire "user_find:$login";	1020	my $guard = cf::lock_acquire "user_find:$login";
978		1021
979	$cf::PLAYER{$_[0]} \|\| do {	1022	$cf::PLAYER{$_[0]} \|\| do {
		1023	# rename old playerfiles to new ones
		1024	#TODO: remove when no longer required
		1025	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		1026	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		1027	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		1028	aio_unlink +(playerdir $login) . "/$login.pl";
		1029
980	my $pl = load_pl path $login	1030	my $pl = load_pl path $login
981	or return;	1031	or return;
982	$cf::PLAYER{$login} = $pl	1032	$cf::PLAYER{$login} = $pl
983	}	1033	}
984	}	1034	}
…		…
1068	while and may block, so not sync_job-capable, ever.	1118	while and may block, so not sync_job-capable, ever.
1069		1119
1070	=cut	1120	=cut
1071		1121
1072	sub list_logins {	1122	sub list_logins {
1073	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1123	my $dirs = aio_readdir $PLAYERDIR
1074	or return [];	1124	or return [];
1075		1125
1076	my @logins;	1126	my @logins;
1077		1127
1078	for my $login (@$dirs) {	1128	for my $login (@$dirs) {
…		…
1113	}	1163	}
1114		1164
1115	\@paths	1165	\@paths
1116	}	1166	}
1117		1167
1118	=item $player->ext_reply ($msgid, $msgtype, %msg)	1168	=item $player->ext_reply ($msgid, %msg)
1119		1169
1120	Sends an ext reply to the player.	1170	Sends an ext reply to the player.
1121		1171
1122	=cut	1172	=cut
1123		1173
1124	sub ext_reply($$$%) {	1174	sub ext_reply($$%) {
1125	my ($self, $id, %msg) = @_;	1175	my ($self, $id, %msg) = @_;
1126		1176
1127	$msg{msgid} = $id;	1177	$msg{msgid} = $id;
1128		1178
1129	$self->send ("ext " . cf::to_json \%msg);	1179	$self->send ("ext " . cf::to_json \%msg);
1130	}	1180	}
1131		1181
1132	package cf;	1182	=item $player->ext_event ($type, %msg)
		1183
		1184	Sends an ext event to the client.
		1185
		1186	=cut
		1187
		1188	sub ext_event($$%) {
		1189	my ($self, $type, %msg) = @_;
		1190
		1191	$self->ns->ext_event ($type, %msg);
		1192	}
		1193
		1194	=head3 cf::region
		1195
		1196	=over 4
		1197
		1198	=cut
		1199
		1200	package cf::region;
		1201
		1202	=item cf::region::find_by_path $path
		1203
		1204	Tries to decuce the probable region for a map knowing only its path.
		1205
		1206	=cut
		1207
		1208	sub find_by_path($) {
		1209	my ($path) = @_;
		1210
		1211	my ($match, $specificity);
		1212
		1213	for my $region (list) {
		1214	if ($region->match && $path =~ $region->match) {
		1215	($match, $specificity) = ($region, $region->specificity)
		1216	if $region->specificity > $specificity;
		1217	}
		1218	}
		1219
		1220	$match
		1221	}
1133		1222
1134	=back	1223	=back
1135
1136		1224
1137	=head3 cf::map	1225	=head3 cf::map
1138		1226
1139	=over 4	1227	=over 4
1140		1228
…		…
1278		1366
1279	# the original (read-only) location	1367	# the original (read-only) location
1280	sub load_path {	1368	sub load_path {
1281	my ($self) = @_;	1369	my ($self) = @_;
1282		1370
1283	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1371	"$MAPDIR/$self->{path}.map"
1284	}	1372	}
1285		1373
1286	# the temporary/swap location	1374	# the temporary/swap location
1287	sub save_path {	1375	sub save_path {
1288	my ($self) = @_;	1376	my ($self) = @_;
1289		1377
1290	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1378	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1291	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1379	"$TMPDIR/$path.map"
1292	}	1380	}
1293		1381
1294	# the unique path, undef == no special unique path	1382	# the unique path, undef == no special unique path
1295	sub uniq_path {	1383	sub uniq_path {
1296	my ($self) = @_;	1384	my ($self) = @_;
1297		1385
1298	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1386	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1299	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1387	"$UNIQUEDIR/$path"
1300	}	1388	}
1301		1389
1302	# and all this just because we cannot iterate over	1390	# and all this just because we cannot iterate over
1303	# all maps in C++...	1391	# all maps in C++...
1304	sub change_all_map_light {	1392	sub change_all_map_light {
…		…
1371	$self->load_header_orig	1459	$self->load_header_orig
1372	or return;	1460	or return;
1373	$self->prepare_orig;	1461	$self->prepare_orig;
1374	}	1462	}
1375		1463
		1464	$self->default_region (cf::region::find_by_path $self->{path})
		1465	unless $self->default_region;
		1466
1376	1	1467	1
1377	}	1468	}
1378		1469
1379	sub find;	1470	sub find;
1380	sub find {	1471	sub find {
…		…
1413	my ($self) = @_;	1504	my ($self) = @_;
1414		1505
1415	local $self->{deny_reset} = 1; # loading can take a long time	1506	local $self->{deny_reset} = 1; # loading can take a long time
1416		1507
1417	my $path = $self->{path};	1508	my $path = $self->{path};
		1509
		1510	{
1418	my $guard = cf::lock_acquire "map_load:$path";	1511	my $guard = cf::lock_acquire "map_load:$path";
1419		1512
1420	return if $self->in_memory != cf::MAP_SWAPPED;	1513	return if $self->in_memory != cf::MAP_SWAPPED;
1421		1514
1422	$self->in_memory (cf::MAP_LOADING);	1515	$self->in_memory (cf::MAP_LOADING);
1423		1516
1424	$self->alloc;	1517	$self->alloc;
1425		1518
1426	$self->pre_load;	1519	$self->pre_load;
1427
1428	$self->_load_objects ($self->{load_path}, 1)
1429	or return;
1430
1431	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1432	if delete $self->{load_original};
1433
1434	if (my $uniq = $self->uniq_path) {
1435	utf8::encode $uniq;
1436	if (aio_open $uniq, O_RDONLY, 0) {
1437	$self->clear_unique_items;
1438	$self->_load_objects ($uniq, 0);
1439	}
1440	}
1441
1442	Coro::cede;
1443
1444	# now do the right thing for maps
1445	$self->link_multipart_objects;
1446
1447	unless ($self->{deny_activate}) {
1448	$self->decay_objects;
1449	$self->fix_auto_apply;
1450	$self->update_buttons;
1451	Coro::cede;	1520	Coro::cede;
1452	$self->set_darkness_map;	1521
		1522	$self->_load_objects ($self->{load_path}, 1)
		1523	or return;
		1524
		1525	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
		1526	if delete $self->{load_original};
		1527
		1528	if (my $uniq = $self->uniq_path) {
		1529	utf8::encode $uniq;
		1530	if (aio_open $uniq, O_RDONLY, 0) {
		1531	$self->clear_unique_items;
		1532	$self->_load_objects ($uniq, 0);
		1533	}
		1534	}
		1535
		1536	Coro::cede;
		1537	# now do the right thing for maps
		1538	$self->link_multipart_objects;
1453	$self->difficulty ($self->estimate_difficulty)	1539	$self->difficulty ($self->estimate_difficulty)
1454	unless $self->difficulty;	1540	unless $self->difficulty;
1455	Coro::cede;	1541	Coro::cede;
		1542
		1543	unless ($self->{deny_activate}) {
		1544	$self->decay_objects;
		1545	$self->fix_auto_apply;
		1546	$self->update_buttons;
		1547	Coro::cede;
		1548	$self->set_darkness_map;
		1549	Coro::cede;
1456	$self->activate;	1550	$self->activate;
		1551	}
		1552
		1553	$self->in_memory (cf::MAP_IN_MEMORY);
1457	}	1554	}
1458		1555
1459	$self->post_load;	1556	$self->post_load;
1460
1461	$self->in_memory (cf::MAP_IN_MEMORY);
1462	}	1557	}
1463		1558
1464	sub customise_for {	1559	sub customise_for {
1465	my ($self, $ob) = @_;	1560	my ($self, $ob) = @_;
1466		1561
…		…
1657	instantiated unique items. May block.	1752	instantiated unique items. May block.
1658		1753
1659	=cut	1754	=cut
1660		1755
1661	sub unique_maps() {	1756	sub unique_maps() {
1662	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	1757	my $files = aio_readdir $UNIQUEDIR
1663	or return;	1758	or return;
1664		1759
1665	my @paths;	1760	my @paths;
1666		1761
1667	for (@$files) {	1762	for (@$files) {
…		…
1923		2018
1924	$rmp->{random_seed} \|\|= $exit->random_seed;	2019	$rmp->{random_seed} \|\|= $exit->random_seed;
1925		2020
1926	my $data = cf::to_json $rmp;	2021	my $data = cf::to_json $rmp;
1927	my $md5 = Digest::MD5::md5_hex $data;	2022	my $md5 = Digest::MD5::md5_hex $data;
1928	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2023	my $meta = "$RANDOMDIR/$md5.meta";
1929		2024
1930	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2025	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
1931	aio_write $fh, 0, (length $data), $data, 0;	2026	aio_write $fh, 0, (length $data), $data, 0;
1932	undef $fh;	2027	undef $fh;
1933	aio_rename "$meta~", $meta;	2028	aio_rename "$meta~", $meta;
…		…
1942		2037
1943	return unless $self->type == cf::PLAYER;	2038	return unless $self->type == cf::PLAYER;
1944		2039
1945	if ($exit->slaying eq "/!") {	2040	if ($exit->slaying eq "/!") {
1946	#TODO: this should de-fi-ni-te-ly not be a sync-job	2041	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2042	# the problem is that $exit might not survive long enough
		2043	# so it needs to be done right now, right here
1947	cf::sync_job { prepare_random_map $exit };	2044	cf::sync_job { prepare_random_map $exit };
1948	}	2045	}
1949		2046
1950	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2047	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1951	my $hp = $exit->stats->hp;	2048	my $hp = $exit->stats->hp;
…		…
1959	$self->goto ($slaying, $hp, $sp);	2056	$self->goto ($slaying, $hp, $sp);
1960		2057
1961	1;	2058	1;
1962	}) {	2059	}) {
1963	$self->message ("Something went wrong deep within the crossfire server. "	2060	$self->message ("Something went wrong deep within the crossfire server. "
1964	. "I'll try to bring you back to the map you were before. "	2061	. "I'll try to bring you back to the map you were before. "
1965	. "Please report this to the dungeon master!",	2062	. "Please report this to the dungeon master!",
1966	cf::NDI_UNIQUE \| cf::NDI_RED);	2063	cf::NDI_UNIQUE \| cf::NDI_RED);
1967		2064
1968	warn "ERROR in enter_exit: $@";	2065	warn "ERROR in enter_exit: $@";
1969	$self->leave_link;	2066	$self->leave_link;
1970	}	2067	}
1971	})->prio (1);	2068	})->prio (1);
…		…
1987		2084
1988	utf8::encode $text;	2085	utf8::encode $text;
1989	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	2086	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
1990	}	2087	}
1991		2088
		2089	=item $client->ext_event ($type, %msg)
		2090
		2091	Sends an exti event to the client.
		2092
		2093	=cut
		2094
		2095	sub cf::client::ext_event($$%) {
		2096	my ($self, $type, %msg) = @_;
		2097
		2098	$msg{msgtype} = "event_$type";
		2099	$self->send_packet ("ext " . cf::to_json \%msg);
		2100	}
1992		2101
1993	=item $success = $client->query ($flags, "text", \&cb)	2102	=item $success = $client->query ($flags, "text", \&cb)
1994		2103
1995	Queues a query to the client, calling the given callback with	2104	Queues a query to the client, calling the given callback with
1996	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2105	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
…		…
2188	#############################################################################	2297	#############################################################################
2189		2298
2190	=head2 EXTENSION DATABASE SUPPORT	2299	=head2 EXTENSION DATABASE SUPPORT
2191		2300
2192	Crossfire maintains a very simple database for extension use. It can	2301	Crossfire maintains a very simple database for extension use. It can
2193	currently store anything that can be serialised using Storable, which	2302	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2194	excludes objects.	2303	convert to/from binary).
2195		2304
2196	The parameter C<$family> should best start with the name of the extension	2305	The parameter C<$family> should best start with the name of the extension
2197	using it, it should be unique.	2306	using it, it should be unique.
2198		2307
2199	=over 4	2308	=over 4
…		…
2222	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;	2331	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
2223	cf::cleanup "db_open(db): $!" if $!;	2332	cf::cleanup "db_open(db): $!" if $!;
2224	};	2333	};
2225	cf::cleanup "db_open(db): $@" if $@;	2334	cf::cleanup "db_open(db): $@" if $@;
2226	};	2335	};
2227
2228	my $path = cf::localdir . "/database.pst";
2229	if (stat $path) {
2230	cf::sync_job {
2231	my $pst = Storable::retrieve $path;
2232
2233	cf::db_put (board => data => $pst->{board});
2234	cf::db_put (guildrules => data => $pst->{guildrules});
2235	cf::db_put (rent => balance => $pst->{rent}{balance});
2236	BDB::db_env_txn_checkpoint $DB_ENV;
2237
2238	unlink $path;
2239	};
2240	}
2241	}	2336	}
2242	}	2337	}
2243		2338
2244	sub db_get($$) {	2339	sub db_get($$) {
2245	my $key = "$_[0]/$_[1]";	2340	my $key = "$_[0]/$_[1]";
2246		2341
2247	cf::sync_job {	2342	cf::sync_job {
2248	BDB::db_get $DB, undef, $key, my $data;	2343	BDB::db_get $DB, undef, $key, my $data;
2249		2344
2250	$! ? ()	2345	$! ? ()
2251	: Compress::LZF::sthaw $data	2346	: $data
2252	}	2347	}
2253	}	2348	}
2254		2349
2255	sub db_put($$$) {	2350	sub db_put($$$) {
2256	BDB::dbreq_pri 4;	2351	BDB::dbreq_pri 4;
2257	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };	2352	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2258	}	2353	}
		2354
		2355	=item cf::cache $id => [$paths...], $processversion => $process
		2356
		2357	Generic caching function that returns the value of the resource $id,
		2358	caching and regenerating as required.
		2359
		2360	This function can block.
		2361
		2362	=cut
		2363
		2364	sub cache {
		2365	my ($id, $src, $processversion, $process) = @_;
		2366
		2367	my $meta =
		2368	join "\x00",
		2369	$processversion,
		2370	map {
		2371	aio_stat $_
		2372	and Carp::croak "$_: $!";
		2373
		2374	($_, (stat _)[7,9])
		2375	} @$src;
		2376
		2377	my $dbmeta = db_get cache => "$id/meta";
		2378	if ($dbmeta ne $meta) {
		2379	# changed, we may need to process
		2380
		2381	my @data;
		2382	my $md5;
		2383
		2384	for (0 .. $#$src) {
		2385	0 <= aio_load $src->[$_], $data[$_]
		2386	or Carp::croak "$src->[$_]: $!";
		2387	}
		2388
		2389	# if processing is expensive, check
		2390	# checksum first
		2391	if (1) {
		2392	$md5 =
		2393	join "\x00",
		2394	$processversion,
		2395	map {
		2396	Coro::cede;
		2397	($src->[$_], Digest::MD5::md5_hex $data[$_])
		2398	} 0.. $#$src;
		2399
		2400
		2401	my $dbmd5 = db_get cache => "$id/md5";
		2402	if ($dbmd5 eq $md5) {
		2403	db_put cache => "$id/meta", $meta;
		2404
		2405	return db_get cache => "$id/data";
		2406	}
		2407	}
		2408
		2409	my $t1 = Time::HiRes::time;
		2410	my $data = $process->(\@data);
		2411	my $t2 = Time::HiRes::time;
		2412
		2413	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		2414
		2415	db_put cache => "$id/data", $data;
		2416	db_put cache => "$id/md5" , $md5;
		2417	db_put cache => "$id/meta", $meta;
		2418
		2419	return $data;
		2420	}
		2421
		2422	db_get cache => "$id/data"
		2423	}
		2424
		2425	=item fork_call { }, $args
		2426
		2427	Executes the given code block with the given arguments in a seperate
		2428	process, returning the results. Everything must be serialisable with
		2429	Coro::Storable. May, of course, block. Note that the executed sub may
		2430	never block itself or use any form of Event handling.
		2431
		2432	=cut
		2433
		2434	sub fork_call(&@) {
		2435	my ($cb, @args) = @_;
		2436
		2437	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		2438	# or die "socketpair: $!";
		2439	pipe my $fh1, my $fh2
		2440	or die "pipe: $!";
		2441
		2442	if (my $pid = fork) {
		2443	close $fh2;
		2444
		2445	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		2446	$res = Coro::Storable::thaw $res;
		2447
		2448	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		2449
		2450	die $$res unless "ARRAY" eq ref $res;
		2451
		2452	return wantarray ? @$res : $res->[-1];
		2453	} else {
		2454	reset_signals;
		2455	local $SIG{__WARN__};
		2456	local $SIG{__DIE__};
		2457	eval {
		2458	close $fh1;
		2459
		2460	my @res = eval { $cb->(@args) };
		2461	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
		2462	};
		2463
		2464	warn $@ if $@;
		2465	_exit 0;
		2466	}
		2467	}
		2468
		2469
2259		2470
2260	#############################################################################	2471	#############################################################################
2261	# the server's init and main functions	2472	# the server's init and main functions
2262		2473
2263	sub load_faces {	2474	sub load_facedata($) {
2264	my $path = sprintf "%s/faces", cf::datadir;	2475	my ($path) = @_;
2265		2476
2266	warn "loading faces from $path\n";	2477	warn "loading facedata from $path\n";
2267		2478
2268	my $faces;	2479	my $facedata;
2269	0 < aio_load $path, $faces	2480	0 < aio_load $path, $facedata
2270	or die "$path: $!";	2481	or die "$path: $!";
2271		2482
2272	Coro::cede;
2273	$faces = Storable::thaw $faces;	2483	$facedata = Coro::Storable::thaw $facedata;
2274	Coro::cede;
2275		2484
2276	my $meta = delete $faces->{""};
2277	$meta->{version} == 1	2485	$facedata->{version} == 2
2278	or cf::cleanup "$path: version mismatch, cannot proceed.";	2486	or cf::cleanup "$path: version mismatch, cannot proceed.";
2279		2487
		2488	{
		2489	my $faces = $facedata->{faceinfo};
		2490
2280	while (my ($face, $info) = each %$faces) {	2491	while (my ($face, $info) = each %$faces) {
2281	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	2492	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
2282	cf::face::set $idx, $info->{visibility}, $info->{magicmap};	2493	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2283	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};	2494	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
		2495	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2284	Coro::cede;	2496	Coro::cede;
2285	}	2497	}
2286		2498
2287	while (my ($face, $info) = each %$faces) {	2499	while (my ($face, $info) = each %$faces) {
2288	next unless $info->{smooth};	2500	next unless $info->{smooth};
2289	my $idx = cf::face::find $face	2501	my $idx = cf::face::find $face
2290	or next;	2502	or next;
2291	if (my $smooth = cf::face::find $info->{smooth}) {	2503	if (my $smooth = cf::face::find $info->{smooth}) {
2292	cf::face::set_smooth $idx, $smooth;	2504	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2293	} else {	2505	} else {
2294	warn "smooth face '$info->{smooth}' not found for face '$face'";	2506	warn "smooth face '$info->{smooth}' not found for face '$face'";
2295	}	2507	}
2296	Coro::cede;	2508	Coro::cede;
		2509	}
		2510	}
		2511
		2512	{
		2513	my $anims = $facedata->{animinfo};
		2514
		2515	while (my ($anim, $info) = each %$anims) {
		2516	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2517	Coro::cede;
		2518	}
		2519
		2520	cf::anim::invalidate_all; # d'oh
2297	}	2521	}
2298		2522
2299	1	2523	1
2300	}	2524	}
2301		2525
		2526	sub reload_regions {
		2527	load_resource_file "$MAPDIR/regions"
		2528	or die "unable to load regions file\n";
		2529	}
		2530
		2531	sub reload_facedata {
		2532	load_facedata "$DATADIR/facedata"
		2533	or die "unable to load facedata\n";
		2534	}
		2535
		2536	sub reload_archetypes {
		2537	load_resource_file "$DATADIR/archetypes"
		2538	or die "unable to load archetypes\n";
		2539	}
		2540
		2541	sub reload_treasures {
		2542	load_resource_file "$DATADIR/treasures"
		2543	or die "unable to load treasurelists\n";
		2544	}
		2545
2302	sub reload_resources {	2546	sub reload_resources {
2303	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2547	warn "reloading resource files...\n";
2304	or die "unable to load regions file\n";#d#	2548
		2549	reload_regions;
2305	load_faces	2550	reload_facedata;
2306	or die "unable to load faces\n";#d#	2551	reload_archetypes;
		2552	reload_treasures;
		2553
		2554	warn "finished reloading resource files\n";
2307	}	2555	}
2308		2556
2309	sub init {	2557	sub init {
2310	reload_resources;	2558	reload_resources;
2311	}	2559	}
2312		2560
2313	sub cfg_load {	2561	sub cfg_load {
2314	open my $fh, "<:utf8", cf::confdir . "/config"	2562	open my $fh, "<:utf8", "$CONFDIR/config"
2315	or return;	2563	or return;
2316		2564
2317	local $/;	2565	local $/;
2318	*CFG = YAML::Syck::Load <$fh>;	2566	*CFG = YAML::Syck::Load <$fh>;
2319		2567
…		…
2404		2652
2405	warn Carp::longmess "post_cleanup backtrace"	2653	warn Carp::longmess "post_cleanup backtrace"
2406	if $make_core;	2654	if $make_core;
2407	}	2655	}
2408		2656
2409	sub reload() {	2657	sub do_reload_perl() {
2410	# can/must only be called in main	2658	# can/must only be called in main
2411	if ($Coro::current != $Coro::main) {	2659	if ($Coro::current != $Coro::main) {
2412	warn "can only reload from main coroutine";	2660	warn "can only reload from main coroutine";
2413	return;	2661	return;
2414	}	2662	}
…		…
2489	Symbol::delete_package "safe::$_"	2737	Symbol::delete_package "safe::$_"
2490	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2738	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2491		2739
2492	warn "unloading cf.pm \"a bit\"";	2740	warn "unloading cf.pm \"a bit\"";
2493	delete $INC{"cf.pm"};	2741	delete $INC{"cf.pm"};
		2742	delete $INC{"cf/pod.pm"};
2494		2743
2495	# don't, removes xs symbols, too,	2744	# don't, removes xs symbols, too,
2496	# and global variables created in xs	2745	# and global variables created in xs
2497	#Symbol::delete_package __PACKAGE__;	2746	#Symbol::delete_package __PACKAGE__;
2498		2747
…		…
2513	warn "reattaching attachments to maps";	2762	warn "reattaching attachments to maps";
2514	reattach $_ for values %MAP;	2763	reattach $_ for values %MAP;
2515	warn "reattaching attachments to players";	2764	warn "reattaching attachments to players";
2516	reattach $_ for values %PLAYER;	2765	reattach $_ for values %PLAYER;
2517		2766
2518	warn "loading reloadable resources";
2519	reload_resources;
2520
2521	warn "leaving sync_job";	2767	warn "leaving sync_job";
2522		2768
2523	1	2769	1
2524	} or do {	2770	} or do {
2525	warn $@;	2771	warn $@;
…		…
2530	warn "reloaded";	2776	warn "reloaded";
2531	};	2777	};
2532		2778
2533	our $RELOAD_WATCHER; # used only during reload	2779	our $RELOAD_WATCHER; # used only during reload
2534		2780
		2781	sub reload_perl() {
		2782	# doing reload synchronously and two reloads happen back-to-back,
		2783	# coro crashes during coro_state_free->destroy here.
		2784
		2785	$RELOAD_WATCHER \|\|= Event->timer (
		2786	reentrant => 0,
		2787	after => 0,
		2788	data => WF_AUTOCANCEL,
		2789	cb => sub {
		2790	do_reload_perl;
		2791	undef $RELOAD_WATCHER;
		2792	},
		2793	);
		2794	}
		2795
2535	register_command "reload" => sub {	2796	register_command "reload" => sub {
2536	my ($who, $arg) = @_;	2797	my ($who, $arg) = @_;
2537		2798
2538	if ($who->flag (FLAG_WIZ)) {	2799	if ($who->flag (FLAG_WIZ)) {
2539	$who->message ("reloading server.");	2800	$who->message ("reloading server.");
2540		2801	async { reload_perl };
2541	# doing reload synchronously and two reloads happen back-to-back,
2542	# coro crashes during coro_state_free->destroy here.
2543
2544	$RELOAD_WATCHER \|\|= Event->timer (
2545	reentrant => 0,
2546	after => 0,
2547	data => WF_AUTOCANCEL,
2548	cb => sub {
2549	reload;
2550	undef $RELOAD_WATCHER;
2551	},
2552	);
2553	}	2802	}
2554	};	2803	};
2555		2804
2556	unshift @INC, $LIBDIR;	2805	unshift @INC, $LIBDIR;
2557		2806
2558	my $bug_warning = 0;	2807	my $bug_warning = 0;
		2808
		2809	our @WAIT_FOR_TICK;
		2810	our @WAIT_FOR_TICK_BEGIN;
		2811
		2812	sub wait_for_tick {
		2813	return unless $TICK_WATCHER->is_active;
		2814	return if $Coro::current == $Coro::main;
		2815
		2816	my $signal = new Coro::Signal;
		2817	push @WAIT_FOR_TICK, $signal;
		2818	$signal->wait;
		2819	}
		2820
		2821	sub wait_for_tick_begin {
		2822	return unless $TICK_WATCHER->is_active;
		2823	return if $Coro::current == $Coro::main;
		2824
		2825	my $signal = new Coro::Signal;
		2826	push @WAIT_FOR_TICK_BEGIN, $signal;
		2827	$signal->wait;
		2828	}
2559		2829
2560	$TICK_WATCHER = Event->timer (	2830	$TICK_WATCHER = Event->timer (
2561	reentrant => 0,	2831	reentrant => 0,
2562	parked => 1,	2832	parked => 1,
2563	prio => 0,	2833	prio => 0,
…		…
2571	}	2841	}
2572		2842
2573	$NOW = Event::time;	2843	$NOW = Event::time;
2574		2844
2575	cf::server_tick; # one server iteration	2845	cf::server_tick; # one server iteration
		2846
2576	$RUNTIME += $TICK;	2847	$RUNTIME += $TICK;
2577	$NEXT_TICK += $TICK;	2848	$NEXT_TICK += $TICK;
2578		2849
2579	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2850	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2580	$NEXT_RUNTIME_WRITE = $NOW + 10;	2851	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2582	write_runtime	2853	write_runtime
2583	or warn "ERROR: unable to write runtime file: $!";	2854	or warn "ERROR: unable to write runtime file: $!";
2584	};	2855	};
2585	}	2856	}
2586		2857
2587	$WAIT_FOR_TICK->broadcast;
2588	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2589
2590	# my $AFTER = Event::time;	2858	# my $AFTER = Event::time;
2591	# warn $AFTER - $NOW;#d#	2859	# warn $AFTER - $NOW;#d#
2592		2860
2593	# if we are delayed by four ticks or more, skip them all	2861	# if we are delayed by four ticks or more, skip them all
2594	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2862	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2595		2863
2596	$TICK_WATCHER->at ($NEXT_TICK);	2864	$TICK_WATCHER->at ($NEXT_TICK);
2597	$TICK_WATCHER->start;	2865	$TICK_WATCHER->start;
		2866
		2867	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2868	$sig->send;
		2869	}
		2870	while (my $sig = shift @WAIT_FOR_TICK) {
		2871	$sig->send;
		2872	}
		2873
		2874	_post_tick;
2598	},	2875	},
2599	);	2876	);
2600		2877
2601	{	2878	{
2602	BDB::max_poll_time $TICK * 0.1;	2879	BDB::max_poll_time $TICK * 0.1;
…		…
2630		2907
2631	cf::sync_job {	2908	cf::sync_job {
2632	eval {	2909	eval {
2633	BDB::db_env_open	2910	BDB::db_env_open
2634	$DB_ENV,	2911	$DB_ENV,
2635	$BDB_ENV_DIR,	2912	$BDBDIR,
2636	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	2913	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
2637	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	2914	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
2638	0666;	2915	0666;
2639		2916
2640	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	2917	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2641		2918
2642	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	2919	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
2643	$DB_ENV->set_lk_detect;	2920	$DB_ENV->set_lk_detect;
2644	};	2921	};
2645		2922
…		…
2661	prio => 6,	2938	prio => 6,
2662	cb => \&IO::AIO::poll_cb,	2939	cb => \&IO::AIO::poll_cb,
2663	);	2940	);
2664	}	2941	}
2665		2942
		2943	my $_log_backtrace;
		2944
		2945	sub _log_backtrace {
		2946	my ($msg, @addr) = @_;
		2947
		2948	$msg =~ s/\n//;
		2949
		2950	# limit the # of concurrent backtraces
		2951	if ($_log_backtrace < 2) {
		2952	++$_log_backtrace;
		2953	async {
		2954	my @bt = fork_call {
		2955	@addr = map { sprintf "%x", $_ } @addr;
		2956	my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
		2957	open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 \|"
		2958	or die "addr2line: $!";
		2959
		2960	my @funcs;
		2961	my @res = <$fh>;
		2962	chomp for @res;
		2963	while (@res) {
		2964	my ($func, $line) = splice @res, 0, 2, ();
		2965	push @funcs, "[$func] $line";
		2966	}
		2967
		2968	@funcs
		2969	};
		2970
		2971	LOG llevInfo, "[ABT] $msg\n";
		2972	LOG llevInfo, "[ABT] $_\n" for @bt;
		2973	--$_log_backtrace;
		2974	};
		2975	} else {
		2976	LOG llevInfo, "[ABT] $msg\n";
		2977	LOG llevInfo, "[ABT] [suppressed]\n";
		2978	}
		2979	}
		2980
		2981	# load additional modules
		2982	use cf::pod;
		2983
2666	END { cf::emergency_save }	2984	END { cf::emergency_save }
2667		2985
2668	1	2986	1
2669		2987

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.228 by root, Mon Mar 26 16:53:33 2007 UTC vs. Revision 1.264 by root, Sun May 6 05:44:48 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.228 by root, Mon Mar 26 16:53:33 2007 UTC vs.
Revision 1.264 by root, Sun May 6 05:44:48 2007 UTC