diff options
author | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-22 21:12:30 +0000 |
---|---|---|
committer | mogorman <mogorman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-22 21:12:30 +0000 |
commit | 38b24efed1fcbc83ca06b4420e7fb8de5f2803e2 (patch) | |
tree | d1895da5e48cb7c2696f1e79242e88dd0d35b3f6 /doc | |
parent | 4169faaaf309db48c66f60b3cc44734e976958e3 (diff) |
asterisk-xmpp merge in
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@29553 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'doc')
-rw-r--r-- | doc/jabber.txt | 13 | ||||
-rw-r--r-- | doc/jingle.txt | 8 |
2 files changed, 21 insertions, 0 deletions
diff --git a/doc/jabber.txt b/doc/jabber.txt new file mode 100644 index 000000000..5889a6e36 --- /dev/null +++ b/doc/jabber.txt @@ -0,0 +1,13 @@ +(res_jabber is very experimental!) +Jabber(xmpp) is an xml based protocol primarily for presence and messaging. +It is an open standard and there are several open server implementations, +ejabberd, jabberd(2), wildfire, and many others, as well as several open source +clients, Psi, gajim, gaim etc. Jabber differs from otherIM applications as it +is immensly extendable. This allows us to easily integrate asterisk with +jabber. The Asterisk Jabber Interface is provided by res_jabber. res_jabber +allows for asterisk to connect to any jabber server via the standard client +protocol or also as a simple client. Several simple functions are exposed to +the dial plan, jabberstatus, jabbersend, and soon jabberrecv. res_jabber is also used +to provide the connection interface for chan_jingle. +The maintainer of res_jabber is Matthew O'Gorman <mogorman@digum.com> or +mog_work on irc or prefered mogorman@astjab.org over jabber. diff --git a/doc/jingle.txt b/doc/jingle.txt new file mode 100644 index 000000000..b6bdd111c --- /dev/null +++ b/doc/jingle.txt @@ -0,0 +1,8 @@ +(Jingle support in asterisk is experimental) +Jingle is an xmpp based protocol for signalling the transfer of media. +Currently asterisk supports the propitery GoogleTalk protocol that is +very similar to jingle, and hopes to support true jingle specs +(JEP-166,167,176,177,180,181 etc) as more clients support the true standard. +Jingle's configuration is very similar to sip.conf only as we are not the +jabber server in this case you must provide a connection for the peer to +travel out on. |