- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12390 - freeswitch/trunk/src
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: brian Date: Tue Mar 3 12:03:25 2009 New Revision: 12390 Log: FSCORE-317 Modified: freeswitch/trunk/src/switch_core_speech.c Modified: freeswitch/trunk/src/switch_core_speech.c ============================================================================== --- freeswitch/trunk/src/switch_core_speech.c (original) +++ freeswitch/trunk/src/switch_core_speech.c Tue Mar 3 12:03:25 2009 @@ -154,7 +154,7 @@ if (switch_test_flag(sh, SWITCH_SPEECH_FLAG_DONE)) { switch_clear_flag(sh, SWITCH_SPEECH_FLAG_DONE); *datalen = 0; - return SWITCH_STATUS_FALSE; + return SWITCH_STATUS_BREAK; } more:

1 0

[commit] r12388 - in freeswitch/trunk/libs/sofia-sip: . s2check
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:27:41 2009 New Revision: 12388 Log: Tue Mar 3 10:37:30 CST 2009 Pekka Pessi <first.last(a)nokia.com> * s2check: added s2base.[hc], s2sip.[hc] Ignore-this: 6a32b36a47a6f9dd2b5fec7c7375c564 Moved nua/test_s2 code here. Added: freeswitch/trunk/libs/sofia-sip/s2check/s2base.c freeswitch/trunk/libs/sofia-sip/s2check/s2base.h freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 3 11:27:41 2009 @@ -1 +1 @@ -Tue Mar 3 11:25:58 CST 2009 +Tue Mar 3 11:27:12 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am Tue Mar 3 11:27:41 2009 @@ -19,6 +19,8 @@ # Rules for building the targets libs2_a_SOURCES = s2check.h s2tcase.c \ + s2base.h s2base.c \ + s2sip.c s2sip.h \ s2_localinfo.h s2_localinfo.c \ s2dns.h s2dns.c \ s2util.h s2time.c Added: freeswitch/trunk/libs/sofia-sip/s2check/s2base.c ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.c Tue Mar 3 11:27:41 2009 @@ -0,0 +1,198 @@ +/* + * This file is part of the Sofia-SIP package + * + * Copyright (C) 2008 Nokia Corporation. + * + * Contact: Pekka Pessi <pekka.pessi(a)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 s2base.c + * @brief Common check-based tester for Sofia SIP modules + * + * @author Pekka Pessi <Pekka.Pessi(a)nokia.com> + * + * @date Created: Wed Apr 30 12:48:27 EEST 2008 ppessi + */ + +#include "config.h" + +#undef NDEBUG + +#define TP_MAGIC_T struct tp_magic_s + +#include "s2base.h" + +#include <sofia-sip/sip_header.h> +#include <sofia-sip/sip_status.h> +#include <sofia-sip/msg_addr.h> +#include <sofia-sip/su_log.h> +#include <sofia-sip/su_tagarg.h> +#include <sofia-sip/su_alloc.h> +#include <sofia-sip/su_string.h> +#include <sofia-sip/sresolv.h> + +#include <stdlib.h> +#include <string.h> +#include <assert.h> +#include <limits.h> +#include <time.h> + +#if HAVE_SYS_TIME_H +#include <sys/time.h> /* Get struct timeval */ +#endif + +#if HAVE_CLOCK_GETTIME +static double +now(void) +{ + struct timespec tv; + +#if CLOCK_MONOTONIC + if (clock_gettime(CLOCK_MONOTONIC, &tv) != 0) +#endif + clock_gettime(CLOCK_REALTIME, &tv); + + return tv.tv_sec * 1.0 + tv.tv_nsec * 1e-9; +} +#elif HAVE_GETTIMEOFDAY +static double +now(void) +{ + struct timespec tv; + + gettimeofday(&tv, NULL); + + return tv.tv_sec * 1.0 + tv.tv_usec * 1e-6; +} + +#else +#error no gettimeofday for test timing +#endif + +/* -- Module globals ---------------------------------------------------- */ + +struct s2base *s2base; + +char const *s2_tester = "s2_tester"; +int s2_start_stop; + +char const *_s2_suite = "X"; +char const *_s2_case = "0.0"; + +static struct { + double setup, start, done, toredown; +} stamps; + +void s2_suite(char const *name) +{ + _s2_suite = name; +} + +/** Basic setup for test cases */ +void s2_setup(char const *label) +{ + assert(s2base == NULL); + + stamps.setup = now(); + + if (s2_start_stop > 1) { + printf("%s - setup %s test case\n", s2_tester, label ? label : "next"); + } + + su_init(); + + s2base = su_home_new(sizeof *s2base); + assert(s2base != NULL); + + s2base->root = su_root_create(s2base); + assert(s2base->root != NULL); +} + +void s2_case(char const *number, + char const *title, + char const *description) +{ + stamps.start = now(); + + _s2_case = number; + if (s2_start_stop) + printf("%s - starting %s/%s-%s\n", s2_tester, _s2_suite, _s2_case, title); +} + +SOFIAPUBVAR su_log_t nua_log[]; +SOFIAPUBVAR su_log_t soa_log[]; +SOFIAPUBVAR su_log_t nea_log[]; +SOFIAPUBVAR su_log_t nta_log[]; +SOFIAPUBVAR su_log_t tport_log[]; +SOFIAPUBVAR su_log_t su_log_default[]; + +void +s2_setup_logs(int level) +{ + assert(s2base); + + su_log_soft_set_level(nua_log, level); + su_log_soft_set_level(soa_log, level); + su_log_soft_set_level(su_log_default, level); + su_log_soft_set_level(nea_log, level); + su_log_soft_set_level(nta_log, level); + su_log_soft_set_level(tport_log, level); +} + +void s2_step(void) +{ + su_root_step(s2base->root, 10); +} + +static char const *s2_teardown_label = NULL; + +void +s2_teardown_started(char const *label) +{ + stamps.done = now(); + + if (!s2_teardown_label) { + s2_teardown_label = label; + if (s2_start_stop > 1) { + double ms = (stamps.done - stamps.start) * 1000.0; + printf("%s - tearing down %s test case (%g ms)\n", s2_tester, label, ms); + } + } +} + +void +s2_teardown(void) +{ + struct s2base *_zap = s2base; + + s2base = NULL; + + su_root_destroy(_zap->root); + su_deinit(); + + stamps.toredown = now(); + + if (s2_start_stop > 1) { + double ms = (stamps.toredown - stamps.setup) * 1000.0; + printf("%s - %s test case tore down (total %g ms)\n", s2_tester, + s2_teardown_label ? s2_teardown_label : "previous", ms); + } + + s2_teardown_label = NULL; +} Added: freeswitch/trunk/libs/sofia-sip/s2check/s2base.h ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.h Tue Mar 3 11:27:41 2009 @@ -0,0 +1,54 @@ +/* + * This file is part of the Sofia-SIP package + * + * Copyright (C) 2008 Nokia Corporation. + * + * Contact: Pekka Pessi <pekka.pessi(a)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 + */ + +#ifndef S2BASE_H +#define S2BASE_H + +#include <sofia-sip/su_wait.h> +#include <sofia-sip/su_alloc.h> +#include "s2util.h" + +extern struct s2base +{ + su_home_t home[1]; + su_root_t *root; +} *s2base; + +extern char const *s2_tester, *_s2_suite, *_s2_case; +extern int s2_start_stop; + +void s2_suite(char const *label); +void s2_setup(char const *label); + +void s2_setup_logs(int level); + +void s2_step(void); + +void s2_case(char const *tag, + char const *title, + char const *description); + +void s2_teardown_started(char const *label); +void s2_teardown(void); + +#endif Added: freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2sip.c Tue Mar 3 11:27:41 2009 @@ -0,0 +1,815 @@ +/* + * This file is part of the Sofia-SIP package + * + * Copyright (C) 2008 Nokia Corporation. + * + * Contact: Pekka Pessi <pekka.pessi(a)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 s2sip.c + * @brief Check-Based Test Suite for Sofia SIP + * + * @author Pekka Pessi <Pekka.Pessi(a)nokia.com> + * + * @date Created: Wed Apr 30 12:48:27 EEST 2008 ppessi + */ + +#include "config.h" + +#undef NDEBUG + +#define TP_STACK_T struct s2sip +#define TP_MAGIC_T struct tp_magic_s +#define SU_ROOT_MAGIC_T struct s2sip + +#include "s2sip.h" +#include "s2base.h" +#include "s2dns.h" + +#include <sofia-sip/sip_header.h> +#include <sofia-sip/sip_status.h> +#include <sofia-sip/msg_addr.h> +#include <sofia-sip/su_log.h> +#include <sofia-sip/su_tagarg.h> +#include <sofia-sip/su_alloc.h> +#include <sofia-sip/su_string.h> +#include <sofia-sip/sresolv.h> + +#include <stdlib.h> +#include <string.h> +#include <assert.h> +#include <limits.h> +#include <time.h> + + +/* -- Module types ------------------------------------------------------ */ + +struct tp_magic_s +{ + sip_via_t *via; + sip_contact_t *contact; +}; + +/* -- Module prototypes ------------------------------------------------- */ + +static msg_t *s2_msg(int flags); +static int s2_complete_response(msg_t *response, + int status, char const *phrase, + msg_t *request); + +/* -- Module globals ---------------------------------------------------- */ + +struct s2sip *s2sip; + +/* ---------------------------------------------------------------------- */ + +char * +s2_sip_generate_tag(su_home_t *home) +{ + static unsigned s2_tag_generator = 0; + + return su_sprintf(home, "tag=%s-%s/%u", _s2_suite, _s2_case, ++s2_tag_generator); +} + +/* ---------------------------------------------------------------------- */ +/* SIP messages */ + +struct message * +s2_sip_remove_message(struct message *m) +{ + if ((*m->prev = m->next)) + m->next->prev = m->prev; + + m->prev = NULL, m->next = NULL; + + return m; +} + +void +s2_sip_free_message(struct message *m) +{ + if (m) { + if (m->prev) { + if ((*m->prev = m->next)) + m->next->prev = m->prev; + } + msg_destroy(m->msg); + tport_unref(m->tport); + free(m); + } +} + +void s2_sip_flush_messages(void) +{ + while (s2sip->received) { + s2_sip_free_message(s2sip->received); + } +} + +struct message * +s2_sip_next_response(void) +{ + struct message *m; + + for (;;) { + for (m = s2sip->received; m; m = m->next) { + if (m->sip->sip_status) + return s2_sip_remove_message(m); + } + s2_step(); + } +} + +struct message * +s2_sip_wait_for_response(int status, sip_method_t method, char const *name) +{ + struct message *m; + + for (;;) { + for (m = s2sip->received; m; m = m->next) { + if (!m->sip->sip_status) + continue; + + if (status != 0 && m->sip->sip_status->st_status != status) + continue; + + if (method == sip_method_unknown && name == NULL) + break; + + if (m->sip->sip_cseq == NULL) + continue; + + if (m->sip->sip_cseq->cs_method != method) + continue; + if (name == NULL) + break; + if (strcmp(m->sip->sip_cseq->cs_method_name, name) == 0) + break; + } + + if (m) + return s2_sip_remove_message(m); + + s2_step(); + } +} + +int +s2_sip_check_response(int status, sip_method_t method, char const *name) +{ + struct message *m = s2_sip_wait_for_response(status, method, name); + s2_sip_free_message(m); + return m != NULL; +} + +int +s2_check_in_response(struct dialog *dialog, + int status, sip_method_t method, char const *name) +{ + struct message *m = s2_sip_wait_for_response(status, method, name); + s2_sip_update_dialog(dialog, m); + s2_sip_free_message(m); + return m != NULL; +} + +struct message * +s2_sip_next_request(sip_method_t method, char const *name) +{ + struct message *m; + + for (m = s2sip->received; m; m = m->next) { + if (m->sip->sip_request) + if (method == sip_method_unknown && name == NULL) + return s2_sip_remove_message(m); + + if (m->sip->sip_request->rq_method == method && + strcmp(m->sip->sip_request->rq_method_name, name) == 0) + return s2_sip_remove_message(m); + } + + return NULL; +} + +struct message * +s2_sip_wait_for_request(sip_method_t method, char const *name) +{ + return s2_sip_wait_for_request_timeout(method, name, (unsigned)-1); +} + +struct message * +s2_sip_wait_for_request_timeout(sip_method_t method, char const *name, unsigned steps) +{ + struct message *m; + + for (; steps > 0; steps--, s2_step()) { + for (m = s2sip->received; m; m = m->next) { + if (m->sip->sip_request) { + if (method == sip_method_unknown && name == NULL) + return s2_sip_remove_message(m); + + if (m->sip->sip_request->rq_method == method && + strcmp(m->sip->sip_request->rq_method_name, name) == 0) + return s2_sip_remove_message(m); + } + } + } + + return NULL; +} + +int +s2_sip_check_request(sip_method_t method, char const *name) +{ + struct message *m = s2_sip_wait_for_request(method, name); + if (m) s2_sip_free_message(m); + return m != NULL; +} + +int +s2_sip_check_request_timeout(sip_method_t method, + char const *name, + unsigned timeout) +{ + struct message *m = s2_sip_wait_for_request_timeout(method, name, timeout); + if (m) s2_sip_free_message(m); + return m != NULL; +} + +void +s2_sip_save_uas_dialog(struct dialog *d, sip_t *sip) +{ + if (d && !d->local) { + assert(sip->sip_request); + d->local = sip_from_dup(d->home, sip->sip_to); + if (d->local->a_tag == NULL) + sip_from_tag(d->home, d->local, s2_sip_generate_tag(d->home)); + d->remote = sip_to_dup(d->home, sip->sip_from); + d->call_id = sip_call_id_dup(d->home, sip->sip_call_id); + d->rseq = sip->sip_cseq->cs_seq; + /* d->route = sip_route_dup(d->home, sip->sip_record_route); */ + d->target = sip_contact_dup(d->home, sip->sip_contact); + } +} + +struct message * +s2_sip_respond_to(struct message *m, struct dialog *d, + int status, char const *phrase, + tag_type_t tag, tag_value_t value, ...) +{ + ta_list ta; + msg_t *reply; + sip_t *sip; + su_home_t *home; + tp_name_t tpn[1]; + char *rport; + + assert(m); assert(m->msg); assert(m->tport); + assert(100 <= status && status < 700); + + s2_sip_save_uas_dialog(d, m->sip); + + ta_start(ta, tag, value); + + reply = s2_msg(0); sip = sip_object(reply); home = msg_home(reply); + + assert(reply && home && sip); + + if (sip_add_tl(reply, sip, ta_tags(ta)) < 0) { + abort(); + } + + s2_complete_response(reply, status, phrase, m->msg); + + if (sip->sip_status && sip->sip_status->st_status > 100 && + sip->sip_to && !sip->sip_to->a_tag && + sip->sip_cseq && sip->sip_cseq->cs_method != sip_method_cancel) { + char const *ltag = NULL; + + if (d && d->local) + ltag = d->local->a_tag; + + if (ltag == NULL) + ltag = s2_sip_generate_tag(home); + + if (sip_to_tag(msg_home(reply), sip->sip_to, ltag) < 0) { + assert(!"add To tag"); + } + } + + if (d && !d->contact) { + d->contact = sip_contact_dup(d->home, sip->sip_contact); + } + + *tpn = *tport_name(m->tport); + + rport = su_sprintf(home, "rport=%u", + ntohs(((su_sockaddr_t *) + msg_addrinfo(m->msg)->ai_addr)->su_port)); + + if (s2sip->server_uses_rport && + sip->sip_via->v_rport && + sip->sip_via->v_rport[0] == '\0') { + msg_header_add_param(home, sip->sip_via->v_common, rport); + } + + tpn->tpn_port = rport + strlen("rport="); + + tport_tsend(m->tport, reply, tpn, TPTAG_MTU(INT_MAX), ta_tags(ta)); + msg_destroy(reply); + + ta_end(ta); + + return m; +} + +/** Add headers from the request to the response message. */ +static int +s2_complete_response(msg_t *response, + int status, char const *phrase, + msg_t *request) +{ + su_home_t *home = msg_home(response); + sip_t *response_sip = sip_object(response); + sip_t const *request_sip = sip_object(request); + + int incomplete = 0; + + if (!response_sip || !request_sip || !request_sip->sip_request) + return -1; + + if (!response_sip->sip_status) + response_sip->sip_status = sip_status_create(home, status, phrase, NULL); + if (!response_sip->sip_via) + response_sip->sip_via = sip_via_dup(home, request_sip->sip_via); + if (!response_sip->sip_from) + response_sip->sip_from = sip_from_dup(home, request_sip->sip_from); + if (!response_sip->sip_to) + response_sip->sip_to = sip_to_dup(home, request_sip->sip_to); + if (!response_sip->sip_call_id) + response_sip->sip_call_id = + sip_call_id_dup(home, request_sip->sip_call_id); + if (!response_sip->sip_cseq) + response_sip->sip_cseq = sip_cseq_dup(home, request_sip->sip_cseq); + + if (!response_sip->sip_record_route && request_sip->sip_record_route) + sip_add_dup(response, response_sip, (void*)request_sip->sip_record_route); + + incomplete = sip_complete_message(response) < 0; + + msg_serialize(response, (msg_pub_t *)response_sip); + + if (incomplete || + !response_sip->sip_status || + !response_sip->sip_via || + !response_sip->sip_from || + !response_sip->sip_to || + !response_sip->sip_call_id || + !response_sip->sip_cseq || + !response_sip->sip_content_length || + !response_sip->sip_separator || + (request_sip->sip_record_route && !response_sip->sip_record_route)) + return -1; + + return 0; +} + +/* Send request (updating dialog). + * + * Return zero upon success, nonzero upon failure. + */ +int +s2_sip_request_to(struct dialog *d, + sip_method_t method, char const *name, + tport_t *tport, + tag_type_t tag, tag_value_t value, ...) +{ + ta_list ta; + tagi_t const *tags; + + msg_t *msg = s2_msg(0); + sip_t *sip = sip_object(msg); + url_t const *target = NULL; + sip_cseq_t cseq[1]; + sip_via_t via[1]; char const *v_params[8]; + sip_content_length_t l[1]; + tp_name_t tpn[1]; + tp_magic_t *magic; + int user_via = 0; + + ta_start(ta, tag, value); + tags = ta_args(ta); + + if (sip_add_tagis(msg, sip, &tags) < 0) + goto error; + + if (sip->sip_request) + target = sip->sip_request->rq_url; + else if (d->target) + target = d->target->m_url; + else if (s2sip->sut.contact) + target = s2sip->sut.contact->m_url; + else + target = NULL; + + if (target == NULL) + goto error; + + if (!sip->sip_request) { + sip_request_t *rq; + rq = sip_request_create(msg_home(msg), method, name, + (url_string_t *)target, NULL); + sip_header_insert(msg, sip, (sip_header_t *)rq); + } + + if (!d->local && sip->sip_from) + d->local = sip_from_dup(d->home, sip->sip_from); + if (!d->contact && sip->sip_contact) + d->contact = sip_contact_dup(d->home, sip->sip_contact); + if (!d->remote && sip->sip_to) + d->remote = sip_to_dup(d->home, sip->sip_to); + if (!d->target && sip->sip_request) + d->target = sip_contact_create(d->home, + (url_string_t *)sip->sip_request->rq_url, + NULL); + if (!d->call_id && sip->sip_call_id) + d->call_id = sip_call_id_dup(d->home, sip->sip_call_id); + if (!d->lseq && sip->sip_cseq) + d->lseq = sip->sip_cseq->cs_seq; + + if (!d->local) + d->local = sip_from_dup(d->home, s2sip->aor); + if (!d->contact) + d->contact = sip_contact_dup(d->home, s2sip->contact); + if (!d->remote) + d->remote = sip_to_dup(d->home, s2sip->sut.aor); + if (!d->call_id) + d->call_id = sip_call_id_create(d->home, NULL); + assert(d->local && d->contact); + assert(d->remote && d->target); + assert(d->call_id); + + if (tport == NULL) + tport = d->tport; + + if (tport == NULL) + tport = s2sip->sut.tport; + + if (tport == NULL && d->target->m_url->url_type == url_sips) + tport = s2sip->tls.tport; + + if (tport == NULL) + tport = s2sip->udp.tport; + else if (tport == NULL) + tport = s2sip->tcp.tport; + else if (tport == NULL) + tport = s2sip->tls.tport; + + assert(tport); + + *tpn = *tport_name(tport); + + if (tport_is_primary(tport)) { + tpn->tpn_host = target->url_host; + tpn->tpn_port = url_port(target); + if (!tpn->tpn_port || !tpn->tpn_port[0]) + tpn->tpn_port = url_port_default(target->url_type); + } + + magic = tport_magic(tport); + assert(magic != NULL); + + sip_cseq_init(cseq); + cseq->cs_method = method; + cseq->cs_method_name = name; + + if (d->invite && (method == sip_method_ack || method == sip_method_cancel)) { + cseq->cs_seq = sip_object(d->invite)->sip_cseq->cs_seq; + } + else { + cseq->cs_seq = ++d->lseq; + } + + if (sip->sip_via) { + user_via = 1; + } + else if (d->invite && method == sip_method_cancel) { + *via = *sip_object(d->invite)->sip_via; + } + else { + *via = *magic->via; + via->v_params = v_params; + v_params[0] = su_sprintf(msg_home(msg), "branch=z9hG4bK%lx", ++s2sip->tid); + v_params[1] = NULL; + } + + sip_content_length_init(l); + if (sip->sip_payload) + l->l_length = sip->sip_payload->pl_len; + + if (d->local->a_tag == NULL) { + char const *ltag = s2_sip_generate_tag(d->home); + + if (sip_from_tag(d->home, d->local, ltag) < 0) { + assert(!"add To tag"); + } + + if (sip->sip_from && sip->sip_from->a_tag == NULL) { + if (sip_from_tag(msg_home(msg), sip->sip_from, ltag) < 0) { + assert(!"add To tag"); + } + } + } + + sip_add_tl(msg, sip, + TAG_IF(!sip->sip_from, SIPTAG_FROM(d->local)), + TAG_IF(!sip->sip_contact, SIPTAG_CONTACT(d->contact)), + TAG_IF(!sip->sip_to, SIPTAG_TO(d->remote)), + TAG_IF(!sip->sip_call_id, SIPTAG_CALL_ID(d->call_id)), + TAG_IF(!sip->sip_cseq, SIPTAG_CSEQ(cseq)), + TAG_IF(!user_via, SIPTAG_VIA(via)), + TAG_IF(!sip->sip_content_length, SIPTAG_CONTENT_LENGTH(l)), + TAG_IF(!sip->sip_separator, SIPTAG_SEPARATOR_STR("\r\n")), + TAG_END()); + + msg_serialize(msg, NULL); + + if (method == sip_method_invite) { + msg_destroy(d->invite); + d->invite = msg_ref_create(msg); + } + + tport = tport_tsend(tport, msg, tpn, ta_tags(ta)); + ta_end(ta); + + if (d->tport != tport) { + tport_unref(d->tport); + d->tport = tport_ref(tport); + } + + return tport ? 0 : -1; + + error: + ta_end(ta); + return -1; +} + +/** Save information from response. + * + * Send ACK for error messages to INVITE. + */ +int s2_sip_update_dialog(struct dialog *d, struct message *m) +{ + int status = 0; + + if (m->sip->sip_status) + status = m->sip->sip_status->st_status; + + if (100 < status && status < 300) { + d->remote = sip_to_dup(d->home, m->sip->sip_to); + if (m->sip->sip_contact) + d->contact = sip_contact_dup(d->home, m->sip->sip_contact); + } + + if (300 <= status && m->sip->sip_cseq && + m->sip->sip_cseq->cs_method == sip_method_invite && + d->invite) { + msg_t *ack = s2_msg(0); + sip_t *sip = sip_object(ack); + sip_t *invite = sip_object(d->invite); + sip_request_t rq[1]; + sip_cseq_t cseq[1]; + tp_name_t tpn[1]; + + *rq = *invite->sip_request; + rq->rq_method = sip_method_ack, rq->rq_method_name = "ACK"; + *cseq = *invite->sip_cseq; + cseq->cs_method = sip_method_ack, cseq->cs_method_name = "ACK"; + + sip_add_tl(ack, sip, + SIPTAG_REQUEST(rq), + SIPTAG_VIA(invite->sip_via), + SIPTAG_FROM(invite->sip_from), + SIPTAG_TO(invite->sip_to), + SIPTAG_CALL_ID(invite->sip_call_id), + SIPTAG_CSEQ(cseq), + SIPTAG_CONTENT_LENGTH_STR("0"), + SIPTAG_SEPARATOR_STR("\r\n"), + TAG_END()); + + *tpn = *tport_name(d->tport); + if (!tport_is_secondary(d->tport) || + !tport_is_clear_to_send(d->tport)) { + tpn->tpn_host = rq->rq_url->url_host; + tpn->tpn_port = rq->rq_url->url_port; + } + + msg_serialize(ack, NULL); + tport_tsend(d->tport, ack, tpn, TAG_END()); + } + + return 0; +} + +/* ---------------------------------------------------------------------- */ +/* tport interface */ +static void +s2_sip_stack_recv(struct s2sip *s2, + tport_t *tp, + msg_t *msg, + tp_magic_t *magic, + su_time_t now) +{ + struct message *next = calloc(1, sizeof *next), **prev; + + next->msg = msg; + next->sip = sip_object(msg); + next->when = now; + next->tport = tport_ref(tp); + +#if 0 + if (next->sip->sip_request) + printf("%s: sent: %s\n", s2tester, next->sip->sip_request->rq_method_name); + else + printf("%s: sent: SIP/2.0 %u %s\n", s2tester, + next->sip->sip_status->st_status, + next->sip->sip_status->st_phrase); +#endif + + for (prev = &s2->received; *prev; prev = &(*prev)->next) + ; + + next->prev = prev, *prev = next; +} + +static void +s2_sip_stack_error(struct s2sip *s2, + tport_t *tp, + int errcode, + char const *remote) +{ + fprintf(stderr, "%s(%p): error %d (%s) from %s\n", + "s2_sip_error", + (void *)tp, errcode, su_strerror(errcode), + remote ? remote : "<unknown destination>"); +} + +static msg_t * +s2_sip_stack_alloc(struct s2sip *s2sip, int flags, + char const data[], usize_t size, + tport_t const *tport, + tp_client_t *tpc) +{ + return msg_create(s2sip->mclass, flags | s2sip->flags); +} + +static msg_t * +s2_msg(int flags) +{ + return msg_create(s2sip->mclass, flags | s2sip->flags); +} + +tp_stack_class_t const s2_sip_stack[1] = + {{ + /* tpac_size */ (sizeof s2_sip_stack), + /* tpac_recv */ s2_sip_stack_recv, + /* tpac_error */ s2_sip_stack_error, + /* tpac_alloc */ s2_sip_stack_alloc, + }}; + +static char const *default_protocols[] = { "udp", "tcp", NULL }; + +/** Setup for SIP transports */ +void s2_sip_setup(char const *hostname, + char const * const *protocols, + tag_type_t tag, tag_value_t value, ...) +{ + su_home_t *home; + ta_list ta; + tp_name_t tpn[1]; + int bound; + tport_t *tp; + + assert(s2base != NULL); + assert(s2sip == NULL); + + s2sip = su_home_new(sizeof *s2sip); + home = s2sip->home; + + s2sip->root = su_root_clone(s2base->root, s2sip); + + s2sip->aor = sip_from_format(home, "Bob <sip:bob@%s>", + hostname ? hostname : "example.net"); + if (hostname == NULL) + hostname = "127.0.0.1"; + s2sip->hostname = hostname; + s2sip->tid = (unsigned long)time(NULL) * 510633671UL; + + ta_start(ta, tag, value); + + s2sip->master = tport_tcreate(s2sip, s2_sip_stack, s2sip->root, + TPTAG_LOG(getenv("S2_TPORT_LOG") != NULL), + ta_tags(ta)); + assert(s2sip->master); + s2sip->mclass = sip_default_mclass(); + s2sip->flags = 0; + + memset(tpn, 0, (sizeof tpn)); + tpn->tpn_proto = "*"; + tpn->tpn_host = "*"; + tpn->tpn_port = "*"; + + if (protocols == NULL) + protocols = default_protocols; + + bound = tport_tbind(s2sip->master, tpn, protocols, + TPTAG_SERVER(1), + ta_tags(ta)); + assert(bound != -1); + + tp = tport_primaries(s2sip->master); + + *tpn = *tport_name(tp); + s2sip->contact = sip_contact_format(home, "<sip:%s:%s>", + tpn->tpn_host, + tpn->tpn_port); + + for (;tp; tp = tport_next(tp)) { + sip_via_t *v; + sip_contact_t *m; + tp_magic_t *magic; + + if (tport_magic(tp)) + continue; + + *tpn = *tport_name(tp); + + v = sip_via_format(home, "SIP/2.0/%s %s:%s", + tpn->tpn_proto, + tpn->tpn_host, + tpn->tpn_port); + assert(v != NULL); + if (!su_casenmatch(tpn->tpn_proto, "tls", 3)) { + m = sip_contact_format(home, "<sip:%s:%s;transport=%s>", + tpn->tpn_host, + tpn->tpn_port, + tpn->tpn_proto); + if (s2sip->udp.contact == NULL && su_casematch(tpn->tpn_proto, "udp")) { + s2sip->udp.tport = tport_ref(tp); + s2sip->udp.contact = m; + } + if (s2sip->tcp.contact == NULL && su_casematch(tpn->tpn_proto, "tcp")) { + s2sip->tcp.tport = tport_ref(tp); + s2sip->tcp.contact = m; + } + } + else if (!su_casematch(tpn->tpn_proto, "tls")) { + m = sip_contact_format(s2sip->home, "<sips:%s:%s;transport=%s>", + tpn->tpn_host, + tpn->tpn_port, + tpn->tpn_proto); + } + else { + m = sip_contact_format(s2sip->home, "<sips:%s:%s>", + tpn->tpn_host, + tpn->tpn_port); + if (s2sip->tls.contact == NULL) { + s2sip->tls.tport = tport_ref(tp); + s2sip->tls.contact = m; + } + } + assert(m != NULL); + + magic = su_zalloc(home, (sizeof *magic)); + magic->via = v, magic->contact = m; + + if (s2sip->contact == NULL) + s2sip->contact = m; + + tport_set_magic(tp, magic); + } +} + +void +s2_sip_teardown(void) +{ + if (s2sip) { + tport_destroy(s2sip->master), s2sip->master = NULL; + su_root_destroy(s2sip->root), s2sip->root = NULL; + } +} Added: freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2sip.h Tue Mar 3 11:27:41 2009 @@ -0,0 +1,124 @@ +/* + * This file is part of the Sofia-SIP package + * + * Copyright (C) 2008 Nokia Corporation. + * + * Contact: Pekka Pessi <pekka.pessi(a)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 + */ + +#ifndef S2SIP_H +#define S2SIP_H + +#include <sofia-sip/su_wait.h> +#include <sofia-sip/sip.h> +#include <sofia-sip/tport.h> +#include <sofia-sip/nua.h> + +#include "s2util.h" + +extern struct s2sip +{ + su_home_t home[1]; + + su_root_t *root; + msg_mclass_t const *mclass; + int flags; + + int server_uses_rport; + + char const *hostname; + tport_t *master; + + sip_to_t *aor; + sip_contact_t *contact; + + struct { + sip_contact_t *contact; + tport_t *tport; + } udp, tcp, tls; + + struct { + sip_to_t *aor; + sip_contact_t *contact; + tport_t *tport; + } sut; + + struct message { + struct message *next, **prev; + msg_t *msg; + sip_t *sip; + tport_t *tport; + su_time_t when; + } *received; + + unsigned long tid; +} *s2sip; + +struct dialog +{ + su_home_t home[1]; + sip_from_t *local; + sip_to_t *remote; + sip_call_id_t *call_id; + uint32_t lseq, rseq; + sip_contact_t *target; + sip_route_t *route; + sip_contact_t *contact; + + tport_t *tport; + msg_t *invite; /* latest invite sent */ +}; + +extern tp_stack_class_t const s2_sip_stack[1]; + +char *s2_sip_generate_tag(su_home_t *home); + +struct message *s2_sip_remove_message(struct message *m); +void s2_sip_free_message(struct message *m); +void s2_sip_flush_messages(void); + +struct message *s2_sip_next_response(void); +struct message *s2_sip_wait_for_response(int status, sip_method_t , char const *); +int s2_sip_check_response(int status, sip_method_t method, char const *name); + +struct message *s2_sip_next_request(sip_method_t method, char const *name); +struct message *s2_sip_wait_for_request(sip_method_t method, char const *name); +struct message *s2_sip_wait_for_request_timeout(sip_method_t, char const *, + unsigned timeout); +int s2_sip_check_request(sip_method_t method, char const *name); +int s2_sip_check_request_timeout(sip_method_t method, char const *, unsigned timeout); + +void s2_sip_save_uas_dialog(struct dialog *d, sip_t *sip); + +struct message *s2_sip_respond_to(struct message *m, struct dialog *d, + int status, char const *phrase, + tag_type_t tag, tag_value_t value, ...); + +int s2_sip_request_to(struct dialog *d, + sip_method_t method, char const *name, + tport_t *tport, + tag_type_t tag, tag_value_t value, ...); + +int s2_sip_update_dialog(struct dialog *d, struct message *response); + +void s2_sip_setup(char const *hostname, + char const * const *protocols, + tag_type_t tag, tag_value_t value, ...); +void s2_sip_teardown(void); + +#endif

1 0

[commit] r12387 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:26:13 2009 New Revision: 12387 Log: Tue Mar 3 07:47:19 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nta: calculate timer D correctly Ignore-this: f43d9dcc11fb6a19c3674a6da35ee7ec Timer D is either 32 seconds or 64 times T1, whichever is larger. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 3 11:26:13 2009 @@ -1 +1 @@ -Tue Mar 3 11:25:14 CST 2009 +Tue Mar 3 11:25:58 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Mar 3 11:26:13 2009 @@ -860,7 +860,7 @@ ta_start(ta, tag, value); if ((agent = su_home_new(sizeof(*agent)))) { - unsigned timer_c; + unsigned timer_c = 0, timer_d = 32000; agent->sa_root = root; agent->sa_callback = callback; @@ -925,6 +925,11 @@ agent->sa_out.re_t1 = &agent->sa_out.re_list; + if (agent->sa_use_timer_c || !agent->sa_is_a_uas) + timer_c = agent->sa_timer_c; + if (timer_d < agent->sa_t1x64) + timer_d = agent->sa_t1x64; + outgoing_queue_init(agent->sa_out.delayed, 0); outgoing_queue_init(agent->sa_out.resolving, 0); outgoing_queue_init(agent->sa_out.trying, agent->sa_t1x64); /* F */ @@ -932,10 +937,8 @@ outgoing_queue_init(agent->sa_out.terminated, 0); /* Special queues (states) for outgoing INVITE transactions */ outgoing_queue_init(agent->sa_out.inv_calling, agent->sa_t1x64); /* B */ - timer_c = (agent->sa_use_timer_c || !agent->sa_is_a_uas) - ? agent->sa_timer_c : 0; outgoing_queue_init(agent->sa_out.inv_proceeding, timer_c); /* C */ - outgoing_queue_init(agent->sa_out.inv_completed, 32000); /* Timer D */ + outgoing_queue_init(agent->sa_out.inv_completed, timer_d); /* D */ if (leg_htable_resize(agent->sa_home, agent->sa_dialogs, 0) < 0 || leg_htable_resize(agent->sa_home, agent->sa_defaults, 0) < 0 || @@ -1446,6 +1449,7 @@ unsigned sip_t4 = agent->sa_t4; unsigned sip_t1x64 = agent->sa_t1x64; unsigned timer_c = agent->sa_timer_c; + unsigned timer_d = 32000; unsigned graylist = agent->sa_graylist; unsigned blacklist = agent->sa_blacklist; int ua = agent->sa_is_a_uas; @@ -1646,6 +1650,9 @@ agent->sa_timer_c = timer_c; outgoing_queue_adjust(agent, agent->sa_out.inv_proceeding, timer_c); } + if (timer_d < sip_t1x64) + timer_d = sip_t1x64; + outgoing_queue_adjust(agent, agent->sa_out.inv_completed, timer_d); if (graylist > 24 * 60 * 60) graylist = 24 * 60 * 60;

1 0

[commit] r12386 - in freeswitch/trunk/libs/sofia-sip: . s2check
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:25:39 2009 New Revision: 12386 Log: Tue Mar 3 11:04:23 CST 2009 Pekka Pessi <first.last(a)nokia.com> * s2check/Makefile.am: more clue about name Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 3 11:25:39 2009 @@ -1 +1 @@ -Tue Mar 3 11:24:11 CST 2009 +Tue Mar 3 11:25:14 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/Makefile.am Tue Mar 3 11:25:39 2009 @@ -1,5 +1,5 @@ # -# Makefile.am for Sofia-SIP module and unit testing +# Makefile.am for "Sofia-SIP 2 Check", module and unit testing library # # Copyright (C) 2009 Nokia Corporation # Contact: Pekka Pessi <pekka.pessi(a)nokia.com>

1 0

[commit] r12385 - freeswitch/trunk/libs/sofia-sip
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:25:03 2009 New Revision: 12385 Log: Tue Mar 3 11:03:53 CST 2009 Pekka Pessi <first.last(a)nokia.com> * RELEASE: describe nta changes with forking, timer C, timer D, and CANCEL Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/RELEASE Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 3 11:25:03 2009 @@ -1 +1 @@ -Tue Mar 3 11:23:38 CST 2009 +Tue Mar 3 11:24:11 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/RELEASE ============================================================================== --- freeswitch/trunk/libs/sofia-sip/RELEASE (original) +++ freeswitch/trunk/libs/sofia-sip/RELEASE Tue Mar 3 11:25:03 2009 @@ -25,6 +25,16 @@ libsofia-sip-ua: - **template**: Added foobar() function (sofia-sip/foobar.h). +- Timing out CANCELed INVITE client transactions is now done with timer D. + Previously, the INVITE client transactions were restarted instead of + timing out under certain circumstances. +- An INVITE transaction that has been timed out with stack timer C is now + CANCELed automatically. Previously, such the INVITE client transactions + were restarted instead of timing out under certain circumstances. +- Timing out forked INVITE client transactions is now done by stack. + The stack generates a 408 response to each INVITE transaction fork that + has not received a final response within 32 seconds (or 64 times SIP T1) + after first final response to the INVITE was received. - The mp_len type was changed from usize_t to unsigned. The change is binary-incompatible on 64-bit platforms when compiled with the configure opetion --disable-size-compat @@ -42,6 +52,7 @@ - t_next_next(), t_next_move(), t_next_len(), t_next_dup(), t_next_filter() - t_filter_with(), t_any_filter() - sres_record_class() + - u2s_alloc() libsofia-sip-ua-glib: - No ABI/API changes, compatible with 1.12.0. Note, libsofia-sip-ua-glib

1 0

[commit] r12384 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/soa
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:24:01 2009 New Revision: 12384 Log: Tue Mar 3 10:56:34 CST 2009 Pekka Pessi <first.last(a)nokia.com> * test_soa.c: ignore fgets() return value. really. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 3 11:24:01 2009 @@ -1 +1 @@ -Tue Mar 3 11:23:11 CST 2009 +Tue Mar 3 11:23:38 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c Tue Mar 3 11:24:01 2009 @@ -2504,10 +2504,11 @@ #endif if (o_attach) { - char line[10]; + char line[10], *cr; printf("%s: pid %u\n", name, getpid()); printf("<Press RETURN to continue>\n"); - fgets(line, sizeof line, stdin); + cr = fgets(line, sizeof line, stdin); + (void)cr; } #if HAVE_ALARM else if (o_alarm) {

1 0

[commit] r12383 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:23:31 2009 New Revision: 12383 Log: Tue Mar 3 10:49:51 CST 2009 Pekka Pessi <first.last(a)nokia.com> * test_nta.c: timer C now CANCELs INVITE transaction Ignore-this: 8de2e5747e7ae0e62e2d8ad9aeb0cbed 408 response is not generated (unless CANCEL times out, too.) Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 3 11:23:31 2009 @@ -1 +1 @@ -Tue Mar 3 11:22:42 CST 2009 +Tue Mar 3 11:23:11 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c Tue Mar 3 11:23:31 2009 @@ -530,7 +530,7 @@ { agent_t *ag = c->c_ag; - for (ag->ag_canceled = 0; !ag->ag_canceled;) { + for (ag->ag_canceled = 0; !ag->ag_canceled || c->c_status < 200;) { if (tstflags & tst_verbatim) { fputs(".", stdout); fflush(stdout); } @@ -3612,8 +3612,9 @@ SIPTAG_PAYLOAD(sdp), TAG_END())); - /* Run until 1) server gets CANCEL and 2) client gets 408 */ - TEST_1(!client_run_until_canceled(ctx, 408)); + /* Run until 1) server gets CANCEL and 2) client gets 487 */ + /* Note: this has been changed in 1.12.11 */ + TEST_1(!client_run_until_canceled(ctx, 487)); TEST_1(ag->ag_canceled != 0); TEST_P(ag->ag_latest_leg, ag->ag_server_leg);

1 0

[commit] r12382 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:23:03 2009 New Revision: 12382 Log: Tue Mar 3 10:47:40 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nta_tag.c: fixed NTATAG_TIMER_C() documentation Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 3 11:23:03 2009 @@ -1 +1 @@ -Tue Mar 3 11:22:16 CST 2009 +Tue Mar 3 11:22:42 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c Tue Mar 3 11:23:03 2009 @@ -634,7 +634,7 @@ * instead if NTATAG_TIMER_C(0) is given. * * @par Default Value - * - 180000 (milliseconds, 3 minutes) + * - 185000 (milliseconds, 3 minutes) * * @sa @RFC3261 sections 13.3.1.1, 16.7 and 16.8, * NTATAG_UA(1), NTATAG_TIMER_C(),

1 0

[commit] r12381 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:22:35 2009 New Revision: 12381 Log: Tue Mar 3 10:47:00 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nta: timeout CANCELed INVITE transactions properly Ignore-this: 4e7fdc56065dba617352443a9310bb28 Use timer D (instead of timer C) to timeout CANCELed INVITE transactions. Also, generate 408 Request Timeout to all forks that have not received a final response. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 3 11:22:35 2009 @@ -1 +1 @@ -Tue Mar 3 11:21:35 CST 2009 +Tue Mar 3 11:22:16 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Mar 3 11:22:35 2009 @@ -556,6 +556,8 @@ nta_outgoing_t *orq_cancel; /**< CANCEL transaction */ + nta_outgoing_t *orq_forking; /**< Untagged transaction */ + nta_outgoing_t *orq_forks; /**< Tagged transactions */ uint32_t orq_rseq; /**< Latest incoming rseq */ }; @@ -7022,10 +7024,10 @@ static void outgoing_destroy(nta_outgoing_t *orq); su_inline int outgoing_is_queued(nta_outgoing_t const *orq); su_inline void outgoing_queue(outgoing_queue_t *queue, - nta_outgoing_t *orq); + nta_outgoing_t *orq); su_inline void outgoing_remove(nta_outgoing_t *orq); su_inline void outgoing_set_timer(nta_outgoing_t *orq, uint32_t interval); -su_inline void outgoing_reset_timer(nta_outgoing_t *orq); +static void outgoing_reset_timer(nta_outgoing_t *orq); static size_t outgoing_timer_dk(outgoing_queue_t *q, char const *timer, uint32_t now); @@ -7043,6 +7045,7 @@ static void outgoing_trying(nta_outgoing_t *orq); static void outgoing_timeout(nta_outgoing_t *orq, uint32_t now); static int outgoing_complete(nta_outgoing_t *orq); +static void outgoing_terminate_invite(nta_outgoing_t *); static int outgoing_terminate(nta_outgoing_t *orq); static size_t outgoing_mass_destroy(nta_agent_t *sa, outgoing_queue_t *q); static void outgoing_estimate_delay(nta_outgoing_t *orq, sip_t *sip); @@ -7350,8 +7353,7 @@ ta_end(ta); - if ((cancel_2543 || cancel_408) && - !orq->orq_stateless && !orq->orq_destroyed) + if ((cancel_2543 || cancel_408) && !orq->orq_stateless) outgoing_reply(orq, SIP_487_REQUEST_CANCELLED, 1); if (msg) { @@ -7369,8 +7371,11 @@ if (delay_sending) orq->orq_cancel = cancel; - if (cancel) + if (cancel) { + if (!delay_sending) + outgoing_complete(orq); return cancel; + } msg_destroy(msg); } @@ -7684,6 +7689,7 @@ /* CANCEL or ACK to [3456]XX */ invalid = tport_name_dup(home, orq->orq_tpn, tpn); #if HAVE_SOFIA_SRESOLV + /* We send ACK or CANCEL only if original request was really sent */ assert(tport_name_is_resolved(orq->orq_tpn)); #endif resolved = tport_name_is_resolved(orq->orq_tpn); @@ -8318,8 +8324,8 @@ /** @internal * Test if an outgoing transaction is in a queue. */ -su_inline -int outgoing_is_queued(nta_outgoing_t const *orq) +su_inline int +outgoing_is_queued(nta_outgoing_t const *orq) { return orq && orq->orq_queue; } @@ -8330,9 +8336,9 @@ * Insert a client transaction into a queue and set the corresponding * timeout at the same time. */ -su_inline -void outgoing_queue(outgoing_queue_t *queue, - nta_outgoing_t *orq) +static void +outgoing_queue(outgoing_queue_t *queue, + nta_outgoing_t *orq) { if (orq->orq_queue == queue) { assert(queue->q_timeout == 0); @@ -8422,7 +8428,7 @@ orq->orq_agent->sa_out.re_t1 = rq; } -su_inline +static void outgoing_reset_timer(nta_outgoing_t *orq) { if (orq->orq_rprev) { @@ -8541,8 +8547,10 @@ /* Application is expected to handle 200 OK statelessly => kill transaction immediately */ else if (orq->orq_method == sip_method_invite && !orq->orq_completed - /* (unless we the transaction has been canceled) */ - && !orq->orq_canceled) { + /* (unless transaction has been canceled) */ + && !orq->orq_canceled + /* or it has been forked */ + && !orq->orq_forking && !orq->orq_forks) { orq->orq_destroyed = 1; outgoing_terminate(orq); } @@ -8717,12 +8725,11 @@ SU_DEBUG_5(("nta: timer %s fired, %s %s (%u)\n", timer, "CANCEL and timeout", orq->orq_method_name, orq->orq_cseq->cs_seq)); - + /* + * If the client transaction has received a provisional response, the + * proxy MUST generate a CANCEL request matching that transaction. + */ nta_outgoing_tcancel(orq, NULL, NULL, TAG_NULL()); - - outgoing_timeout(orq, now); - - assert(q->q_head != orq); } return timeout; @@ -8731,16 +8738,18 @@ /** @internal Signal transaction timeout to the application. */ void outgoing_timeout(nta_outgoing_t *orq, uint32_t now) { - nta_outgoing_t *cancel; + nta_outgoing_t *cancel = NULL; - if (outgoing_other_destinations(orq)) { + if (orq->orq_status || orq->orq_canceled) + ; + else if (outgoing_other_destinations(orq)) { SU_DEBUG_5(("%s(%p): %s\n", "nta", (void *)orq, "try next after timeout")); outgoing_try_another(orq); return; } - cancel = orq->orq_cancel; orq->orq_cancel = NULL; + cancel = orq->orq_cancel, orq->orq_cancel = NULL; orq->orq_agent->sa_stats->as_tout_request++; outgoing_reply(orq, SIP_408_REQUEST_TIMEOUT, 0); @@ -8753,15 +8762,19 @@ * * @return True if transaction was free()d. */ -static -int outgoing_complete(nta_outgoing_t *orq) +static int +outgoing_complete(nta_outgoing_t *orq) { orq->orq_completed = 1; outgoing_reset_timer(orq); /* Timer A / Timer E */ - if (orq->orq_stateless || orq->orq_reliable) + if (orq->orq_stateless) return outgoing_terminate(orq); + if (orq->orq_reliable) { + if (orq->orq_method != sip_method_invite || !orq->orq_agent->sa_is_a_uas) + return outgoing_terminate(orq); + } if (orq->orq_method == sip_method_invite) { if (orq->orq_queue != orq->orq_agent->sa_out.inv_completed) @@ -8793,12 +8806,52 @@ SU_DEBUG_5(("nta: timer %s fired, %s %s (%u)\n", timer, "terminate", orq->orq_method_name, orq->orq_cseq->cs_seq)); - outgoing_terminate(orq); + if (orq->orq_method == sip_method_invite) + outgoing_terminate_invite(orq); + else + outgoing_terminate(orq); } return terminated; } + +/** Terminate an INVITE client transaction. */ +static void +outgoing_terminate_invite(nta_outgoing_t *original) +{ + nta_outgoing_t *orq = original; + + while (original->orq_forks) { + orq = original->orq_forks; + original->orq_forks = orq->orq_forks; + + assert(orq->orq_forking == original); + + SU_DEBUG_5(("nta: timer %s fired, %s %s (%u);tag=%s\n", "D", + "terminate", orq->orq_method_name, orq->orq_cseq->cs_seq, + orq->orq_tag)); + + if (outgoing_terminate(orq)) + continue; + + if (orq->orq_status < 200) { + /* Fork has timed out */ + orq->orq_agent->sa_stats->as_tout_request++; + outgoing_reply(orq, SIP_408_REQUEST_TIMEOUT, 0); + } + } + + if (outgoing_terminate(orq = original)) + return; + + if (orq->orq_status < 200) { + /* Original INVITE has timed out */ + orq->orq_agent->sa_stats->as_tout_request++; + outgoing_reply(orq, SIP_408_REQUEST_TIMEOUT, 0); + } +} + /** Terminate a client transaction. */ static int outgoing_terminate(nta_outgoing_t *orq) @@ -8946,46 +8999,38 @@ } /** Process a response message. */ -int outgoing_recv(nta_outgoing_t *orq, +int outgoing_recv(nta_outgoing_t *_orq, int status, msg_t *msg, sip_t *sip) { + nta_outgoing_t *orq = _orq->orq_forking ? _orq->orq_forking : _orq; nta_agent_t *sa = orq->orq_agent; - short orq_status = orq->orq_status; int internal = sip == NULL || (sip->sip_flags & NTA_INTERNAL_MSG) != 0; int uas = sa->sa_is_a_uas; + assert(!internal || status >= 300); + assert(orq == _orq || orq->orq_method == sip_method_invite); + if (status < 100) status = 100; if (!internal && orq->orq_delay == UINT_MAX) outgoing_estimate_delay(orq, sip); - assert(!internal || status >= 300); - if (orq->orq_cc) agent_accept_compressed(orq->orq_agent, msg, orq->orq_cc); if (orq->orq_cancel) { nta_outgoing_t *cancel; - cancel = orq->orq_cancel; orq->orq_cancel = NULL; - cancel->orq_delayed = 0; - if (status < 200) + if (status < 200) { outgoing_send(cancel, 0); - else + outgoing_complete(orq); + } + else { outgoing_reply(cancel, SIP_481_NO_TRANSACTION, 0); - - if (status < 300 && orq->orq_destroyed && - orq->orq_method == sip_method_invite) { - outgoing_terminate(orq); /* We can now kill transaction */ - if (status == 100) { - msg_destroy(msg); - return 0; - } - return -1; } } @@ -8998,9 +9043,12 @@ /* The state machines */ if (orq->orq_method == sip_method_invite) { + nta_outgoing_t *original = orq; - if (uas && orq->orq_destroyed && 200 <= status && status < 300) { - if (su_strcasecmp(sip->sip_to->a_tag, orq->orq_tag) != 0) { + orq = _orq; + + if (orq->orq_destroyed && 200 <= status && status < 300) { + if (uas && su_strcasecmp(sip->sip_to->a_tag, orq->orq_tag) != 0) { /* Orphan 200 Ok to INVITE. ACK and BYE it */ SU_DEBUG_5(("nta: Orphan 200 Ok send ACK&BYE\n")); return nta_msg_ackbye(sa, msg); @@ -9008,38 +9056,41 @@ return -1; /* Proxy statelessly (RFC3261 section 16.11) */ } - outgoing_reset_timer(orq); + outgoing_reset_timer(original); if (status < 200) { - if (orq->orq_queue == sa->sa_out.inv_calling) { - orq->orq_status = status; - outgoing_queue(sa->sa_out.inv_proceeding, orq); + original->orq_status = status; + orq->orq_status = status; + if (original->orq_queue == sa->sa_out.inv_calling) { + outgoing_queue(sa->sa_out.inv_proceeding, original); } - else if (orq->orq_queue == sa->sa_out.inv_proceeding) { - orq->orq_status = status; + else if (original->orq_queue == sa->sa_out.inv_proceeding) { if (sa->sa_out.inv_proceeding->q_timeout) { - outgoing_remove(orq); - outgoing_queue(sa->sa_out.inv_proceeding, orq); + outgoing_remove(original); + outgoing_queue(sa->sa_out.inv_proceeding, original); } } + } + if (status < 200) { /* Handle 100rel */ - if (sip && sip->sip_rseq) + if (sip && sip->sip_rseq) { if (outgoing_recv_reliable(orq, msg, sip) < 0) { msg_destroy(msg); return 0; } + } } else { /* Final response */ if (status >= 300 && !internal) - outgoing_ack(orq, sip); + outgoing_ack(original, sip); - if (!orq->orq_completed) { - if (outgoing_complete(orq)) + if (!original->orq_completed) { + if (outgoing_complete(original)) return 0; - if (sip && uas) { + if (uas && sip && orq == original) { /* * We silently discard duplicate final responses to INVITE below * with outgoing_duplicate() @@ -9049,7 +9100,7 @@ } } /* Retransmission or response from another fork */ - else { + else if (orq->orq_status >= 200) { /* Once 2xx has been received, non-2xx will not be forwarded */ if (status >= 300) return outgoing_duplicate(orq, msg, sip); @@ -9072,7 +9123,7 @@ /* Non-INVITE */ if (orq->orq_queue == sa->sa_out.trying || orq->orq_queue == sa->sa_out.resolving) { - assert(orq_status < 200); (void)orq_status; + assert(orq->orq_status < 200); if (status < 200) { /* @RFC3261 17.1.2.1: @@ -11066,9 +11117,20 @@ if (orq == NULL || to_tag == NULL) return NULL; + if (orq->orq_to->a_tag) { - SU_DEBUG_1(("%s: transaction %p already in dialog\n", __func__, - (void *)orq)); + SU_DEBUG_1(("%s: transaction %p (CSeq: %s %u) already in dialog\n", __func__, + (void *)orq, orq->orq_cseq->cs_method_name, orq->orq_cseq->cs_seq)); + return NULL; + } + if (orq->orq_method != sip_method_invite) { + SU_DEBUG_1(("%s: transaction %p (CSeq: %s %u) cannot be tagged\n", __func__, + (void *)orq, orq->orq_cseq->cs_method_name, orq->orq_cseq->cs_seq)); + return NULL; + } + if (orq->orq_status < 100) { + SU_DEBUG_1(("%s: transaction %p (CSeq: %s %u) still calling\n", __func__, + (void *)orq, orq->orq_cseq->cs_method_name, orq->orq_cseq->cs_seq)); return NULL; } @@ -11098,17 +11160,12 @@ tagged->orq_request = msg_ref_create(orq->orq_request); tagged->orq_response = msg_ref_create(orq->orq_response); tagged->orq_cancel = NULL; - - tagged->orq_pending = tport_pend(orq->orq_tport, - orq->orq_request, - outgoing_tport_error, - tagged); - if (tagged->orq_pending < 0) - tagged->orq_pending = 0; + tagged->orq_forking = orq; + tagged->orq_forks = orq->orq_forks; + orq->orq_forks = tagged; tagged->orq_rseq = 0; - outgoing_queue(orq->orq_queue, tagged); outgoing_insert(agent, tagged); return tagged;

1 0

[commit] r12380 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:22:01 2009 New Revision: 12380 Log: Tue Mar 3 10:40:57 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nta: nta_agent_set_params() now returns correct value for tport parameters set Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 3 11:22:01 2009 @@ -1 +1 @@ -Tue Mar 3 11:21:02 CST 2009 +Tue Mar 3 11:21:35 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Mar 3 11:22:01 2009 @@ -1537,12 +1537,13 @@ m = 0; for (tport = agent->sa_tports; tport; tport = tport_next(tport)) { - m = tport_set_params(tport, TAG_NEXT(tags)); + int m0 = tport_set_params(tport, TAG_NEXT(tags)); + if (m0 < 0) + return m0; + if (m0 > m) + m = m0; } - if (m == -1) - return m; - n += m; if (aliases != NONE) {

1 0