ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/login.ext
(Generate patch)

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.17 by root, Mon Jan 8 14:11:05 2007 UTC vs.
Revision 1.78 by root, Mon Jan 7 01:55:19 2008 UTC

1#! perl 1#! perl # mandatory
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7 7
8my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir; 8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
9 9
10# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
11sub nuke_str { 11sub nuke_str {
12 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
13} 13}
14 14
15sub query { 15sub query {
16 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
17 17
18 my $current = $Coro::current; 18 my $current = $Coro::current;
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0]; }); 19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] });
20 Coro::schedule while ref $current; 20 Coro::schedule while ref $current;
21 21
22 $current 22 $current
23} 23}
24 24
25sub can_cleanup { 25sub can_cleanup {
26 my ($playerfile, $mtime) = @_; 26 my ($pl, $mtime) = @_;
27 27
28 my $age = time - $mtime; 28 my $age = time - $mtime;
29 my $level = $playerfile =~ /^level (\d+)$/m ? $1 : return; 29 my $level = $pl->ob->level;
30 30
31 ($level <= 3 && $age > 7 * 86400) # 7 days for level 0..3 31 ($level <= 3 && $age > 7 * 86400) # 7 days for level 0..3
32 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9 32 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9
33 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20 33 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20
34 || $age > 700 * 86400 # 2 years for everybody else 34 || $age > 700 * 86400 # 2 years for everybody else
40 return unless cf::player::find_active $user; 40 return unless cf::player::find_active $user;
41 41
42 $ns->send_drawinfo ( 42 $ns->send_drawinfo (
43 "That player is already logged in on this server. " 43 "That player is already logged in on this server. "
44 . "If you want to create a new player, choose another name. " 44 . "If you want to create a new player, choose another name. "
45 . "If you are already a registered player, make sure nobody " 45 . "If you have already a registered, make sure nobody "
46 . "else is using your account at this time. If you lost your conenction " 46 . "else is using your account at this time. If you lost your connection "
47 . "then the server will likely timeout within a minute. If you still " 47 . "then the server will likely timeout within a minute. If you still "
48 . "cannot log-in after a minute, you are still logged in. Make sure " 48 . "cannot log-in after a minute, you are still logged in. Make sure "
49 . "you do not have another client running. If you use windows, reboot, " 49 . "you do not have another client running. If you use windows, reboot, "
50 . "this will fix anything.", 50 . "this will fix anything.",
51 cf::NDI_RED 51 cf::NDI_RED
52 ); 52 );
53 53
54 1 54 1
55} 55}
56 56
57sub check_clean_save { 57sub safe_spot($$$) {
58 my ($m, $x, $y) = @_;
59
60 return 0;
61 warn join ":", $m->at ($x, $y);#d#
62 warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
63 return 0;
64
65 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
66}
67
68sub enter_map {
58 my ($pl) = @_; 69 my ($pl) = @_;
59 70
60 unless (delete $pl->{clean_save}) { 71 my $ob = $pl->ob;
61 #d#TODO 72
73 my ($map, $x, $y)
74 = $ob->{_link_pos}
75 ? @{delete $ob->{_link_pos}}
76 : ($pl->maplevel, $ob->x, $ob->y);
77
78 $ob->enter_link;
79
80 my $m = cf::map::find $map;
81 my $time = delete $pl->{unclean_save};
82
83 if ($time && $m && !safe_spot $m, $x, $y) {
84 if ($time < $m->{instantiate_time}) {
85 # the map was reset in the meantime
86 my $age = $cf::RUNTIME - $time;
87
88 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
89
90 ($map, $x, $y) = $pl->savebed;
91
92 if ($age >= $MAX_DISCONNECT_TIME) {
93 $ob->message (
94 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
95 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
96 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
97 . "H<You disconnected too long without having used a savebed.>",
98 cf::NDI_RED
99 );
100 # kill them.
101 # reminds me of the famous badness 10000 syndrome...
102 $ob->stats->hp (-10000); #] if they survive this they deserved to live
103 $pl->killer ("a cave-in");
104 } else {
105 $ob->message (
106 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
107 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
108 . "Better use a savebed next time, much worse things could have happened... "
109 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
110 cf::NDI_RED
111 );
112 }
113 } else {
114 $ob->message (
115 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
116 . "as lots of things could happen when you leave by other means, such as cave-ins, "
117 . "or monsters suddenly snapping your body. Better use a savebed next time. "
118 . "H<Always apply a bed of reality to disconnect from the server.>",
119 cf::NDI_RED
120 );
121 }
62 } 122 }
123
124 $ob->goto ($map, $x, $y);
63} 125}
64 126
65# delete a player directory, be non-blocking AND synchronous... 127# delete a player directory, be non-blocking AND synchronous...
66# (thats hard, so we crap out and fork). 128# (thats hard, so we crap out and fork).
67sub nuke_playerdir { 129sub nuke_playerdir {
68 my ($user) = @_; 130 my ($user) = @_;
69 131
70 aio_stat "$PLAYERDIR/$user"; 132 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
71 system "cd \Q$PLAYERDIR\E "
72 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
73 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
74}
75 133
76sub addme { 134 cf::fork_call {
135 rename "$PLAYERDIR/$user", $temp;
136 system "rm", "-rf", $temp;
137 };
138}
139
140cf::client->attach (on_addme => sub {
77 my ($ns) = @_; 141 my ($ns) = @_;
78 142
79 $ns->destroy if $ns->pl; 143 if (!$ns->facecache)
144 {
145 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
146
147
148***
149*** WARNING:
150*** Your client does not support face/image caching,
151*** or it has been disabled. Face caching is mandatory
152*** so please enable it or use a newer client.
153***
154*** Look at your client preferences:
155***
156*** CFPlus: all known versions automatically enable the facecache.
157*** cfclient: use the -cache commandline option.
158*** cfclient: map will not redraw automatically (bug).
159*** gcfclient: use -cache commandline option, or enable
160*** gcfclient: Client => Configure => Map & Image => Cache Images.
161*** jcrossclient: your client is broken, use CFPlus or gcfclient.
162***
163***
164EOF
165 if ($ns->version =~ /jcrossclient/) {
166 # let them, for now
167 } else {
168 $ns->flush;
169 return $ns->destroy;
170 }
171
172 # $ns->facecache = true;
173 }
174
175 if ($ns->mapmode < cf::Map1aCmd) {
176 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
177
178
179***
180*** WARNING:
181*** Your client is too old. Please upgrade to a newer version.
182EOF
183
184 $ns->flush;
185 return $ns->destroy;
186 }
187
188 $ns->pl and return $ns->destroy;
80 189
81 $ns->async (sub { 190 $ns->async (sub {
191 $Coro::current->{desc} = "addme init";
192
82 my ($user, $pass); 193 my ($user, $pass);
83 194
84 $ns->send_packet ("addme_success"); 195 $ns->send_packet ("addme_success");
85 196
86 for (;;) { 197 for (;;) {
99 $ns->send_drawinfo ( 210 $ns->send_drawinfo (
100 "That username is currently used in another login session. " 211 "That username is currently used in another login session. "
101 . "Chose another, or wait till the other session has ended.", 212 . "Chose another, or wait till the other session has ended.",
102 cf::NDI_RED 213 cf::NDI_RED
103 ); 214 );
104 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}$/) { 215 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) {
105 last; 216 last;
106 } else { 217 } else {
107 $ns->send_drawinfo ( 218 $ns->send_drawinfo (
108 "Your username contains illegal characters " 219 "Your username contains illegal characters "
109 . "(only a-z, A-Z and 0-9 are allowed), " 220 . "(only a-z, A-Z and 0-9 are allowed), "
110 . "or is not between 3 and 18 characters in length.", 221 . "or is not between 3 and 18 characters in length.",
111 cf::NDI_RED 222 cf::NDI_RED
112 ); 223 );
113 } 224 }
225 Coro::Timer::sleep 0.4;
114 } 226 }
115 227
116 check_playing $ns, $user and next; 228 check_playing $ns, $user and next;
229
230 $Coro::current->{desc} = "addme($user) pass";
117 231
118 $ns->send_drawinfo ( 232 $ns->send_drawinfo (
119 "Welcome $user, please enter your password now. " 233 "Welcome $user, please enter your password now. "
120 . "New users should now choose a password. " 234 . "New users should now choose a password. "
121 . "Anything your client lets you enter is fine.", 235 . "Anything your client lets you enter is fine.",
129 $ns->send_drawinfo ( 243 $ns->send_drawinfo (
130 "Try to use at least three characters as your password please, " 244 "Try to use at least three characters as your password please, "
131 . "that cannot be too much to ask for :)", 245 . "that cannot be too much to ask for :)",
132 cf::NDI_RED 246 cf::NDI_RED
133 ); 247 );
248 Coro::Timer::sleep 0.4;
134 } 249 }
135 250
136 # lock this username for the remainder of this login session 251 # lock this username for the remainder of this login session
137 if ($cf::LOGIN_LOCK{$user}) { 252 if ($cf::LOGIN_LOCK{$user}) {
138 $ns->send_drawinfo ( 253 $ns->send_drawinfo (
144 } 259 }
145 local $cf::LOGIN_LOCK{$user} = 1; 260 local $cf::LOGIN_LOCK{$user} = 1;
146 261
147 check_playing $ns, $user and next; 262 check_playing $ns, $user and next;
148 263
264 $Coro::current->{desc} = "addme($user) check";
265
149 # try to read the user file and check the password 266 # try to read the user file and check the password
150 if (my $fh = aio_open cf::player::path $user, O_RDONLY, 0) { 267 if (my $pl = cf::player::find $user) {
268 aio_stat $pl->path and next;
151 my $mtime = (stat $fh)[9]; 269 my $mtime = (stat _)[9];
152
153 0 < aio_read $fh, 0, 16384, my $buf, 0 or next;
154 $buf =~ /^password (\S+)$/m or next;
155 my $hash = $1; 270 my $hash = $pl->password;
156 271
157 if ($hash eq crypt $pass, $hash) { 272 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
158 nuke_str $pass; 273 nuke_str $pass;
159 # password matches, wonderful 274 # password matches, wonderful
160 my $pl = cf::player::find $user or next; 275 my $pl = cf::player::find $user or next;
161 $pl->connect ($ns); 276 $pl->connect ($ns);
162 check_clean_save $pl; 277 enter_map $pl;
163 $pl->{clean_save} = 1;
164 last; 278 last;
165 } elsif (can_cleanup $buf, $mtime) { 279 } elsif (can_cleanup $pl, $mtime) {
166 Coro::Timer::sleep 1; 280 Coro::Timer::sleep 1;
167 281
168 $ns->send_drawinfo ( 282 $ns->send_drawinfo (
169 "Player exists, but password does not match. If this is your account, " 283 "Player exists, but password does not match. If this is your account, "
170 . "please try again. If not, you can now decide to take over this account " 284 . "please try again. If not, you can now decide to take over this account "
178 292
179 # check if the file hasn't changed 293 # check if the file hasn't changed
180 aio_stat cf::player::path $user and next; 294 aio_stat cf::player::path $user and next;
181 $mtime == (stat _)[9] or next; 295 $mtime == (stat _)[9] or next;
182 296
183 nuke_playerdir $user; 297 $pl->quit_character;
184 298
185 # fall through to creation 299 # fall through to creation
186 } else { 300 } else {
187 nuke_str $pass; 301 nuke_str $pass;
188 302
193 . "(check for Numlock and other semi-obvious error sources).", 307 . "(check for Numlock and other semi-obvious error sources).",
194 cf::NDI_RED 308 cf::NDI_RED
195 ); 309 );
196 next; 310 next;
197 } 311 }
312 } else {
313 # unable to load the playerfile:
314 # check wether the player dir exists, which means the file is corrupted or
315 # something very similar.
316 if (!aio_stat cf::player::playerdir $user) {
317 $ns->send_drawinfo (
318 "Unable to retrieve this player. It might be a locked or broken account. "
319 . "If this is your account, ask a dungeon master for assistance. "
320 . "Otherwise choose a different login name.",
321 cf::NDI_RED
322 );
323 next;
324 }
198 } 325 }
199 326
200 # the rest of this function is character creation 327 # the rest of this function is character creation
328 $Coro::current->{desc} = "addme($user) chargen";
201 329
202 # just to make sure nothing is left over 330 # just to make sure nothing is left over
203 nuke_playerdir $user; 331 nuke_playerdir $user;
204 332
205 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 333 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
209 nuke_str $pass2; 337 nuke_str $pass2;
210 $ns->send_drawinfo ( 338 $ns->send_drawinfo (
211 "The passwords do not match, please try again.", 339 "The passwords do not match, please try again.",
212 cf::NDI_RED 340 cf::NDI_RED
213 ); 341 );
342 Coro::Timer::sleep 0.5;
214 next; 343 next;
215 } 344 }
216 345
217 nuke_str $pass2; 346 nuke_str $pass2;
218 347
219 my $pl = cf::player::new $user; 348 my $pl = cf::player::new $user;
220 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 349 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
221 nuke_str $pass; 350 nuke_str $pass;
222 $pl->connect ($ns); 351 $pl->connect ($ns);
223
224 my $ob = $pl->ob; 352 my $ob = $pl->ob;
353
354 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
225 355
226 while () { 356 while () {
227 $ob->update_stats; 357 $ob->update_stats;
228 $pl->save_stats; 358 $pl->save_stats;
229 359
239 $ob->swap_stats ($res - 1, $swap - 1); 369 $ob->swap_stats ($res - 1, $swap - 1);
240 } 370 }
241 } else { 371 } else {
242 $ob->roll_stats; 372 $ob->roll_stats;
243 } 373 }
374
375 Coro::Timer::sleep 0.2;
244 } 376 }
245 377
246 $ob->set_animation (2); 378 $ob->set_animation (2);
247 $ob->add_statbonus; 379 $ob->add_statbonus;
248 380
249 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 381 while () {
250 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 382 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
383 my $msg = $ob->msg;
384 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
385 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
386
387 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
251 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 388 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
252 389
253 $ns->state (cf::ST_CHANGE_CLASS); 390 last if $res =~ /[dD]/;
391
392 $pl->chargen_race_next;
393 Coro::Timer::sleep 0.2;
394 }
395
396 $pl->chargen_race_done;
397
398 while () {
399 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
400 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
401
402 if ($res =~ /^[fF]/) {
403 $pl->gender (1);
404 last;
405 } elsif ($res =~ /^[mM]/) {
406 $pl->gender (0);
407 last;
408 }
409 Coro::Timer::sleep 0.2;
410 }
411
412 $ob->reply (undef, "Welcome to Deliantra!");
413
254 delete $pl->{deny_save};#d# too early 414 delete $pl->{deny_save};
255 415
256 last; 416 last;
257 } 417 }
258 }); 418 });
259} 419});
260 420
261cf::register_command quit => sub { 421cf::register_command quit => sub {
262 my ($ob, $arg) = @_; 422 my ($ob, $arg) = @_;
263 423
264 $ob->reply (undef, 424 $ob->reply (undef,
280 } else { 440 } else {
281 $ob->reply (undef, 441 $ob->reply (undef,
282 "Ok, quitting, hope to see you again.", 442 "Ok, quitting, hope to see you again.",
283 cf::NDI_UNIQUE | cf::NDI_RED); 443 cf::NDI_UNIQUE | cf::NDI_RED);
284 $pl->ns->flush; 444 $pl->ns->flush;
285 $pl->quit_character; 445 cf::async { $pl->quit_character };
286 } 446 }
287 }); 447 });
288}; 448};
289 449
290cf::object->attach ( 450cf::object->attach (
296 456
297 my $pl = $ob->contr; 457 my $pl = $ob->contr;
298 458
299 # update respawn position 459 # update respawn position
300 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 460 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
461 cf::async { $pl->save };
301 462
302 $pl->killer ("left"); 463 $pl->killer ("left");
303 $ob->check_score; 464 $ob->check_score;
304 465
305 $ob->reply (undef, "In the future, you will wake up here when you die."); 466 $ob->reply (undef, "In the future, you will wake up here when you die.");
329 490
330 if ($cleanly) { 491 if ($cleanly) {
331 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 492 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
332 } else { 493 } else {
333 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 494 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
334 delete $pl->{clean_save}; 495 $pl->{unclean_save} = $cf::RUNTIME;
335 } 496 }
336 }, 497 },
337); 498);
338 499
339cf::client->attach (
340 on_addme => \&addme,
341);
342
343############################################################################# 500#############################################################################
344 501
345our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 502our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
346our $SAVE_TIMEOUT = 200; # save players every n seconds 503our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
347our $SAVE_INTERVAL = 0.1; # save at max. one player every $SAVE_INTERVAL
348 504
349our $SCHEDULER = cf::async_ext { 505our $SCHEDULER = cf::async_ext {
506 $Coro::current->{desc} = "player scheduler";
507
350 while () { 508 while () {
351 Coro::Timer::sleep $SCHEDULE_INTERVAL; 509 Coro::EV::timer_once $SCHEDULE_INTERVAL;
352 510
353 # this weird form of iteration over values is used because 511 # this weird form of iteration over values is used because
354 # the hash changes underneath us frequently, and for 512 # the hash changes underneath us frequently, and for
355 # keeps a direct reference to the value without (in 5.8 perls) 513 # keeps a direct reference to the value without (in 5.8 perls)
356 # keeping a reference, so this is prone to crashes or worse. 514 # keeping a reference, so this is prone to crashes or worse.
361 $pl->valid or next; 519 $pl->valid or next;
362 520
363 eval { 521 eval {
364 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 522 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
365 $pl->save; 523 $pl->save;
366 Coro::Timer::sleep $SAVE_INTERVAL;
367 }
368 524
369 unless ($pl->active) { 525 unless ($pl->active || $pl->ns) {
370 # check refcounts, this is tricky and needs to be adjusted to fit server internals 526 # check refcounts, this is tricky and needs to be adjusted to fit server internals
371 my $ob = $pl->ob; 527 my $ob = $pl->ob;
372 Scalar::Util::weaken $pl; 528
373 Scalar::Util::weaken $ob;
374 my $a_ = $pl->refcnt;
375 my $b_ = $ob->refcnt;
376 my $pl_ref = $pl->refcnt_cnt; 529 my $pl_ref = $pl->refcnt_cnt;
377 my $ob_ref = $ob->refcnt_cnt; 530 my $ob_ref = $ob->refcnt_cnt;
378 531
532 ## pl_ref == $pl + ob->contr + %cf::PLAYER
533 ## ob_ref == $ob + pl->observe + simply being an object
379 if ($pl_ref == 2 && $ob_ref == 1) { 534 if ($pl_ref == 3 && $ob_ref == 3) {
380 warn "player-scheduler destroy ", $ob->name;#d# 535 warn "player-scheduler destroy ", $ob->name;#d#
536
537 # remove from sight and get fresh "copies"
381 delete $cf::PLAYER{$ob->name}; 538 $pl = delete $cf::PLAYER{$ob->name};
382 # pl_ref == one from object + one from cf::PLAYER
383 # ob_ref == one from simply being an object
384 $ob->destroy; 539 $ob = $pl->ob;
540
385 $pl->destroy; 541 $pl->destroy; # destroys $ob
386 } else { 542 } else {
543 my $a_ = $pl->refcnt;#d#
544 my $b_ = $ob->refcnt;#d#
545
387 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 546 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
547 }
388 } 548 }
389 } 549 }
390 }; 550 };
391 warn $@ if $@; 551 warn $@ if $@;
392 Coro::cede; 552 Coro::cede;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines