2006-12-21 06:30:28 +00:00
|
|
|
/*
|
|
|
|
* This file is part of the Sofia-SIP package
|
|
|
|
*
|
|
|
|
* Copyright (C) 2005 Nokia Corporation.
|
|
|
|
*
|
|
|
|
* Contact: Pekka Pessi <pekka.pessi@nokia.com>
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2.1 of
|
|
|
|
* the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
|
|
|
* 02110-1301 USA
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**@CFILE tport_tls.c
|
|
|
|
* @brief TLS interface
|
|
|
|
*
|
|
|
|
* @author Mikko Haataja <ext-Mikko.A.Haataja@nokia.com>
|
|
|
|
* @author Pekka Pessi <ext-Pekka.Pessi@nokia.com>
|
|
|
|
*
|
|
|
|
* Copyright 2001, 2002 Nokia Research Center. All rights reserved.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#define OPENSSL_NO_KRB5 oh-no
|
|
|
|
|
|
|
|
#include <openssl/lhash.h>
|
|
|
|
#include <openssl/bn.h>
|
|
|
|
#include <openssl/x509.h>
|
|
|
|
#include <openssl/x509v3.h>
|
|
|
|
#include <openssl/ssl.h>
|
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/pem.h>
|
|
|
|
#include <openssl/rand.h>
|
|
|
|
#include <openssl/bio.h>
|
|
|
|
#include <openssl/opensslv.h>
|
|
|
|
|
|
|
|
#include <sofia-sip/su_types.h>
|
|
|
|
#include <sofia-sip/su.h>
|
|
|
|
#include <sofia-sip/su_wait.h>
|
2008-01-18 23:33:44 +00:00
|
|
|
#include <sofia-sip/su_debug.h>
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2007-04-15 02:03:41 +00:00
|
|
|
|
|
|
|
#if HAVE_SIGPIPE
|
2006-12-21 06:30:28 +00:00
|
|
|
#include <signal.h>
|
2007-04-15 02:03:41 +00:00
|
|
|
#endif
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
#include "tport_tls.h"
|
|
|
|
|
|
|
|
char const tls_version[] = OPENSSL_VERSION_TEXT;
|
|
|
|
|
|
|
|
enum { tls_master, tls_slave };
|
|
|
|
|
|
|
|
struct tls_s {
|
|
|
|
SSL_CTX *ctx;
|
|
|
|
SSL *con;
|
|
|
|
BIO *bio_con;
|
|
|
|
BIO *bio_err;
|
|
|
|
int type;
|
|
|
|
int verified;
|
|
|
|
|
|
|
|
/* Receiving */
|
|
|
|
int read_events;
|
|
|
|
void *read_buffer;
|
|
|
|
size_t read_buffer_len;
|
|
|
|
|
|
|
|
/* Sending */
|
|
|
|
int write_events;
|
|
|
|
void *write_buffer;
|
|
|
|
size_t write_buffer_len;
|
|
|
|
|
|
|
|
/* Host names */
|
|
|
|
char *hosts[TLS_MAX_HOSTS + 1];
|
|
|
|
};
|
|
|
|
|
|
|
|
enum { tls_buffer_size = 16384 };
|
|
|
|
|
|
|
|
static
|
|
|
|
tls_t *tls_create(int type)
|
|
|
|
{
|
|
|
|
tls_t *tls = calloc(1, sizeof(*tls));
|
|
|
|
|
|
|
|
if (tls)
|
|
|
|
tls->type = type;
|
|
|
|
|
|
|
|
return tls;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
|
|
|
void tls_set_default(tls_issues_t *i)
|
|
|
|
{
|
|
|
|
i->verify_depth = i->verify_depth == 0 ? 2 : i->verify_depth;
|
|
|
|
i->cert = i->cert ? i->cert : "agent.pem";
|
|
|
|
i->key = i->key ? i->key : i->cert;
|
|
|
|
i->randFile = i->randFile ? i->randFile : "tls_seed.dat";
|
|
|
|
i->CAfile = i->CAfile ? i->CAfile : "cafile.pem";
|
|
|
|
i->cipher = i->cipher ? i->cipher : "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH";
|
|
|
|
/* Default SIP cipher */
|
|
|
|
/* "RSA-WITH-AES-128-CBC-SHA"; */
|
|
|
|
/* RFC-2543-compatibility ciphersuite */
|
|
|
|
/* TLS_RSA_WITH_3DES_EDE_CBC_SHA; */
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
|
|
|
int tls_verify_cb(int ok, X509_STORE_CTX *store)
|
|
|
|
{
|
|
|
|
char data[256];
|
|
|
|
|
|
|
|
X509 *cert = X509_STORE_CTX_get_current_cert(store);
|
|
|
|
int depth = X509_STORE_CTX_get_error_depth(store);
|
|
|
|
int err = X509_STORE_CTX_get_error(store);
|
|
|
|
|
|
|
|
#if nomore
|
|
|
|
509_NAME_oneline(X509_get_subject_name(cert), data, 256);
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1(("depth=%d %s\n",depth,data));
|
2006-12-21 06:30:28 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
if (!ok)
|
|
|
|
{
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1(("-Error with certificate at depth: %i\n", depth));
|
2006-12-21 06:30:28 +00:00
|
|
|
X509_NAME_oneline(X509_get_issuer_name(cert), data, 256);
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1((" issuer = %s\n", data));
|
2006-12-21 06:30:28 +00:00
|
|
|
X509_NAME_oneline(X509_get_subject_name(cert), data, 256);
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1((" subject = %s\n", data));
|
|
|
|
SU_DEBUG_1((" err %i:%s\n", err, X509_verify_cert_error_string(err)));
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 1; /* Always return "ok" */
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
|
|
|
int tls_init_context(tls_t *tls, tls_issues_t const *ti)
|
|
|
|
{
|
|
|
|
static int initialized = 0;
|
|
|
|
|
|
|
|
if (!initialized) {
|
|
|
|
initialized = 1;
|
|
|
|
SSL_library_init();
|
|
|
|
SSL_load_error_strings();
|
|
|
|
|
|
|
|
if (ti->randFile &&
|
|
|
|
!RAND_load_file(ti->randFile, 1024 * 1024)) {
|
|
|
|
if (ti->configured > 1) {
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1(("%s: cannot open randFile %s\n",
|
|
|
|
"tls_init_context", ti->randFile));
|
2006-12-21 06:30:28 +00:00
|
|
|
ERR_print_errors(tls->bio_err);
|
|
|
|
}
|
|
|
|
/* errno = EIO; */
|
|
|
|
/* return -1; */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
#if HAVE_SIGPIPE
|
2006-12-21 06:30:28 +00:00
|
|
|
/* Avoid possible SIGPIPE when sending close_notify */
|
|
|
|
signal(SIGPIPE, SIG_IGN);
|
2007-04-15 02:03:41 +00:00
|
|
|
#endif
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
if (tls->bio_err == NULL)
|
|
|
|
tls->bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
|
|
|
|
|
|
|
|
if (tls->ctx == NULL) {
|
|
|
|
SSL_METHOD *meth;
|
|
|
|
|
|
|
|
/* meth = SSLv3_method(); */
|
|
|
|
/* meth = SSLv23_method(); */
|
|
|
|
|
|
|
|
if (ti->version)
|
|
|
|
meth = TLSv1_method();
|
|
|
|
else
|
|
|
|
meth = SSLv23_method();
|
|
|
|
|
|
|
|
tls->ctx = SSL_CTX_new(meth);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tls->ctx == NULL) {
|
|
|
|
ERR_print_errors(tls->bio_err);
|
|
|
|
errno = EIO;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!SSL_CTX_use_certificate_file(tls->ctx,
|
|
|
|
ti->cert,
|
|
|
|
SSL_FILETYPE_PEM)) {
|
|
|
|
if (ti->configured > 0) {
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1(("%s: invalid certificate: %s\n",
|
|
|
|
"tls_init_context", ti->cert));
|
2006-12-21 06:30:28 +00:00
|
|
|
ERR_print_errors(tls->bio_err);
|
|
|
|
#if require_client_certificate
|
|
|
|
errno = EIO;
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!SSL_CTX_use_PrivateKey_file(tls->ctx,
|
|
|
|
ti->key,
|
|
|
|
SSL_FILETYPE_PEM)) {
|
|
|
|
if (ti->configured > 0) {
|
|
|
|
ERR_print_errors(tls->bio_err);
|
|
|
|
#if require_client_certificate
|
|
|
|
errno = EIO;
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!SSL_CTX_check_private_key(tls->ctx)) {
|
|
|
|
if (ti->configured > 0) {
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1(("Private key does not match the certificate public key\n"));
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
#if require_client_certificate
|
|
|
|
errno = EIO;
|
|
|
|
return -1;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!SSL_CTX_load_verify_locations(tls->ctx,
|
|
|
|
ti->CAfile,
|
|
|
|
ti->CApath)) {
|
|
|
|
if (ti->configured > 0)
|
|
|
|
ERR_print_errors(tls->bio_err);
|
|
|
|
errno = EIO;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
SSL_CTX_set_verify_depth(tls->ctx, ti->verify_depth);
|
|
|
|
|
|
|
|
SSL_CTX_set_verify(tls->ctx,
|
|
|
|
getenv("SSL_VERIFY_PEER") ? SSL_VERIFY_PEER : SSL_VERIFY_NONE
|
|
|
|
/* SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT */,
|
|
|
|
tls_verify_cb);
|
|
|
|
|
|
|
|
if (!SSL_CTX_set_cipher_list(tls->ctx, ti->cipher)) {
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1(("error setting cipher list\n"));
|
2006-12-21 06:30:28 +00:00
|
|
|
ERR_print_errors(tls->bio_err);
|
|
|
|
errno = EIO;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void tls_free(tls_t *tls)
|
|
|
|
{
|
|
|
|
int k;
|
|
|
|
|
|
|
|
if (!tls)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (tls->read_buffer)
|
|
|
|
free(tls->read_buffer), tls->read_buffer = NULL;
|
|
|
|
|
|
|
|
if (tls->con != NULL)
|
|
|
|
SSL_shutdown(tls->con);
|
|
|
|
|
|
|
|
if (tls->ctx != NULL && tls->type != tls_slave)
|
|
|
|
SSL_CTX_free(tls->ctx);
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
free(tls);
|
|
|
|
}
|
|
|
|
|
|
|
|
int tls_get_socket(tls_t *tls)
|
|
|
|
{
|
|
|
|
int sock = -1;
|
|
|
|
|
|
|
|
if (tls != NULL && tls->bio_con != NULL)
|
|
|
|
BIO_get_fd(tls->bio_con, &sock);
|
|
|
|
|
|
|
|
return sock;
|
|
|
|
}
|
|
|
|
|
|
|
|
tls_t *tls_init_master(tls_issues_t *ti)
|
|
|
|
{
|
|
|
|
/* Default id in case RAND fails */
|
|
|
|
unsigned char sessionId[32] = "sofia/tls";
|
|
|
|
tls_t *tls;
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
#if HAVE_SIGPIPE
|
2006-12-21 06:30:28 +00:00
|
|
|
signal(SIGPIPE, SIG_IGN); /* Ignore spurios SIGPIPE from OpenSSL */
|
2007-04-15 02:03:41 +00:00
|
|
|
#endif
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
tls_set_default(ti);
|
|
|
|
|
|
|
|
if (!(tls = tls_create(tls_master)))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (tls_init_context(tls, ti) < 0) {
|
|
|
|
int err = errno;
|
|
|
|
tls_free(tls);
|
|
|
|
errno = err;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
RAND_pseudo_bytes(sessionId, sizeof(sessionId));
|
|
|
|
|
|
|
|
SSL_CTX_set_session_id_context(tls->ctx,
|
|
|
|
(void*) sessionId,
|
|
|
|
sizeof(sessionId));
|
|
|
|
|
|
|
|
if (ti->CAfile != NULL)
|
|
|
|
SSL_CTX_set_client_CA_list(tls->ctx,
|
|
|
|
SSL_load_client_CA_file(ti->CAfile));
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
if (sock != -1) {
|
|
|
|
tls->bio_con = BIO_new_socket(sock, BIO_NOCLOSE);
|
|
|
|
|
|
|
|
if (tls->bio_con == NULL) {
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1(("tls_init_master: BIO_new_socket failed\n"));
|
2006-12-21 06:30:28 +00:00
|
|
|
ERR_print_errors(tls->bio_err);
|
|
|
|
tls_free(tls);
|
|
|
|
errno = EIO;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return tls;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
#include <poll.h>
|
|
|
|
|
|
|
|
static
|
|
|
|
int tls_accept(tls_t *tls)
|
|
|
|
{
|
|
|
|
int ret = SSL_accept(tls->con);
|
|
|
|
int verify_result;
|
|
|
|
|
|
|
|
if (ret <= 0) {
|
|
|
|
int err = SSL_get_error(tls->con, ret);
|
|
|
|
switch(err) {
|
|
|
|
case SSL_ERROR_WANT_READ:
|
|
|
|
return errno = EAGAIN, tls->read_events = SU_WAIT_IN, 0;
|
|
|
|
case SSL_ERROR_WANT_WRITE:
|
|
|
|
return errno = EAGAIN, tls->read_events = SU_WAIT_OUT, 0;
|
|
|
|
|
|
|
|
default:
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1(("SSL_connect failed: %d %s\n",
|
2006-12-21 06:30:28 +00:00
|
|
|
err,
|
2008-01-18 23:33:44 +00:00
|
|
|
ERR_error_string(err, NULL)));
|
2006-12-21 06:30:28 +00:00
|
|
|
ERR_print_errors(tls->bio_err);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
verify_result = SSL_get_verify_result(tls->con);
|
|
|
|
|
|
|
|
if (verify_result != X509_V_OK) {
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1((
|
2006-12-21 06:30:28 +00:00
|
|
|
"Client certificate doesn't verify: %s\n",
|
2008-01-18 23:33:44 +00:00
|
|
|
X509_verify_cert_error_string(verify_result)));
|
2006-12-21 06:30:28 +00:00
|
|
|
#if 0
|
|
|
|
tls_free(tls);
|
|
|
|
return NULL;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
if (SSL_get_peer_certificate(tls->con) == NULL) {
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1(("Client didn't send certificate\n"));
|
2006-12-21 06:30:28 +00:00
|
|
|
#if 0
|
|
|
|
tls_free(tls);
|
|
|
|
return NULL;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
tls_t *tls_clone(tls_t *master, int sock, int accept)
|
|
|
|
{
|
|
|
|
tls_t *tls = tls_create(tls_slave);
|
|
|
|
|
|
|
|
if (tls) {
|
|
|
|
tls->ctx = master->ctx;
|
|
|
|
tls->bio_err = master->bio_err;
|
|
|
|
|
|
|
|
if (!(tls->read_buffer = malloc(tls_buffer_size)))
|
|
|
|
free(tls), tls = NULL;
|
|
|
|
}
|
|
|
|
if (!tls)
|
|
|
|
return tls;
|
|
|
|
|
|
|
|
assert(sock != -1);
|
|
|
|
|
|
|
|
tls->bio_con = BIO_new_socket(sock, BIO_NOCLOSE);
|
|
|
|
tls->con = SSL_new(tls->ctx);
|
|
|
|
|
|
|
|
if (tls->con == NULL) {
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1(("tls_clone: SSL_new failed\n"));
|
2006-12-21 06:30:28 +00:00
|
|
|
ERR_print_errors(tls->bio_err);
|
|
|
|
tls_free(tls);
|
|
|
|
errno = EIO;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
SSL_set_bio(tls->con, tls->bio_con, tls->bio_con);
|
|
|
|
if (accept)
|
|
|
|
SSL_set_accept_state(tls->con);
|
|
|
|
else
|
|
|
|
SSL_set_connect_state(tls->con);
|
|
|
|
SSL_set_mode(tls->con, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
|
|
|
|
|
2007-04-15 02:03:41 +00:00
|
|
|
su_setblocking(sock, 0);
|
2006-12-21 06:30:28 +00:00
|
|
|
tls_read(tls); /* XXX - works only with non-blocking sockets */
|
|
|
|
|
|
|
|
return tls;
|
|
|
|
}
|
|
|
|
|
|
|
|
tls_t *tls_init_slave(tls_t *master, int sock)
|
|
|
|
{
|
|
|
|
int accept;
|
|
|
|
return tls_clone(master, sock, accept = 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
tls_t *tls_init_client(tls_t *master, int sock)
|
|
|
|
{
|
|
|
|
int accept;
|
|
|
|
return tls_clone(master, sock, accept = 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *tls_strdup(char const *s)
|
|
|
|
{
|
|
|
|
if (s) {
|
|
|
|
size_t len = strlen(s) + 1;
|
|
|
|
char *d = malloc(len);
|
|
|
|
if (d)
|
|
|
|
memcpy(d, s, len);
|
|
|
|
return d;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
|
|
|
int tls_post_connection_check(tls_t *tls)
|
|
|
|
{
|
|
|
|
X509 *cert;
|
|
|
|
int extcount;
|
|
|
|
int k, i, j, error;
|
|
|
|
|
|
|
|
if (!tls) return -1;
|
|
|
|
|
|
|
|
cert = SSL_get_peer_certificate(tls->con);
|
|
|
|
if (!cert)
|
|
|
|
return X509_V_OK;
|
|
|
|
|
|
|
|
extcount = X509_get_ext_count(cert);
|
|
|
|
|
|
|
|
for (k = 0; k < TLS_MAX_HOSTS && tls->hosts[k]; k++)
|
|
|
|
;
|
|
|
|
|
|
|
|
/* Find matching subjectAltName.DNS */
|
|
|
|
for (i = 0; i < extcount; i++) {
|
|
|
|
X509_EXTENSION *ext;
|
|
|
|
char const *name;
|
|
|
|
X509V3_EXT_METHOD *vp;
|
|
|
|
STACK_OF(CONF_VALUE) *values;
|
|
|
|
CONF_VALUE *value;
|
|
|
|
void *d2i;
|
|
|
|
|
|
|
|
ext = X509_get_ext(cert, i);
|
|
|
|
name = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
|
|
|
|
|
|
|
|
if (strcmp(name, "subjectAltName") != 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
vp = X509V3_EXT_get(ext); if (!vp) continue;
|
|
|
|
d2i = X509V3_EXT_d2i(ext);
|
|
|
|
values = vp->i2v(vp, d2i, NULL);
|
|
|
|
|
|
|
|
for (j = 0; j < sk_CONF_VALUE_num(values); j++) {
|
|
|
|
value = sk_CONF_VALUE_value(values, j);
|
|
|
|
if (strcmp(value->name, "DNS") == 0) {
|
|
|
|
if (k < TLS_MAX_HOSTS) {
|
|
|
|
tls->hosts[k] = tls_strdup(value->value);
|
|
|
|
k += tls->hosts[k] != NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (strcmp(value->name, "URI") == 0) {
|
|
|
|
char const *uri = strchr(value->value, ':');
|
|
|
|
if (uri ++ && k < TLS_MAX_HOSTS) {
|
|
|
|
tls->hosts[k] = tls_strdup(uri);
|
|
|
|
k += tls->hosts[k] != NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (k < TLS_MAX_HOSTS) {
|
|
|
|
X509_NAME *subject;
|
|
|
|
char name[256];
|
|
|
|
|
|
|
|
subject = X509_get_subject_name(cert);
|
|
|
|
if (subject) {
|
|
|
|
if (X509_NAME_get_text_by_NID(subject, NID_commonName,
|
|
|
|
name, sizeof name) > 0) {
|
|
|
|
name[(sizeof name) - 1] = '\0';
|
|
|
|
|
|
|
|
for (i = 0; tls->hosts[i]; i++)
|
|
|
|
if (strcasecmp(tls->hosts[i], name) == 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (i == k)
|
|
|
|
tls->hosts[k++] = tls_strdup(name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
X509_free(cert);
|
|
|
|
|
|
|
|
error = SSL_get_verify_result(tls->con);
|
|
|
|
|
|
|
|
if (error == X509_V_OK)
|
|
|
|
tls->verified = 1;
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
int tls_check_hosts(tls_t *tls, char const *hosts[TLS_MAX_HOSTS])
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
if (tls == NULL) { errno = EINVAL; return -1; }
|
|
|
|
if (!tls->verified) { errno = EAGAIN; return -1; }
|
|
|
|
|
|
|
|
if (!hosts)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
for (i = 0; hosts[i]; i++) {
|
|
|
|
for (j = 0; tls->hosts[j]; j++) {
|
|
|
|
if (strcasecmp(hosts[i], tls->hosts[j]) == 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (tls->hosts[j] == NULL) {
|
|
|
|
errno = EACCES;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static
|
|
|
|
int tls_error(tls_t *tls, int ret, char const *who, char const *operation,
|
|
|
|
void *buf, int size)
|
|
|
|
{
|
|
|
|
char errorbuf[128];
|
|
|
|
int events = 0;
|
|
|
|
int err = SSL_get_error(tls->con, ret);
|
|
|
|
|
|
|
|
switch (err) {
|
|
|
|
case SSL_ERROR_WANT_WRITE:
|
|
|
|
events = SU_WAIT_OUT;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SSL_ERROR_WANT_READ:
|
|
|
|
events = SU_WAIT_IN;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SSL_ERROR_ZERO_RETURN:
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
case SSL_ERROR_SYSCALL:
|
Merge up to the most recent sofia-sip darcs tree. Includes the following patches from darcs:
Tue Aug 21 09:38:59 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_udp.c: checking error while checking that MSG_TRUNC works.
Shall I pull this patch? (1/43) [ynWvpxqadjk], or ? for help: y
Tue Aug 21 10:49:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_params.c: NUTAG_SIPS_URL() now sets the handle target, too.
Problem reported by Jari Tenhunen.
Shall I pull this patch? (2/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 11:22:42 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: do not destroy INVITE transaction if it has been CANCELed
Handle gracefully cases where the INVITE transaction is destroyed
immediately after canceling it. The old behaviour was to left it up to the
application to ACK the final response returned to INVITE.
Thanks for Fabio Margarido for reporting this problem.
Shall I pull this patch? (3/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 13:02:01 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added test with user SDP containing already rejected media
Shall I pull this patch? (4/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
* nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (5/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (6/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:00:10 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: disabled nta_msg_ackbye(). Fix for sf.net bug #1750691
Thanks for Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (7/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 06:54:38 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for sf.net bug #1750691
Shall I pull this patch? (8/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:03:45 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for nua_bye() sending CANCEL
Shall I pull this patch? (9/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 31 12:08:09 EDT 2007 Pekka.Pessi@nokia.com
* url.c: fixed escaping of '/' %2F, ';' %3B and '=' %3D in URL path/params
Thanks for Fabio Margarido for reporting this bug.
Shall I pull this patch? (10/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 3 10:14:55 EDT 2007 Pekka.Pessi@nokia.com
* url.c: do not un-escape %40 in URI parameters.
Do not unescape %2C, %3B, %3D, or %40 in URI parameters, nor
%2C, %2F, %3B, %3D, or %40 in URI path.
The @ sign can be ambiguous in the SIP URL, e.g.,
<sip:test.info;p=value@test.com>
can be parsed in two ways:
1) username contains test.info;param=value and host part has test.com
2) empty username, host part test.info, URI parameter p=value@test.com
Previously Sofia URL parser converted escaped '@' at signs (%40) in the URI
parameters to the unescaped form. The resulting URI could be ambiguous and
sometimes fail the syntax check if there was no '@' sign before the
unescaped one.
Thanks for Jan van den Bosch and Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (11/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 04:59:57 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed indenting, logging
Shall I pull this patch? (12/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 13 12:47:33 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.h, nua/test_proxy.c: added support for multiple domains
Each domain has its own registrar and authentication module.
Shall I pull this patch? (13/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:19:33 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: added timestamp to event logging
Shall I pull this patch? (14/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:20:12 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed timing problems in testing.
Shall I pull this patch? (15/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:04 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: reduce su_root_step() delay to 0.1 seconds
Shall I pull this patch? (16/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:22 EDT 2007 Pekka.Pessi@nokia.com
* test_register.c: fixed timing problem
Shall I pull this patch? (17/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 17:03:46 EDT 2007 Pekka.Pessi@nokia.com
* test_100rel.c: fixed timing problems resulting in events being reordered
Shall I pull this patch? (18/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:40:53 EDT 2007 Pekka.Pessi@nokia.com
* nua (test_init.c, test_register.c): using test_proxy domains
Shall I pull this patch? (19/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 12:12:32 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added cleanup code
Shall I pull this patch? (20/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:35:35 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: increase lifetime of ACK transaction from T4 to T1 x 64
nta.c creates a ACK transaction in order to restransmit ACK requests when
ever a retransmitted 2XX response to INVITE is received. The UAS retransmits
the 2XX responses for 64 x T1 (32 second by default).
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (21/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 10:21:04 EDT 2007 Pekka.Pessi@nokia.com
* Makefile.am: generating libsofia-sip-ua/docs/Doxyfile.rfc before making manpages
Shall I pull this patch? (22/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:05:33 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/tport_tag.h: added TPTAG_KEEPALIVE(), TPTAG_PINGPONG(), TPTAG_PONG2PING()
Shall I pull this patch? (23/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:09:06 EDT 2007 Pekka.Pessi@nokia.com
* tport: added ping-pong keepalive on TCP. replaced single tick with connection-specific timer
Now detecting closed connections on TLS, too.
Added tests for idle timeout, receive timeout, ping-pong timeout.
Shall I pull this patch? (24/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 6 10:19:32 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: added nta_incoming_received()
Shall I pull this patch? (25/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:29:56 EDT 2007 Pekka.Pessi@nokia.com
* nua_session.c: delay transition to ready when O/A is incomplete
Delay sending ACK and subsequent transition of call to the ready state when
the 200 OK response to the INVITE is received if the SDP Offer/Answer
exchange using UPDATE/PRACK was still incomplete.
Previously, if the O/A using UPDATE or PRACK was incomplete and an 200 OK
was received, the call setup logic regarded this as a fatal error and
terminated the call.
Thanks for Mike Jerris for detecting and reporting this bug.
Shall I pull this patch? (26/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:22:46 EDT 2007 Pekka.Pessi@nokia.com
* test_call_reject.c: testing Retry-After
Shall I pull this patch? (27/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:42:51 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using rudimentary outbound support in B's proxy.
Shall I pull this patch? (28/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:48:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: added some logging to nua_register_connection_closed()
Shall I pull this patch? (29/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:43:57 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using AUTHTAG_MAX_NCOUNT(1) for Mr. C
C is now challenged every time.
Shall I pull this patch? (30/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 11:05:19 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_100rel.c: fixed timing problem re response to PRACK and ACK
Shall I pull this patch? (31/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 06:02:50 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* DIST_SUBDIRS must include everything unconditionally
Shall I pull this patch? (32/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:53:04 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: silenced warnings
Shall I pull this patch? (33/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
* nua: refactored dialog refresh code
Shall I pull this patch? (34/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nua: refactored dialog refresh code
Shall I pull this patch? (35/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:01:25 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc]: renamed functions setting refresh interval
Shall I pull this patch? (36/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:15:03 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc], nua_stack.c: added nua_dialog_repeat_shutdown()
Shall I pull this patch? (37/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:19:20 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.h: renamed nua_remote_t as nua_dialog_peer_info_t
Shall I pull this patch? (38/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:23:04 EDT 2007 Pekka.Pessi@nokia.com
* nua_stack.c: added timer to client request in order to implement Retry-After
Shall I pull this patch? (39/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:33:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: added backpointers to nua_dialog_usage_t and nua_dialog_state_t
Shall I pull this patch? (40/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:56:48 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: abort() in timeout alarm function if -a is given
Shall I pull this patch? (41/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 17:13:18 EDT 2007 Pekka.Pessi@nokia.com
* nua_subnotref.c: include SIPTAG_EVENT() in the nua_i_notify tag list
Shall I pull this patch? (42/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 10 12:27:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: save Contact from target refresh request or response.
Save the Contact header which the application has added to the target
refresh requests or responses and use the saved contact in subsequent target
refresh requests or responses.
Previously the application had no way of specifying the Contact included in
the automatic responses to target refresh requests.
Thanks for Anthony Minessale for reporting this problem.
Shall I pull this patch? (43/43) [ynWvpxqadjk], or ? for help: y
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5692 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-09-10 20:45:25 +00:00
|
|
|
if (SSL_get_shutdown(tls->con) & SSL_RECEIVED_SHUTDOWN)
|
|
|
|
return 0; /* EOS */
|
|
|
|
if (errno == 0)
|
|
|
|
return 0; /* EOS */
|
2006-12-21 06:30:28 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
default:
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1(("%s: %s failed (%d): %s\n",
|
|
|
|
who, operation, err, ERR_error_string(err, errorbuf)));
|
2006-12-21 06:30:28 +00:00
|
|
|
ERR_print_errors(tls->bio_err);
|
|
|
|
errno = EIO;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (buf) {
|
|
|
|
tls->write_events = events;
|
|
|
|
tls->write_buffer = buf, tls->write_buffer_len = size;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
tls->read_events = events;
|
|
|
|
}
|
|
|
|
|
|
|
|
errno = EAGAIN;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ssize_t tls_read(tls_t *tls)
|
|
|
|
{
|
|
|
|
ssize_t ret;
|
|
|
|
|
|
|
|
if (tls == NULL) {
|
|
|
|
errno = EINVAL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (0)
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1(("tls_read(%p) called on %s (events %u)\n", (void *)tls,
|
2006-12-21 06:30:28 +00:00
|
|
|
tls->type == tls_slave ? "server" : "client",
|
2008-01-18 23:33:44 +00:00
|
|
|
tls->read_events));
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
if (tls->read_buffer_len)
|
|
|
|
return (ssize_t)tls->read_buffer_len;
|
|
|
|
|
|
|
|
tls->read_events = SU_WAIT_IN;
|
|
|
|
|
|
|
|
ret = SSL_read(tls->con, tls->read_buffer, tls_buffer_size);
|
|
|
|
if (ret <= 0)
|
|
|
|
return tls_error(tls, ret, "tls_read", "SSL_read", NULL, 0);
|
|
|
|
|
|
|
|
if (!tls->verified) {
|
|
|
|
int err = tls_post_connection_check(tls);
|
|
|
|
|
|
|
|
if (err != X509_V_OK &&
|
|
|
|
err != SSL_ERROR_SYSCALL &&
|
|
|
|
err != SSL_ERROR_WANT_WRITE &&
|
|
|
|
err != SSL_ERROR_WANT_READ) {
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1((
|
2006-12-21 06:30:28 +00:00
|
|
|
"%s: server certificate doesn't verify\n",
|
2008-01-18 23:33:44 +00:00
|
|
|
"tls_read"));
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return (ssize_t)(tls->read_buffer_len = ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
void *tls_read_buffer(tls_t *tls, size_t N)
|
|
|
|
{
|
|
|
|
assert(N == tls->read_buffer_len);
|
|
|
|
tls->read_buffer_len = 0;
|
|
|
|
return tls->read_buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
int tls_pending(tls_t const *tls)
|
|
|
|
{
|
|
|
|
return tls && tls->con && SSL_pending(tls->con);
|
|
|
|
}
|
|
|
|
|
2007-10-11 19:58:13 +00:00
|
|
|
/** Check if data is available in TCP connection.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @retval -1 upon an error
|
|
|
|
* @retval 0 end-of-stream
|
|
|
|
* @retval 1 nothing to read
|
|
|
|
* @retval 2 there is data to read
|
|
|
|
*/
|
2006-12-21 06:30:28 +00:00
|
|
|
int tls_want_read(tls_t *tls, int events)
|
|
|
|
{
|
|
|
|
if (tls && (events & tls->read_events)) {
|
|
|
|
int ret = tls_read(tls);
|
Merge up to the most recent sofia-sip darcs tree. Includes the following patches from darcs:
Tue Aug 21 09:38:59 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_udp.c: checking error while checking that MSG_TRUNC works.
Shall I pull this patch? (1/43) [ynWvpxqadjk], or ? for help: y
Tue Aug 21 10:49:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_params.c: NUTAG_SIPS_URL() now sets the handle target, too.
Problem reported by Jari Tenhunen.
Shall I pull this patch? (2/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 11:22:42 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: do not destroy INVITE transaction if it has been CANCELed
Handle gracefully cases where the INVITE transaction is destroyed
immediately after canceling it. The old behaviour was to left it up to the
application to ACK the final response returned to INVITE.
Thanks for Fabio Margarido for reporting this problem.
Shall I pull this patch? (3/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 13:02:01 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added test with user SDP containing already rejected media
Shall I pull this patch? (4/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
* nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (5/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (6/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:00:10 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: disabled nta_msg_ackbye(). Fix for sf.net bug #1750691
Thanks for Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (7/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 06:54:38 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for sf.net bug #1750691
Shall I pull this patch? (8/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:03:45 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for nua_bye() sending CANCEL
Shall I pull this patch? (9/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 31 12:08:09 EDT 2007 Pekka.Pessi@nokia.com
* url.c: fixed escaping of '/' %2F, ';' %3B and '=' %3D in URL path/params
Thanks for Fabio Margarido for reporting this bug.
Shall I pull this patch? (10/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 3 10:14:55 EDT 2007 Pekka.Pessi@nokia.com
* url.c: do not un-escape %40 in URI parameters.
Do not unescape %2C, %3B, %3D, or %40 in URI parameters, nor
%2C, %2F, %3B, %3D, or %40 in URI path.
The @ sign can be ambiguous in the SIP URL, e.g.,
<sip:test.info;p=value@test.com>
can be parsed in two ways:
1) username contains test.info;param=value and host part has test.com
2) empty username, host part test.info, URI parameter p=value@test.com
Previously Sofia URL parser converted escaped '@' at signs (%40) in the URI
parameters to the unescaped form. The resulting URI could be ambiguous and
sometimes fail the syntax check if there was no '@' sign before the
unescaped one.
Thanks for Jan van den Bosch and Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (11/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 04:59:57 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed indenting, logging
Shall I pull this patch? (12/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 13 12:47:33 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.h, nua/test_proxy.c: added support for multiple domains
Each domain has its own registrar and authentication module.
Shall I pull this patch? (13/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:19:33 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: added timestamp to event logging
Shall I pull this patch? (14/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:20:12 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed timing problems in testing.
Shall I pull this patch? (15/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:04 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: reduce su_root_step() delay to 0.1 seconds
Shall I pull this patch? (16/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:22 EDT 2007 Pekka.Pessi@nokia.com
* test_register.c: fixed timing problem
Shall I pull this patch? (17/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 17:03:46 EDT 2007 Pekka.Pessi@nokia.com
* test_100rel.c: fixed timing problems resulting in events being reordered
Shall I pull this patch? (18/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:40:53 EDT 2007 Pekka.Pessi@nokia.com
* nua (test_init.c, test_register.c): using test_proxy domains
Shall I pull this patch? (19/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 12:12:32 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added cleanup code
Shall I pull this patch? (20/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:35:35 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: increase lifetime of ACK transaction from T4 to T1 x 64
nta.c creates a ACK transaction in order to restransmit ACK requests when
ever a retransmitted 2XX response to INVITE is received. The UAS retransmits
the 2XX responses for 64 x T1 (32 second by default).
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (21/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 10:21:04 EDT 2007 Pekka.Pessi@nokia.com
* Makefile.am: generating libsofia-sip-ua/docs/Doxyfile.rfc before making manpages
Shall I pull this patch? (22/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:05:33 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/tport_tag.h: added TPTAG_KEEPALIVE(), TPTAG_PINGPONG(), TPTAG_PONG2PING()
Shall I pull this patch? (23/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:09:06 EDT 2007 Pekka.Pessi@nokia.com
* tport: added ping-pong keepalive on TCP. replaced single tick with connection-specific timer
Now detecting closed connections on TLS, too.
Added tests for idle timeout, receive timeout, ping-pong timeout.
Shall I pull this patch? (24/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 6 10:19:32 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: added nta_incoming_received()
Shall I pull this patch? (25/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:29:56 EDT 2007 Pekka.Pessi@nokia.com
* nua_session.c: delay transition to ready when O/A is incomplete
Delay sending ACK and subsequent transition of call to the ready state when
the 200 OK response to the INVITE is received if the SDP Offer/Answer
exchange using UPDATE/PRACK was still incomplete.
Previously, if the O/A using UPDATE or PRACK was incomplete and an 200 OK
was received, the call setup logic regarded this as a fatal error and
terminated the call.
Thanks for Mike Jerris for detecting and reporting this bug.
Shall I pull this patch? (26/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:22:46 EDT 2007 Pekka.Pessi@nokia.com
* test_call_reject.c: testing Retry-After
Shall I pull this patch? (27/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:42:51 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using rudimentary outbound support in B's proxy.
Shall I pull this patch? (28/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:48:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: added some logging to nua_register_connection_closed()
Shall I pull this patch? (29/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:43:57 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using AUTHTAG_MAX_NCOUNT(1) for Mr. C
C is now challenged every time.
Shall I pull this patch? (30/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 11:05:19 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_100rel.c: fixed timing problem re response to PRACK and ACK
Shall I pull this patch? (31/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 06:02:50 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* DIST_SUBDIRS must include everything unconditionally
Shall I pull this patch? (32/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:53:04 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: silenced warnings
Shall I pull this patch? (33/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
* nua: refactored dialog refresh code
Shall I pull this patch? (34/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nua: refactored dialog refresh code
Shall I pull this patch? (35/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:01:25 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc]: renamed functions setting refresh interval
Shall I pull this patch? (36/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:15:03 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc], nua_stack.c: added nua_dialog_repeat_shutdown()
Shall I pull this patch? (37/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:19:20 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.h: renamed nua_remote_t as nua_dialog_peer_info_t
Shall I pull this patch? (38/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:23:04 EDT 2007 Pekka.Pessi@nokia.com
* nua_stack.c: added timer to client request in order to implement Retry-After
Shall I pull this patch? (39/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:33:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: added backpointers to nua_dialog_usage_t and nua_dialog_state_t
Shall I pull this patch? (40/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:56:48 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: abort() in timeout alarm function if -a is given
Shall I pull this patch? (41/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 17:13:18 EDT 2007 Pekka.Pessi@nokia.com
* nua_subnotref.c: include SIPTAG_EVENT() in the nua_i_notify tag list
Shall I pull this patch? (42/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 10 12:27:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: save Contact from target refresh request or response.
Save the Contact header which the application has added to the target
refresh requests or responses and use the saved contact in subsequent target
refresh requests or responses.
Previously the application had no way of specifying the Contact included in
the automatic responses to target refresh requests.
Thanks for Anthony Minessale for reporting this problem.
Shall I pull this patch? (43/43) [ynWvpxqadjk], or ? for help: y
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5692 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-09-10 20:45:25 +00:00
|
|
|
if (ret > 0)
|
2007-10-11 19:58:13 +00:00
|
|
|
return 2;
|
Merge up to the most recent sofia-sip darcs tree. Includes the following patches from darcs:
Tue Aug 21 09:38:59 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_udp.c: checking error while checking that MSG_TRUNC works.
Shall I pull this patch? (1/43) [ynWvpxqadjk], or ? for help: y
Tue Aug 21 10:49:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_params.c: NUTAG_SIPS_URL() now sets the handle target, too.
Problem reported by Jari Tenhunen.
Shall I pull this patch? (2/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 11:22:42 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: do not destroy INVITE transaction if it has been CANCELed
Handle gracefully cases where the INVITE transaction is destroyed
immediately after canceling it. The old behaviour was to left it up to the
application to ACK the final response returned to INVITE.
Thanks for Fabio Margarido for reporting this problem.
Shall I pull this patch? (3/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 13:02:01 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added test with user SDP containing already rejected media
Shall I pull this patch? (4/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
* nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (5/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (6/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:00:10 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: disabled nta_msg_ackbye(). Fix for sf.net bug #1750691
Thanks for Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (7/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 06:54:38 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for sf.net bug #1750691
Shall I pull this patch? (8/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:03:45 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for nua_bye() sending CANCEL
Shall I pull this patch? (9/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 31 12:08:09 EDT 2007 Pekka.Pessi@nokia.com
* url.c: fixed escaping of '/' %2F, ';' %3B and '=' %3D in URL path/params
Thanks for Fabio Margarido for reporting this bug.
Shall I pull this patch? (10/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 3 10:14:55 EDT 2007 Pekka.Pessi@nokia.com
* url.c: do not un-escape %40 in URI parameters.
Do not unescape %2C, %3B, %3D, or %40 in URI parameters, nor
%2C, %2F, %3B, %3D, or %40 in URI path.
The @ sign can be ambiguous in the SIP URL, e.g.,
<sip:test.info;p=value@test.com>
can be parsed in two ways:
1) username contains test.info;param=value and host part has test.com
2) empty username, host part test.info, URI parameter p=value@test.com
Previously Sofia URL parser converted escaped '@' at signs (%40) in the URI
parameters to the unescaped form. The resulting URI could be ambiguous and
sometimes fail the syntax check if there was no '@' sign before the
unescaped one.
Thanks for Jan van den Bosch and Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (11/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 04:59:57 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed indenting, logging
Shall I pull this patch? (12/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 13 12:47:33 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.h, nua/test_proxy.c: added support for multiple domains
Each domain has its own registrar and authentication module.
Shall I pull this patch? (13/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:19:33 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: added timestamp to event logging
Shall I pull this patch? (14/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:20:12 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed timing problems in testing.
Shall I pull this patch? (15/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:04 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: reduce su_root_step() delay to 0.1 seconds
Shall I pull this patch? (16/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:22 EDT 2007 Pekka.Pessi@nokia.com
* test_register.c: fixed timing problem
Shall I pull this patch? (17/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 17:03:46 EDT 2007 Pekka.Pessi@nokia.com
* test_100rel.c: fixed timing problems resulting in events being reordered
Shall I pull this patch? (18/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:40:53 EDT 2007 Pekka.Pessi@nokia.com
* nua (test_init.c, test_register.c): using test_proxy domains
Shall I pull this patch? (19/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 12:12:32 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added cleanup code
Shall I pull this patch? (20/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:35:35 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: increase lifetime of ACK transaction from T4 to T1 x 64
nta.c creates a ACK transaction in order to restransmit ACK requests when
ever a retransmitted 2XX response to INVITE is received. The UAS retransmits
the 2XX responses for 64 x T1 (32 second by default).
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (21/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 10:21:04 EDT 2007 Pekka.Pessi@nokia.com
* Makefile.am: generating libsofia-sip-ua/docs/Doxyfile.rfc before making manpages
Shall I pull this patch? (22/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:05:33 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/tport_tag.h: added TPTAG_KEEPALIVE(), TPTAG_PINGPONG(), TPTAG_PONG2PING()
Shall I pull this patch? (23/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:09:06 EDT 2007 Pekka.Pessi@nokia.com
* tport: added ping-pong keepalive on TCP. replaced single tick with connection-specific timer
Now detecting closed connections on TLS, too.
Added tests for idle timeout, receive timeout, ping-pong timeout.
Shall I pull this patch? (24/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 6 10:19:32 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: added nta_incoming_received()
Shall I pull this patch? (25/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:29:56 EDT 2007 Pekka.Pessi@nokia.com
* nua_session.c: delay transition to ready when O/A is incomplete
Delay sending ACK and subsequent transition of call to the ready state when
the 200 OK response to the INVITE is received if the SDP Offer/Answer
exchange using UPDATE/PRACK was still incomplete.
Previously, if the O/A using UPDATE or PRACK was incomplete and an 200 OK
was received, the call setup logic regarded this as a fatal error and
terminated the call.
Thanks for Mike Jerris for detecting and reporting this bug.
Shall I pull this patch? (26/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:22:46 EDT 2007 Pekka.Pessi@nokia.com
* test_call_reject.c: testing Retry-After
Shall I pull this patch? (27/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:42:51 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using rudimentary outbound support in B's proxy.
Shall I pull this patch? (28/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:48:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: added some logging to nua_register_connection_closed()
Shall I pull this patch? (29/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:43:57 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using AUTHTAG_MAX_NCOUNT(1) for Mr. C
C is now challenged every time.
Shall I pull this patch? (30/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 11:05:19 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_100rel.c: fixed timing problem re response to PRACK and ACK
Shall I pull this patch? (31/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 06:02:50 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* DIST_SUBDIRS must include everything unconditionally
Shall I pull this patch? (32/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:53:04 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: silenced warnings
Shall I pull this patch? (33/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
* nua: refactored dialog refresh code
Shall I pull this patch? (34/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nua: refactored dialog refresh code
Shall I pull this patch? (35/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:01:25 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc]: renamed functions setting refresh interval
Shall I pull this patch? (36/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:15:03 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc], nua_stack.c: added nua_dialog_repeat_shutdown()
Shall I pull this patch? (37/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:19:20 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.h: renamed nua_remote_t as nua_dialog_peer_info_t
Shall I pull this patch? (38/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:23:04 EDT 2007 Pekka.Pessi@nokia.com
* nua_stack.c: added timer to client request in order to implement Retry-After
Shall I pull this patch? (39/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:33:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: added backpointers to nua_dialog_usage_t and nua_dialog_state_t
Shall I pull this patch? (40/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:56:48 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: abort() in timeout alarm function if -a is given
Shall I pull this patch? (41/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 17:13:18 EDT 2007 Pekka.Pessi@nokia.com
* nua_subnotref.c: include SIPTAG_EVENT() in the nua_i_notify tag list
Shall I pull this patch? (42/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 10 12:27:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: save Contact from target refresh request or response.
Save the Contact header which the application has added to the target
refresh requests or responses and use the saved contact in subsequent target
refresh requests or responses.
Previously the application had no way of specifying the Contact included in
the automatic responses to target refresh requests.
Thanks for Anthony Minessale for reporting this problem.
Shall I pull this patch? (43/43) [ynWvpxqadjk], or ? for help: y
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5692 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-09-10 20:45:25 +00:00
|
|
|
else if (ret == 0)
|
2006-12-21 06:30:28 +00:00
|
|
|
return 0;
|
Merge up to the most recent sofia-sip darcs tree. Includes the following patches from darcs:
Tue Aug 21 09:38:59 EDT 2007 Pekka.Pessi@nokia.com
* tport_type_udp.c: checking error while checking that MSG_TRUNC works.
Shall I pull this patch? (1/43) [ynWvpxqadjk], or ? for help: y
Tue Aug 21 10:49:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_params.c: NUTAG_SIPS_URL() now sets the handle target, too.
Problem reported by Jari Tenhunen.
Shall I pull this patch? (2/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 11:22:42 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: do not destroy INVITE transaction if it has been CANCELed
Handle gracefully cases where the INVITE transaction is destroyed
immediately after canceling it. The old behaviour was to left it up to the
application to ACK the final response returned to INVITE.
Thanks for Fabio Margarido for reporting this problem.
Shall I pull this patch? (3/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 13:02:01 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added test with user SDP containing already rejected media
Shall I pull this patch? (4/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
* nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (5/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:41:20 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nta: added option for processing orphan responses matching with a dialog
The orphan responses matching with the dialog can now be processed by the
response callback.The dialog leg can be created with
NTATAG_RESPONSE_CALLBACK() or a response callback can be later bound to the
leg with nta_leg_bind_response().
This is practically useful only with 200 OK responses to the INVITE that are
retransmitted by the UAS. By default, the retransmission are catched by the
ACK transaction (which then retransmits the ACK request message). However,
after ACK transaction times out, the retransmitted 200 OK indicates most
probably that the ACK request messages do not reach UAS.
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (6/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:00:10 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: disabled nta_msg_ackbye(). Fix for sf.net bug #1750691
Thanks for Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (7/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 06:54:38 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for sf.net bug #1750691
Shall I pull this patch? (8/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 30 07:03:45 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: added test for nua_bye() sending CANCEL
Shall I pull this patch? (9/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 31 12:08:09 EDT 2007 Pekka.Pessi@nokia.com
* url.c: fixed escaping of '/' %2F, ';' %3B and '=' %3D in URL path/params
Thanks for Fabio Margarido for reporting this bug.
Shall I pull this patch? (10/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 3 10:14:55 EDT 2007 Pekka.Pessi@nokia.com
* url.c: do not un-escape %40 in URI parameters.
Do not unescape %2C, %3B, %3D, or %40 in URI parameters, nor
%2C, %2F, %3B, %3D, or %40 in URI path.
The @ sign can be ambiguous in the SIP URL, e.g.,
<sip:test.info;p=value@test.com>
can be parsed in two ways:
1) username contains test.info;param=value and host part has test.com
2) empty username, host part test.info, URI parameter p=value@test.com
Previously Sofia URL parser converted escaped '@' at signs (%40) in the URI
parameters to the unescaped form. The resulting URI could be ambiguous and
sometimes fail the syntax check if there was no '@' sign before the
unescaped one.
Thanks for Jan van den Bosch and Mikhail Zabaluev for reporting this bug.
Shall I pull this patch? (11/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 04:59:57 EDT 2007 Pekka.Pessi@nokia.com
* tport.c: fixed indenting, logging
Shall I pull this patch? (12/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 13 12:47:33 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_proxy.h, nua/test_proxy.c: added support for multiple domains
Each domain has its own registrar and authentication module.
Shall I pull this patch? (13/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:19:33 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: added timestamp to event logging
Shall I pull this patch? (14/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:20:12 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: fixed timing problems in testing.
Shall I pull this patch? (15/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:04 EDT 2007 Pekka.Pessi@nokia.com
* test_ops.c: reduce su_root_step() delay to 0.1 seconds
Shall I pull this patch? (16/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:31:22 EDT 2007 Pekka.Pessi@nokia.com
* test_register.c: fixed timing problem
Shall I pull this patch? (17/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 17:03:46 EDT 2007 Pekka.Pessi@nokia.com
* test_100rel.c: fixed timing problems resulting in events being reordered
Shall I pull this patch? (18/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:40:53 EDT 2007 Pekka.Pessi@nokia.com
* nua (test_init.c, test_register.c): using test_proxy domains
Shall I pull this patch? (19/43) [ynWvpxqadjk], or ? for help: y
Thu Aug 23 12:12:32 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: added cleanup code
Shall I pull this patch? (20/43) [ynWvpxqadjk], or ? for help: y
Fri Aug 24 09:35:35 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: increase lifetime of ACK transaction from T4 to T1 x 64
nta.c creates a ACK transaction in order to restransmit ACK requests when
ever a retransmitted 2XX response to INVITE is received. The UAS retransmits
the 2XX responses for 64 x T1 (32 second by default).
Partially fixes the sf.net bug #1750691 reported by Mikhail Zabaluev.
Shall I pull this patch? (21/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 10:21:04 EDT 2007 Pekka.Pessi@nokia.com
* Makefile.am: generating libsofia-sip-ua/docs/Doxyfile.rfc before making manpages
Shall I pull this patch? (22/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:05:33 EDT 2007 Pekka.Pessi@nokia.com
* sofia-sip/tport_tag.h: added TPTAG_KEEPALIVE(), TPTAG_PINGPONG(), TPTAG_PONG2PING()
Shall I pull this patch? (23/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:09:06 EDT 2007 Pekka.Pessi@nokia.com
* tport: added ping-pong keepalive on TCP. replaced single tick with connection-specific timer
Now detecting closed connections on TLS, too.
Added tests for idle timeout, receive timeout, ping-pong timeout.
Shall I pull this patch? (24/43) [ynWvpxqadjk], or ? for help: y
Fri Jul 6 10:19:32 EDT 2007 Pekka.Pessi@nokia.com
* nta.c: added nta_incoming_received()
Shall I pull this patch? (25/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 11:29:56 EDT 2007 Pekka.Pessi@nokia.com
* nua_session.c: delay transition to ready when O/A is incomplete
Delay sending ACK and subsequent transition of call to the ready state when
the 200 OK response to the INVITE is received if the SDP Offer/Answer
exchange using UPDATE/PRACK was still incomplete.
Previously, if the O/A using UPDATE or PRACK was incomplete and an 200 OK
was received, the call setup logic regarded this as a fatal error and
terminated the call.
Thanks for Mike Jerris for detecting and reporting this bug.
Shall I pull this patch? (26/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:22:46 EDT 2007 Pekka.Pessi@nokia.com
* test_call_reject.c: testing Retry-After
Shall I pull this patch? (27/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:42:51 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using rudimentary outbound support in B's proxy.
Shall I pull this patch? (28/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:48:33 EDT 2007 Pekka.Pessi@nokia.com
* nua_register.c: added some logging to nua_register_connection_closed()
Shall I pull this patch? (29/43) [ynWvpxqadjk], or ? for help: y
Wed Jul 25 12:43:57 EDT 2007 Pekka.Pessi@nokia.com
* test_nua: using AUTHTAG_MAX_NCOUNT(1) for Mr. C
C is now challenged every time.
Shall I pull this patch? (30/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 11:05:19 EDT 2007 Pekka.Pessi@nokia.com
* nua/test_100rel.c: fixed timing problem re response to PRACK and ACK
Shall I pull this patch? (31/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 06:02:50 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
* DIST_SUBDIRS must include everything unconditionally
Shall I pull this patch? (32/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:53:04 EDT 2007 Pekka.Pessi@nokia.com
* test_soa.c: silenced warnings
Shall I pull this patch? (33/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
* nua: refactored dialog refresh code
Shall I pull this patch? (34/43) [ynWvpxqadjk], or ? for help: y
Mon Jul 23 16:59:48 EDT 2007 Pekka.Pessi@nokia.com
UNDO: nua: refactored dialog refresh code
Shall I pull this patch? (35/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:01:25 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc]: renamed functions setting refresh interval
Shall I pull this patch? (36/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:15:03 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.[hc], nua_stack.c: added nua_dialog_repeat_shutdown()
Shall I pull this patch? (37/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:19:20 EDT 2007 Pekka.Pessi@nokia.com
* nua_dialog.h: renamed nua_remote_t as nua_dialog_peer_info_t
Shall I pull this patch? (38/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:23:04 EDT 2007 Pekka.Pessi@nokia.com
* nua_stack.c: added timer to client request in order to implement Retry-After
Shall I pull this patch? (39/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 12:33:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: added backpointers to nua_dialog_usage_t and nua_dialog_state_t
Shall I pull this patch? (40/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 13:56:48 EDT 2007 Pekka.Pessi@nokia.com
* test_nua.c: abort() in timeout alarm function if -a is given
Shall I pull this patch? (41/43) [ynWvpxqadjk], or ? for help: y
Thu Sep 6 17:13:18 EDT 2007 Pekka.Pessi@nokia.com
* nua_subnotref.c: include SIPTAG_EVENT() in the nua_i_notify tag list
Shall I pull this patch? (42/43) [ynWvpxqadjk], or ? for help: y
Mon Sep 10 12:27:53 EDT 2007 Pekka.Pessi@nokia.com
* nua: save Contact from target refresh request or response.
Save the Contact header which the application has added to the target
refresh requests or responses and use the saved contact in subsequent target
refresh requests or responses.
Previously the application had no way of specifying the Contact included in
the automatic responses to target refresh requests.
Thanks for Anthony Minessale for reporting this problem.
Shall I pull this patch? (43/43) [ynWvpxqadjk], or ? for help: y
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5692 d0543943-73ff-0310-b7d9-9358b9ac24b2
2007-09-10 20:45:25 +00:00
|
|
|
else if (errno == EAGAIN)
|
2007-10-11 19:58:13 +00:00
|
|
|
return 3; /* ??? */
|
2006-12-21 06:30:28 +00:00
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2007-10-11 19:58:13 +00:00
|
|
|
return 1;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ssize_t tls_write(tls_t *tls, void *buf, size_t size)
|
|
|
|
{
|
|
|
|
ssize_t ret;
|
|
|
|
|
|
|
|
if (0)
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1(("tls_write(%p, %p, "MOD_ZU") called on %s\n",
|
2007-04-15 02:03:41 +00:00
|
|
|
(void *)tls, buf, size,
|
2008-01-18 23:33:44 +00:00
|
|
|
tls && tls->type == tls_slave ? "server" : "client"));
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
if (tls == NULL || buf == NULL) {
|
|
|
|
errno = EINVAL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tls->write_buffer) {
|
|
|
|
assert(buf == tls->write_buffer);
|
|
|
|
assert(size >= tls->write_buffer_len);
|
|
|
|
assert(tls->write_events == 0);
|
|
|
|
|
|
|
|
if (tls->write_events ||
|
|
|
|
buf != tls->write_buffer ||
|
|
|
|
size < tls->write_buffer_len) {
|
|
|
|
errno = EIO;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = tls->write_buffer_len;
|
|
|
|
|
|
|
|
tls->write_buffer = NULL;
|
|
|
|
tls->write_buffer_len = 0;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (size == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
tls->write_events = 0;
|
|
|
|
|
|
|
|
if (!tls->verified) {
|
|
|
|
if (tls_post_connection_check(tls) != X509_V_OK) {
|
2008-01-18 23:33:44 +00:00
|
|
|
SU_DEBUG_1((
|
|
|
|
"tls_read: server certificate doesn't verify\n"));
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = SSL_write(tls->con, buf, size);
|
|
|
|
if (ret < 0)
|
|
|
|
return tls_error(tls, ret, "tls_write", "SSL_write", buf, size);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int tls_want_write(tls_t *tls, int events)
|
|
|
|
{
|
|
|
|
if (tls && (events & tls->write_events)) {
|
|
|
|
int ret;
|
|
|
|
void *buf = tls->write_buffer;
|
|
|
|
size_t size = tls->write_buffer_len;
|
|
|
|
|
|
|
|
tls->write_events = 0;
|
|
|
|
|
|
|
|
/* remove buf */
|
|
|
|
tls->write_buffer = NULL;
|
|
|
|
tls->write_buffer_len = 0;
|
|
|
|
|
|
|
|
ret = tls_write(tls, buf, size);
|
|
|
|
|
|
|
|
if (ret >= 0)
|
|
|
|
/* Restore buf */
|
|
|
|
return tls->write_buffer = buf, tls->write_buffer_len = ret;
|
|
|
|
else if (errno == EAGAIN)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int tls_events(tls_t const *tls, int mask)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (!tls)
|
|
|
|
return mask;
|
|
|
|
|
|
|
|
if (tls->type == tls_master)
|
|
|
|
return mask;
|
|
|
|
|
|
|
|
return
|
|
|
|
(mask & ~(SU_WAIT_IN|SU_WAIT_OUT)) |
|
|
|
|
((mask & SU_WAIT_IN) ? tls->read_events : 0) |
|
|
|
|
((mask & SU_WAIT_OUT) ? tls->write_events : 0);
|
|
|
|
}
|