March 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7830 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: anthm Date: Fri Mar 7 13:43:28 2008 New Revision: 7830 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_pcm.c Log: fix rtp break on blocking sockets Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Mar 7 13:43:28 2008 @@ -787,7 +787,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s I/O Error\n", switch_channel_get_name(tech_pvt->channel)); return; } - tech_pvt->iananame = switch_core_session_strdup(tech_pvt->session, "NO-NAME"); + tech_pvt->iananame = switch_core_session_strdup(tech_pvt->session, "PROXY"); tech_pvt->rm_rate = 8000; tech_pvt->codec_ms = 20; } Modified: freeswitch/trunk/src/switch_pcm.c ============================================================================== --- freeswitch/trunk/src/switch_pcm.c (original) +++ freeswitch/trunk/src/switch_pcm.c Fri Mar 7 13:43:28 2008 @@ -94,33 +94,32 @@ -static switch_status_t switch_nn_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +static switch_status_t switch_proxy_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) { return SWITCH_STATUS_SUCCESS; } -static switch_status_t switch_nn_encode(switch_codec_t *codec, +static switch_status_t switch_proxy_encode(switch_codec_t *codec, switch_codec_t *other_codec, void *decoded_data, uint32_t decoded_data_len, uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, unsigned int *flag) { - /* NOOP indicates that the audio in is already the same as the audio out, so no conversion was necessary. */ - return SWITCH_STATUS_NOOP; + return SWITCH_STATUS_FALSE; } -static switch_status_t switch_nn_decode(switch_codec_t *codec, +static switch_status_t switch_proxy_decode(switch_codec_t *codec, switch_codec_t *other_codec, void *encoded_data, uint32_t encoded_data_len, uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, unsigned int *flag) { - return SWITCH_STATUS_NOOP; + return SWITCH_STATUS_FALSE; } -static switch_status_t switch_nn_destroy(switch_codec_t *codec) +static switch_status_t switch_proxy_destroy(switch_codec_t *codec) { return SWITCH_STATUS_SUCCESS; } @@ -300,11 +299,11 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_CODEC(codec_interface, "NO-NAME PASS-THROUGH"); + SWITCH_ADD_CODEC(codec_interface, "PROXY PASS-THROUGH"); switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_AUDIO, 0, "NO-NAME", NULL, 8000, 8000, 0, + SWITCH_CODEC_TYPE_AUDIO, 0, "PROXY", NULL, 8000, 8000, 0, 20000, 160, 320, 320, 1, 1, 12, - switch_nn_init, switch_nn_encode, switch_nn_decode, switch_nn_destroy); + switch_proxy_init, switch_proxy_encode, switch_proxy_decode, switch_proxy_destroy); SWITCH_ADD_CODEC(codec_interface, "RAW Signed Linear (16 bit)");

1 0

[commit] r7829 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: anthm Date: Fri Mar 7 13:21:08 2008 New Revision: 7829 Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_rtp.c Log: fix rtp break on blocking sockets Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Fri Mar 7 13:21:08 2008 @@ -191,6 +191,8 @@ */ SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session); +SWITCH_DECLARE(void) switch_rtp_break(switch_rtp_t *rtp_session); + /*! \brief Test if an RTP session is ready \param rtp_session an RTP session to test Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Mar 7 13:21:08 2008 @@ -644,10 +644,10 @@ switch (sig) { case SWITCH_SIG_BREAK: if (switch_rtp_ready(tech_pvt->rtp_session)) { - switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_BREAK); + switch_rtp_break(tech_pvt->rtp_session); } if (switch_rtp_ready(tech_pvt->video_rtp_session)) { - switch_rtp_set_flag(tech_pvt->video_rtp_session, SWITCH_RTP_FLAG_BREAK); + switch_rtp_break(tech_pvt->rtp_session); } break; case SWITCH_SIG_KILL: Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Mar 7 13:21:08 2008 @@ -1436,7 +1436,7 @@ } if (switch_core_session_receive_message(other_session, &msg) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Other leg is not available\n"); - nua_respond(tech_pvt->nh, 488, "Hangup in progress", TAG_END()); + nua_respond(tech_pvt->nh, 403, "Hangup in progress", TAG_END()); } switch_core_session_rwunlock(other_session); } @@ -1780,7 +1780,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Passing SDP to other leg.\n%s\n", r_sdp); if (switch_core_session_receive_message(other_session, &msg) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Other leg is not available\n"); - nua_respond(tech_pvt->nh, 488, "Hangup in progress", TAG_END()); + nua_respond(tech_pvt->nh, 403, "Hangup in progress", TAG_END()); } switch_core_session_rwunlock(other_session); } else { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Mar 7 13:21:08 2008 @@ -804,14 +804,29 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_DECLARE(void) switch_rtp_break(switch_rtp_t *rtp_session) +{ + char o = 42; + switch_size_t len = sizeof(o); + + switch_assert(rtp_session != NULL); + switch_mutex_lock(rtp_session->flag_mutex); + if (rtp_session->sock) { + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); + switch_socket_sendto(rtp_session->sock, rtp_session->local_addr, 0, (void *) &o, &len); + } + switch_mutex_unlock(rtp_session->flag_mutex); +} + SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session) { switch_assert(rtp_session != NULL); switch_mutex_lock(rtp_session->flag_mutex); if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) { switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_IO); - switch_assert(rtp_session->sock != NULL); - switch_socket_shutdown(rtp_session->sock, SWITCH_SHUTDOWN_READWRITE); + if (rtp_session->sock) { + switch_socket_shutdown(rtp_session->sock, SWITCH_SHUTDOWN_READWRITE); + } } switch_mutex_unlock(rtp_session->flag_mutex); } @@ -1081,6 +1096,13 @@ bytes = sizeof(rtp_msg_t); status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock, 0, (void *) &rtp_session->recv_msg, &bytes); + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); + bytes = 0; + do_cng = 1; + goto cng; + } + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) { /* Fast PASS! */ *flags |= SFF_PROXY_PACKET; @@ -1224,10 +1246,9 @@ do_cng = 1; } - - if (do_cng || (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK))) { - switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); + cng: + if (do_cng) { memset(&rtp_session->recv_msg.body, 0, 2); rtp_session->recv_msg.body[0] = 127; rtp_session->recv_msg.header.pt = SWITCH_RTP_CNG_PAYLOAD;

1 0

[commit] r7828 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: mikej Date: Fri Mar 7 12:52:20 2008 New Revision: 7828 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c Log: Fri Mar 7 12:31:52 EST 2008 Pekka.Pessi(a)nokia.com * sres_blocking.c: validating calloc() return value Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c Fri Mar 7 12:52:20 2008 @@ -113,6 +113,9 @@ { int i, N = b->n_sockets; + if (b == NULL) + return -1; + if (old_socket == new_socket) { if (old_socket == INVALID_SOCKET) { free(b); /* Destroy us */ @@ -233,11 +236,13 @@ /* Create a synchronous (blocking) interface towards resolver */ b = calloc(1, sizeof *b); - for (i = 0; i < SRES_MAX_NAMESERVERS; i++) - b->fds[i].fd = INVALID_SOCKET; + if (b) { + for (i = 0; i < SRES_MAX_NAMESERVERS; i++) + b->fds[i].fd = INVALID_SOCKET; - if (!sres_resolver_set_async(res, sres_blocking_update, b, 0)) { - free(b), b = NULL; + if (!sres_resolver_set_async(res, sres_blocking_update, b, 0)) { + free(b), b = NULL; + } } return b;

1 0

[commit] r7827 - in freeswitch/trunk/libs/sofia-sip: libsofia-sip-ua/su m4
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: mikej Date: Fri Mar 7 12:50:32 2008 New Revision: 7827 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Log: Fri Mar 7 12:24:05 EST 2008 Pekka.Pessi(a)nokia.com * su_alloc.c: using safe free Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Fri Mar 7 12:50:32 2008 @@ -203,6 +203,12 @@ void (*_su_home_destroy_mutexes)(void *mutex); +#if HAVE_FREE_NULL +#define safefree(x) free((x)) +#else +su_inline void safefree(void *b) { b ? free(b) : (void)0; } +#endif + #define MEMLOCK(h) \ ((void)((h) && (h)->suh_lock ? _su_home_locker((h)->suh_lock) : 0), (h)->suh_blocks) #define UNLOCK(h) ((void)((h) && (h)->suh_lock ? _su_home_unlocker((h)->suh_lock) : 0), NULL) @@ -457,7 +463,7 @@ home->suh_blocks = b2; if (sub && !sub->sub_auto) - free(sub); + safefree(sub); sub = b2; } @@ -500,7 +506,7 @@ subhome->suh_blocks = su_hash_alloc(SUB_N); if (!subhome->suh_blocks) - return (void)free(data), NULL; + return (void)safefree(data), NULL; subhome->suh_size = (unsigned)size; subhome->suh_blocks->sub_parent = home; @@ -555,7 +561,7 @@ if (home->suh_blocks) home->suh_blocks->sub_hauto = 0; else - free(home), home = NULL; + safefree(home), home = NULL; } return home; @@ -670,7 +676,7 @@ int hauto = sub->sub_hauto; _su_home_deinit(home); if (!hauto) - free(home); + safefree(home); /* UNLOCK(home); */ return 1; } @@ -827,7 +833,7 @@ UNLOCK(home); } - free(data); + safefree(data); } /** Check home consistency. @@ -977,8 +983,8 @@ } else if (su_is_preloaded(b, b->sub_nodes[i].sua_data)) continue; - safe_free(b->sub_nodes[i].sua_data); - + + safefree(b->sub_nodes[i].sua_data); } } Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 ============================================================================== --- freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 (original) +++ freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Fri Mar 7 12:50:32 2008 @@ -202,6 +202,28 @@ Define this as 1 if your compiler puts the variable argument list nicely in memory]) fi +### ====================================================================== +### Test if free(0) fails +### + +AC_CACHE_CHECK([for graceful free(0)],[ac_cv_free_null],[ +ac_cv_free_null=no + +AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include <stdlib.h> + +int main(int avc, char **av) +{ + free(0); + return 0; +} +]])],[ac_cv_free_null=yes],[ac_cv_free_null=no],[ac_cv_free_null=no])]) + +if test $ac_cv_free_null = yes ; then +AC_DEFINE([HAVE_FREE_NULL], 1, [ +Define this as 1 if your c library does not crash with free(0)]) +fi + dnl ====================================================================== dnl Socket features

1 0

[commit] r7826 - freeswitch/trunk/libs/sofia-sip/tests
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: mikej Date: Fri Mar 7 12:47:44 2008 New Revision: 7826 Modified: freeswitch/trunk/libs/sofia-sip/tests/Makefile.am Log: Fri Mar 7 11:49:17 EST 2008 Pekka.Pessi(a)nokia.com * tests/Makefile: using testsdir, installing check_sofia there Modified: freeswitch/trunk/libs/sofia-sip/tests/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/tests/Makefile.am Fri Mar 7 12:47:44 2008 @@ -5,7 +5,8 @@ EXTRA_DIST = check_sofia.h check_sofia.c suite_for_nua.c TESTS = -check_PROGRAMS = +tests_PROGRAMS = +testsdir := ${libdir}/tests/libsofia-sip-ua-tests include $(top_srcdir)/rules/sofia.am @@ -14,20 +15,21 @@ AM_CFLAGS += @CHECK_CFLAGS@ if HAVE_CHECK + TESTS += check_sofia -check_PROGRAMS += check_sofia +tests_PROGRAMS += check_sofia check_sofia_SOURCES = check_sofia.c check_sofia.h \ suite_for_nua.c -${sofiabuilddir}/nua/libtestnua.la \ +CHECKLIBS = ${sofiabuilddir}/nua/libtestnua.la \ ${sofiabuilddir}/nua/libtestproxy.la \ - ${sofiabuilddir}/nua/libtestnat.la: + ${sofiabuilddir}/nua/libtestnat.la + +$(CHECKLIBS): cd ${sofiabuilddir}/nua && make checklib check_sofia_LDADD = \ - ${sofiabuilddir}/nua/libtestnua.la \ - ${sofiabuilddir}/nua/libtestproxy.la \ - ${sofiabuilddir}/nua/libtestnat.la \ - ${sofiabuilddir}/libsofia-sip-ua.la @CHECK_LIBS@ + $(CHECKLIBS) ${sofiabuilddir}/libsofia-sip-ua.la \ + @CHECK_LIBS@ endif

1 0

[commit] r7825 - freeswitch/trunk/libs/sofia-sip/open_c/group
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: mikej Date: Fri Mar 7 12:47:04 2008 New Revision: 7825 Modified: freeswitch/trunk/libs/sofia-sip/open_c/group/test_nua.mmp Log: Fri Mar 7 11:47:53 EST 2008 Pekka.Pessi(a)nokia.com * test_nua.mmp: not using IN_LIBSOFIA_SIP_UA and IN_LIBSOFIA_SRES with test program (test program links with dll, not contributes to it) Modified: freeswitch/trunk/libs/sofia-sip/open_c/group/test_nua.mmp ============================================================================== --- freeswitch/trunk/libs/sofia-sip/open_c/group/test_nua.mmp (original) +++ freeswitch/trunk/libs/sofia-sip/open_c/group/test_nua.mmp Fri Mar 7 12:47:04 2008 @@ -35,8 +35,8 @@ #endif MACRO SYMBIAN -MACRO IN_LIBSOFIA_SIP_UA -MACRO IN_LIBSOFIA_SRES +//MACRO IN_LIBSOFIA_SIP_UA +//MACRO IN_LIBSOFIA_SRES // Source files SOURCEPATH ..\..\libsofia-sip-ua\su

1 0

[commit] r7824 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: mikej Date: Fri Mar 7 12:46:28 2008 New Revision: 7824 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c Log: Fri Mar 7 11:47:06 EST 2008 Pekka.Pessi(a)nokia.com * tport: allow using TPTAG_LOG() and TPTAG_DUMP() with tport_set_params(). Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Fri Mar 7 12:46:28 2008 @@ -532,7 +532,6 @@ ta_start(ta, tag, value); tport_set_params(mr->mr_master, ta_tags(ta)); - tport_open_log(mr, ta_args(ta)); #if HAVE_SOFIA_STUN tport_init_stun_server(mr, ta_args(ta)); @@ -1233,12 +1232,12 @@ tag_type_t tag, tag_value_t value, ...) { ta_list ta; - int n; + int n, m = 0; tport_params_t tpp[1], *tpp0; usize_t mtu; int connect, sdwn_error, reusable, stun_server, pong2ping; - + if (self == NULL) return su_seterrno(EINVAL); @@ -1272,10 +1271,13 @@ TPTAG_TOS_REF(tpp->tpp_tos), TAG_END()); + if (self == (tport_t *)self->tp_master) + m = tport_open_log(self->tp_master, ta_args(ta)); + ta_end(ta); if (n == 0) - return 0; + return m; if (tpp->tpp_idle > 0 && tpp->tpp_idle < 100) tpp->tpp_idle = 100; @@ -1314,7 +1316,7 @@ if (tport_is_secondary(self)) tport_set_secondary_timer(self); - return n; + return n + m; } extern tport_vtable_t const tport_udp_vtable; @@ -4260,6 +4262,7 @@ return NULL; else if (tport_is_master(self)) return ((tport_master_t *)self)->mr_primaries->pri_primary; + else if (tport_is_primary(self)) return ((tport_primary_t *)self)->pri_next->pri_primary; else Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h Fri Mar 7 12:46:28 2008 @@ -283,9 +283,9 @@ /**< Timer reclaiming unused connections and compartment */ su_timer_t *mr_timer; - /** File to dump received and sent data */ + /** FILE to dump received and sent data */ FILE *mr_dump_file; - + char *mr_dump; /**< Filename for dumping received/sent data */ tport_primary_t *mr_primaries; /**< List of primary contacts */ tport_params_t mr_params[1]; @@ -453,7 +453,7 @@ void tport_error_report(tport_t *self, int errcode, su_sockaddr_t const *addr); -void tport_open_log(tport_master_t *mr, tagi_t *tags); +int tport_open_log(tport_master_t *mr, tagi_t *tags); void tport_log_msg(tport_t *tp, msg_t *msg, char const *what, char const *via, su_time_t now); void tport_dump_iovec(tport_t const *self, msg_t *msg, Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c Fri Mar 7 12:46:28 2008 @@ -94,30 +94,43 @@ /** Initialize logging. */ -void tport_open_log(tport_master_t *mr, tagi_t *tags) +int tport_open_log(tport_master_t *mr, tagi_t *tags) { - char const *log = NULL; - int log_msg = 0; - - tl_gets(tags, TPTAG_LOG_REF(log_msg), TAG_END()); + int log_msg = mr->mr_log != 0; + char const *dump = NULL; + int n; + + n = tl_gets(tags, + TPTAG_LOG_REF(log_msg), + TPTAG_DUMP_REF(dump), + TAG_END()); if (getenv("MSG_STREAM_LOG") != NULL || getenv("TPORT_LOG") != NULL) log_msg = 1; - mr->mr_log = log_msg ? MSG_DO_EXTRACT_COPY : 0; - tl_gets(tags, TPTAG_DUMP_REF(log), TAG_END()); - if (getenv("MSG_DUMP")) - log = getenv("MSG_DUMP"); + dump = getenv("MSG_DUMP"); if (getenv("TPORT_DUMP")) - log = getenv("TPORT_DUMP"); + dump = getenv("TPORT_DUMP"); - if (log) { + if (dump) { time_t now; + char *dumpname; - if (strcmp(log, "-")) - mr->mr_dump_file = fopen(log, "ab"); /* XXX */ + if (mr->mr_dump && strcmp(dump, mr->mr_dump) == 0) + return n; + dumpname = su_strdup(mr->mr_home, dump); + if (dumpname == NULL) + return n; + su_free(mr->mr_home, mr->mr_dump); + mr->mr_dump = dumpname; + + if (mr->mr_dump_file && mr->mr_dump_file != stdout) + fclose(mr->mr_dump_file), mr->mr_dump_file = NULL; + + if (strcmp(dumpname, "-")) + mr->mr_dump_file = fopen(dumpname, "ab"); /* XXX */ else mr->mr_dump_file = stdout; @@ -126,6 +139,8 @@ fprintf(mr->mr_dump_file, "dump started at %s\n\n", ctime(&now)); } } + + return n; } /** Create log stamp */

1 0

[commit] r7823 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: mikej Date: Fri Mar 7 12:45:14 2008 New Revision: 7823 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Log: Fri Mar 7 11:46:34 EST 2008 Pekka.Pessi(a)nokia.com * su_root.c: su_task_execute() now accepts NULL as return_value pointer Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Fri Mar 7 12:45:14 2008 @@ -327,9 +327,14 @@ int (*function)(void *), void *arg, int *return_value) { + int dummy; + if (function == NULL) return (errno = EFAULT), -1; + if (return_value == NULL) + return_value = &dummy; + if (!su_port_own_thread(task->sut_port)) { return su_port_execute(task, function, arg, return_value); }

1 0

[commit] r7822 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: mikej Date: Fri Mar 7 12:44:42 2008 New Revision: 7822 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c Log: Fri Mar 7 11:46:08 EST 2008 Pekka.Pessi(a)nokia.com * sip_util.c: fixed doxygen docs Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_util.c Fri Mar 7 12:44:42 2008 @@ -883,7 +883,7 @@ * decide whether to gracefully terminate or not, the * @a *return_graceful_terminate_usage is left unmodified. * - * @RFC 5057 + * @RFC5057 */ int sip_response_terminates_dialog(int response_code, sip_method_t method,

1 0

[commit] r7821 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: mikej Date: Fri Mar 7 12:44:21 2008 New Revision: 7821 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_call_hold.c Log: Fri Mar 7 11:45:51 EST 2008 Pekka.Pessi(a)nokia.com * test_call_hold.c: added more cases for hairy call termination. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_call_hold.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_call_hold.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_call_hold.c Fri Mar 7 12:44:21 2008 @@ -43,7 +43,10 @@ #define __func__ "test_call_hold" #endif -int ack_when_completing(CONDITION_PARAMS); +int complete_call(CONDITION_PARAMS); +int until_complete(CONDITION_PARAMS); +int invite_responded(CONDITION_PARAMS); +static size_t remove_first_ack(void *_once, void *message, size_t len); /* ======================================================================== */ /* test_call_hold message sequence looks like this: @@ -88,6 +91,9 @@ struct endpoint *a = &ctx->a, *b = &ctx->b; struct call *a_call = a->call, *b_call = b->call; struct event *e; + sip_t *sip; + int zero = 0; + struct nat_filter *f; a_call->sdp = "m=audio 5008 RTP/AVP 0 8\n" @@ -476,7 +482,7 @@ INVITE(b, b_call, b_call->nh, SOATAG_HOLD(""), SIPTAG_SUBJECT_STR("TEST NUA-7.6: re-INVITE without auto-ack"), TAG_END()); - run_ab_until(ctx, -1, until_ready, -1, ack_when_completing); + run_ab_until(ctx, -1, until_complete, -1, complete_call); /* Client transitions: READY -(C1)-> CALLING: nua_invite(), nua_i_state @@ -492,9 +498,8 @@ TEST_1(is_answer_recv(e->data->e_tags)); TEST(audio_activity(e->data->e_tags), SOA_ACTIVE_SENDRECV); TEST(video_activity(e->data->e_tags), SOA_ACTIVE_SENDRECV); - TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state); - TEST(callstate(e->data->e_tags), nua_callstate_ready); /* READY */ TEST_1(!e->next); + free_events_in_list(ctx, b->events); /* @@ -508,7 +513,19 @@ TEST(callstate(e->data->e_tags), nua_callstate_completed); /* COMPLETED */ TEST_1(is_answer_sent(e->data->e_tags)); TEST(audio_activity(e->data->e_tags), SOA_ACTIVE_SENDRECV); - TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_ack); + TEST_1(!e->next); + free_events_in_list(ctx, a->events); + + ACK(b, b_call, b_call->nh, TAG_END()); + + run_ab_until(ctx, -1, until_ready, -1, until_ready); + + TEST_1(e = b->events->head); TEST_E(e->data->e_event, nua_i_state); + TEST(callstate(e->data->e_tags), nua_callstate_ready); /* READY */ + TEST_1(!e->next); + free_events_in_list(ctx, b->events); + + TEST_1(e = a->events->head); TEST_E(e->data->e_event, nua_i_ack); TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state); TEST(callstate(e->data->e_tags), nua_callstate_ready); /* READY */ TEST(audio_activity(e->data->e_tags), SOA_ACTIVE_SENDRECV); @@ -519,6 +536,95 @@ if (print_headings) printf("TEST NUA-7.6.1: PASSED\n"); + /* ------------------------------------------------------------------------ */ + /* + : : + |<------INVITE-------| + |--------200-------->| + |<--------ACK--------| + : : + */ + + if (ctx->proxy_tests && ctx->nat) { + if (print_headings) + printf("TEST NUA-7.6.2: almost overlapping re-INVITE\n"); + + /* Turn off auto-ack */ + nua_set_hparams(b_call->nh, NUTAG_AUTOACK(0), TAG_END()); + run_b_until(ctx, nua_r_set_params, until_final_response); + + INVITE(b, b_call, b_call->nh, SOATAG_HOLD("#"), + SIPTAG_SUBJECT_STR("TEST NUA-7.6.2: re-INVITE"), + TAG_END()); + run_ab_until(ctx, -1, until_complete, -1, complete_call); + + /* Client transitions: + READY -(C1)-> CALLING: nua_invite(), nua_i_state + CALLING -(C3a)-> COMPLETING: nua_r_invite, nua_i_state + COMPLETING -(C4)-> READY: nua_ack(), nua_i_state + */ + TEST_1(e = b->events->head); TEST_E(e->data->e_event, nua_i_state); + TEST(callstate(e->data->e_tags), nua_callstate_calling); /* CALLING */ + TEST_1(is_offer_sent(e->data->e_tags)); + TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_invite); + TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state); + TEST(callstate(e->data->e_tags), nua_callstate_completing); /* COMPLETING */ + TEST_1(is_answer_recv(e->data->e_tags)); + TEST(audio_activity(e->data->e_tags), SOA_ACTIVE_INACTIVE); + TEST(video_activity(e->data->e_tags), SOA_ACTIVE_INACTIVE); + TEST_1(!e->next); + + free_events_in_list(ctx, b->events); + + /* + Server transitions: + READY -(S3a)-> COMPLETED: nua_i_invite, <auto-answer>, nua_i_state + COMPLETED -(S4)-> READY: nua_i_ack, nua_i_state + */ + TEST_1(e = a->events->head); TEST_E(e->data->e_event, nua_i_invite); + TEST(e->data->e_status, 200); + TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state); + TEST(callstate(e->data->e_tags), nua_callstate_completed); /* COMPLETED */ + TEST_1(is_answer_sent(e->data->e_tags)); + TEST(audio_activity(e->data->e_tags), SOA_ACTIVE_INACTIVE); + TEST_1(!e->next); + free_events_in_list(ctx, a->events); + + f = test_nat_add_filter(ctx->nat, remove_first_ack, &zero, nat_inbound); + + ACK(b, b_call, b_call->nh, TAG_END()); + INVITE(b, b_call, b_call->nh, SOATAG_HOLD("*"), + SIPTAG_SUBJECT_STR("TEST NUA-7.6.2: almost overlapping re-INVITE"), + NUTAG_AUTOACK(1), + TAG_END()); + + run_ab_until(ctx, -1, until_ready, -1, invite_responded); + + TEST_1(e = b->events->head); TEST_E(e->data->e_event, nua_i_state); + TEST(callstate(e->data->e_tags), nua_callstate_ready); /* READY */ + TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state); + TEST(callstate(e->data->e_tags), nua_callstate_calling); /* CALLING */ + TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_invite); + TEST(e->data->e_status, 100); + TEST_1(sip = sip_object(e->data->e_msg)); + TEST_1(sip->sip_retry_after); + TEST_1(!e->next); + free_events_in_list(ctx, b->events); + + TEST_1(e = a->events->head); TEST_E(e->data->e_event, nua_i_ack); + TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state); + TEST(callstate(e->data->e_tags), nua_callstate_ready); /* READY */ + TEST(audio_activity(e->data->e_tags), SOA_ACTIVE_INACTIVE); + TEST(video_activity(e->data->e_tags), SOA_ACTIVE_INACTIVE); + TEST_1(!e->next); + free_events_in_list(ctx, a->events); + + test_nat_remove_filter(ctx->nat, f); + + if (print_headings) + printf("TEST NUA-7.6.2: PASSED\n"); + } + /* ---------------------------------------------------------------------- */ /* @@ -528,7 +634,7 @@ */ if (print_headings) - printf("TEST NUA-7.6.2: terminate call\n"); + printf("TEST NUA-7.6.3: terminate call\n"); BYE(a, a_call, a_call->nh, TAG_END()); run_ab_until(ctx, -1, until_terminated, -1, until_terminated); @@ -549,13 +655,17 @@ */ TEST_1(e = b->events->head); TEST_E(e->data->e_event, nua_i_bye); TEST(e->data->e_status, 200); + if (ctx->proxy_tests && ctx->nat) { + TEST_1(e = e->next); TEST_E(e->data->e_event, nua_r_invite); + TEST(e->data->e_status, 481); + } TEST_1(e = e->next); TEST_E(e->data->e_event, nua_i_state); TEST(callstate(e->data->e_tags), nua_callstate_terminated); /* TERMINATED */ TEST_1(!e->next); free_events_in_list(ctx, b->events); if (print_headings) - printf("TEST NUA-7.6.2: PASSED\n"); + printf("TEST NUA-7.6.3: PASSED\n"); nua_handle_destroy(a_call->nh), a_call->nh = NULL; nua_handle_destroy(b_call->nh), b_call->nh = NULL; @@ -572,7 +682,7 @@ | | |---------ACK------->| */ -int ack_when_completing(CONDITION_PARAMS) +int complete_call(CONDITION_PARAMS) { if (!(check_handle(ep, call, nh, SIP_500_INTERNAL_SERVER_ERROR))) return 0; @@ -581,8 +691,33 @@ switch (callstate(tags)) { case nua_callstate_completing: - ACK(ep, call, nh, TAG_END()); + return 1; + case nua_callstate_ready: + return 1; + case nua_callstate_terminated: + if (call) + nua_handle_destroy(call->nh), call->nh = NULL; + return 1; + default: return 0; + } +} + +/* + X INVITE + | | + |-------INVITE------>| + |<--------200--------| +*/ +int until_complete(CONDITION_PARAMS) +{ + if (!(check_handle(ep, call, nh, SIP_500_INTERNAL_SERVER_ERROR))) + return 0; + + save_event_in_list(ctx, event, ep, call); + + switch (callstate(tags)) { + case nua_callstate_completed: case nua_callstate_ready: return 1; case nua_callstate_terminated: @@ -594,6 +729,22 @@ } } +static size_t remove_first_ack(void *_once, void *message, size_t len) +{ + int *once = _once; + + if (*once) + return len; + + if (strncmp("ACK ", message, 4) == 0) { + printf("FILTERING %.*s\n", strcspn(message, "\r\n"), (char *)message); + *once = 1; + return 0; + } + + return len; +} + /* ======================================================================== */ /* test_reinvite message sequence looks like this: @@ -986,6 +1137,17 @@ } } +int invite_responded(CONDITION_PARAMS) +{ + if (!(check_handle(ep, call, nh, SIP_500_INTERNAL_SERVER_ERROR))) + return 0; + + save_event_in_list(ctx, event, ep, call); + + return event == nua_r_invite && status >= 100; +} + + int test_reinvites(struct context *ctx) { int retval = 0;

1 0