← Back to branch summary

~ubuntu-branches/ubuntu/karmic/asterisk/karmic

« back to all changes in this revision

Viewing changes to res/res_jabber.c

  • Committer: Bazaar Package Importer
  • Author(s): Jean-Michel Dault, Faidon Liambotis, Tzafrir Cohen
  • Date: 2009-08-20 03:40:08 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090820034008-rg2s51o9ruqvmwml
Tags: 1:1.6.2.0~dfsg~beta4-0ubuntu1
http://bugs.debian.org/532971
http://bugs.debian.org/539150
* Merge from Debian.
  - Lsb patches dropped: fixed upstream
  - Patch for LP #350732 dropped: fixed upstream
* Added:
  - Add support for web interface
  - Don't enable voicetronix cards by default
  - Chown /dev/dahdi in init script
  - Add files for potential backports
  - Change maintainer
  - Standards version 3.8.3

* Debian changes

 [ Faidon Liambotis ]
 * Fix FTBFS on armel. (Closes: #532971)

 [ Tzafrir Cohen ]
 * New upstream beta.
 * Patch hardware_dtmf_mute_fix removed: Applied upstream.
 * No need for a separate app_directory_odbc (will use app_voicemail_odbc).
 * Fix name of voicemail 'openssl' dep. (Thomas Renard) (Closes: #539150)

Show diffs side-by-side

added added

removed removed

Lines of Context:
res/res_jabber.c
37
37
 
38
38
#include "asterisk.h"
39
39
 
40
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 198397 $")
 
40
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 209234 $")
41
41
 
42
42
#include <ctype.h>
43
43
#include <iksemel.h>
542
542
/*!
543
543
 * \brief Dial plan function to send a message.
544
544
 * \param chan ast_channel
545
 
 * \param data  Data is sender|reciever|message.
 
545
 * \param data  Data is sender|receiver|message.
546
546
 * \return 0 on success,-1 on error.
547
547
 */
548
548
static int aji_send_exec(struct ast_channel *chan, void *data)
621
621
        
622
622
        ast_debug(1, "Starting TLS handshake\n"); 
623
623
 
624
 
        /* Load encryption, hashing algorithms and error strings */
625
 
        SSL_library_init();
626
 
        SSL_load_error_strings();
627
 
 
628
624
        /* Choose an SSL/TLS protocol version, create SSL_CTX */
629
625
        client->ssl_method = SSLv3_method();
630
626
        client->ssl_context = SSL_CTX_new(client->ssl_method);                
1423
1419
 
1424
1420
        resource = aji_find_resource(buddy, pak->from->resource);
1425
1421
        if (pak->subtype == IKS_TYPE_ERROR) {
1426
 
                ast_log(LOG_WARNING, "Recieved error from a client, turn on jabber debug!\n");
 
1422
                ast_log(LOG_WARNING, "Received error from a client, turn on jabber debug!\n");
1427
1423
                return IKS_FILTER_EAT;
1428
1424
        }
1429
1425
        if (pak->subtype == IKS_TYPE_RESULT) {