Mercurial > prosody-hg
comparison net/server_event.lua @ 6382:57d23c26039b
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 02 Sep 2014 22:33:11 +0200 |
| parents | 7a3e2f2d43fc a280bd6ccce2 |
| children | ec8878113907 ec172dbe9d14 |
comparison
equal
deleted
inserted
replaced
| 6377:50e5aed4eeea | 6382:57d23c26039b |
|---|---|
| 436 end | 436 end |
| 437 return false, "setoption not implemented"; | 437 return false, "setoption not implemented"; |
| 438 end | 438 end |
| 439 | 439 |
| 440 function interface_mt:setlistener(listener) | 440 function interface_mt:setlistener(listener) |
| 441 self.onconnect, self.ondisconnect, self.onincoming, self.ontimeout, self.onreadtimeout, self.onstatus | 441 self:ondetach(); -- Notify listener that it is no longer responsible for this connection |
| 442 = listener.onconnect, listener.ondisconnect, listener.onincoming, | 442 self.onconnect, self.ondisconnect, self.onincoming, self.ontimeout, |
| 443 listener.ontimeout, listener.onreadtimeout, listener.onstatus; | 443 self.onreadtimeout, self.onstatus, self.ondetach |
| 444 = listener.onconnect, listener.ondisconnect, listener.onincoming, listener.ontimeout, | |
| 445 listener.onreadtimeout, listener.onstatus, listener.ondetach; | |
| 444 end | 446 end |
| 445 | 447 |
| 446 -- Stub handlers | 448 -- Stub handlers |
| 447 function interface_mt:onconnect() | 449 function interface_mt:onconnect() |
| 448 end | 450 end |
| 457 debug( "connection failed:", self.fatalerror ) | 459 debug( "connection failed:", self.fatalerror ) |
| 458 self:_close() | 460 self:_close() |
| 459 self.eventread = nil | 461 self.eventread = nil |
| 460 end | 462 end |
| 461 function interface_mt:ondrain() | 463 function interface_mt:ondrain() |
| 464 end | |
| 465 function interface_mt:ondetach() | |
| 462 end | 466 end |
| 463 function interface_mt:onstatus() | 467 function interface_mt:onstatus() |
| 464 end | 468 end |
| 465 end | 469 end |
| 466 | 470 |
| 485 ondisconnect = listener.ondisconnect; -- will be called when client disconnects | 489 ondisconnect = listener.ondisconnect; -- will be called when client disconnects |
| 486 onincoming = listener.onincoming; -- will be called when client sends data | 490 onincoming = listener.onincoming; -- will be called when client sends data |
| 487 ontimeout = listener.ontimeout; -- called when fatal socket timeout occurs | 491 ontimeout = listener.ontimeout; -- called when fatal socket timeout occurs |
| 488 onreadtimeout = listener.onreadtimeout; -- called when socket inactivity timeout occurs | 492 onreadtimeout = listener.onreadtimeout; -- called when socket inactivity timeout occurs |
| 489 ondrain = listener.ondrain; -- called when writebuffer is empty | 493 ondrain = listener.ondrain; -- called when writebuffer is empty |
| 494 ondetach = listener.ondetach; -- called when disassociating this listener from this connection | |
| 490 onstatus = listener.onstatus; -- called for status changes (e.g. of SSL/TLS) | 495 onstatus = listener.onstatus; -- called for status changes (e.g. of SSL/TLS) |
| 491 eventread = false, eventwrite = false, eventclose = false, | 496 eventread = false, eventwrite = false, eventclose = false, |
| 492 eventhandshake = false, eventstarthandshake = false; -- event handler | 497 eventhandshake = false, eventstarthandshake = false; -- event handler |
| 493 eventconnect = false, eventsession = false; -- more event handler... | 498 eventconnect = false, eventsession = false; -- more event handler... |
| 494 eventwritetimeout = false; -- even more event handler... | 499 eventwritetimeout = false; -- even more event handler... |