- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7295 - freeswitch/trunk/libs/sofia-sip
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: mikej Date: Fri Jan 18 20:48:21 2008 New Revision: 7295 Modified: freeswitch/trunk/libs/sofia-sip/.update Log: push tls tweaks to force rebuild Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri Jan 18 20:48:21 2008 @@ -1 +1 @@ -Sun Jan 6 15:11:42 EST 2008 +Sat Jan 19 01:47:55 GMT 2008

1 0

[commit] r7294 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: stkn Date: Fri Jan 18 20:28:36 2008 New Revision: 7294 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: Ouput a second line with tls_url and (TLS) in sofia status for tls enabled profiles Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Jan 18 20:28:36 2008 @@ -1260,6 +1260,12 @@ } else { stream->write_function(stream, "%25s\t%s\t %32s\t%s (%u)\n", profile->name, "profile", profile->url, sofia_test_pflag(profile, PFLAG_RUNNING) ? "RUNNING" : "DOWN", profile->inuse); + + if (sofia_test_pflag(profile, PFLAG_TLS)) { + stream->write_function(stream, "%25s\t%s\t %32s\t%s (%u) (TLS)\n", profile->name, "profile", profile->tls_url, + sofia_test_pflag(profile, PFLAG_RUNNING) ? "RUNNING" : "DOWN", profile->inuse); + } + c++; for (gp = profile->gateways; gp; gp = gp->next) {

1 0

[commit] r7293 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: stkn Date: Fri Jan 18 20:12:48 2008 New Revision: 7293 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: Show TLS urls in sofia status profile output Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Jan 18 20:12:48 2008 @@ -1214,6 +1214,10 @@ } stream->write_function(stream, "URL \t%s\n", switch_str_nil(profile->url)); stream->write_function(stream, "BIND-URL \t%s\n", switch_str_nil(profile->bindurl)); + if (sofia_test_pflag(profile, PFLAG_TLS)) { + stream->write_function(stream, "TLS-URL \t%s\n", switch_str_nil(profile->tls_url)); + stream->write_function(stream, "TLS-BIND-URL \t%s\n", switch_str_nil(profile->tls_bindurl)); + } stream->write_function(stream, "HOLD-MUSIC \t%s\n", switch_str_nil(profile->hold_music)); stream->write_function(stream, "CODECS \t%s\n", switch_str_nil(profile->codec_string)); stream->write_function(stream, "TEL-EVENT \t%d\n", profile->te);

1 0

[commit] r7292 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport
by Freeswitch SVN 19 Jan '08

19 Jan '08

Author: stkn Date: Fri Jan 18 19:20:31 2008 New Revision: 7292 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Log: Silence openssl messages, part 2 of 2. Changed to TPORT_DEBUG=1 (thanks MikeJ). This one converts all ERR_print_errors() calls Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Fri Jan 18 19:20:31 2008 @@ -50,7 +50,6 @@ #include <sofia-sip/su_types.h> #include <sofia-sip/su.h> #include <sofia-sip/su_wait.h> -#include <sofia-sip/su_debug.h> #include <assert.h> #include <stdio.h> @@ -62,6 +61,7 @@ #endif #include "tport_tls.h" +#include "tport_internal.h" char const tls_version[] = OPENSSL_VERSION_TEXT; @@ -71,7 +71,6 @@ SSL_CTX *ctx; SSL *con; BIO *bio_con; - BIO *bio_err; int type; int verified; @@ -92,6 +91,13 @@ enum { tls_buffer_size = 16384 }; static +int tls_print_errors(const char *str, size_t len, void *u) +{ + SU_DEBUG_1((str)); + return 0; +} + +static tls_t *tls_create(int type) { tls_t *tls = calloc(1, sizeof(*tls)); @@ -159,7 +165,7 @@ if (ti->configured > 1) { SU_DEBUG_1(("%s: cannot open randFile %s\n", "tls_init_context", ti->randFile)); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); } /* errno = EIO; */ /* return -1; */ @@ -171,9 +177,6 @@ signal(SIGPIPE, SIG_IGN); #endif - if (tls->bio_err == NULL) - tls->bio_err = BIO_new_fp(stderr, BIO_NOCLOSE); - if (tls->ctx == NULL) { SSL_METHOD *meth; @@ -189,7 +192,7 @@ } if (tls->ctx == NULL) { - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); errno = EIO; return -1; } @@ -200,7 +203,7 @@ if (ti->configured > 0) { SU_DEBUG_1(("%s: invalid certificate: %s\n", "tls_init_context", ti->cert)); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); #if require_client_certificate errno = EIO; return -1; @@ -212,7 +215,7 @@ ti->key, SSL_FILETYPE_PEM)) { if (ti->configured > 0) { - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); #if require_client_certificate errno = EIO; return -1; @@ -234,7 +237,7 @@ ti->CAfile, ti->CApath)) { if (ti->configured > 0) - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); errno = EIO; return -1; } @@ -248,7 +251,7 @@ if (!SSL_CTX_set_cipher_list(tls->ctx, ti->cipher)) { SU_DEBUG_1(("error setting cipher list\n")); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); errno = EIO; return -1; } @@ -275,9 +278,6 @@ if (tls->bio_con != NULL) BIO_free(tls->bio_con); - if (tls->bio_err != NULL && tls->type != tls_slave) - BIO_free(tls->bio_err); - for (k = 0; k < TLS_MAX_HOSTS; k++) free(tls->hosts[k]), tls->hosts[k] = NULL; @@ -332,7 +332,7 @@ if (tls->bio_con == NULL) { SU_DEBUG_1(("tls_init_master: BIO_new_socket failed\n")); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); tls_free(tls); errno = EIO; return NULL; @@ -364,7 +364,7 @@ SU_DEBUG_1(("SSL_connect failed: %d %s\n", err, ERR_error_string(err, NULL))); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); return -1; } } @@ -399,7 +399,6 @@ if (tls) { tls->ctx = master->ctx; - tls->bio_err = master->bio_err; if (!(tls->read_buffer = malloc(tls_buffer_size))) free(tls), tls = NULL; @@ -414,7 +413,7 @@ if (tls->con == NULL) { SU_DEBUG_1(("tls_clone: SSL_new failed\n")); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); tls_free(tls); errno = EIO; return NULL; @@ -596,7 +595,7 @@ default: SU_DEBUG_1(("%s: %s failed (%d): %s\n", who, operation, err, ERR_error_string(err, errorbuf))); - ERR_print_errors(tls->bio_err); + ERR_print_errors_cb(&tls_print_errors, NULL); errno = EIO; return -1; }

1 0

[commit] r7291 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport
by Freeswitch SVN 18 Jan '08

18 Jan '08

Author: stkn Date: Fri Jan 18 18:33:44 2008 New Revision: 7291 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Log: Silence openssl messages, use export SU_DEBUG=1 to get them back (part 1 of 2) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c Fri Jan 18 18:33:44 2008 @@ -50,6 +50,7 @@ #include <sofia-sip/su_types.h> #include <sofia-sip/su.h> #include <sofia-sip/su_wait.h> +#include <sofia-sip/su_debug.h> #include <assert.h> #include <stdio.h> @@ -127,17 +128,17 @@ #if nomore 509_NAME_oneline(X509_get_subject_name(cert), data, 256); - fprintf(stderr,"depth=%d %s\n",depth,data); + SU_DEBUG_1(("depth=%d %s\n",depth,data)); #endif if (!ok) { - fprintf(stderr, "-Error with certificate at depth: %i\n", depth); + SU_DEBUG_1(("-Error with certificate at depth: %i\n", depth)); X509_NAME_oneline(X509_get_issuer_name(cert), data, 256); - fprintf(stderr, " issuer = %s\n", data); + SU_DEBUG_1((" issuer = %s\n", data)); X509_NAME_oneline(X509_get_subject_name(cert), data, 256); - fprintf(stderr, " subject = %s\n", data); - fprintf(stderr, " err %i:%s\n", err, X509_verify_cert_error_string(err)); + SU_DEBUG_1((" subject = %s\n", data)); + SU_DEBUG_1((" err %i:%s\n", err, X509_verify_cert_error_string(err))); } return 1; /* Always return "ok" */ @@ -156,8 +157,8 @@ if (ti->randFile && !RAND_load_file(ti->randFile, 1024 * 1024)) { if (ti->configured > 1) { - BIO_printf(tls->bio_err, "%s: cannot open randFile %s\n", - "tls_init_context", ti->randFile); + SU_DEBUG_1(("%s: cannot open randFile %s\n", + "tls_init_context", ti->randFile)); ERR_print_errors(tls->bio_err); } /* errno = EIO; */ @@ -197,8 +198,8 @@ ti->cert, SSL_FILETYPE_PEM)) { if (ti->configured > 0) { - BIO_printf(tls->bio_err, "%s: invalid certificate: %s\n", - "tls_init_context", ti->cert); + SU_DEBUG_1(("%s: invalid certificate: %s\n", + "tls_init_context", ti->cert)); ERR_print_errors(tls->bio_err); #if require_client_certificate errno = EIO; @@ -221,8 +222,7 @@ if (!SSL_CTX_check_private_key(tls->ctx)) { if (ti->configured > 0) { - BIO_printf(tls->bio_err, - "Private key does not match the certificate public key\n"); + SU_DEBUG_1(("Private key does not match the certificate public key\n")); } #if require_client_certificate errno = EIO; @@ -247,7 +247,7 @@ tls_verify_cb); if (!SSL_CTX_set_cipher_list(tls->ctx, ti->cipher)) { - BIO_printf(tls->bio_err,"error setting cipher list\n"); + SU_DEBUG_1(("error setting cipher list\n")); ERR_print_errors(tls->bio_err); errno = EIO; return -1; @@ -331,7 +331,7 @@ tls->bio_con = BIO_new_socket(sock, BIO_NOCLOSE); if (tls->bio_con == NULL) { - BIO_printf(tls->bio_err, "tls_init_master: BIO_new_socket failed\n"); + SU_DEBUG_1(("tls_init_master: BIO_new_socket failed\n")); ERR_print_errors(tls->bio_err); tls_free(tls); errno = EIO; @@ -361,9 +361,9 @@ return errno = EAGAIN, tls->read_events = SU_WAIT_OUT, 0; default: - BIO_printf(tls->bio_err, "SSL_connect failed: %d %s\n", + SU_DEBUG_1(("SSL_connect failed: %d %s\n", err, - ERR_error_string(err, NULL)); + ERR_error_string(err, NULL))); ERR_print_errors(tls->bio_err); return -1; } @@ -372,9 +372,9 @@ verify_result = SSL_get_verify_result(tls->con); if (verify_result != X509_V_OK) { - BIO_printf(tls->bio_err, + SU_DEBUG_1(( "Client certificate doesn't verify: %s\n", - X509_verify_cert_error_string(verify_result)); + X509_verify_cert_error_string(verify_result))); #if 0 tls_free(tls); return NULL; @@ -382,7 +382,7 @@ } if (SSL_get_peer_certificate(tls->con) == NULL) { - BIO_printf(tls->bio_err, "Client didn't send certificate\n"); + SU_DEBUG_1(("Client didn't send certificate\n")); #if 0 tls_free(tls); return NULL; @@ -413,7 +413,7 @@ tls->con = SSL_new(tls->ctx); if (tls->con == NULL) { - BIO_printf(tls->bio_err, "tls_clone: SSL_new failed\n"); + SU_DEBUG_1(("tls_clone: SSL_new failed\n")); ERR_print_errors(tls->bio_err); tls_free(tls); errno = EIO; @@ -594,8 +594,8 @@ return -1; default: - BIO_printf(tls->bio_err, "%s: %s failed (%d): %s\n", - who, operation, err, ERR_error_string(err, errorbuf)); + SU_DEBUG_1(("%s: %s failed (%d): %s\n", + who, operation, err, ERR_error_string(err, errorbuf))); ERR_print_errors(tls->bio_err); errno = EIO; return -1; @@ -623,9 +623,9 @@ } if (0) - fprintf(stderr, "tls_read(%p) called on %s (events %u)\n", (void *)tls, + SU_DEBUG_1(("tls_read(%p) called on %s (events %u)\n", (void *)tls, tls->type == tls_slave ? "server" : "client", - tls->read_events); + tls->read_events)); if (tls->read_buffer_len) return (ssize_t)tls->read_buffer_len; @@ -643,9 +643,9 @@ err != SSL_ERROR_SYSCALL && err != SSL_ERROR_WANT_WRITE && err != SSL_ERROR_WANT_READ) { - BIO_printf(tls->bio_err, + SU_DEBUG_1(( "%s: server certificate doesn't verify\n", - "tls_read"); + "tls_read")); } } @@ -695,9 +695,9 @@ ssize_t ret; if (0) - fprintf(stderr, "tls_write(%p, %p, "MOD_ZU") called on %s\n", + SU_DEBUG_1(("tls_write(%p, %p, "MOD_ZU") called on %s\n", (void *)tls, buf, size, - tls && tls->type == tls_slave ? "server" : "client"); + tls && tls->type == tls_slave ? "server" : "client")); if (tls == NULL || buf == NULL) { errno = EINVAL; @@ -731,8 +731,8 @@ if (!tls->verified) { if (tls_post_connection_check(tls) != X509_V_OK) { - BIO_printf(tls->bio_err, - "tls_read: server certificate doesn't verify\n"); + SU_DEBUG_1(( + "tls_read: server certificate doesn't verify\n")); } }

1 0

[commit] r7290 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 18 Jan '08

18 Jan '08

Author: anthm Date: Fri Jan 18 18:21:01 2008 New Revision: 7290 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Jan 18 18:21:01 2008 @@ -424,7 +424,9 @@ conference_member_t *member = NULL; switch_assert(conference != NULL); - switch_assert(id != 0); + if (!id) { + return NULL; + } switch_mutex_lock(conference->member_mutex); for (member = conference->members; member; member = member->next) {

1 0

[commit] r7289 - in freeswitch/trunk/conf: autoload_configs dialplan
by Freeswitch SVN 18 Jan '08

18 Jan '08

Author: brian Date: Fri Jan 18 17:51:53 2008 New Revision: 7289 Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml freeswitch/trunk/conf/dialplan/default.xml Log: tweaks Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/switch.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/switch.conf.xml Fri Jan 18 17:51:53 2008 @@ -19,7 +19,7 @@ <variables> <variable name="uk-ring" value="%(400,200,400,450);%(400,2200,400,450)"/> <variable name="us-ring" value="%(2000, 4000, 440.0, 480.0)"/> - <variable name="bong-ring" value="v=4000;>=0;+=2;#(60,0);v=2000;%(940,0,350,440)"/> + <variable name="bong-ring" value="v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/> </variables> </configuration> Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Jan 18 17:51:53 2008 @@ -273,7 +273,7 @@ <extension name="is_secure"> <condition field="${sip_secure_media_confirmed}" expression="^true$" break="never"> <action application="sleep" data="1000"/> - <action application="gentones" data="%(1000, 0, 320)"/> + <action application="gentones" data="${bong-ring}"/> </condition> </extension>

1 0

[commit] r7288 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 18 Jan '08

18 Jan '08

Author: brian Date: Fri Jan 18 17:28:38 2008 New Revision: 7288 Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml Log: tweak the tone Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Fri Jan 18 17:28:38 2008 @@ -70,7 +70,7 @@  <param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>  - <param name="exit-sound" value="tone_stream://%(200,0,300,200,100)"/> + <param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>  <param name="kicked-sound" value="conference/conf-kicked.wav"/>

1 0

[commit] r7287 - freeswitch/trunk/docs
by Freeswitch SVN 18 Jan '08

18 Jan '08

Author: brian Date: Fri Jan 18 16:42:40 2008 New Revision: 7287 Modified: freeswitch/trunk/docs/AUTHORS Log: thanks stkn Modified: freeswitch/trunk/docs/AUTHORS ============================================================================== --- freeswitch/trunk/docs/AUTHORS (original) +++ freeswitch/trunk/docs/AUTHORS Fri Jan 18 16:42:40 2008 @@ -24,7 +24,7 @@ James Martelletti <james(a)nerdc0re.com> - All around cool guy (mod_syslog) Johny Kadarisman <jkr888(a)gmail.com> Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> - implementation of mod_cdr (perldd, mysql, csv) - Stefan Knoblich - Various patches and support. Thanks. + Stefan Knoblich - Sofia TLS, various patches and support. Thanks. Justin Unger - <justinunger at gmail dot com> Lots of help with patches and SIP testing. Thanks! Paul D. Tinsley - Various patches and support. <pdt at jackhammer.org> Ken Rice - <krice AT suspicious.org> - xmlcdr, sofia improvements, load testing, 1 liners here and there.

1 0

[commit] r7286 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Jan '08

18 Jan '08

Author: stkn Date: Fri Jan 18 16:13:52 2008 New Revision: 7286 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: Check if TLS is really available Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Jan 18 16:13:52 2008 @@ -765,6 +765,11 @@ } } + if (!sofia_test_pflag(tech_pvt->profile, PFLAG_TLS) && sofia_glue_transport_has_tls(tech_pvt->transport)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "TLS not supported by profile\n"); + return SWITCH_STATUS_FALSE; + } + if (switch_strlen_zero(tech_pvt->invite_contact)) { if (sofia_glue_transport_has_tls(tech_pvt->transport))

1 0