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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.222 by root, Tue Mar 6 03:06:00 2007 UTC vs.
Revision 1.254 by root, Thu Apr 19 11:12:45 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;
		10	use Event;
9	use Opcode;	11	use Opcode;
10	use Safe;	12	use Safe;
11	use Safe::Hole;	13	use Safe::Hole;
12		14
13	use Coro 3.5 ();	15	use Coro 3.61 ();
		16	use Coro::State;
		17	use Coro::Handle;
14	use Coro::Event;	18	use Coro::Event;
15	use Coro::Timer;	19	use Coro::Timer;
16	use Coro::Signal;	20	use Coro::Signal;
17	use Coro::Semaphore;	21	use Coro::Semaphore;
18	use Coro::AIO;	22	use Coro::AIO;
		23	use Coro::Storable;
19		24
20	use BDB ();	25	use BDB ();
21	use Data::Dumper;	26	use Data::Dumper;
22	use Digest::MD5;	27	use Digest::MD5;
23	use Fcntl;	28	use Fcntl;
		29	use YAML::Syck ();
24	use IO::AIO 2.32 ();	30	use IO::AIO 2.32 ();
25	use YAML::Syck ();
26	use Time::HiRes;	31	use Time::HiRes;
27	use Compress::LZF;	32	use Compress::LZF;
28		33
		34	# configure various modules to our taste
		35	#
		36	$Storable::canonical = 1; # reduce rsync transfers
		37	Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29	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
30		39
31	use Event; $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
32
33	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34		41
35	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?	42	# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36	$YAML::Syck::ImplicitUnicode = 1;	43	$YAML::Syck::ImplicitUnicode = 1;
37		44
38	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority	45	$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
		46
		47	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
39		48
40	our %COMMAND = ();	49	our %COMMAND = ();
41	our %COMMAND_TIME = ();	50	our %COMMAND_TIME = ();
42		51
43	our @EXTS = (); # list of extension package names	52	our @EXTS = (); # list of extension package names
44	our %EXTCMD = ();	53	our %EXTCMD = ();
45	our %EXT_CORO = (); # coroutines bound to extensions	54	our %EXT_CORO = (); # coroutines bound to extensions
46	our %EXT_MAP = (); # pluggable maps	55	our %EXT_MAP = (); # pluggable maps
47		56
		57	our $RELOAD; # number of reloads so far
48	our @EVENT;	58	our @EVENT;
49	our $LIBDIR = datadir . "/ext";
50		59
51	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(!)
52	our $TICK_WATCHER;	73	our $TICK_WATCHER;
53	our $AIO_POLL_WATCHER;	74	our $AIO_POLL_WATCHER;
54	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	75	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55	our $NEXT_TICK;	76	our $NEXT_TICK;
56	our $NOW;	77	our $NOW;
…		…
65	our $RUNTIME;	86	our $RUNTIME;
66		87
67	our %PLAYER; # all users	88	our %PLAYER; # all users
68	our %MAP; # all maps	89	our %MAP; # all maps
69	our $LINK_MAP; # the special {link} map, which is always available	90	our $LINK_MAP; # the special {link} map, which is always available
70	our $RANDOM_MAPS = cf::localdir . "/random";
71	our $BDB_ENV_DIR = cf::localdir . "/db";
72
73	our $WAIT_FOR_TICK; $WAIT_FOR_TICK \|\|= new Coro::Signal;
74	our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE \|\|= new Coro::Signal;
75		91
76	# 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 ∕
77	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons	93	our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78		94
79	binmode STDOUT;	95	binmode STDOUT;
80	binmode STDERR;	96	binmode STDERR;
81		97
82	# read virtual server time, if available	98	# read virtual server time, if available
83	unless ($RUNTIME \|\| !-e cf::localdir . "/runtime") {	99	unless ($RUNTIME \|\| !-e "$LOCALDIR/runtime") {
84	open my $fh, "<", cf::localdir . "/runtime"	100	open my $fh, "<", "$LOCALDIR/runtime"
85	or die "unable to read runtime file: $!";	101	or die "unable to read runtime file: $!";
86	$RUNTIME = <$fh> + 0.;	102	$RUNTIME = <$fh> + 0.;
87	}	103	}
88		104
89	mkdir cf::localdir;	105	mkdir $_
90	mkdir cf::localdir . "/" . cf::playerdir;	106	for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91	mkdir cf::localdir . "/" . cf::tmpdir;
92	mkdir cf::localdir . "/" . cf::uniquedir;
93	mkdir $RANDOM_MAPS;
94	mkdir $BDB_ENV_DIR;
95		107
96	our $EMERGENCY_POSITION;	108	our $EMERGENCY_POSITION;
97		109
98	sub cf::map::normalise;	110	sub cf::map::normalise;
99		111
…		…
110	=item $cf::RUNTIME	122	=item $cf::RUNTIME
111		123
112	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
113	every server tick.	125	every server tick.
114		126
115	=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
116		130
117	The perl library directory, where extensions and cf-specific modules can	131	Various directories - "/etc", read-only install directory, perl-library
118	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.
119		135
120	=item $cf::NOW	136	=item $cf::NOW
121		137
122	The time of the last (current) server tick.	138	The time of the last (current) server tick.
123		139
…		…
128	=item %cf::CFG	144	=item %cf::CFG
129		145
130	Configuration for the server, loaded from C</etc/crossfire/config>, or	146	Configuration for the server, loaded from C</etc/crossfire/config>, or
131	from wherever your confdir points to.	147	from wherever your confdir points to.
132		148
133	=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE	149	=item cf::wait_for_tick, cf::wait_for_tick_begin
134		150
135	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
136	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
137	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.
138	window of cpu time available, or simply to synchronise to the server tick.
139		154
140	=back	155	=back
141		156
142	=cut	157	=cut
143		158
144	BEGIN {	159	BEGIN {
145	*CORE::GLOBAL::warn = sub {	160	*CORE::GLOBAL::warn = sub {
146	my $msg = join "", @_;	161	my $msg = join "", @_;
147	utf8::encode $msg;
148		162
149	$msg .= "\n"	163	$msg .= "\n"
150	unless $msg =~ /\n$/;	164	unless $msg =~ /\n$/;
151		165
		166	$msg =~ s/([\x00-\x09\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
		167
		168	utf8::encode $msg;
152	LOG llevError, $msg;	169	LOG llevError, $msg;
153	};	170	};
154	}	171	}
155		172
156	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';	173	@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
…		…
202	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	219	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203	$d	220	$d
204	} \|\| "[unable to dump $_[0]: '$@']";	221	} \|\| "[unable to dump $_[0]: '$@']";
205	}	222	}
206		223
207	use JSON::Syck (); # TODO# replace by JSON::PC once working	224	use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
208		225
209	=item $ref = cf::from_json $json	226	=item $ref = cf::from_json $json
210		227
211	Converts a JSON string into the corresponding perl data structure.	228	Converts a JSON string into the corresponding perl data structure.
212		229
213	=cut
214
215	sub from_json($) {
216	$JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217	JSON::Syck::Load $_[0]
218	}
219
220	=item $json = cf::to_json $ref	230	=item $json = cf::to_json $ref
221		231
222	Converts a perl data structure into its JSON representation.	232	Converts a perl data structure into its JSON representation.
223
224	=cut
225
226	sub to_json($) {
227	$JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
228	JSON::Syck::Dump $_[0]
229	}
230		233
231	=item cf::lock_wait $string	234	=item cf::lock_wait $string
232		235
233	Wait until the given lock is available. See cf::lock_acquire.	236	Wait until the given lock is available. See cf::lock_acquire.
234		237
…		…
240	returned.	243	returned.
241		244
242	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
243	uses map_find and cf::map::load uses map_load).	246	uses map_find and cf::map::load uses map_load).
244		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
245	=cut	252	=cut
246		253
247	our %LOCK;	254	our %LOCK;
248		255
249	sub lock_wait($) {	256	sub lock_wait($) {
…		…
266		273
267	Coro::guard {	274	Coro::guard {
268	# wake up all waiters, to be on the safe side	275	# wake up all waiters, to be on the safe side
269	$_->ready for @{ delete $LOCK{$key} };	276	$_->ready for @{ delete $LOCK{$key} };
270	}	277	}
		278	}
		279
		280	sub lock_active($) {
		281	my ($key) = @_;
		282
		283	! ! $LOCK{$key}
271	}	284	}
272		285
273	sub freeze_mainloop {	286	sub freeze_mainloop {
274	return unless $TICK_WATCHER->is_active;	287	return unless $TICK_WATCHER->is_active;
275		288
…		…
356	}	369	}
357		370
358	sub write_runtime {	371	sub write_runtime {
359	my $guard = cf::lock_acquire "write_runtime";	372	my $guard = cf::lock_acquire "write_runtime";
360		373
361	my $runtime = cf::localdir . "/runtime";	374	my $runtime = "$LOCALDIR/runtime";
362		375
363	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644	376	my $fh = aio_open "$runtime~", O_WRONLY \| O_CREAT, 0644
364	or return;	377	or return;
365		378
366	my $value = $cf::RUNTIME + 90 + 10;	379	my $value = $cf::RUNTIME + 90 + 10;
…		…
379		392
380	aio_rename "$runtime~", $runtime	393	aio_rename "$runtime~", $runtime
381	and return;	394	and return;
382		395
383	1	396	1
		397	}
		398
		399	=item cf::datalog type => key => value, ...
		400
		401	Log a datalog packet of the given type with the given key-value pairs.
		402
		403	=cut
		404
		405	sub datalog($@) {
		406	my ($type, %kv) = @_;
		407	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384	}	408	}
385		409
386	=back	410	=back
387		411
388	=cut	412	=cut
…		…
950	Returns the given player object, loading it if necessary (might block).	974	Returns the given player object, loading it if necessary (might block).
951		975
952	=cut	976	=cut
953		977
954	sub playerdir($) {	978	sub playerdir($) {
955	cf::localdir	979	"$PLAYERDIR/"
956	. "/"
957	. cf::playerdir
958	. "/"
959	. (ref $_[0] ? $_[0]->ob->name : $_[0])	980	. (ref $_[0] ? $_[0]->ob->name : $_[0])
960	}	981	}
961		982
962	sub path($) {	983	sub path($) {
963	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];	984	my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964		985
965	(playerdir $login) . "/$login.pl"	986	(playerdir $login) . "/playerdata"
966	}	987	}
967		988
968	sub find_active($) {	989	sub find_active($) {
969	$cf::PLAYER{$_[0]}	990	$cf::PLAYER{$_[0]}
970	and $cf::PLAYER{$_[0]}->active	991	and $cf::PLAYER{$_[0]}->active
…		…
983	my $login = $_[0];	1004	my $login = $_[0];
984		1005
985	my $guard = cf::lock_acquire "user_find:$login";	1006	my $guard = cf::lock_acquire "user_find:$login";
986		1007
987	$cf::PLAYER{$_[0]} \|\| do {	1008	$cf::PLAYER{$_[0]} \|\| do {
		1009	# rename old playerfiles to new ones
		1010	#TODO: remove when no longer required
		1011	aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
		1012	aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
		1013	aio_unlink +(playerdir $login) . "/$login.pl.pst";
		1014	aio_unlink +(playerdir $login) . "/$login.pl";
		1015
988	my $pl = load_pl path $login	1016	my $pl = load_pl path $login
989	or return;	1017	or return;
990	$cf::PLAYER{$login} = $pl	1018	$cf::PLAYER{$login} = $pl
991	}	1019	}
992	}	1020	}
…		…
1076	while and may block, so not sync_job-capable, ever.	1104	while and may block, so not sync_job-capable, ever.
1077		1105
1078	=cut	1106	=cut
1079		1107
1080	sub list_logins {	1108	sub list_logins {
1081	my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir	1109	my $dirs = aio_readdir $PLAYERDIR
1082	or return [];	1110	or return [];
1083		1111
1084	my @logins;	1112	my @logins;
1085		1113
1086	for my $login (@$dirs) {	1114	for my $login (@$dirs) {
…		…
1121	}	1149	}
1122		1150
1123	\@paths	1151	\@paths
1124	}	1152	}
1125		1153
1126	=item $player->ext_reply ($msgid, $msgtype, %msg)	1154	=item $player->ext_reply ($msgid, %msg)
1127		1155
1128	Sends an ext reply to the player.	1156	Sends an ext reply to the player.
1129		1157
1130	=cut	1158	=cut
1131		1159
1132	sub ext_reply($$$%) {	1160	sub ext_reply($$%) {
1133	my ($self, $id, %msg) = @_;	1161	my ($self, $id, %msg) = @_;
1134		1162
1135	$msg{msgid} = $id;	1163	$msg{msgid} = $id;
1136		1164
1137	$self->send ("ext " . cf::to_json \%msg);	1165	$self->send ("ext " . cf::to_json \%msg);
1138	}	1166	}
1139		1167
1140	package cf;	1168	=item $player->ext_event ($type, %msg)
		1169
		1170	Sends an ext event to the client.
		1171
		1172	=cut
		1173
		1174	sub ext_event($$%) {
		1175	my ($self, $type, %msg) = @_;
		1176
		1177	$self->ns->ext_event ($type, %msg);
		1178	}
		1179
		1180	=head3 cf::region
		1181
		1182	=over 4
		1183
		1184	=cut
		1185
		1186	package cf::region;
		1187
		1188	=item cf::region::find_by_path $path
		1189
		1190	Tries to decuce the probable region for a map knowing only its path.
		1191
		1192	=cut
		1193
		1194	sub find_by_path($) {
		1195	my ($path) = @_;
		1196
		1197	my ($match, $specificity);
		1198
		1199	for my $region (list) {
		1200	if ($region->match && $path =~ $region->match) {
		1201	($match, $specificity) = ($region, $region->specificity)
		1202	if $region->specificity > $specificity;
		1203	}
		1204	}
		1205
		1206	$match
		1207	}
1141		1208
1142	=back	1209	=back
1143
1144		1210
1145	=head3 cf::map	1211	=head3 cf::map
1146		1212
1147	=over 4	1213	=over 4
1148		1214
…		…
1286		1352
1287	# the original (read-only) location	1353	# the original (read-only) location
1288	sub load_path {	1354	sub load_path {
1289	my ($self) = @_;	1355	my ($self) = @_;
1290		1356
1291	sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}	1357	"$MAPDIR/$self->{path}.map"
1292	}	1358	}
1293		1359
1294	# the temporary/swap location	1360	# the temporary/swap location
1295	sub save_path {	1361	sub save_path {
1296	my ($self) = @_;	1362	my ($self) = @_;
1297		1363
1298	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1364	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1299	sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path	1365	"$TMPDIR/$path.map"
1300	}	1366	}
1301		1367
1302	# the unique path, undef == no special unique path	1368	# the unique path, undef == no special unique path
1303	sub uniq_path {	1369	sub uniq_path {
1304	my ($self) = @_;	1370	my ($self) = @_;
1305		1371
1306	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;	1372	(my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1307	sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path	1373	"$UNIQUEDIR/$path"
1308	}	1374	}
1309		1375
1310	# and all this just because we cannot iterate over	1376	# and all this just because we cannot iterate over
1311	# all maps in C++...	1377	# all maps in C++...
1312	sub change_all_map_light {	1378	sub change_all_map_light {
…		…
1379	$self->load_header_orig	1445	$self->load_header_orig
1380	or return;	1446	or return;
1381	$self->prepare_orig;	1447	$self->prepare_orig;
1382	}	1448	}
1383		1449
		1450	$self->default_region (cf::region::find_by_path $self->{path})
		1451	unless $self->default_region;
		1452
1384	1	1453	1
1385	}	1454	}
1386		1455
1387	sub find;	1456	sub find;
1388	sub find {	1457	sub find {
…		…
1430	$self->in_memory (cf::MAP_LOADING);	1499	$self->in_memory (cf::MAP_LOADING);
1431		1500
1432	$self->alloc;	1501	$self->alloc;
1433		1502
1434	$self->pre_load;	1503	$self->pre_load;
		1504	Coro::cede;
1435		1505
1436	$self->_load_objects ($self->{load_path}, 1)	1506	$self->_load_objects ($self->{load_path}, 1)
1437	or return;	1507	or return;
1438		1508
1439	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)	1509	$self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
…		…
1446	$self->_load_objects ($uniq, 0);	1516	$self->_load_objects ($uniq, 0);
1447	}	1517	}
1448	}	1518	}
1449		1519
1450	Coro::cede;	1520	Coro::cede;
1451
1452	# now do the right thing for maps	1521	# now do the right thing for maps
1453	$self->link_multipart_objects;	1522	$self->link_multipart_objects;
		1523	Coro::cede;
1454		1524
1455	unless ($self->{deny_activate}) {	1525	unless ($self->{deny_activate}) {
1456	$self->decay_objects;	1526	$self->decay_objects;
1457	$self->fix_auto_apply;	1527	$self->fix_auto_apply;
1458	$self->update_buttons;	1528	$self->update_buttons;
…		…
1460	$self->set_darkness_map;	1530	$self->set_darkness_map;
1461	$self->difficulty ($self->estimate_difficulty)	1531	$self->difficulty ($self->estimate_difficulty)
1462	unless $self->difficulty;	1532	unless $self->difficulty;
1463	Coro::cede;	1533	Coro::cede;
1464	$self->activate;	1534	$self->activate;
		1535	Coro::cede;
1465	}	1536	}
1466		1537
1467	$self->post_load;	1538	$self->post_load;
		1539	Coro::cede;
1468		1540
1469	$self->in_memory (cf::MAP_IN_MEMORY);	1541	$self->in_memory (cf::MAP_IN_MEMORY);
1470	}	1542	}
1471		1543
1472	sub customise_for {	1544	sub customise_for {
…		…
1665	instantiated unique items. May block.	1737	instantiated unique items. May block.
1666		1738
1667	=cut	1739	=cut
1668		1740
1669	sub unique_maps() {	1741	sub unique_maps() {
1670	my $files = aio_readdir cf::localdir . "/" . cf::uniquedir	1742	my $files = aio_readdir $UNIQUEDIR
1671	or return;	1743	or return;
1672		1744
1673	my @paths;	1745	my @paths;
1674		1746
1675	for (@$files) {	1747	for (@$files) {
…		…
1931		2003
1932	$rmp->{random_seed} \|\|= $exit->random_seed;	2004	$rmp->{random_seed} \|\|= $exit->random_seed;
1933		2005
1934	my $data = cf::to_json $rmp;	2006	my $data = cf::to_json $rmp;
1935	my $md5 = Digest::MD5::md5_hex $data;	2007	my $md5 = Digest::MD5::md5_hex $data;
1936	my $meta = "$cf::RANDOM_MAPS/$md5.meta";	2008	my $meta = "$RANDOMDIR/$md5.meta";
1937		2009
1938	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {	2010	if (my $fh = aio_open "$meta~", O_WRONLY \| O_CREAT, 0666) {
1939	aio_write $fh, 0, (length $data), $data, 0;	2011	aio_write $fh, 0, (length $data), $data, 0;
1940	undef $fh;	2012	undef $fh;
1941	aio_rename "$meta~", $meta;	2013	aio_rename "$meta~", $meta;
…		…
1950		2022
1951	return unless $self->type == cf::PLAYER;	2023	return unless $self->type == cf::PLAYER;
1952		2024
1953	if ($exit->slaying eq "/!") {	2025	if ($exit->slaying eq "/!") {
1954	#TODO: this should de-fi-ni-te-ly not be a sync-job	2026	#TODO: this should de-fi-ni-te-ly not be a sync-job
		2027	# the problem is that $exit might not survive long enough
		2028	# so it needs to be done right now, right here
1955	cf::sync_job { prepare_random_map $exit };	2029	cf::sync_job { prepare_random_map $exit };
1956	}	2030	}
1957		2031
1958	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2032	my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1959	my $hp = $exit->stats->hp;	2033	my $hp = $exit->stats->hp;
…		…
1967	$self->goto ($slaying, $hp, $sp);	2041	$self->goto ($slaying, $hp, $sp);
1968		2042
1969	1;	2043	1;
1970	}) {	2044	}) {
1971	$self->message ("Something went wrong deep within the crossfire server. "	2045	$self->message ("Something went wrong deep within the crossfire server. "
1972	. "I'll try to bring you back to the map you were before. "	2046	. "I'll try to bring you back to the map you were before. "
1973	. "Please report this to the dungeon master!",	2047	. "Please report this to the dungeon master!",
1974	cf::NDI_UNIQUE \| cf::NDI_RED);	2048	cf::NDI_UNIQUE \| cf::NDI_RED);
1975		2049
1976	warn "ERROR in enter_exit: $@";	2050	warn "ERROR in enter_exit: $@";
1977	$self->leave_link;	2051	$self->leave_link;
1978	}	2052	}
1979	})->prio (1);	2053	})->prio (1);
…		…
1992		2066
1993	sub cf::client::send_drawinfo {	2067	sub cf::client::send_drawinfo {
1994	my ($self, $text, $flags) = @_;	2068	my ($self, $text, $flags) = @_;
1995		2069
1996	utf8::encode $text;	2070	utf8::encode $text;
1997	$self->send_packet (sprintf "drawinfo %d %s", $flags, $text);	2071	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
1998	}	2072	}
1999		2073
		2074	=item $client->ext_event ($type, %msg)
		2075
		2076	Sends an exti event to the client.
		2077
		2078	=cut
		2079
		2080	sub cf::client::ext_event($$%) {
		2081	my ($self, $type, %msg) = @_;
		2082
		2083	$msg{msgtype} = "event_$type";
		2084	$self->send_packet ("ext " . cf::to_json \%msg);
		2085	}
2000		2086
2001	=item $success = $client->query ($flags, "text", \&cb)	2087	=item $success = $client->query ($flags, "text", \&cb)
2002		2088
2003	Queues a query to the client, calling the given callback with	2089	Queues a query to the client, calling the given callback with
2004	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,	2090	the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
…		…
2101		2187
2102	# here we export the classes and methods available to script code	2188	# here we export the classes and methods available to script code
2103		2189
2104	=pod	2190	=pod
2105		2191
2106	The following fucntions and emthods are available within a safe environment:	2192	The following functions and methods are available within a safe environment:
2107		2193
2108	cf::object contr pay_amount pay_player map	2194	cf::object contr pay_amount pay_player map
2109	cf::object::player player	2195	cf::object::player player
2110	cf::player peaceful	2196	cf::player peaceful
2111	cf::map trigger	2197	cf::map trigger
…		…
2196	#############################################################################	2282	#############################################################################
2197		2283
2198	=head2 EXTENSION DATABASE SUPPORT	2284	=head2 EXTENSION DATABASE SUPPORT
2199		2285
2200	Crossfire maintains a very simple database for extension use. It can	2286	Crossfire maintains a very simple database for extension use. It can
2201	currently store anything that can be serialised using Storable, which	2287	currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2202	excludes objects.	2288	convert to/from binary).
2203		2289
2204	The parameter C<$family> should best start with the name of the extension	2290	The parameter C<$family> should best start with the name of the extension
2205	using it, it should be unique.	2291	using it, it should be unique.
2206		2292
2207	=over 4	2293	=over 4
…		…
2230	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;	2316	BDB::CREATE \| BDB::AUTO_COMMIT, 0666;
2231	cf::cleanup "db_open(db): $!" if $!;	2317	cf::cleanup "db_open(db): $!" if $!;
2232	};	2318	};
2233	cf::cleanup "db_open(db): $@" if $@;	2319	cf::cleanup "db_open(db): $@" if $@;
2234	};	2320	};
2235
2236	my $path = cf::localdir . "/database.pst";
2237	if (stat $path) {
2238	cf::sync_job {
2239	my $pst = Storable::retrieve $path;
2240
2241	cf::db_put (board => data => $pst->{board});
2242	cf::db_put (guildrules => data => $pst->{guildrules});
2243	cf::db_put (rent => balance => $pst->{rent}{balance});
2244	BDB::db_env_txn_checkpoint $DB_ENV;
2245
2246	unlink $path;
2247	};
2248	}
2249	}	2321	}
2250	}	2322	}
2251		2323
2252	sub db_get($$) {	2324	sub db_get($$) {
2253	my $key = "$_[0]/$_[1]";	2325	my $key = "$_[0]/$_[1]";
2254		2326
2255	cf::sync_job {	2327	cf::sync_job {
2256	BDB::db_get $DB, undef, $key, my $data;	2328	BDB::db_get $DB, undef, $key, my $data;
2257		2329
2258	$! ? ()	2330	$! ? ()
2259	: Compress::LZF::sthaw $data	2331	: $data
2260	}	2332	}
2261	}	2333	}
2262		2334
2263	sub db_put($$$) {	2335	sub db_put($$$) {
2264	BDB::dbreq_pri 4;	2336	BDB::dbreq_pri 4;
2265	BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };	2337	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2266	}	2338	}
		2339
		2340	=item cf::cache $id => [$paths...], $processversion => $process
		2341
		2342	Generic caching function that returns the value of the resource $id,
		2343	caching and regenerating as required.
		2344
		2345	This function can block.
		2346
		2347	=cut
		2348
		2349	sub cache {
		2350	my ($id, $src, $processversion, $process) = @_;
		2351
		2352	my $meta =
		2353	join "\x00",
		2354	$processversion,
		2355	map {
		2356	aio_stat $_
		2357	and Carp::croak "$_: $!";
		2358
		2359	($_, (stat _)[7,9])
		2360	} @$src;
		2361
		2362	my $dbmeta = db_get cache => "$id/meta";
		2363	if ($dbmeta ne $meta) {
		2364	# changed, we may need to process
		2365
		2366	my @data;
		2367	my $md5;
		2368
		2369	for (0 .. $#$src) {
		2370	0 <= aio_load $src->[$_], $data[$_]
		2371	or Carp::croak "$src->[$_]: $!";
		2372	}
		2373
		2374	# if processing is expensive, check
		2375	# checksum first
		2376	if (1) {
		2377	$md5 =
		2378	join "\x00",
		2379	$processversion,
		2380	map {
		2381	Coro::cede;
		2382	($src->[$_], Digest::MD5::md5_hex $data[$_])
		2383	} 0.. $#$src;
		2384
		2385
		2386	my $dbmd5 = db_get cache => "$id/md5";
		2387	if ($dbmd5 eq $md5) {
		2388	db_put cache => "$id/meta", $meta;
		2389
		2390	return db_get cache => "$id/data";
		2391	}
		2392	}
		2393
		2394	my $t1 = Time::HiRes::time;
		2395	my $data = $process->(\@data);
		2396	my $t2 = Time::HiRes::time;
		2397
		2398	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
		2399
		2400	db_put cache => "$id/data", $data;
		2401	db_put cache => "$id/md5" , $md5;
		2402	db_put cache => "$id/meta", $meta;
		2403
		2404	return $data;
		2405	}
		2406
		2407	db_get cache => "$id/data"
		2408	}
		2409
		2410	=item fork_call { }, $args
		2411
		2412	Executes the given code block with the given arguments in a seperate
		2413	process, returning the results. Everything must be serialisable with
		2414	Coro::Storable. May, of course, block. Note that the executed sub may
		2415	never block itself or use any form of Event handling.
		2416
		2417	=cut
		2418
		2419	sub fork_call(&@) {
		2420	my ($cb, @args) = @_;
		2421
		2422	# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
		2423	# or die "socketpair: $!";
		2424	pipe my $fh1, my $fh2
		2425	or die "pipe: $!";
		2426
		2427	if (my $pid = fork) {
		2428	close $fh2;
		2429
		2430	my $res = (Coro::Handle::unblock $fh1)->readline (undef);
		2431	$res = Coro::Storable::thaw $res;
		2432
		2433	waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
		2434
		2435	die $$res unless "ARRAY" eq ref $res;
		2436
		2437	return wantarray ? @$res : $res->[-1];
		2438	} else {
		2439	local $SIG{__WARN__};
		2440	eval {
		2441	local $SIG{__DIE__};
		2442	close $fh1;
		2443
		2444	my @res = eval { $cb->(@args) };
		2445	syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
		2446	};
		2447
		2448	warn $@ if $@;
		2449	_exit 0;
		2450	}
		2451	}
		2452
		2453
2267		2454
2268	#############################################################################	2455	#############################################################################
2269	# the server's init and main functions	2456	# the server's init and main functions
2270		2457
2271	sub init_resources {	2458	sub load_facedata($) {
2272	load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir	2459	my ($path) = @_;
		2460
		2461	warn "loading facedata from $path\n";
		2462
		2463	my $facedata;
		2464	0 < aio_load $path, $facedata
		2465	or die "$path: $!";
		2466
		2467	$facedata = Coro::Storable::thaw $facedata;
		2468
		2469	$facedata->{version} == 2
		2470	or cf::cleanup "$path: version mismatch, cannot proceed.";
		2471
		2472	{
		2473	my $faces = $facedata->{faceinfo};
		2474
		2475	while (my ($face, $info) = each %$faces) {
		2476	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
		2477	cf::face::set $idx, $info->{visibility}, $info->{magicmap};
		2478	cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
		2479	cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
		2480	Coro::cede;
		2481	}
		2482
		2483	while (my ($face, $info) = each %$faces) {
		2484	next unless $info->{smooth};
		2485	my $idx = cf::face::find $face
		2486	or next;
		2487	if (my $smooth = cf::face::find $info->{smooth}) {
		2488	cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
		2489	} else {
		2490	warn "smooth face '$info->{smooth}' not found for face '$face'";
		2491	}
		2492	Coro::cede;
		2493	}
		2494	}
		2495
		2496	{
		2497	my $anims = $facedata->{animinfo};
		2498
		2499	while (my ($anim, $info) = each %$anims) {
		2500	cf::anim::set $anim, $info->{frames}, $info->{facings};
		2501	Coro::cede;
		2502	}
		2503
		2504	cf::anim::invalidate_all; # d'oh
		2505	}
		2506
		2507	1
		2508	}
		2509
		2510	sub reload_regions {
		2511	load_resource_file "$MAPDIR/regions"
2273	or die "unable to load regions file\n";#d#	2512	or die "unable to load regions file\n";
		2513	}
		2514
		2515	sub reload_facedata {
		2516	load_facedata "$DATADIR/facedata"
		2517	or die "unable to load facedata\n";
		2518	}
		2519
		2520	sub reload_archetypes {
		2521	load_resource_file "$DATADIR/archetypes"
		2522	or die "unable to load archetypes\n";
		2523	}
		2524
		2525	sub reload_treasures {
		2526	load_resource_file "$DATADIR/treasures"
		2527	or die "unable to load treasurelists\n";
		2528	}
		2529
		2530	sub reload_resources {
		2531	warn "reloading resource files...\n";
		2532
		2533	reload_regions;
		2534	reload_facedata;
		2535	reload_archetypes;
		2536	reload_treasures;
		2537
		2538	warn "finished reloading resource files\n";
		2539	}
		2540
		2541	sub init {
		2542	reload_resources;
2274	}	2543	}
2275		2544
2276	sub cfg_load {	2545	sub cfg_load {
2277	open my $fh, "<:utf8", cf::confdir . "/config"	2546	open my $fh, "<:utf8", "$CONFDIR/config"
2278	or return;	2547	or return;
2279		2548
2280	local $/;	2549	local $/;
2281	*CFG = YAML::Syck::Load <$fh>;	2550	*CFG = YAML::Syck::Load <$fh>;
2282		2551
…		…
2290	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	2559	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2291	and die "WARNING: m(un)lockall failed: $!\n";	2560	and die "WARNING: m(un)lockall failed: $!\n";
2292	};	2561	};
2293	warn $@ if $@;	2562	warn $@ if $@;
2294	}	2563	}
2295	}
2296
2297	sub init {
2298	init_resources;
2299	}	2564	}
2300		2565
2301	sub main {	2566	sub main {
2302	# we must not ever block the main coroutine	2567	# we must not ever block the main coroutine
2303	local $Coro::idle = sub {	2568	local $Coro::idle = sub {
…		…
2371		2636
2372	warn Carp::longmess "post_cleanup backtrace"	2637	warn Carp::longmess "post_cleanup backtrace"
2373	if $make_core;	2638	if $make_core;
2374	}	2639	}
2375		2640
2376	sub reload() {	2641	sub do_reload_perl() {
2377	# can/must only be called in main	2642	# can/must only be called in main
2378	if ($Coro::current != $Coro::main) {	2643	if ($Coro::current != $Coro::main) {
2379	warn "can only reload from main coroutine";	2644	warn "can only reload from main coroutine";
2380	return;	2645	return;
2381	}	2646	}
…		…
2406	Coro::cede;	2671	Coro::cede;
2407	last unless IO::AIO::nreqs \|\| BDB::nreqs;	2672	last unless IO::AIO::nreqs \|\| BDB::nreqs;
2408	warn "iterate...";	2673	warn "iterate...";
2409	}	2674	}
2410		2675
		2676	++$RELOAD;
		2677
2411	warn "cancelling all extension coros";	2678	warn "cancelling all extension coros";
2412	$_->cancel for values %EXT_CORO;	2679	$_->cancel for values %EXT_CORO;
2413	%EXT_CORO = ();	2680	%EXT_CORO = ();
2414		2681
2415	warn "removing commands";	2682	warn "removing commands";
…		…
2454	Symbol::delete_package "safe::$_"	2721	Symbol::delete_package "safe::$_"
2455	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	2722	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2456		2723
2457	warn "unloading cf.pm \"a bit\"";	2724	warn "unloading cf.pm \"a bit\"";
2458	delete $INC{"cf.pm"};	2725	delete $INC{"cf.pm"};
		2726	delete $INC{"cf/pod.pm"};
2459		2727
2460	# don't, removes xs symbols, too,	2728	# don't, removes xs symbols, too,
2461	# and global variables created in xs	2729	# and global variables created in xs
2462	#Symbol::delete_package __PACKAGE__;	2730	#Symbol::delete_package __PACKAGE__;
2463		2731
…		…
2478	warn "reattaching attachments to maps";	2746	warn "reattaching attachments to maps";
2479	reattach $_ for values %MAP;	2747	reattach $_ for values %MAP;
2480	warn "reattaching attachments to players";	2748	warn "reattaching attachments to players";
2481	reattach $_ for values %PLAYER;	2749	reattach $_ for values %PLAYER;
2482		2750
2483	warn "loading reloadable resources";
2484	init_resources;
2485
2486	warn "leaving sync_job";	2751	warn "leaving sync_job";
2487		2752
2488	1	2753	1
2489	} or do {	2754	} or do {
2490	warn $@;	2755	warn $@;
…		…
2495	warn "reloaded";	2760	warn "reloaded";
2496	};	2761	};
2497		2762
2498	our $RELOAD_WATCHER; # used only during reload	2763	our $RELOAD_WATCHER; # used only during reload
2499		2764
		2765	sub reload_perl() {
		2766	# doing reload synchronously and two reloads happen back-to-back,
		2767	# coro crashes during coro_state_free->destroy here.
		2768
		2769	$RELOAD_WATCHER \|\|= Event->timer (
		2770	reentrant => 0,
		2771	after => 0,
		2772	data => WF_AUTOCANCEL,
		2773	cb => sub {
		2774	do_reload_perl;
		2775	undef $RELOAD_WATCHER;
		2776	},
		2777	);
		2778	}
		2779
2500	register_command "reload" => sub {	2780	register_command "reload" => sub {
2501	my ($who, $arg) = @_;	2781	my ($who, $arg) = @_;
2502		2782
2503	if ($who->flag (FLAG_WIZ)) {	2783	if ($who->flag (FLAG_WIZ)) {
2504	$who->message ("reloading server.");	2784	$who->message ("reloading server.");
2505		2785	async { reload_perl };
2506	# doing reload synchronously and two reloads happen back-to-back,
2507	# coro crashes during coro_state_free->destroy here.
2508
2509	$RELOAD_WATCHER \|\|= Event->timer (
2510	reentrant => 0,
2511	after => 0,
2512	data => WF_AUTOCANCEL,
2513	cb => sub {
2514	reload;
2515	undef $RELOAD_WATCHER;
2516	},
2517	);
2518	}	2786	}
2519	};	2787	};
2520		2788
2521	unshift @INC, $LIBDIR;	2789	unshift @INC, $LIBDIR;
2522		2790
2523	my $bug_warning = 0;	2791	my $bug_warning = 0;
		2792
		2793	our @WAIT_FOR_TICK;
		2794	our @WAIT_FOR_TICK_BEGIN;
		2795
		2796	sub wait_for_tick {
		2797	return unless $TICK_WATCHER->is_active;
		2798	return if $Coro::current == $Coro::main;
		2799
		2800	my $signal = new Coro::Signal;
		2801	push @WAIT_FOR_TICK, $signal;
		2802	$signal->wait;
		2803	}
		2804
		2805	sub wait_for_tick_begin {
		2806	return unless $TICK_WATCHER->is_active;
		2807	return if $Coro::current == $Coro::main;
		2808
		2809	my $signal = new Coro::Signal;
		2810	push @WAIT_FOR_TICK_BEGIN, $signal;
		2811	$signal->wait;
		2812	}
2524		2813
2525	$TICK_WATCHER = Event->timer (	2814	$TICK_WATCHER = Event->timer (
2526	reentrant => 0,	2815	reentrant => 0,
2527	parked => 1,	2816	parked => 1,
2528	prio => 0,	2817	prio => 0,
…		…
2536	}	2825	}
2537		2826
2538	$NOW = Event::time;	2827	$NOW = Event::time;
2539		2828
2540	cf::server_tick; # one server iteration	2829	cf::server_tick; # one server iteration
		2830
2541	$RUNTIME += $TICK;	2831	$RUNTIME += $TICK;
2542	$NEXT_TICK += $TICK;	2832	$NEXT_TICK += $TICK;
2543		2833
2544	if ($NOW >= $NEXT_RUNTIME_WRITE) {	2834	if ($NOW >= $NEXT_RUNTIME_WRITE) {
2545	$NEXT_RUNTIME_WRITE = $NOW + 10;	2835	$NEXT_RUNTIME_WRITE = $NOW + 10;
…		…
2547	write_runtime	2837	write_runtime
2548	or warn "ERROR: unable to write runtime file: $!";	2838	or warn "ERROR: unable to write runtime file: $!";
2549	};	2839	};
2550	}	2840	}
2551		2841
2552	$WAIT_FOR_TICK->broadcast;
2553	$WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2554
2555	# my $AFTER = Event::time;	2842	# my $AFTER = Event::time;
2556	# warn $AFTER - $NOW;#d#	2843	# warn $AFTER - $NOW;#d#
2557		2844
2558	# if we are delayed by four ticks or more, skip them all	2845	# if we are delayed by four ticks or more, skip them all
2559	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;	2846	$NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2560		2847
2561	$TICK_WATCHER->at ($NEXT_TICK);	2848	$TICK_WATCHER->at ($NEXT_TICK);
2562	$TICK_WATCHER->start;	2849	$TICK_WATCHER->start;
		2850
		2851	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
		2852	$sig->send;
		2853	}
		2854	while (my $sig = shift @WAIT_FOR_TICK) {
		2855	$sig->send;
		2856	}
		2857
		2858	_post_tick;
2563	},	2859	},
2564	);	2860	);
2565		2861
2566	{	2862	{
2567	BDB::max_poll_time $TICK * 0.1;	2863	BDB::max_poll_time $TICK * 0.1;
…		…
2595		2891
2596	cf::sync_job {	2892	cf::sync_job {
2597	eval {	2893	eval {
2598	BDB::db_env_open	2894	BDB::db_env_open
2599	$DB_ENV,	2895	$DB_ENV,
2600	$BDB_ENV_DIR,	2896	$BDBDIR,
2601	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN	2897	BDB::INIT_LOCK \| BDB::INIT_LOG \| BDB::INIT_MPOOL \| BDB::INIT_TXN
2602	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,	2898	\| BDB::RECOVER \| BDB::REGISTER \| BDB::USE_ENVIRON \| BDB::CREATE,
2603	0666;	2899	0666;
2604		2900
2605	cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;	2901	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2606		2902
2607	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);	2903	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT \| BDB::TXN_NOSYNC, 1);
2608	$DB_ENV->set_lk_detect;	2904	$DB_ENV->set_lk_detect;
2609	};	2905	};
2610		2906
…		…
2626	prio => 6,	2922	prio => 6,
2627	cb => \&IO::AIO::poll_cb,	2923	cb => \&IO::AIO::poll_cb,
2628	);	2924	);
2629	}	2925	}
2630		2926
		2927	# load additional modules
		2928	use cf::pod;
		2929
2631	END { cf::emergency_save }	2930	END { cf::emergency_save }
2632		2931
2633	1	2932	1
2634		2933

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.222 by root, Tue Mar 6 03:06:00 2007 UTC vs. Revision 1.254 by root, Thu Apr 19 11:12:45 2007 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.222 by root, Tue Mar 6 03:06:00 2007 UTC vs.
Revision 1.254 by root, Thu Apr 19 11:12:45 2007 UTC