ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.71 by root, Sun Oct 1 10:59:30 2006 UTC vs.
Revision 1.102 by root, Wed Dec 27 15:20:54 2006 UTC

1package cf; 1package cf;
2
3use utf8;
4use strict;
2 5
3use Symbol; 6use Symbol;
4use List::Util; 7use List::Util;
5use Storable; 8use Storable;
6use Opcode; 9use Opcode;
7use Safe; 10use Safe;
8use Safe::Hole; 11use Safe::Hole;
9 12
13use Coro;
14use Coro::Event;
15use Coro::Timer;
16use Coro::Signal;
17use Coro::Semaphore;
18
19use IO::AIO 2.3;
20use YAML::Syck ();
10use Time::HiRes; 21use Time::HiRes;
11use Event; 22
12$Event::Eval = 1; # no idea why this is required, but it is 23use Event; $Event::Eval = 1; # no idea why this is required, but it is
13 24
14use strict; 25# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
26$YAML::Syck::ImplicitUnicode = 1;
15 27
16_init_vars; 28$Coro::main->prio (Coro::PRIO_MIN);
17 29
30sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
31
18our %COMMAND = (); 32our %COMMAND = ();
33our %COMMAND_TIME = ();
34our %EXTCMD = ();
35
19our @EVENT; 36our @EVENT;
20our $LIBDIR = maps_directory "perl"; 37our $LIBDIR = datadir . "/ext";
21 38
22our $TICK = MAX_TIME * 1e-6; 39our $TICK = MAX_TIME * 1e-6;
23our $TICK_WATCHER; 40our $TICK_WATCHER;
24our $NEXT_TICK; 41our $NEXT_TICK;
25 42
26our %CFG; 43our %CFG;
27 44
45our $UPTIME; $UPTIME ||= time;
46
28############################################################################# 47#############################################################################
29 48
30=head2 GLOBAL VARIABLES 49=head2 GLOBAL VARIABLES
31 50
32=over 4 51=over 4
52
53=item $cf::UPTIME
54
55The timestamp of the server start (so not actually an uptime).
33 56
34=item $cf::LIBDIR 57=item $cf::LIBDIR
35 58
36The perl library directory, where extensions and cf-specific modules can 59The perl library directory, where extensions and cf-specific modules can
37be found. It will be added to C<@INC> automatically. 60be found. It will be added to C<@INC> automatically.
58 print STDERR "cfperl: $msg"; 81 print STDERR "cfperl: $msg";
59 LOG llevError, "cfperl: $msg"; 82 LOG llevError, "cfperl: $msg";
60 }; 83 };
61} 84}
62 85
86@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
87@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
88@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
89@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
90@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
63@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 91@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
64 92
65# we bless all objects into (empty) derived classes to force a method lookup 93# we bless all objects into (empty) derived classes to force a method lookup
66# within the Safe compartment. 94# within the Safe compartment.
67for my $pkg (qw(cf::object cf::object::player cf::player cf::map cf::party cf::region cf::arch cf::living)) { 95for my $pkg (qw(
96 cf::global cf::attachable
97 cf::object cf::object::player
98 cf::client cf::player
99 cf::arch cf::living
100 cf::map cf::party cf::region
101)) {
68 no strict 'refs'; 102 no strict 'refs';
69 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 103 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
70} 104}
71 105
72$Event::DIED = sub { 106$Event::DIED = sub {
74}; 108};
75 109
76my %ext_pkg; 110my %ext_pkg;
77my @exts; 111my @exts;
78my @hook; 112my @hook;
79my %command;
80my %extcmd;
81 113
82=head2 UTILITY FUNCTIONS 114=head2 UTILITY FUNCTIONS
83 115
84=over 4 116=over 4
85 117
113 145
114=cut 146=cut
115 147
116############################################################################# 148#############################################################################
117 149
118=head2 EVENTS AND OBJECT ATTACHMENTS 150=head2 ATTACHABLE OBJECTS
151
152Many objects in crossfire are so-called attachable objects. That means you can
153attach callbacks/event handlers (a collection of which is called an "attachment")
154to it. All such attachable objects support the following methods.
155
156In the following description, CLASS can be any of C<global>, C<object>
157C<player>, C<client> or C<map> (i.e. the attachable objects in
158crossfire+).
119 159
120=over 4 160=over 4
121 161
122=item $object->attach ($attachment, key => $value...)
123
124=item $object->detach ($attachment)
125
126Attach/detach a pre-registered attachment to an object.
127
128=item $player->attach ($attachment, key => $value...)
129
130=item $player->detach ($attachment)
131
132Attach/detach a pre-registered attachment to a player.
133
134=item $map->attach ($attachment, key => $value...) 162=item $attachable->attach ($attachment, key => $value...)
135 163
136=item $map->detach ($attachment) 164=item $attachable->detach ($attachment)
137 165
138Attach/detach a pre-registered attachment to a map. 166Attach/detach a pre-registered attachment to a specific object and give it
167the specified key/value pairs as arguments.
139 168
140=item $bool = $object->attached ($name) 169Example, attach a minesweeper attachment to the given object, making it a
17010x10 minesweeper game:
141 171
142=item $bool = $player->attached ($name) 172 $obj->attach (minesweeper => width => 10, height => 10);
143 173
144=item $bool = $map->attached ($name) 174=item $bool = $attachable->attached ($name)
145 175
146Checks wether the named attachment is currently attached to the object. 176Checks wether the named attachment is currently attached to the object.
147 177
148=item cf::attach_global ... 178=item cf::CLASS->attach ...
149 179
150Attach handlers for global events. 180=item cf::CLASS->detach ...
151 181
152This and all following C<attach_*>-functions expect any number of the 182Define an anonymous attachment and attach it to all objects of the given
153following handler/hook descriptions: 183CLASS. See the next function for an explanation of its arguments.
184
185You can attach to global events by using the C<cf::global> class.
186
187Example, log all player logins:
188
189 cf::player->attach (
190 on_login => sub {
191 my ($pl) = @_;
192 ...
193 },
194 );
195
196Example, attach to the jeweler skill:
197
198 cf::object->attach (
199 type => cf::SKILL,
200 subtype => cf::SK_JEWELER,
201 on_use_skill => sub {
202 my ($sk, $ob, $part, $dir, $msg) = @_;
203 ...
204 },
205 );
206
207=item cf::CLASS::attachment $name, ...
208
209Register an attachment by C<$name> through which attachable objects of the
210given CLASS can refer to this attachment.
211
212Some classes such as crossfire maps and objects can specify attachments
213that are attached at load/instantiate time, thus the need for a name.
214
215These calls expect any number of the following handler/hook descriptions:
154 216
155=over 4 217=over 4
156 218
157=item prio => $number 219=item prio => $number
158 220
160by another C<prio> setting). Lower priority handlers get executed 222by another C<prio> setting). Lower priority handlers get executed
161earlier. The default priority is C<0>, and many built-in handlers are 223earlier. The default priority is C<0>, and many built-in handlers are
162registered at priority C<-1000>, so lower priorities should not be used 224registered at priority C<-1000>, so lower priorities should not be used
163unless you know what you are doing. 225unless you know what you are doing.
164 226
227=item type => $type
228
229(Only for C<< cf::object->attach >> calls), limits the attachment to the
230given type of objects only (the additional parameter C<subtype> can be
231used to further limit to the given subtype).
232
165=item on_I<event> => \&cb 233=item on_I<event> => \&cb
166 234
167Call the given code reference whenever the named event happens (event is 235Call the given code reference whenever the named event happens (event is
168something like C<instantiate>, C<apply>, C<use_skill> and so on, and which 236something like C<instantiate>, C<apply>, C<use_skill> and so on, and which
169handlers are recognised generally depends on the type of object these 237handlers are recognised generally depends on the type of object these
178package and register them. Only handlers for eevents supported by the 246package and register them. Only handlers for eevents supported by the
179object/class are recognised. 247object/class are recognised.
180 248
181=back 249=back
182 250
183=item cf::attach_to_type $object_type, $subtype, ... 251Example, define an attachment called "sockpuppet" that calls the given
252event handler when a monster attacks:
184 253
185Attach handlers for a specific object type (e.g. TRANSPORT) and 254 cf::object::attachment sockpuppet =>
186subtype. If C<$subtype> is zero or undef, matches all objects of the given 255 on_skill_attack => sub {
187type. 256 my ($self, $victim) = @_;
188 257 ...
189=item cf::attach_to_objects ...
190
191Attach handlers to all objects. Do not use this except for debugging or
192very rare events, as handlers are (obviously) called for I<all> objects in
193the game.
194
195=item cf::attach_to_players ...
196
197Attach handlers to all players.
198
199=item cf::attach_to_maps ...
200
201Attach handlers to all maps.
202
203=item cf:register_attachment $name, ...
204
205Register an attachment by name through which objects can refer to this
206attachment.
207
208=item cf:register_player_attachment $name, ...
209
210Register an attachment by name through which players can refer to this
211attachment.
212
213=item cf:register_map_attachment $name, ...
214
215Register an attachment by name through which maps can refer to this
216attachment.
217
218=cut
219
220# the following variables are defined in .xs and must not be re-created
221our @CB_GLOBAL = (); # registry for all global events
222our @CB_OBJECT = (); # all objects (should not be used except in emergency)
223our @CB_PLAYER = ();
224our @CB_TYPE = (); # registry for type (cf-object class) based events
225our @CB_MAP = ();
226
227my %attachment;
228
229sub _attach_cb($\%$$$) {
230 my ($registry, $undo, $event, $prio, $cb) = @_;
231
232 use sort 'stable';
233
234 $cb = [$prio, $cb];
235
236 @{$registry->[$event]} = sort
237 { $a->[0] cmp $b->[0] }
238 @{$registry->[$event] || []}, $cb;
239
240 push @{$undo->{cb}}, [$event, $cb];
241}
242
243# attach handles attaching event callbacks
244# the only thing the caller has to do is pass the correct
245# registry (== where the callback attaches to).
246sub _attach(\@$@) {
247 my ($registry, $klass, @arg) = @_;
248
249 my $prio = 0;
250
251 my %undo = (
252 registry => $registry,
253 cb => [],
254 );
255
256 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
257
258 while (@arg) {
259 my $type = shift @arg;
260
261 if ($type eq "prio") {
262 $prio = shift @arg;
263
264 } elsif ($type eq "package") {
265 my $pkg = shift @arg;
266
267 while (my ($name, $id) = each %cb_id) {
268 if (my $cb = $pkg->can ($name)) {
269 _attach_cb $registry, %undo, $id, $prio, $cb;
270 }
271 } 258 }
272
273 } elsif (exists $cb_id{$type}) {
274 _attach_cb $registry, %undo, $cb_id{$type}, $prio, shift @arg;
275
276 } elsif (ref $type) {
277 warn "attaching objects not supported, ignoring.\n";
278
279 } else {
280 shift @arg;
281 warn "attach argument '$type' not supported, ignoring.\n";
282 }
283 }
284
285 \%undo
286}
287
288sub _attach_attachment {
289 my ($obj, $name, %arg) = @_;
290
291 return if exists $obj->{_attachment}{$name};
292
293 my $res;
294
295 if (my $attach = $attachment{$name}) {
296 my $registry = $obj->registry;
297
298 for (@$attach) {
299 my ($klass, @attach) = @$_;
300 $res = _attach @$registry, $klass, @attach;
301 }
302
303 $obj->{$name} = \%arg;
304 } else {
305 warn "object uses attachment '$name' that is not available, postponing.\n";
306 }
307
308 $obj->{_attachment}{$name} = undef;
309
310 $res->{attachment} = $name;
311 $res
312}
313
314*cf::object::attach =
315*cf::player::attach =
316*cf::map::attach = sub {
317 my ($obj, $name, %arg) = @_;
318
319 _attach_attachment $obj, $name, %arg;
320};
321
322# all those should be optimised
323*cf::object::detach =
324*cf::player::detach =
325*cf::map::detach = sub {
326 my ($obj, $name) = @_;
327
328 delete $obj->{_attachment}{$name};
329 reattach ($obj);
330};
331
332*cf::object::attached =
333*cf::player::attached =
334*cf::map::attached = sub {
335 my ($obj, $name) = @_;
336
337 exists $obj->{_attachment}{$name}
338};
339
340sub attach_global {
341 _attach @CB_GLOBAL, KLASS_GLOBAL, @_
342}
343
344sub attach_to_type {
345 my $type = shift;
346 my $subtype = shift;
347
348 _attach @{$CB_TYPE[$type + $subtype * NUM_SUBTYPES]}, KLASS_OBJECT, @_
349}
350
351sub attach_to_objects {
352 _attach @CB_OBJECT, KLASS_OBJECT, @_
353}
354
355sub attach_to_players {
356 _attach @CB_PLAYER, KLASS_PLAYER, @_
357}
358
359sub attach_to_maps {
360 _attach @CB_MAP, KLASS_MAP, @_
361}
362
363sub register_attachment {
364 my $name = shift;
365
366 $attachment{$name} = [[KLASS_OBJECT, @_]];
367}
368
369sub register_player_attachment {
370 my $name = shift;
371
372 $attachment{$name} = [[KLASS_PLAYER, @_]];
373}
374
375sub register_map_attachment {
376 my $name = shift;
377
378 $attachment{$name} = [[KLASS_MAP, @_]];
379}
380
381our $override;
382our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
383
384sub override {
385 $override = 1;
386 @invoke_results = ();
387}
388
389sub do_invoke {
390 my $event = shift;
391 my $callbacks = shift;
392
393 @invoke_results = ();
394
395 local $override;
396
397 for (@$callbacks) {
398 eval { &{$_->[1]} };
399
400 if ($@) {
401 warn "$@";
402 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
403 override;
404 }
405
406 return 1 if $override;
407 }
408
409 0 259 }
410}
411 260
412=item $bool = cf::invoke EVENT_GLOBAL_XXX, ... 261=item $attachable->valid
413
414=item $bool = $object->invoke (EVENT_OBJECT_XXX, ...)
415
416=item $bool = $player->invoke (EVENT_PLAYER_XXX, ...)
417
418=item $bool = $map->invoke (EVENT_MAP_XXX, ...)
419
420Generate a global/object/player/map-specific event with the given arguments.
421
422This API is preliminary (most likely, the EVENT_KLASS_xxx prefix will be
423removed in future versions), and there is no public API to access override
424results (if you must, access C<@cf::invoke_results> directly).
425
426=back
427
428=cut
429
430#############################################################################
431
432=head2 METHODS VALID FOR ALL CORE OBJECTS
433
434=over 4
435
436=item $object->valid, $player->valid, $map->valid
437 262
438Just because you have a perl object does not mean that the corresponding 263Just because you have a perl object does not mean that the corresponding
439C-level object still exists. If you try to access an object that has no 264C-level object still exists. If you try to access an object that has no
440valid C counterpart anymore you get an exception at runtime. This method 265valid C counterpart anymore you get an exception at runtime. This method
441can be used to test for existence of the C object part without causing an 266can be used to test for existence of the C object part without causing an
442exception. 267exception.
443 268
269=cut
270
271# the following variables are defined in .xs and must not be re-created
272our @CB_GLOBAL = (); # registry for all global events
273our @CB_ATTACHABLE = (); # registry for all attachables
274our @CB_OBJECT = (); # all objects (should not be used except in emergency)
275our @CB_PLAYER = ();
276our @CB_CLIENT = ();
277our @CB_TYPE = (); # registry for type (cf-object class) based events
278our @CB_MAP = ();
279
280my %attachment;
281
282sub _attach_cb($$$$) {
283 my ($registry, $event, $prio, $cb) = @_;
284
285 use sort 'stable';
286
287 $cb = [$prio, $cb];
288
289 @{$registry->[$event]} = sort
290 { $a->[0] cmp $b->[0] }
291 @{$registry->[$event] || []}, $cb;
292}
293
294# hack
295my %attachable_klass = map +($_ => 1), KLASS_OBJECT, KLASS_CLIENT, KLASS_PLAYER, KLASS_MAP;
296
297# attach handles attaching event callbacks
298# the only thing the caller has to do is pass the correct
299# registry (== where the callback attaches to).
300sub _attach {
301 my ($registry, $klass, @arg) = @_;
302
303 my $object_type;
304 my $prio = 0;
305 my %cb_id = map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == $klass, 0 .. $#EVENT;
306
307 #TODO: get rid of this hack
308 if ($attachable_klass{$klass}) {
309 %cb_id = (%cb_id, map +("on_" . lc $EVENT[$_][0], $_) , grep $EVENT[$_][1] == KLASS_ATTACHABLE, 0 .. $#EVENT);
310 }
311
312 while (@arg) {
313 my $type = shift @arg;
314
315 if ($type eq "prio") {
316 $prio = shift @arg;
317
318 } elsif ($type eq "type") {
319 $object_type = shift @arg;
320 $registry = $CB_TYPE[$object_type] ||= [];
321
322 } elsif ($type eq "subtype") {
323 defined $object_type or Carp::croak "subtype specified without type";
324 my $object_subtype = shift @arg;
325 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= [];
326
327 } elsif ($type eq "package") {
328 my $pkg = shift @arg;
329
330 while (my ($name, $id) = each %cb_id) {
331 if (my $cb = $pkg->can ($name)) {
332 _attach_cb $registry, $id, $prio, $cb;
333 }
334 }
335
336 } elsif (exists $cb_id{$type}) {
337 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
338
339 } elsif (ref $type) {
340 warn "attaching objects not supported, ignoring.\n";
341
342 } else {
343 shift @arg;
344 warn "attach argument '$type' not supported, ignoring.\n";
345 }
346 }
347}
348
349sub _object_attach {
350 my ($obj, $name, %arg) = @_;
351
352 return if exists $obj->{_attachment}{$name};
353
354 if (my $attach = $attachment{$name}) {
355 my $registry = $obj->registry;
356
357 for (@$attach) {
358 my ($klass, @attach) = @$_;
359 _attach $registry, $klass, @attach;
360 }
361
362 $obj->{$name} = \%arg;
363 } else {
364 warn "object uses attachment '$name' that is not available, postponing.\n";
365 }
366
367 $obj->{_attachment}{$name} = undef;
368}
369
370sub cf::attachable::attach {
371 if (ref $_[0]) {
372 _object_attach @_;
373 } else {
374 _attach shift->_attach_registry, @_;
375 }
376};
377
378# all those should be optimised
379sub cf::attachable::detach {
380 my ($obj, $name) = @_;
381
382 if (ref $obj) {
383 delete $obj->{_attachment}{$name};
384 reattach ($obj);
385 } else {
386 Carp::croak "cannot, currently, detach class attachments";
387 }
388};
389
390sub cf::attachable::attached {
391 my ($obj, $name) = @_;
392
393 exists $obj->{_attachment}{$name}
394}
395
396for my $klass (qw(ATTACHABLE GLOBAL OBJECT PLAYER CLIENT MAP)) {
397 eval "#line " . __LINE__ . " 'cf.pm'
398 sub cf::\L$klass\E::_attach_registry {
399 (\\\@CB_$klass, KLASS_$klass)
400 }
401
402 sub cf::\L$klass\E::attachment {
403 my \$name = shift;
404
405 \$attachment{\$name} = [[KLASS_$klass, \@_]];
406 }
407 ";
408 die if $@;
409}
410
411our $override;
412our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
413
414sub override {
415 $override = 1;
416 @invoke_results = ();
417}
418
419sub do_invoke {
420 my $event = shift;
421 my $callbacks = shift;
422
423 @invoke_results = ();
424
425 local $override;
426
427 for (@$callbacks) {
428 eval { &{$_->[1]} };
429
430 if ($@) {
431 warn "$@";
432 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
433 override;
434 }
435
436 return 1 if $override;
437 }
438
439 0
440}
441
442=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...)
443
444=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
445
446Generate an object-specific event with the given arguments.
447
448This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
449removed in future versions), and there is no public API to access override
450results (if you must, access C<@cf::invoke_results> directly).
451
444=back 452=back
445 453
446=cut 454=cut
447
448*cf::object::valid =
449*cf::player::valid =
450*cf::map::valid = \&cf::_valid;
451 455
452############################################################################# 456#############################################################################
453# object support 457# object support
454 458
455sub instantiate {
456 my ($obj, $data) = @_;
457
458 $data = from_json $data;
459
460 for (@$data) {
461 my ($name, $args) = @$_;
462
463 $obj->attach ($name, %{$args || {} });
464 }
465}
466
467# basically do the same as instantiate, without calling instantiate
468sub reattach { 459sub reattach {
460 # basically do the same as instantiate, without calling instantiate
469 my ($obj) = @_; 461 my ($obj) = @_;
462
470 my $registry = $obj->registry; 463 my $registry = $obj->registry;
471 464
472 @$registry = (); 465 @$registry = ();
473 466
474 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} }; 467 delete $obj->{_attachment} unless scalar keys %{ $obj->{_attachment} || {} };
475 468
476 for my $name (keys %{ $obj->{_attachment} || {} }) { 469 for my $name (keys %{ $obj->{_attachment} || {} }) {
477 if (my $attach = $attachment{$name}) { 470 if (my $attach = $attachment{$name}) {
478 for (@$attach) { 471 for (@$attach) {
479 my ($klass, @attach) = @$_; 472 my ($klass, @attach) = @$_;
480 _attach @$registry, $klass, @attach; 473 _attach $registry, $klass, @attach;
481 } 474 }
482 } else { 475 } else {
483 warn "object uses attachment '$name' that is not available, postponing.\n"; 476 warn "object uses attachment '$name' that is not available, postponing.\n";
484 } 477 }
485 } 478 }
486} 479}
480
481cf::attachable->attach (
482 prio => -1000000,
483 on_instantiate => sub {
484 my ($obj, $data) = @_;
485
486 $data = from_json $data;
487
488 for (@$data) {
489 my ($name, $args) = @$_;
490
491 $obj->attach ($name, %{$args || {} });
492 }
493 },
494 on_reattach => \&reattach,
495 on_clone => sub {
496 my ($src, $dst) = @_;
497
498 @{$dst->registry} = @{$src->registry};
499
500 %$dst = %$src;
501
502 %{$dst->{_attachment}} = %{$src->{_attachment}}
503 if exists $src->{_attachment};
504 },
505);
487 506
488sub object_freezer_save { 507sub object_freezer_save {
489 my ($filename, $rdata, $objs) = @_; 508 my ($filename, $rdata, $objs) = @_;
490 509
491 if (length $$rdata) { 510 if (length $$rdata) {
514 unlink $filename; 533 unlink $filename;
515 unlink "$filename.pst"; 534 unlink "$filename.pst";
516 } 535 }
517} 536}
518 537
538sub object_freezer_as_string {
539 my ($rdata, $objs) = @_;
540
541 use Data::Dumper;
542
543 $$rdata . Dumper $objs
544}
545
519sub object_thawer_load { 546sub object_thawer_load {
520 my ($filename) = @_; 547 my ($filename) = @_;
521 548
522 local $/; 549 local $/;
523 550
533 } 560 }
534 561
535 () 562 ()
536} 563}
537 564
538attach_to_objects
539 prio => -1000000,
540 on_clone => sub {
541 my ($src, $dst) = @_;
542
543 @{$dst->registry} = @{$src->registry};
544
545 %$dst = %$src;
546
547 %{$dst->{_attachment}} = %{$src->{_attachment}}
548 if exists $src->{_attachment};
549 },
550;
551
552############################################################################# 565#############################################################################
553# old plug-in events 566# command handling &c
554 567
555sub inject_event { 568=item cf::register_command $name => \&callback($ob,$args);
556 my $extension = shift;
557 my $event_code = shift;
558 569
559 my $cb = $hook[$event_code]{$extension} 570Register a callback for execution when the client sends the user command
560 or return; 571$name.
561 572
562 &$cb 573=cut
563}
564
565sub inject_global_event {
566 my $event = shift;
567
568 my $cb = $hook[$event]
569 or return;
570
571 List::Util::max map &$_, values %$cb
572}
573
574sub inject_command {
575 my ($name, $obj, $params) = @_;
576
577 for my $cmd (@{ $command{$name} }) {
578 $cmd->[1]->($obj, $params);
579 }
580
581 -1
582}
583 574
584sub register_command { 575sub register_command {
585 my ($name, $time, $cb) = @_; 576 my ($name, $cb) = @_;
586 577
587 my $caller = caller; 578 my $caller = caller;
588 #warn "registering command '$name/$time' to '$caller'"; 579 #warn "registering command '$name/$time' to '$caller'";
589 580
590 push @{ $command{$name} }, [$time, $cb, $caller]; 581 push @{ $COMMAND{$name} }, [$caller, $cb];
591 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @{ $command{$name} };
592} 582}
583
584=item cf::register_extcmd $name => \&callback($pl,$packet);
585
586Register a callbackf ro execution when the client sends an extcmd packet.
587
588If the callback returns something, it is sent back as if reply was being
589called.
590
591=cut
593 592
594sub register_extcmd { 593sub register_extcmd {
595 my ($name, $cb) = @_; 594 my ($name, $cb) = @_;
596 595
597 my $caller = caller; 596 my $caller = caller;
598 #warn "registering extcmd '$name' to '$caller'"; 597 #warn "registering extcmd '$name' to '$caller'";
599 598
600 $extcmd{$name} = [$cb, $caller]; 599 $EXTCMD{$name} = [$cb, $caller];
601} 600}
601
602cf::player->attach (
603 on_command => sub {
604 my ($pl, $name, $params) = @_;
605
606 my $cb = $COMMAND{$name}
607 or return;
608
609 for my $cmd (@$cb) {
610 $cmd->[1]->($pl->ob, $params);
611 }
612
613 cf::override;
614 },
615 on_extcmd => sub {
616 my ($pl, $buf) = @_;
617
618 my $msg = eval { from_json $buf };
619
620 if (ref $msg) {
621 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
622 if (my %reply = $cb->[0]->($pl, $msg)) {
623 $pl->ext_reply ($msg->{msgid}, %reply);
624 }
625 }
626 } else {
627 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
628 }
629
630 cf::override;
631 },
632);
602 633
603sub register { 634sub register {
604 my ($base, $pkg) = @_; 635 my ($base, $pkg) = @_;
605 636
606 #TODO 637 #TODO
625 . "#line 1 \"$path\"\n{\n" 656 . "#line 1 \"$path\"\n{\n"
626 . (do { local $/; <$fh> }) 657 . (do { local $/; <$fh> })
627 . "\n};\n1"; 658 . "\n};\n1";
628 659
629 eval $source 660 eval $source
630 or die "$path: $@"; 661 or die $@ ? "$path: $@\n"
662 : "extension disabled.\n";
631 663
632 push @exts, $pkg; 664 push @exts, $pkg;
633 $ext_pkg{$base} = $pkg; 665 $ext_pkg{$base} = $pkg;
634 666
635# no strict 'refs'; 667# no strict 'refs';
648# for my $idx (0 .. $#PLUGIN_EVENT) { 680# for my $idx (0 .. $#PLUGIN_EVENT) {
649# delete $hook[$idx]{$pkg}; 681# delete $hook[$idx]{$pkg};
650# } 682# }
651 683
652 # remove commands 684 # remove commands
653 for my $name (keys %command) { 685 for my $name (keys %COMMAND) {
654 my @cb = grep $_->[2] ne $pkg, @{ $command{$name} }; 686 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
655 687
656 if (@cb) { 688 if (@cb) {
657 $command{$name} = \@cb; 689 $COMMAND{$name} = \@cb;
658 $COMMAND{"$name\000"} = List::Util::max map $_->[0], @cb;
659 } else { 690 } else {
660 delete $command{$name};
661 delete $COMMAND{"$name\000"}; 691 delete $COMMAND{$name};
662 } 692 }
663 } 693 }
664 694
665 # remove extcmds 695 # remove extcmds
666 for my $name (grep $extcmd{$_}[1] eq $pkg, keys %extcmd) { 696 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
667 delete $extcmd{$name}; 697 delete $EXTCMD{$name};
668 } 698 }
669 699
670 if (my $cb = $pkg->can ("unload")) { 700 if (my $cb = $pkg->can ("unload")) {
671 eval { 701 eval {
672 $cb->($pkg); 702 $cb->($pkg);
676 706
677 Symbol::delete_package $pkg; 707 Symbol::delete_package $pkg;
678} 708}
679 709
680sub load_extensions { 710sub load_extensions {
681 my $LIBDIR = maps_directory "perl";
682
683 for my $ext (<$LIBDIR/*.ext>) { 711 for my $ext (<$LIBDIR/*.ext>) {
684 next unless -r $ext; 712 next unless -r $ext;
685 eval { 713 eval {
686 load_extension $ext; 714 load_extension $ext;
687 1 715 1
688 } or warn "$ext not loaded: $@"; 716 } or warn "$ext not loaded: $@";
689 } 717 }
690} 718}
691 719
692############################################################################# 720#############################################################################
693# extcmd framework, basically convert ext <msg>
694# into pkg::->on_extcmd_arg1 (...) while shortcutting a few
695
696attach_to_players
697 on_extcmd => sub {
698 my ($pl, $buf) = @_;
699
700 my $msg = eval { from_json $buf };
701
702 if (ref $msg) {
703 if (my $cb = $extcmd{$msg->{msgtype}}) {
704 if (my %reply = $cb->[0]->($pl, $msg)) {
705 $pl->ext_reply ($msg->{msgid}, %reply);
706 }
707 }
708 } else {
709 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
710 }
711
712 cf::override;
713 },
714;
715
716#############################################################################
717# load/save/clean perl data associated with a map 721# load/save/clean perl data associated with a map
718 722
719*cf::mapsupport::on_clean = sub { 723*cf::mapsupport::on_clean = sub {
720 my ($map) = @_; 724 my ($map) = @_;
721 725
723 defined $path or return; 727 defined $path or return;
724 728
725 unlink "$path.pst"; 729 unlink "$path.pst";
726}; 730};
727 731
728attach_to_maps prio => -10000, package => cf::mapsupport::; 732cf::map->attach (prio => -10000, package => cf::mapsupport::);
729 733
730############################################################################# 734#############################################################################
731# load/save perl data associated with player->ob objects 735# load/save perl data associated with player->ob objects
732 736
733sub all_objects(@) { 737sub all_objects(@) {
734 @_, map all_objects ($_->inv), @_ 738 @_, map all_objects ($_->inv), @_
735} 739}
736 740
737# TODO: compatibility cruft, remove when no longer needed 741# TODO: compatibility cruft, remove when no longer needed
738attach_to_players 742cf::player->attach (
739 on_load => sub { 743 on_load => sub {
740 my ($pl, $path) = @_; 744 my ($pl, $path) = @_;
741 745
742 for my $o (all_objects $pl->ob) { 746 for my $o (all_objects $pl->ob) {
743 if (my $value = $o->get_ob_key_value ("_perl_data")) { 747 if (my $value = $o->get_ob_key_value ("_perl_data")) {
745 749
746 %$o = %{ Storable::thaw pack "H*", $value }; 750 %$o = %{ Storable::thaw pack "H*", $value };
747 } 751 }
748 } 752 }
749 }, 753 },
750; 754);
751 755
752############################################################################# 756#############################################################################
753 757
754=head2 CORE EXTENSIONS 758=head2 CORE EXTENSIONS
755 759
756Functions and methods that extend core crossfire objects. 760Functions and methods that extend core crossfire objects.
761
762=head3 cf::player
757 763
758=over 4 764=over 4
759 765
760=item cf::player::exists $login 766=item cf::player::exists $login
761 767
766sub cf::player::exists($) { 772sub cf::player::exists($) {
767 cf::player::find $_[0] 773 cf::player::find $_[0]
768 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 774 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
769} 775}
770 776
777=item $player->ext_reply ($msgid, $msgtype, %msg)
778
779Sends an ext reply to the player.
780
781=cut
782
783sub cf::player::ext_reply($$$%) {
784 my ($self, $id, %msg) = @_;
785
786 $msg{msgid} = $id;
787
788 $self->send ("ext " . to_json \%msg);
789}
790
791=back
792
793=head3 cf::object::player
794
795=over 4
796
771=item $player->reply ($npc, $msg[, $flags]) 797=item $player_object->reply ($npc, $msg[, $flags])
772 798
773Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 799Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
774can be C<undef>. Does the right thing when the player is currently in a 800can be C<undef>. Does the right thing when the player is currently in a
775dialogue with the given NPC character. 801dialogue with the given NPC character.
776 802
777=cut 803=cut
778 804
779# rough implementation of a future "reply" method that works 805# rough implementation of a future "reply" method that works
780# with dialog boxes. 806# with dialog boxes.
807#TODO: the first argument must go, split into a $npc->reply_to ( method
781sub cf::object::player::reply($$$;$) { 808sub cf::object::player::reply($$$;$) {
782 my ($self, $npc, $msg, $flags) = @_; 809 my ($self, $npc, $msg, $flags) = @_;
783 810
784 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 811 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
785 812
789 $msg = $npc->name . " says: $msg" if $npc; 816 $msg = $npc->name . " says: $msg" if $npc;
790 $self->message ($msg, $flags); 817 $self->message ($msg, $flags);
791 } 818 }
792} 819}
793 820
794=item $player->ext_reply ($msgid, $msgtype, %msg) 821=item $player_object->may ("access")
795 822
796Sends an ext reply to the player. 823Returns wether the given player is authorized to access resource "access"
824(e.g. "command_wizcast").
797 825
798=cut 826=cut
799 827
800sub cf::player::ext_reply($$$%) { 828sub cf::object::player::may {
829 my ($self, $access) = @_;
830
831 $self->flag (cf::FLAG_WIZ) ||
832 (ref $cf::CFG{"may_$access"}
833 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}
834 : $cf::CFG{"may_$access"})
835}
836
837=head3 cf::client
838
839=over 4
840
841=item $client->send_drawinfo ($text, $flags)
842
843Sends a drawinfo packet to the client. Circumvents output buffering so
844should not be used under normal circumstances.
845
846=cut
847
848sub cf::client::send_drawinfo {
849 my ($self, $text, $flags) = @_;
850
851 utf8::encode $text;
852 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text);
853}
854
855
856=item $success = $client->query ($flags, "text", \&cb)
857
858Queues a query to the client, calling the given callback with
859the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
860C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
861
862Queries can fail, so check the return code. Or don't, as queries will become
863reliable at some point in the future.
864
865=cut
866
867sub cf::client::query {
868 my ($self, $flags, $text, $cb) = @_;
869
870 return unless $self->state == ST_PLAYING
871 || $self->state == ST_SETUP
872 || $self->state == ST_CUSTOM;
873
874 $self->state (ST_CUSTOM);
875
876 utf8::encode $text;
877 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
878
879 $self->send_packet ($self->{query_queue}[0][0])
880 if @{ $self->{query_queue} } == 1;
881}
882
883cf::client->attach (
884 on_reply => sub {
885 my ($ns, $msg) = @_;
886
887 # this weird shuffling is so that direct followup queries
888 # get handled first
889 my $queue = delete $ns->{query_queue};
890
891 (shift @$queue)->[1]->($msg);
892
893 push @{ $ns->{query_queue} }, @$queue;
894
895 if (@{ $ns->{query_queue} } == @$queue) {
896 if (@$queue) {
897 $ns->send_packet ($ns->{query_queue}[0][0]);
898 } else {
899 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
900 }
901 }
902 },
903);
904
905=item $client->coro (\&cb)
906
907Create a new coroutine, running the specified callback. The coroutine will
908be automatically cancelled when the client gets destroyed (e.g. on logout,
909or loss of connection).
910
911=cut
912
913sub cf::client::coro {
801 my ($self, $id, %msg) = @_; 914 my ($self, $cb) = @_;
802 915
803 $msg{msgid} = $id; 916 my $coro; $coro = async {
917 eval {
918 $cb->();
919 };
920 warn $@ if $@;
921 delete $self->{_coro}{$coro+0};
922 };
804 923
805 $self->send ("ext " . to_json \%msg); 924 $self->{_coro}{$coro+0} = $coro;
806} 925}
926
927cf::client->attach (
928 on_destroy => sub {
929 my ($ns) = @_;
930
931 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
932 },
933);
807 934
808=back 935=back
809 936
810=cut
811
812#############################################################################
813 937
814=head2 SAFE SCRIPTING 938=head2 SAFE SCRIPTING
815 939
816Functions that provide a safe environment to compile and execute 940Functions that provide a safe environment to compile and execute
817snippets of perl code without them endangering the safety of the server 941snippets of perl code without them endangering the safety of the server
818itself. Looping constructs, I/O operators and other built-in functionality 942itself. Looping constructs, I/O operators and other built-in functionality
819is not available in the safe scripting environment, and the number of 943is not available in the safe scripting environment, and the number of
820functions and methods that cna be called is greatly reduced. 944functions and methods that can be called is greatly reduced.
821 945
822=cut 946=cut
823 947
824our $safe = new Safe "safe"; 948our $safe = new Safe "safe";
825our $safe_hole = new Safe::Hole; 949our $safe_hole = new Safe::Hole;
832 956
833=pod 957=pod
834 958
835The following fucntions and emthods are available within a safe environment: 959The following fucntions and emthods are available within a safe environment:
836 960
837 cf::object contr pay_amount pay_player 961 cf::object contr pay_amount pay_player map
838 cf::object::player player 962 cf::object::player player
839 cf::player peaceful 963 cf::player peaceful
964 cf::map trigger
840 965
841=cut 966=cut
842 967
843for ( 968for (
844 ["cf::object" => qw(contr pay_amount pay_player)], 969 ["cf::object" => qw(contr pay_amount pay_player map)],
845 ["cf::object::player" => qw(player)], 970 ["cf::object::player" => qw(player)],
846 ["cf::player" => qw(peaceful)], 971 ["cf::player" => qw(peaceful)],
972 ["cf::map" => qw(trigger)],
847) { 973) {
848 no strict 'refs'; 974 no strict 'refs';
849 my ($pkg, @funs) = @$_; 975 my ($pkg, @funs) = @$_;
850 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 976 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
851 for @funs; 977 for @funs;
961 1087
962Immediately write the database to disk I<if it is dirty>. 1088Immediately write the database to disk I<if it is dirty>.
963 1089
964=cut 1090=cut
965 1091
1092our $DB;
1093
966{ 1094{
967 my $db;
968 my $path = cf::localdir . "/database.pst"; 1095 my $path = cf::localdir . "/database.pst";
969 1096
970 sub db_load() { 1097 sub db_load() {
971 warn "loading database $path\n";#d# remove later 1098 warn "loading database $path\n";#d# remove later
972 $db = stat $path ? Storable::retrieve $path : { }; 1099 $DB = stat $path ? Storable::retrieve $path : { };
973 } 1100 }
974 1101
975 my $pid; 1102 my $pid;
976 1103
977 sub db_save() { 1104 sub db_save() {
978 warn "saving database $path\n";#d# remove later 1105 warn "saving database $path\n";#d# remove later
979 waitpid $pid, 0 if $pid; 1106 waitpid $pid, 0 if $pid;
980 if (0 == ($pid = fork)) { 1107 if (0 == ($pid = fork)) {
981 $db->{_meta}{version} = 1; 1108 $DB->{_meta}{version} = 1;
982 Storable::nstore $db, "$path~"; 1109 Storable::nstore $DB, "$path~";
983 rename "$path~", $path; 1110 rename "$path~", $path;
984 cf::_exit 0 if defined $pid; 1111 cf::_exit 0 if defined $pid;
985 } 1112 }
986 } 1113 }
987 1114
990 sub db_sync() { 1117 sub db_sync() {
991 db_save if $dirty; 1118 db_save if $dirty;
992 undef $dirty; 1119 undef $dirty;
993 } 1120 }
994 1121
995 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, cb => sub { 1122 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
996 db_sync; 1123 db_sync;
997 }); 1124 });
998 1125
999 sub db_dirty() { 1126 sub db_dirty() {
1000 $dirty = 1; 1127 $dirty = 1;
1001 $idle->start; 1128 $idle->start;
1002 } 1129 }
1003 1130
1004 sub db_get($;$) { 1131 sub db_get($;$) {
1005 @_ >= 2 1132 @_ >= 2
1006 ? $db->{$_[0]}{$_[1]} 1133 ? $DB->{$_[0]}{$_[1]}
1007 : ($db->{$_[0]} ||= { }) 1134 : ($DB->{$_[0]} ||= { })
1008 } 1135 }
1009 1136
1010 sub db_put($$;$) { 1137 sub db_put($$;$) {
1011 if (@_ >= 3) { 1138 if (@_ >= 3) {
1012 $db->{$_[0]}{$_[1]} = $_[2]; 1139 $DB->{$_[0]}{$_[1]} = $_[2];
1013 } else { 1140 } else {
1014 $db->{$_[0]} = $_[1]; 1141 $DB->{$_[0]} = $_[1];
1015 } 1142 }
1016 db_dirty; 1143 db_dirty;
1017 } 1144 }
1018 1145
1019 attach_global 1146 cf::global->attach (
1020 prio => 10000, 1147 prio => 10000,
1021 on_cleanup => sub { 1148 on_cleanup => sub {
1022 db_sync; 1149 db_sync;
1023 }, 1150 },
1024 ; 1151 );
1025} 1152}
1026 1153
1027############################################################################# 1154#############################################################################
1028# the server's main() 1155# the server's main()
1029 1156
1157sub cfg_load {
1158 open my $fh, "<:utf8", cf::confdir . "/config"
1159 or return;
1160
1161 local $/;
1162 *CFG = YAML::Syck::Load <$fh>;
1163}
1164
1030sub main { 1165sub main {
1166 cfg_load;
1031 db_load; 1167 db_load;
1032 load_extensions; 1168 load_extensions;
1033 Event::loop; 1169 Event::loop;
1034} 1170}
1035 1171
1041 1177
1042 $msg->("reloading..."); 1178 $msg->("reloading...");
1043 1179
1044 eval { 1180 eval {
1045 # cancel all watchers 1181 # cancel all watchers
1046 $_->cancel for Event::all_watchers; 1182 for (Event::all_watchers) {
1183 $_->cancel if $_->data & WF_AUTOCANCEL;
1184 }
1047 1185
1048 # unload all extensions 1186 # unload all extensions
1049 for (@exts) { 1187 for (@exts) {
1050 $msg->("unloading <$_>"); 1188 $msg->("unloading <$_>");
1051 unload_extension $_; 1189 unload_extension $_;
1086 #Symbol::delete_package __PACKAGE__; 1224 #Symbol::delete_package __PACKAGE__;
1087 1225
1088 # reload cf.pm 1226 # reload cf.pm
1089 $msg->("reloading cf.pm"); 1227 $msg->("reloading cf.pm");
1090 require cf; 1228 require cf;
1229 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
1091 1230
1092 # load database again 1231 # load config and database again
1232 cf::cfg_load;
1093 cf::db_load; 1233 cf::db_load;
1094 1234
1095 # load extensions 1235 # load extensions
1096 $msg->("load extensions"); 1236 $msg->("load extensions");
1097 cf::load_extensions; 1237 cf::load_extensions;
1110 warn $_[0]; 1250 warn $_[0];
1111 print "$_[0]\n"; 1251 print "$_[0]\n";
1112 }; 1252 };
1113} 1253}
1114 1254
1255register "<global>", __PACKAGE__;
1256
1115register_command "perl-reload", 0, sub { 1257register_command "perl-reload" => sub {
1116 my ($who, $arg) = @_; 1258 my ($who, $arg) = @_;
1117 1259
1118 if ($who->flag (FLAG_WIZ)) { 1260 if ($who->flag (FLAG_WIZ)) {
1119 _perl_reload { 1261 _perl_reload {
1120 warn $_[0]; 1262 warn $_[0];
1121 $who->message ($_[0]); 1263 $who->message ($_[0]);
1122 }; 1264 };
1123 } 1265 }
1124}; 1266};
1125 1267
1126register "<global>", __PACKAGE__;
1127
1128unshift @INC, $LIBDIR; 1268unshift @INC, $LIBDIR;
1129 1269
1130$TICK_WATCHER = Event->timer ( 1270$TICK_WATCHER = Event->timer (
1131 prio => 1, 1271 prio => 0,
1132 at => $NEXT_TICK || 1, 1272 at => $NEXT_TICK || 1,
1273 data => WF_AUTOCANCEL,
1133 cb => sub { 1274 cb => sub {
1134 cf::server_tick; # one server iteration 1275 cf::server_tick; # one server iteration
1135 1276
1136 my $NOW = Event::time; 1277 my $NOW = Event::time;
1137 $NEXT_TICK += $TICK; 1278 $NEXT_TICK += $TICK;
1138 1279
1139 # if we are delayed by four ticks, skip them all 1280 # if we are delayed by four ticks or more, skip them all
1140 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4; 1281 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
1141 1282
1142 $TICK_WATCHER->at ($NEXT_TICK); 1283 $TICK_WATCHER->at ($NEXT_TICK);
1143 $TICK_WATCHER->start; 1284 $TICK_WATCHER->start;
1144 }, 1285 },
1145); 1286);
1146 1287
1288IO::AIO::max_poll_time $TICK * 0.2;
1289
1290Event->io (fd => IO::AIO::poll_fileno,
1291 poll => 'r',
1292 prio => 5,
1293 data => WF_AUTOCANCEL,
1294 cb => \&IO::AIO::poll_cb);
1295
11471 12961
1148 1297

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines