May 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8651 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 19:53:23 2008 New Revision: 8651 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c Log: whoops Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c Sun May 25 19:53:23 2008 @@ -189,7 +189,6 @@ if (*waitobj) WSACloseEvent(*waitobj); #else - su_wait_t w0 = NULL; su_wait_t w0 = { INVALID_SOCKET, 0, 0 }; assert(waitobj != NULL); *waitobj = w0;

1 0

[commit] r8650 - freeswitch/trunk/build
by Freeswitch SVN 25 May '08

25 May '08

Author: stkn Date: Sun May 25 18:07:31 2008 New Revision: 8650 Modified: freeswitch/trunk/build/modmake.rules.in Log: fix -D_GNU_SOURC typo in build/modmake.rules.in ALL_CXXFLAGS Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Sun May 25 18:07:31 2008 @@ -35,7 +35,7 @@ LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS) ALL_CFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CFLAGS@ @CFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS) -ALL_CXXFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURC $(OUR_CFLAGS) +ALL_CXXFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS) COMPILE = $(CC) $(ALL_CFLAGS) $(DEFS) LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)

1 0

[commit] r8646 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 25 May '08

25 May '08

Author: brian Date: Sun May 25 17:54:02 2008 New Revision: 8646 Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Log: tweak Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Sun May 25 17:54:02 2008 @@ -5,7 +5,7 @@ <menu name="demo_ivr" greet-long="phrase:demo_ivr_main_menu" greet-short="phrase:demo_ivr_main_menu_short" - invalid-sound="voicemail/vm-hello.wav" + invalid-sound="ivr/ivr-that_was_an_invalid_entry.wav" exit-sound="voicemail/vm-goodbye.wav" timeout ="10000" inter-digit-timeout="2000" @@ -23,7 +23,7 @@ <menu name="demo_ivr_submenu" greet-long="phrase:demo_ivr_sub_menu" greet-short="phrase:demo_ivr_sub_menu_short" - invalid-sound="voicemail/vm-hello.wav" + invalid-sound="ivr/ivr-that_was_an_invalid_entry.wav" exit-sound="voicemail/vm-goodbye.wav" timeout="15000" max-failures="3">

1 0

[commit] r8645 - freeswitch/trunk
by Freeswitch SVN 25 May '08

25 May '08

Author: cypromis Date: Sun May 25 17:51:24 2008 New Revision: 8645 Modified: freeswitch/trunk/freeswitch.spec Log: Changed freeswitch.spec so it only runs bootstrap.sh if Makefile.in does not exist deleted german and french internationalisation until declared stable made lua and perl modules their own packages general cleanups Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Sun May 25 17:51:24 2008 @@ -115,6 +115,20 @@ %description spidermonkey +%package lua +Summary: Lua support for the FreeSWITCH open source telephony platform +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description lua + +%package perl +Summary: Perl support for the FreeSWITCH open source telephony platform +Group: System/Libraries +Requires: %{name} = %{version}-%{release} + +%description perl + %package lang-en Summary: Provides english language dependand modules and sounds for the FreeSwitch Open Source telephone platform. Group: System/Libraries @@ -123,22 +137,6 @@ %description lang-en English language phrases module and directory structure for say module and voicemail -%package lang-de -Summary: Provides german language dependand modules and sounds for the FreeSwitch Open Source telephone platform. -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description lang-de -German language phrases module and directory structure for say module and voicemail - -%package lang-fr -Summary: Provides french language dependand modules and sounds for the FreeSwitch Open Source telephone platform. -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description lang-fr -French language phrases module and directory structure for say module and voicemail - %prep %setup -q @@ -163,15 +161,16 @@ ENDPOINTS_MODULES="endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_woomera ../../libs/openzap/mod_openzap" EVENT_HANDLERS_MODULES="event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_cdr_csv" FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream" -LANGUAGES_MODULES= +LANGUAGES_MODULES="languages/mod_perl languages/mod_lua" LOGGERS_MODULES="loggers/mod_console loggers/mod_logfile loggers/mod_syslog" -SAY_MODULES="say/mod_say_en say/mod_say_fr say/mod_say_de" +SAY_MODULES="say/mod_say_en" TIMERS_MODULES= DISABLED_MODULES="applications/mod_sountouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl" XML_INT_MODULES="xml_int/mod_xml_rpc xml_int/mod_xml_curl xml_int/mod_xml_cdr" MYMODULES="$PASSTHRU_CODEC_MODULES $SPIDERMONKEY_MODULES $APPLICATIONS_MODULES $ASR_TTS_MODULES $CODECS_MODULES $DIALPLANS_MODULES $DIRECTORIES_MODULES $DOTNET_MODULES $ENDPOINTS_MODULES $EVENT_HANDLERS_MODULES $FORMATS_MODULES $LANGUAGES_MODULES $LOGGERS_MODULES $SAY_MODULES $TIMERS_MODULES $XML_INT_MODULES" export MODULES=$MYMODULES +rm modules.conf touch modules.conf for i in $MODULES; do echo $i >> modules.conf; done export VERBOSE=yes @@ -179,8 +178,13 @@ export PKG_CONFIG_PATH=/usr/bin/pkg-config:$PKG_CONFIG_PATH export ACLOCAL_FLAGS="-I /usr/share/aclocal" -./bootstrap.sh -%configure -C \ +if test ! -f Makefile.in +then + bootstrap.sh +fi + + + %configure -C \ --prefix=%{prefix} \ --bindir=%{prefix}/bin \ --libdir=%{prefix}/lib \ @@ -205,6 +209,12 @@ %{__make} %install +# delete unsupported langugages for now +rm -rf conf/lang/de +rm -rf conf/lang/fr +rm -rf $RPM_BUILD_ROOT%{prefix}/conf/lang/de +rm -rf $RPM_BUILD_ROOT%{prefix}/conf/lang/fr + %{__make} DESTDIR=$RPM_BUILD_ROOT install # Create a log dir @@ -286,6 +296,7 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/*.ttml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/*.conf +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/acl.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/alsa.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/conference.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/console.conf.xml @@ -321,8 +332,8 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/directory/default/* %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/mrcp_profiles/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/*.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/default/*.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/outbound/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/internal/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/external/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/nat/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/jingle_profiles/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/htdocs/* @@ -397,6 +408,19 @@ %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/autoload_configs %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/spidermonkey.conf.xml +%files lua +%defattr(-,freeswitch,daemon) +%{prefix}/mod/mod_lua*.so* +%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/autoload_configs +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/lua.conf.xml + +%files perl +%defattr(-,freeswitch,daemon) +%{prefix}/mod/mod_perl*.so* +%{prefix}/perl/* +%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/autoload_configs +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/perl.conf.xml + %files devel %defattr(-, freeswitch, daemon) %{prefix}/lib/*.a @@ -414,25 +438,13 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/en/vm/*.xml %{prefix}/mod/mod_say_en.so* -%files lang-de -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/de -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/de/demo -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/de/vm -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/de/*.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/de/demo/*.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/de/vm/*.xml -%{prefix}/mod/mod_say_de.so* - -%files lang-fr -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/fr -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/fr/demo -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang/fr/vm -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/fr/*.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/fr/demo/*.xml -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/lang/fr/vm/*.xml -%{prefix}/mod/mod_say_fr.so* - %changelog +* Thu May 22 2008 - michal.bielicki(a)voiceworks.pl +- disabled beta class language stuff +- bumped revision up to rc6 +- added mod_lua +- added mod_perl +- Only bootstrap if no Makfile.in exists * Mon Feb 04 2008 - michal.bielicki(a)voiceworks.pl - More fixes to specfile - First go at SFE files @@ -443,7 +455,7 @@ * Fri Jan 18 2008 - michal.bielicki(a)voiceworks.pl - fixes, fixes and more fixes in preparation for rc1 * Thu Dec 5 2007 - michal.bielicki(a)voiceworks.pl - - put in detail configfiles in to split of spidermonkey configs +- put in detail configfiles in to split of spidermonkey configs - created link from /opt/freesxwitch/conf to /etc%{prefix} * Thu Nov 29 2007 - michal.bielicki(a)voiceworks.pl - Added ifdefs for susealities

1 0

[commit] r8644 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 25 May '08

25 May '08

Author: stkn Date: Sun May 25 17:37:40 2008 New Revision: 8644 Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml Log: Add mod_lua to modules.conf.xml as requested by pressureman Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Sun May 25 17:37:40 2008 @@ -76,6 +76,7 @@    +

1 0

[commit] r8643 - in freeswitch/trunk: libs/sofia-sip/libsofia-sip-ua/nta src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 17:22:35 2008 New Revision: 8643 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add NTATAG_SERVER_RPORT(2) that will act like there is always a rport in the via. 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 Sun May 25 17:22:35 2008 @@ -987,7 +987,7 @@ void *smime = agent->sa_smime; uint32_t flags = agent->sa_flags; int rport = agent->sa_rport; - int server_rport = agent->sa_server_rport; + unsigned server_rport = agent->sa_server_rport; int tcp_rport = agent->sa_tcp_rport; unsigned preload = agent->sa_preload; unsigned threadpool = agent->sa_tport_threadpool; @@ -2579,7 +2579,7 @@ rport = su_sprintf(msg_home(msg), "rport=%u", ntohs(from->su_port)); msg_header_replace_param(msg_home(msg), v->v_common, rport); } - else { + else if (agent->sa_server_rport == 2) { rport = su_sprintf(msg_home(msg), "rport=%u", ntohs(from->su_port)); msg_header_replace_param(msg_home(msg), v->v_common, rport); } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta_internal.h Sun May 25 17:22:35 2008 @@ -226,7 +226,7 @@ /** If true, use rport at client */ unsigned sa_rport:1; /** If true, use rport at server */ - unsigned sa_server_rport:1; + unsigned sa_server_rport:2; /** If true, use rport with tcp, too */ unsigned sa_tcp_rport:1; 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 Sun May 25 17:22:35 2008 @@ -1334,7 +1334,7 @@ * * @sa @RFC3581, NTATAG_CLIENT_RPORT(), NTATAG_TCP_RPORT(), @Via */ -tag_typedef_t ntatag_server_rport = BOOLTAG_TYPEDEF(server_rport); +tag_typedef_t ntatag_server_rport = UINTTAG_TYPEDEF(server_rport); /**@def NTATAG_TCP_RPORT(x) 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 Sun May 25 17:22:35 2008 @@ -544,6 +544,7 @@ TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)), NTATAG_UDP_MTU(65536), + NTATAG_SERVER_RPORT(2), TAG_IF(tportlog, TPTAG_LOG(1)), TAG_END()); /* Last tag should always finish the sequence */ @@ -586,6 +587,7 @@ node->nua = nua_create(profile->s_root, /* Event loop */ sofia_event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ + NTATAG_SERVER_RPORT(2), NUTAG_URL(node->url), TAG_END()); /* Last tag should always finish the sequence */ nua_set_params(node->nua,

1 0

[commit] r8642 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 17:18:42 2008 New Revision: 8642 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c Log: fix build Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_wait.c Sun May 25 17:18:42 2008 @@ -185,11 +185,11 @@ int su_wait_destroy(su_wait_t *waitobj) { #if SU_HAVE_WINSOCK - su_wait_t w0 = NULL; assert(waitobj != NULL); if (*waitobj) WSACloseEvent(*waitobj); #else + su_wait_t w0 = NULL; su_wait_t w0 = { INVALID_SOCKET, 0, 0 }; assert(waitobj != NULL); *waitobj = w0;

1 0

[commit] r8641 - in freeswitch/trunk/libs/sofia-sip: . tests
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:24:07 2008 New Revision: 8641 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/tests/Makefile.am Log: Fri May 23 07:53:25 EDT 2008 Pekka.Pessi(a)nokia.com * tests/Makefile.am: do not fix testsdir Build check_sofia only with make check. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 11:24:07 2008 @@ -1 +1 @@ -Sun May 25 11:23:32 EDT 2008 +Sun May 25 11:24:02 EDT 2008 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 Sun May 25 11:24:07 2008 @@ -32,20 +32,13 @@ libtestnat_a_SOURCES = test_nat.h test_nat.c test_nat_tags.c -# -# Install in special test package -# -testsdir = ${libdir}/tests/libsofia-sip-ua-tests -tests_PROGRAMS = - if HAVE_CHECK TESTS += check_sofia -tests_PROGRAMS += check_sofia +check_PROGRAMS += check_sofia endif check_sofia_CFLAGS = @CHECK_CFLAGS@ - check_sofia_SOURCES = check_sofia.c check_sofia.h \ suite_for_nua.c

1 0

[commit] r8640 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:23:36 2008 New Revision: 8640 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c Log: Thu May 22 10:57:40 EDT 2008 Pekka.Pessi(a)nokia.com * nua_register.c: fixed klocwork issues Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 11:23:36 2008 @@ -1 +1 @@ -Sun May 25 11:23:06 EDT 2008 +Sun May 25 11:23:32 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c Sun May 25 11:23:36 2008 @@ -188,7 +188,7 @@ nua_dialog_state_t *ds, nua_dialog_usage_t *du) { - nua_registration_t *nr = nua_dialog_usage_private(du); + nua_registration_t *nr = NUA_DIALOG_USAGE_PRIVATE(du); if (ds->ds_has_register) return -1; /* There can be only one usage */ @@ -207,7 +207,7 @@ nua_client_request_t *cr, nua_server_request_t *sr) { - nua_registration_t *nr = nua_dialog_usage_private(du); + nua_registration_t *nr = NUA_DIALOG_USAGE_PRIVATE(du); if (nr->nr_list) nua_registration_remove(nr); /* Remove from list of registrations */ @@ -236,7 +236,7 @@ nua_dialog_state_t const *ds, sip_t const *sip) { - nua_registration_t *nr = nua_dialog_usage_private(du); + nua_registration_t *nr = NUA_DIALOG_USAGE_PRIVATE(du); if (nr->nr_ob) outbound_peer_info(nr->nr_ob, sip); } @@ -1016,16 +1016,18 @@ msg_t *msg, int error) { - nua_dialog_usage_t *du = nua_dialog_usage_public(nr); + nua_dialog_usage_t *du; tp_name_t const *tpn; - int pending = nr->nr_error_report_id; + int pending; - assert(tport == nr->nr_tport); - - if (!nr->nr_tport) + assert(nr && tport == nr->nr_tport); + if (nr == NULL || tport != nr->nr_tport) return; - if (tport_release(nr->nr_tport, pending, NULL, NULL, nr, 0) < 0) + du = NUA_DIALOG_USAGE_PUBLIC(nr); + pending = nr->nr_error_report_id; + + if (tport_release(tport, pending, NULL, NULL, nr, 0) < 0) SU_DEBUG_1(("nua_register: tport_release() failed\n")); nr->nr_error_report_id = 0; @@ -1110,7 +1112,7 @@ nua_dialog_usage_t *du) { nua_client_request_t *cr = du->du_cr; - nua_registration_t *nr = nua_dialog_usage_private(du); + nua_registration_t *nr = NUA_DIALOG_USAGE_PRIVATE(du); if (cr) { if (nua_client_is_queued(cr)) /* Already registering. */

1 0

[commit] r8639 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 11:23:11 2008 New Revision: 8639 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Log: Thu May 22 10:45:32 EDT 2008 Pekka.Pessi(a)nokia.com * nua_session.c: handling answer better by nua_prack_server_init() Fixed klocwork issue, too. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 11:23:11 2008 @@ -1 +1 @@ -Sun May 25 11:22:40 EDT 2008 +Sun May 25 11:23:06 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Sun May 25 11:23:11 2008 @@ -2694,19 +2694,22 @@ return sr->sr_status; if (sr->sr_sdp) { - nua_session_usage_t *ss = nua_dialog_usage_private(sr->sr_usage); + nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(sr->sr_usage); + char const *offeranswer; /* XXX - check for overlap? */ - if (sri->sr_offer_sent) - sr->sr_answer_recv = 1, ss->ss_oa_recv = Answer; - else - sr->sr_offer_recv = 1, ss->ss_oa_recv = Offer; + if (sri->sr_offer_sent && !sri->sr_answer_recv) + sr->sr_answer_recv = 1, sri->sr_answer_recv = 1, offeranswer = Answer; + else + sr->sr_offer_recv = 1, offeranswer = Offer; + + ss->ss_oa_recv = offeranswer; if (nh->nh_soa && soa_set_remote_sdp(nh->nh_soa, NULL, sr->sr_sdp, sr->sr_sdp_len) < 0) { SU_DEBUG_5(("nua(%p): %s server: error parsing %s\n", (void *)nh, - "PRACK", Offer)); + "PRACK", offeranswer)); return sr->sr_status = soa_error_as_sip_response(nh->nh_soa, &sr->sr_phrase); }

1 0