diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2004-12-05 20:54:55 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2004-12-05 20:54:55 +0000 |
| commit | da58d568b1254e00679b448519f8d7f1daa9b2b2 (patch) | |
| tree | 7fb166928c08fb192093cf20e02c59576d8218c0 /src/jlib.hrl | |
| parent | * src/ejabberd_listener.erl: Enable keepalive option (diff) | |
* src/web/ejabberd_web_admin.erl: Changed type of password field
to "password"
* src/jlib.hrl: More stream error defines (thanks to Sergei
Golovan)
* src/ejabberd_c2s.erl: Support for starttls_required option
(thanks to Sergei Golovan)
* src/mod_muc/mod_muc_room.erl: Fixed mistake in case condition
(thanks to Sergei Golovan)
* src/xml_stream.erl: Added function parse_element/1
* src/expat_erl.c: Added PARSE_FINAL_COMMAND
SVN Revision: 289
Diffstat (limited to '')
| -rw-r--r-- | src/jlib.hrl | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/src/jlib.hrl b/src/jlib.hrl index c2a9ba43a..5f9e17b50 100644 --- a/src/jlib.hrl +++ b/src/jlib.hrl @@ -214,6 +214,63 @@ %-define(SERR_, % ?STREAM_ERROR("")). +-define(STREAM_ERRORT(Condition, Lang, Text), + {xmlelement, "stream:error", + [], + [{xmlelement, Condition, [{"xmlns", ?NS_STREAMS}], []}, + {xmlelement, "text", [{"xml:lang", Lang}, {"xmlns", ?NS_STREAMS}], + [{xmlcdata, translate:translate(Lang, Text)}]}]}). + +-define(SERRT_BAD_FORMAT(Lang, Text), + ?STREAM_ERRORT("bad-format", Lang, Text)). +-define(SERRT_BAD_NAMESPACE_PREFIX(Lang, Text), + ?STREAM_ERRORT("bad-namespace-prefix", Lang, Text)). +-define(SERRT_CONFLICT(Lang, Text), + ?STREAM_ERRORT("conflict", Lang, Text)). +-define(SERRT_CONNECTION_TIMEOUT(Lang, Text), + ?STREAM_ERRORT("connection-timeout", Lang, Text)). +-define(SERRT_HOST_GONE(Lang, Text), + ?STREAM_ERRORT("host-gone", Lang, Text)). +-define(SERRT_HOST_UNKNOWN(Lang, Text), + ?STREAM_ERRORT("host-unknown", Lang, Text)). +-define(SERRT_IMPROPER_ADDRESSING(Lang, Text), + ?STREAM_ERRORT("improper-addressing", Lang, Text)). +-define(SERRT_INTERNAL_SERVER_ERROR(Lang, Text), + ?STREAM_ERRORT("internal-server-error", Lang, Text)). +-define(SERRT_INVALID_FROM(Lang, Text), + ?STREAM_ERRORT("invalid-from", Lang, Text)). +-define(SERRT_INVALID_ID(Lang, Text), + ?STREAM_ERRORT("invalid-id", Lang, Text)). +-define(SERRT_INVALID_NAMESPACE(Lang, Text), + ?STREAM_ERRORT("invalid-namespace", Lang, Text)). +-define(SERRT_INVALID_XML(Lang, Text), + ?STREAM_ERRORT("invalid-xml", Lang, Text)). +-define(SERRT_NOT_AUTHORIZED(Lang, Text), + ?STREAM_ERRORT("not-authorized", Lang, Text)). +-define(SERRT_POLICY_VIOLATION(Lang, Text), + ?STREAM_ERRORT("policy-violation", Lang, Text)). +-define(SERRT_REMOTE_CONNECTION_FAILED(Lang, Text), + ?STREAM_ERRORT("remote-connection-failed", Lang, Text)). +-define(SERRT_RESOURSE_CONSTRAINT(Lang, Text), + ?STREAM_ERRORT("resource-constraint", Lang, Text)). +-define(SERRT_RESTRICTED_XML(Lang, Text), + ?STREAM_ERRORT("restricted-xml", Lang, Text)). +% TODO: include hostname or IP +-define(SERRT_SEE_OTHER_HOST(Lang, Text), + ?STREAM_ERRORT("see-other-host", Lang, Text)). +-define(SERRT_SYSTEM_SHUTDOWN(Lang, Text), + ?STREAM_ERRORT("system-shutdown", Lang, Text)). +-define(SERRT_UNSUPPORTED_ENCODING(Lang, Text), + ?STREAM_ERRORT("unsupported-encoding", Lang, Text)). +-define(SERRT_UNSUPPORTED_STANZA_TYPE(Lang, Text), + ?STREAM_ERRORT("unsupported-stanza-type", Lang, Text)). +-define(SERRT_UNSUPPORTED_VERSION(Lang, Text), + ?STREAM_ERRORT("unsupported-version", Lang, Text)). +-define(SERRT_XML_NOT_WELL_FORMED(Lang, Text), + ?STREAM_ERRORT("xml-not-well-formed", Lang, Text)). +%-define(SERRT_(Lang, Text), +% ?STREAM_ERRORT("", Lang, Text)). + -record(jid, {user, server, resource, luser, lserver, lresource}). |