Mercurial > prosody-hg
comparison main.lua @ 150:d09b8a1ab046
Merging more s2s
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 24 Oct 2008 07:36:48 +0100 |
| parents | b92493ea6fd7 fbb3a4ff9cf1 |
| children | 5c2e6b9eeeb6 |
comparison
equal
deleted
inserted
replaced
| 149:40e443eacbbd | 150:d09b8a1ab046 |
|---|---|
| 52 | 52 |
| 53 local protected_handler = function (conn, data, err) local success, ret = pcall(handler, conn, data, err); if not success then print("ERROR on "..tostring(conn)..": "..ret); conn:close(); end end; | 53 local protected_handler = function (conn, data, err) local success, ret = pcall(handler, conn, data, err); if not success then print("ERROR on "..tostring(conn)..": "..ret); conn:close(); end end; |
| 54 local protected_disconnect = function (conn, err) local success, ret = pcall(disconnect, conn, err); if not success then print("ERROR on "..tostring(conn).." disconnect: "..ret); conn:close(); end end; | 54 local protected_disconnect = function (conn, err) local success, ret = pcall(disconnect, conn, err); if not success then print("ERROR on "..tostring(conn).." disconnect: "..ret); conn:close(); end end; |
| 55 | 55 |
| 56 start("xmppclient", { ssl = ssl_ctx }) | 56 start("xmppclient", { ssl = ssl_ctx }) |
| 57 start("xmppserver", { ssl = ssl_ctx }) | |
| 57 | 58 |
| 58 server.loop(); | 59 server.loop(); |
