- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4209 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: mikej Date: Mon Feb 12 15:30:13 2007 New Revision: 4209 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: data pulled from xml needs to be duped in order for it to stay around for sure. Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Feb 12 15:30:13 2007 @@ -4357,7 +4357,7 @@ action = (caller_control_action_t *)switch_core_alloc(conference->pool, sizeof(caller_control_action_t)); if (action != NULL) { action->fndesc = &ccfntbl[i]; - action->data = (void *)data; + action->data = (void *)switch_core_strdup(conference->pool, data); status = switch_ivr_digit_stream_parser_set_event(conference->dtmf_parser, val, action); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "unable to alloc memory for caller control binding '%s' to '%s'\n", ccfntbl[i].key, ccfntbl[i].digits);

1 0

[commit] r4208 - in freeswitch/trunk/src: include mod/applications/mod_dptools
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: anthm Date: Mon Feb 12 15:03:29 2007 New Revision: 4208 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: tweaks Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Feb 12 15:03:29 2007 @@ -35,7 +35,7 @@ #define SWITCH_TYPES_H #include <switch.h> - +#include <ctype.h> SWITCH_BEGIN_EXTERN_C #ifdef WIN32 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Feb 12 15:03:29 2007 @@ -610,7 +610,7 @@ /* long_desc */ "Pre-Answer the call for a channel.", /* short_desc */ "Pre-Answer the call", /* syntax */ "", - /*.next */ &hangup_application_interface + /*.next */ &answer_application_interface };

1 0

[commit] r4207 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: mikej Date: Mon Feb 12 14:55:12 2007 New Revision: 4207 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: avoid array out of bounds. Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Mon Feb 12 14:55:12 2007 @@ -203,7 +203,7 @@ switch_stream_handle_t stream = {0}; switch_size_t encode_len = 1024, new_len = 0; char *encode_buf = NULL; - char *prof[11] = {0}, *prof_names[11] = {0}, *e = NULL; + char *prof[12] = {0}, *prof_names[12] = {0}, *e = NULL; switch_hash_index_t *hi; uint32_t x = 0; char *alt_path = (char *) arg;

1 0

[commit] r4206 - freeswitch/trunk/src
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: mikej Date: Mon Feb 12 14:35:09 2007 New Revision: 4206 Modified: freeswitch/trunk/src/switch_rtp.c Log: ntohs takes u_short, and we are in a 16 bit bitfield, so we can cast this. Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Feb 12 14:35:09 2007 @@ -1194,7 +1194,7 @@ } rtp_session->last_write_ts = ntohl(send_msg->header.ts); - rtp_session->last_write_seq = ntohs(send_msg->header.seq); + rtp_session->last_write_seq = ntohs((u_short)send_msg->header.seq); if (send) { switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)send_msg, &bytes);

1 0

[commit] r4205 - freeswitch/trunk/libs/sofia-sip/packages
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: mikej Date: Mon Feb 12 13:29:52 2007 New Revision: 4205 Modified: freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-1.12.5.spec Log: add missing spec file updates Modified: freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-1.12.5.spec ============================================================================== --- freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-1.12.5.spec (original) +++ freeswitch/trunk/libs/sofia-sip/packages/sofia-sip-1.12.5.spec Mon Feb 12 13:29:52 2007 @@ -12,15 +12,15 @@ BuildRequires: pkgconfig -%{!?bcond_with:%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}} -%{!?bcond_without:%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}} +%define opt_with() %{expand:%%global with_%{1} %%{?_with_%{1}:1}%%{?!_with_%{1}:0}} +%define opt_without() %{expand:%%global with_%{1} %%{!?_without_%{1}:1}%%{?_without_%{1}:0}} # Options: -%bcond_with doxygen - Generate documents using doxygen and dot -%bcond_with check - Run tests -%bcond_with openssl - Always use OpenSSL (TLS) -%bcond_with glib - Always use glib-2.0 (>= 2.2) -%bcond_with sctp - Include SCTP transport +%opt_with doxygen - Generate documents using doxygen and dot +%opt_with check - Run tests +%opt_with openssl - Always use OpenSSL (TLS) +%opt_with glib - Always use glib-2.0 (>= 2.2) +%opt_with sctp - Include SCTP transport %define have_doxygen %{?_with_doxygen:1}%{!?_with_doxygen:0} %define have_openssl %(%{?!_with_openssl:pkg-config 'openssl >= 0.9.7'&&}echo 1||echo 0) @@ -49,7 +49,7 @@ %if !%{have_glib} options="$options --without-glib" %endif -%if %{with sctp} +%if %{with_sctp} options="$options --enable-sctp" %endif @@ -62,7 +62,7 @@ # XXX comment next line to build with non-check aware rpmbuild. %check -%if %{with check} +%if %{with_check} make check %endif @@ -126,7 +126,7 @@ Development package for Sofia SIP UA library. This package includes static libraries and include files. -%if %{without doxygen} +%if !%{with_doxygen} The reference documentation for Sofia SIP UA library is available at <http://sofia-sip.sourceforge.net/development.html> %endif

1 0

[commit] r4204 - freeswitch/trunk/src
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: anthm Date: Mon Feb 12 13:22:30 2007 New Revision: 4204 Modified: freeswitch/trunk/src/switch_rtp.c Log: alternate which devices we support with the ones we don't using rfc2833 Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Feb 12 13:22:30 2007 @@ -135,6 +135,8 @@ void *private_data; uint32_t ts; + uint32_t last_write_ts; + uint16_t last_write_seq; uint32_t flags; switch_memory_pool_t *pool; switch_sockaddr_t *from_addr; @@ -655,13 +657,16 @@ for (x = 0; x < loops; x++) { switch_rtp_write_manual(rtp_session, rtp_session->dtmf_data.out_digit_packet, 4, 0, rtp_session->te, rtp_session->dtmf_data.timestamp_dtmf, - rtp_session->dtmf_data.out_digit_seq++, &flags); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s packet for [%c] ts=%d sofar=%u dur=%d\n", + rtp_session->dtmf_data.out_digit_seq, &flags); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send %s packet for [%c] ts=%d sofar=%u dur=%d seq=%d\n", loops == 1 ? "middle" : "end", rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, - duration); + duration, + rtp_session->dtmf_data.out_digit_seq); + + rtp_session->dtmf_data.out_digit_seq++; } } @@ -680,8 +685,11 @@ rtp_session->dtmf_data.out_digit_packet[1] = 7; //ts = rtp_session->dtmf_data.timestamp_dtmf += samples; - rtp_session->dtmf_data.timestamp_dtmf++; + //rtp_session->dtmf_data.timestamp_dtmf++; + rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts; + rtp_session->dtmf_data.out_digit_seq = rtp_session->last_write_seq; + for (x = 0; x < 3; x++) { switch_rtp_write_manual(rtp_session, @@ -690,15 +698,17 @@ switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BUGGY_2833) ? 0 : 1, rtp_session->te, rtp_session->dtmf_data.timestamp_dtmf, - rtp_session->dtmf_data.out_digit_seq++, + rtp_session->dtmf_data.out_digit_seq, &flags); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, - "Send start packet for [%c] ts=%d sofar=%u dur=%d\n", + "Send start packet for [%c] ts=%d sofar=%u dur=%d seq=%d\n", rtp_session->dtmf_data.out_digit, rtp_session->dtmf_data.timestamp_dtmf, rtp_session->dtmf_data.out_digit_sofar, - 0); + 0, + rtp_session->dtmf_data.out_digit_seq); + rtp_session->dtmf_data.out_digit_seq++; } free(rdigit); @@ -1183,6 +1193,9 @@ } } + rtp_session->last_write_ts = ntohl(send_msg->header.ts); + rtp_session->last_write_seq = ntohs(send_msg->header.seq); + if (send) { switch_socket_sendto(rtp_session->sock, rtp_session->remote_addr, 0, (void*)send_msg, &bytes); } @@ -1299,7 +1312,6 @@ return -1; } - rtp_session->ts += ts; rtp_session->send_msg.header.seq = htons(mseq); rtp_session->send_msg.header.ts = htonl(ts);

1 0

[commit] r4203 - in freeswitch/trunk/src: . include mod/endpoints/mod_portaudio
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: mikej Date: Mon Feb 12 13:13:14 2007 New Revision: 4203 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/switch_caller.c freeswitch/trunk/src/switch_ivr.c Log: some more protection from passing around and printing null values, we are now initializing null's passed to switch_caller_profile_new as blank strings in the caller profile, if your using any caller profile values in if's, please use !switch_strlen_zero() in your check. Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Mon Feb 12 13:13:14 2007 @@ -200,6 +200,13 @@ #define switch_strlen_zero(s) (!s || *s == '\0') /*! + \brief Make a null string a blank string instead + \param s the string to test + \return the original string or blank string. +*/ +#define switch_str_nil(s) (s ? s : "") + +/*! \brief Wait a desired number of microseconds and yield the CPU */ #if defined(HAVE_USLEEP) Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Mon Feb 12 13:13:14 2007 @@ -849,7 +849,7 @@ if (outbound_profile) { char name[128]; - char *id = outbound_profile->caller_id_number ? outbound_profile->caller_id_number : "na"; + char *id = !switch_strlen_zero(outbound_profile->caller_id_number) ? outbound_profile->caller_id_number : "na"; snprintf(name, sizeof(name), "PortAudio/%s", id); switch_channel_set_name(channel, name); Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Mon Feb 12 13:13:14 2007 @@ -53,17 +53,17 @@ if (!context) { context = "default"; } - profile->username = switch_core_strdup(pool, username); - profile->dialplan = switch_core_strdup(pool, dialplan); - profile->caller_id_name = switch_core_strdup(pool, caller_id_name); - profile->caller_id_number = switch_core_strdup(pool, caller_id_number); - profile->network_addr = switch_core_strdup(pool, network_addr); - profile->ani = switch_core_strdup(pool, ani); - profile->aniii = switch_core_strdup(pool, aniii); - profile->rdnis = switch_core_strdup(pool, rdnis); - profile->source = switch_core_strdup(pool, source); - profile->context = switch_core_strdup(pool, context); - profile->destination_number = switch_core_strdup(pool, destination_number); + profile->username = switch_core_strdup(pool, switch_str_nil(username)); + profile->dialplan = switch_core_strdup(pool, switch_str_nil(dialplan)); + profile->caller_id_name = switch_core_strdup(pool, switch_str_nil(caller_id_name)); + profile->caller_id_number = switch_core_strdup(pool, switch_str_nil(caller_id_number)); + profile->network_addr = switch_core_strdup(pool, switch_str_nil(network_addr)); + profile->ani = switch_core_strdup(pool, switch_str_nil(ani)); + profile->aniii = switch_core_strdup(pool, switch_str_nil(aniii)); + profile->rdnis = switch_core_strdup(pool, switch_str_nil(rdnis)); + profile->source = switch_core_strdup(pool, switch_str_nil(source)); + profile->context = switch_core_strdup(pool, switch_str_nil(context)); + profile->destination_number = switch_core_strdup(pool, switch_str_nil(destination_number)); switch_set_flag(profile, SWITCH_CPF_SCREEN); } @@ -145,55 +145,55 @@ char header_name[1024]; - if (caller_profile->username) { + if (!switch_strlen_zero(caller_profile->username)) { snprintf(header_name, sizeof(header_name), "%s-Username", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->username); } - if (caller_profile->dialplan) { + if (!switch_strlen_zero(caller_profile->dialplan)) { snprintf(header_name, sizeof(header_name), "%s-Dialplan", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->dialplan); } - if (caller_profile->caller_id_name) { + if (!switch_strlen_zero(caller_profile->caller_id_name)) { snprintf(header_name, sizeof(header_name), "%s-Caller-ID-Name", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->caller_id_name); } - if (caller_profile->caller_id_number) { + if (!switch_strlen_zero(caller_profile->caller_id_number)) { snprintf(header_name, sizeof(header_name), "%s-Caller-ID-Number", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->caller_id_number); } - if (caller_profile->network_addr) { + if (!switch_strlen_zero(caller_profile->network_addr)) { snprintf(header_name, sizeof(header_name), "%s-Network-Addr", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->network_addr); } - if (caller_profile->ani) { + if (!switch_strlen_zero(caller_profile->ani)) { snprintf(header_name, sizeof(header_name), "%s-ANI", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->ani); } - if (caller_profile->aniii) { + if (!switch_strlen_zero(caller_profile->aniii)) { snprintf(header_name, sizeof(header_name), "%s-ANI-II", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->aniii); } - if (caller_profile->destination_number) { + if (!switch_strlen_zero(caller_profile->destination_number)) { snprintf(header_name, sizeof(header_name), "%s-Destination-Number", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->destination_number); } - if (caller_profile->uuid) { + if (!switch_strlen_zero(caller_profile->uuid)) { snprintf(header_name, sizeof(header_name), "%s-Unique-ID", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->uuid); } - if (caller_profile->source) { + if (!switch_strlen_zero(caller_profile->source)) { snprintf(header_name, sizeof(header_name), "%s-Source", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->source); } - if (caller_profile->context) { + if (!switch_strlen_zero(caller_profile->context)) { snprintf(header_name, sizeof(header_name), "%s-Context", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->context); } - if (caller_profile->rdnis) { + if (!switch_strlen_zero(caller_profile->rdnis)) { snprintf(header_name, sizeof(header_name), "%s-RDNIS", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->rdnis); } - if (caller_profile->chan_name) { + if (!switch_strlen_zero(caller_profile->chan_name)) { snprintf(header_name, sizeof(header_name), "%s-Channel-Name", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->chan_name); } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Feb 12 13:13:14 2007 @@ -3642,13 +3642,13 @@ new_profile = switch_caller_profile_clone(session, profile); new_profile->destination_number = switch_core_session_strdup(session, extension); - if (dialplan) { + if (!switch_strlen_zero(dialplan)) { new_profile->dialplan = switch_core_session_strdup(session, dialplan); } else { dialplan = new_profile->dialplan; } - if (context) { + if (!switch_strlen_zero(context)) { new_profile->context = switch_core_session_strdup(session, context); } else { context = new_profile->context;

1 0

[commit] r4202 - freeswitch/trunk/libs/sofia-sip
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: mikej Date: Mon Feb 12 11:02:55 2007 New Revision: 4202 Modified: freeswitch/trunk/libs/sofia-sip/.update Log: .update Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Mon Feb 12 11:02:55 2007 @@ -1 +1 @@ -Fri Feb 9 13:12:04 EST 2007 +Mon Feb 12 11:02:32 EST 2007

1 0

[commit] r4201 - in freeswitch/trunk/libs/sofia-sip: libsofia-sip-ua/iptsec libsofia-sip-ua/nta libsofia-sip-ua/nua libsofia-sip-ua/su libsofia-sip-ua/url libsofia-sip-ua/url/sofia-sip packages
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: mikej Date: Mon Feb 12 11:01:22 2007 New Revision: 4201 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_osx_runloop.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/torture_url.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c freeswitch/trunk/libs/sofia-sip/packages/sofia-sip.spec.in Log: merge fixes to sofia-sip including double free causing segfault or assert in sres Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am Mon Feb 12 11:01:22 2007 @@ -31,40 +31,22 @@ BUILT_SOURCES = auth_tag_ref.c -HTTP_SRC = auth_module_http.c -if HAVE_NTH -USE_HTTP_SRC = $(HTTP_SRC) -OPT_LDDD = ../http/libhttp.la -endif - nobase_include_sofia_HEADERS = \ sofia-sip/auth_common.h \ sofia-sip/auth_client.h sofia-sip/auth_digest.h \ sofia-sip/auth_module.h sofia-sip/auth_plugin.h \ - sofia-sip/auth_client_plugin.h \ - $(NTLM_HEADER) + sofia-sip/auth_client_plugin.h libiptsec_la_SOURCES = iptsec_debug.h \ auth_client.c auth_common.c auth_digest.c \ auth_module.c auth_tag.c auth_tag_ref.c \ auth_plugin.c auth_plugin_delayed.c \ auth_module_sip.c \ - $(NTLM_SOURCE) \ - $(USE_HTTP_SOURCE) \ iptsec_debug.c -NTLM_HEADER = sofia-sip/auth_ntlm.h -if HAVE_NTLM -NTLM_SOURCE = auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c -endif - -EXTRA_libiptsec_la_SOURCES = \ - auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c - COVERAGE_INPUT = $(libiptsec_la_SOURCES) $(include_sofia_HEADERS) LDADD = libiptsec.la \ - $(OPT_LDADD) \ ../nta/libnta.la \ ../sip/libsip.la \ ../msg/libmsg.la \ @@ -75,11 +57,28 @@ test_auth_digest_LDFLAGS = -static +if HAVE_NTLM +nobase_include_sofia_HEADERS += $(NTLM_HEADER) +libiptsec_la_SOURCES += $(NTLM_SOURCE) +endif + +if HAVE_NTH +libiptsec_la_SOURCES += $(HTTP_SOURCE) +LDADD += ../http/libhttp.la +endif + +HTTP_SOURCE = auth_module_http.c + +NTLM_HEADER = sofia-sip/auth_ntlm.h +NTLM_SOURCE = auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c + +EXTRA_libiptsec_la_SOURCES = \ + $(NTLM_HEADER) $(NTLM_SOURCE) $(HTTP_SOURCE) + # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile iptsec.docs testpasswd \ - auth_module_sip.c $(HTTP_SRC) $(BUILT_SOURCES) +EXTRA_DIST = Doxyfile iptsec.docs testpasswd $(BUILT_SOURCES) # ---------------------------------------------------------------------- # Sofia specific rules Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.in ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.in (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.in Mon Feb 12 11:01:22 2007 @@ -79,12 +79,17 @@ host_triplet = @host@ target_triplet = @target@ check_PROGRAMS = test_auth_digest$(EXEEXT) -DIST_COMMON = $(nobase_include_sofia_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/rules/sofia.am \ - $(top_srcdir)/rules/valcheck.am ChangeLog +@HAVE_NTLM_TRUE@am__append_1 = $(NTLM_HEADER) +@HAVE_NTLM_TRUE@am__append_2 = $(NTLM_SOURCE) +@HAVE_NTH_TRUE@am__append_3 = $(HTTP_SOURCE) +@HAVE_NTH_TRUE@am__append_4 = ../http/libhttp.la +DIST_COMMON = $(am__nobase_include_sofia_HEADERS_DIST) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/rules/sofia.am $(top_srcdir)/rules/valcheck.am \ + ChangeLog # Use with --enable-ndebug -@NDEBUG_TRUE@am__append_1 = -DNDEBUG +@NDEBUG_TRUE@am__append_5 = -DNDEBUG subdir = libsofia-sip-ua/iptsec ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/sac-general.m4 \ @@ -102,21 +107,25 @@ am__libiptsec_la_SOURCES_DIST = iptsec_debug.h auth_client.c \ auth_common.c auth_digest.c auth_module.c auth_tag.c \ auth_tag_ref.c auth_plugin.c auth_plugin_delayed.c \ - auth_module_sip.c auth_ntlm.c auth_client_ntlm.c \ - auth_plugin_ntlm.c iptsec_debug.c -@HAVE_NTLM_TRUE@am__objects_1 = auth_ntlm.lo auth_client_ntlm.lo \ -@HAVE_NTLM_TRUE@ auth_plugin_ntlm.lo + auth_module_sip.c iptsec_debug.c auth_ntlm.c \ + auth_client_ntlm.c auth_plugin_ntlm.c auth_module_http.c +am__objects_1 = auth_ntlm.lo auth_client_ntlm.lo auth_plugin_ntlm.lo +@HAVE_NTLM_TRUE@am__objects_2 = $(am__objects_1) +am__objects_3 = auth_module_http.lo +@HAVE_NTH_TRUE@am__objects_4 = $(am__objects_3) am_libiptsec_la_OBJECTS = auth_client.lo auth_common.lo auth_digest.lo \ auth_module.lo auth_tag.lo auth_tag_ref.lo auth_plugin.lo \ - auth_plugin_delayed.lo auth_module_sip.lo $(am__objects_1) \ - iptsec_debug.lo + auth_plugin_delayed.lo auth_module_sip.lo iptsec_debug.lo \ + $(am__objects_2) $(am__objects_4) libiptsec_la_OBJECTS = $(am_libiptsec_la_OBJECTS) test_auth_digest_SOURCES = test_auth_digest.c test_auth_digest_OBJECTS = test_auth_digest.$(OBJEXT) test_auth_digest_LDADD = $(LDADD) +@HAVE_NTH_TRUE@am__DEPENDENCIES_1 = ../http/libhttp.la test_auth_digest_DEPENDENCIES = libiptsec.la ../nta/libnta.la \ ../sip/libsip.la ../msg/libmsg.la ../url/liburl.la \ - ../bnf/libbnf.la ../ipt/libipt.la ../su/libsu.la + ../bnf/libbnf.la ../ipt/libipt.la ../su/libsu.la \ + $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/libsofia-sip-ua/su/sofia-sip depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -132,6 +141,10 @@ test_auth_digest.c DIST_SOURCES = $(am__libiptsec_la_SOURCES_DIST) \ $(EXTRA_libiptsec_la_SOURCES) test_auth_digest.c +am__nobase_include_sofia_HEADERS_DIST = sofia-sip/auth_common.h \ + sofia-sip/auth_client.h sofia-sip/auth_digest.h \ + sofia-sip/auth_module.h sofia-sip/auth_plugin.h \ + sofia-sip/auth_client_plugin.h sofia-sip/auth_ntlm.h am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -314,50 +327,31 @@ # ---------------------------------------------------------------------- # Rules for building the targets BUILT_SOURCES = auth_tag_ref.c -HTTP_SRC = auth_module_http.c -@HAVE_NTH_TRUE@USE_HTTP_SRC = $(HTTP_SRC) -@HAVE_NTH_TRUE@OPT_LDDD = ../http/libhttp.la -nobase_include_sofia_HEADERS = \ - sofia-sip/auth_common.h \ - sofia-sip/auth_client.h sofia-sip/auth_digest.h \ - sofia-sip/auth_module.h sofia-sip/auth_plugin.h \ - sofia-sip/auth_client_plugin.h \ - $(NTLM_HEADER) - -libiptsec_la_SOURCES = iptsec_debug.h \ - auth_client.c auth_common.c auth_digest.c \ - auth_module.c auth_tag.c auth_tag_ref.c \ - auth_plugin.c auth_plugin_delayed.c \ - auth_module_sip.c \ - $(NTLM_SOURCE) \ - $(USE_HTTP_SOURCE) \ - iptsec_debug.c - +nobase_include_sofia_HEADERS = sofia-sip/auth_common.h \ + sofia-sip/auth_client.h sofia-sip/auth_digest.h \ + sofia-sip/auth_module.h sofia-sip/auth_plugin.h \ + sofia-sip/auth_client_plugin.h $(am__append_1) +libiptsec_la_SOURCES = iptsec_debug.h auth_client.c auth_common.c \ + auth_digest.c auth_module.c auth_tag.c auth_tag_ref.c \ + auth_plugin.c auth_plugin_delayed.c auth_module_sip.c \ + iptsec_debug.c $(am__append_2) $(am__append_3) +COVERAGE_INPUT = $(libiptsec_la_SOURCES) $(include_sofia_HEADERS) +LDADD = libiptsec.la ../nta/libnta.la ../sip/libsip.la \ + ../msg/libmsg.la ../url/liburl.la ../bnf/libbnf.la \ + ../ipt/libipt.la ../su/libsu.la $(am__append_4) +test_auth_digest_LDFLAGS = -static +HTTP_SOURCE = auth_module_http.c NTLM_HEADER = sofia-sip/auth_ntlm.h -@HAVE_NTLM_TRUE@NTLM_SOURCE = auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c +NTLM_SOURCE = auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c EXTRA_libiptsec_la_SOURCES = \ - auth_ntlm.c auth_client_ntlm.c auth_plugin_ntlm.c + $(NTLM_HEADER) $(NTLM_SOURCE) $(HTTP_SOURCE) -COVERAGE_INPUT = $(libiptsec_la_SOURCES) $(include_sofia_HEADERS) -LDADD = libiptsec.la \ - $(OPT_LDADD) \ - ../nta/libnta.la \ - ../sip/libsip.la \ - ../msg/libmsg.la \ - ../url/liburl.la \ - ../bnf/libbnf.la \ - ../ipt/libipt.la \ - ../su/libsu.la - -test_auth_digest_LDFLAGS = -static # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile iptsec.docs testpasswd \ - auth_module_sip.c $(HTTP_SRC) $(BUILT_SOURCES) - +EXTRA_DIST = Doxyfile iptsec.docs testpasswd $(BUILT_SOURCES) AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) \ - $(am__append_1) + $(am__append_5) DISTCLEANFILES = $(BUILT_SOURCES) # rules for building tag files @@ -452,6 +446,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_common.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_digest.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_module.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_module_http.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_module_sip.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_ntlm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth_plugin.Plo@am__quote@ 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 Mon Feb 12 11:01:22 2007 @@ -9651,8 +9651,9 @@ status = rel->rel_callback(rel->rel_magic, rel, pr_irq, sip); rel = NULL; irq->irq_in_callback = pr_irq->irq_in_callback = 0; - if (pr_irq->irq_destroyed && pr_irq->irq_terminated) { - incoming_free(pr_irq); + if (pr_irq->irq_completed) { /* Already sent final response */ + if (pr_irq->irq_terminated && pr_irq->irq_destroyed) + incoming_free(pr_irq); } else if (status != 0) { if (status < 200 || status > 299) { @@ -9915,6 +9916,9 @@ tagged->orq_prev = NULL, tagged->orq_next = NULL, tagged->orq_queue = NULL; tagged->orq_rprev = NULL, tagged->orq_rnext = NULL; +#if HAVE_SOFIA_SRESOLV + tagged->orq_resolver = NULL; +#endif if (tagged->orq_cc) nta_compartment_ref(tagged->orq_cc); 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 Mon Feb 12 11:01:22 2007 @@ -2465,7 +2465,7 @@ break; if (sri) { - SR_STATUS1(sr, SIP_180_RINGING); + SR_STATUS1(sri, SIP_180_RINGING); nua_server_respond(sri, NULL); nua_server_report(sri); } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_osx_runloop.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_osx_runloop.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_osx_runloop.c Mon Feb 12 11:01:22 2007 @@ -284,10 +284,11 @@ CFRunLoopObserverCreate(NULL, kCFRunLoopAfterWaiting | kCFRunLoopBeforeWaiting, TRUE, 0, cf_observer_cb, self->sup_observer_cntx); - +#if 0 CFRunLoopAddObserver(CFRunLoopGetCurrent(), self->sup_observer, kCFRunLoopDefaultMode); +#endif } else return su_home_unref(su_port_home(self)), NULL; @@ -1234,8 +1235,6 @@ CFAbsoluteTime start; int ret, timeout = tout > INT32_MAX ? INT32_MAX : tout; - // XXX - mela assert(SU_OSX_PORT_OWN_THREAD(self)); - rl = CFRunLoopGetCurrent(); if (!rl) @@ -1259,27 +1258,12 @@ if (self->sup_base->sup_head) tout = 0; - start = CFAbsoluteTimeGetCurrent(); - for (;;) { - /* Run loop with only one pass, indicate if a source was processed */ - ret = CFRunLoopRunInMode(kCFRunLoopDefaultMode, - 0, - TRUE); - - /* Ok, one of our sources was fired */ - if (self->sup_source_fired == 1) { - self->sup_source_fired = 0; - break; - } + ret = CFRunLoopRunInMode(kCFRunLoopDefaultMode, + tout/1000000.0, + true); + + CFRunLoopWakeUp(rl); -#if 0 - /* Check how long to run this loop */ - if (CFAbsoluteTimeGetCurrent() >= start + timeout / 10000) -#else - break; -#endif - } - if (self->sup_base->sup_head) su_base_port_getmsgs(self); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/sofia-sip/url.h Mon Feb 12 11:01:22 2007 @@ -34,29 +34,32 @@ #ifndef URL_H_TYPES #define URL_H_TYPES -/** Recognized URL schemes (value of url_t.url_type). */ +/** Recognized URL schemes (value of url_t.url_type). + * + * @sa <<a href="http://www.iana.org/assignments/uri-schemes.html">http://www.iana.org/assignments/uri-schemes.html</a>> + */ enum url_type_e { - url_invalid = -2, /**< Invalid url. */ - url_unknown = -1, /**< Unknown scheme. */ - url_any = 0, /**< @c "*" */ - url_sip, /**< @c "sip:" */ - url_sips, /**< @c "sips:" */ - url_tel, /**< @c "tel:" */ - url_fax, /**< @c "fax:" */ - url_modem, /**< @c "modem:" */ - url_http, /**< @c "http:" */ - url_https, /**< @c "https:" */ - url_ftp, /**< @c "ftp:" */ - url_file, /**< @c "file:" */ - url_rtsp, /**< @c "rtsp:" */ - url_rtspu, /**< @c "rtspu:" */ - url_mailto, /**< @c "mailto:" */ - url_im, /**< @c "im:" (simple instant messaging) */ - url_pres, /**< @c "pres:" (simple presence) */ - url_cid, /**< @c "cid:" (Content-ID) */ - url_msrp, /**< @c "msrp:" (message session relay) */ - url_msrps, /**< @c "msrps:" (new in @VERSION_1_12_2) */ - url_wv, /**< @c "wv:" (Wireless village) */ + url_invalid = -2, /**< Invalid url. */ + url_unknown = -1, /**< Unknown scheme. */ + url_any = 0, /**< "*" */ + url_sip, /**< "sip:". @sa @RFC3261 */ + url_sips, /**< "sips:". @sa @RFC3261 */ + url_tel, /**< "tel:" @sa RFC3966 */ + url_fax, /**< "fax:". @note Obsolete. @sa @RFC2806 */ + url_modem, /**< "modem:". @note Obsolete. @sa @RFC2806 */ + url_http, /**< "http:". @sa @RFC2616, @RFC3986 */ + url_https, /**< "https:". @sa @RFC2618, @RFC3986 */ + url_ftp, /**< "ftp:". @sa @RFC1738 */ + url_file, /**< "file:" @sa @RFC1738 */ + url_rtsp, /**< "rtsp:" @sa @RFC2326 */ + url_rtspu, /**< "rtspu:" @sa @RFC2326 */ + url_mailto, /**< "mailto:" @sa @RFC2368 */ + url_im, /**< "im:" (simple instant messaging). @sa @RFC3860 */ + url_pres, /**< "pres:" (simple presence). @sa @RFC3859 */ + url_cid, /**< "cid:" (Content-ID). @sa @RFC2392 */ + url_msrp, /**< "msrp:" (message session relay) */ + url_msrps, /**< "msrps:" (new in @VERSION_1_12_2) */ + url_wv, /**< "wv:" (Wireless village) */ _url_none }; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/torture_url.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/torture_url.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/torture_url.c Mon Feb 12 11:01:22 2007 @@ -639,7 +639,7 @@ int test_file(void) { /* Test a url with path like file:/foo/bar */ - char fileurl[] = "file:/foo/bar"; + char fileurl[] = "file:///foo/bar"; url_t file[1] = { URL_INIT_AS(file) }; su_home_t home[1] = { SU_HOME_INIT(home) }; char *tst; @@ -653,7 +653,9 @@ TEST_1(tst = su_strdup(home, fileurl)); TEST(url_d(url, tst), 0); + TEST_S(url->url_host, ""); file->url_root = '/'; + file->url_host = ""; file->url_path = "foo/bar"; TEST(url_cmp(file, url), 0); TEST(url->url_type, url_file); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c Mon Feb 12 11:01:22 2007 @@ -669,10 +669,18 @@ else { n = strcspn(host, ":"); } - - if (n == 0 && url->url_type != url_unknown) - return -1; + /* We allow empty host by default */ + if (n == 0) switch (url->url_type) { + case url_sip: + case url_sips: + case url_im: + case url_pres: + return -1; + default: + break; + } + if (host[n] == ':') { char *port = host + n + 1; url->url_port = port; Modified: freeswitch/trunk/libs/sofia-sip/packages/sofia-sip.spec.in ============================================================================== --- freeswitch/trunk/libs/sofia-sip/packages/sofia-sip.spec.in (original) +++ freeswitch/trunk/libs/sofia-sip/packages/sofia-sip.spec.in Mon Feb 12 11:01:22 2007 @@ -12,15 +12,15 @@ BuildRequires: pkgconfig -%{!?bcond_with:%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}} -%{!?bcond_without:%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}} +%define opt_with() %{expand:%%global with_%{1} %%{?_with_%{1}:1}%%{?!_with_%{1}:0}} +%define opt_without() %{expand:%%global with_%{1} %%{!?_without_%{1}:1}%%{?_without_%{1}:0}} # Options: -%bcond_with doxygen - Generate documents using doxygen and dot -%bcond_with check - Run tests -%bcond_with openssl - Always use OpenSSL (TLS) -%bcond_with glib - Always use glib-2.0 (>= 2.2) -%bcond_with sctp - Include SCTP transport +%opt_with doxygen - Generate documents using doxygen and dot +%opt_with check - Run tests +%opt_with openssl - Always use OpenSSL (TLS) +%opt_with glib - Always use glib-2.0 (>= 2.2) +%opt_with sctp - Include SCTP transport %define have_doxygen %{?_with_doxygen:1}%{!?_with_doxygen:0} %define have_openssl %(%{?!_with_openssl:pkg-config 'openssl >= 0.9.7'&&}echo 1||echo 0) @@ -49,7 +49,7 @@ %if !%{have_glib} options="$options --without-glib" %endif -%if %{with sctp} +%if %{with_sctp} options="$options --enable-sctp" %endif @@ -62,7 +62,7 @@ # XXX comment next line to build with non-check aware rpmbuild. %check -%if %{with check} +%if %{with_check} make check %endif @@ -126,7 +126,7 @@ Development package for Sofia SIP UA library. This package includes static libraries and include files. -%if %{without doxygen} +%if !%{with_doxygen} The reference documentation for Sofia SIP UA library is available at <http://sofia-sip.sourceforge.net/development.html> %endif

1 0

[commit] r4200 - freeswitch/trunk/src/mod/timers/mod_softtimer
by Freeswitch SVN 12 Feb '07

12 Feb '07

Author: anthm Date: Mon Feb 12 10:47:43 2007 New Revision: 4200 Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Log: update Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Mon Feb 12 10:47:43 2007 @@ -89,7 +89,7 @@ timer_step(timer); while (TIMER_MATRIX[timer->interval].tick < private_info->reference) { - switch_yield(timer->interval * 750); + switch_yield(1000); } timer->samplecount += timer->samples; return SWITCH_STATUS_SUCCESS;

1 0