- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7353 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Jan '08

25 Jan '08

Author: mikej Date: Fri Jan 25 11:39:02 2008 New Revision: 7353 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Log: do people really ignore a packet because a user agent has too many slashes in it? Is this better Veraz? Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Jan 25 11:39:02 2008 @@ -66,7 +66,7 @@ #define MY_EVENT_EXPIRE "sofia::expire" #define MULTICAST_EVENT "multicast::event" #define SOFIA_REPLACES_HEADER "_sofia_replaces_" -#define SOFIA_USER_AGENT "FreeSWITCH/" SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO "/" SWITCH_VERSION_REVISION "/mod_sofia" +#define SOFIA_USER_AGENT "FreeSWITCH-mod_sofia/" SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO "-" SWITCH_VERSION_REVISION #define SOFIA_CHAT_PROTO "sip" #define SOFIA_SIP_HEADER_PREFIX "sip_h_" #define SOFIA_SIP_HEADER_PREFIX_T "~sip_h_"

1 0

[commit] r7352 - freeswitch/trunk/libs/speex/libspeex
by Freeswitch SVN 25 Jan '08

25 Jan '08

Author: mikej Date: Fri Jan 25 10:17:48 2008 New Revision: 7352 Modified: freeswitch/trunk/libs/speex/libspeex/Makefile.am Log: remove the build stubs for the exe's and the ogg dependency as we don't use them Modified: freeswitch/trunk/libs/speex/libspeex/Makefile.am ============================================================================== --- freeswitch/trunk/libs/speex/libspeex/Makefile.am (original) +++ freeswitch/trunk/libs/speex/libspeex/Makefile.am Fri Jan 25 10:17:48 2008 @@ -4,7 +4,7 @@ EXTRA_DIST=testenc.c testenc_wb.c testenc_uwb.c testdenoise.c testecho.c -INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) lib_LTLIBRARIES = libspeex.la

1 0

[commit] r7351 - freeswitch/trunk/libs/speex
by Freeswitch SVN 25 Jan '08

25 Jan '08

Author: mikej Date: Fri Jan 25 10:14:10 2008 New Revision: 7351 Modified: freeswitch/trunk/libs/speex/Makefile.am freeswitch/trunk/libs/speex/configure.ac Log: remove the build stubs for the exe's and the ogg dependency as we don't use them Modified: freeswitch/trunk/libs/speex/Makefile.am ============================================================================== --- freeswitch/trunk/libs/speex/Makefile.am (original) +++ freeswitch/trunk/libs/speex/Makefile.am Fri Jan 25 10:14:10 2008 @@ -13,7 +13,7 @@ EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP #Fools KDevelop into including all files -SUBDIRS = libspeex include @src@ doc win32 symbian ti +SUBDIRS = libspeex include doc win32 symbian ti DIST_SUBDIRS = libspeex include src doc win32 symbian ti Modified: freeswitch/trunk/libs/speex/configure.ac ============================================================================== --- freeswitch/trunk/libs/speex/configure.ac (original) +++ freeswitch/trunk/libs/speex/configure.ac Fri Jan 25 10:14:10 2008 @@ -67,9 +67,6 @@ AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h) -XIPH_PATH_OGG([src="src"], [src=""]) -AC_SUBST(src) - AC_CHECK_LIB(m, sin) # Check for getopt_long; if not found, use included source. @@ -230,10 +227,4 @@ ti/speex_C54_test/Makefile ti/speex_C55_test/Makefile ti/speex_C64_test/Makefile ]) -if test "x$src" = "x"; then -echo "**IMPORTANT**" -echo "You don't seem to have the development package for libogg (libogg-devel) installed. Only the Speex library (libspeex) will be built (no encoder/decoder executable)" -echo "You can download libogg from http://downloads.xiph.org/releases/ogg/" -fi - echo "Type \"make; make install\" to compile and install Speex";

1 0

[commit] r7350 - freeswitch/trunk/src
by Freeswitch SVN 25 Jan '08

25 Jan '08

Author: mikej Date: Fri Jan 25 09:08:53 2008 New Revision: 7350 Modified: freeswitch/trunk/src/switch.c Log: add -c command line arg to run in console mode. Should we change the default on release? Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Fri Jan 25 09:08:53 2008 @@ -242,6 +242,7 @@ "\t-nosql -- disable internal sql scoreboard\n" "\t-stop -- stop freeswitch\n" "\t-nc -- do not output to a console and background\n" + "\t-c -- output to a console and stay in the foreground\n" "\t-conf [confdir] -- specify an alternate config dir\n" "\t-log [logdir] -- specify an alternate log dir\n" "\t-db [dbdir] -- specify an alternate db dir\n" @@ -341,6 +342,10 @@ known_opt++; } + if (argv[x] && !strcmp(argv[x], "-c")) { + nc = 0; + known_opt++; + } if (argv[x] && !strcmp(argv[x], "-conf")) { x++;

1 0

[commit] r7349 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Jan '08

24 Jan '08

Author: anthm Date: Thu Jan 24 17:09:39 2008 New Revision: 7349 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: add lookup params to allow sip auth from remote authenticator (like radius) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Jan 24 17:09:39 2008 @@ -857,9 +857,18 @@ switch_event_create(&params, SWITCH_EVENT_MESSAGE); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "action", "sip_auth"); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile", profile->name); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "user_agent", (sip && sip->sip_user_agent) ? sip->sip_user_agent->g_string : "unknown"); - + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_profile", profile->name); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_user_agent", (sip && sip->sip_user_agent) ? sip->sip_user_agent->g_string : "unknown"); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_username", username); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_realm", realm); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_nonce", nonce); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_uri", uri); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_qop", qop); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_cnonce", cnonce); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_response", response); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_nc", nc); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_auth_method", (sip && sip->sip_request) ? sip->sip_request->rq_method_name : NULL); + if (!switch_strlen_zero(profile->reg_domain)) { domain_name = profile->reg_domain;

1 0

[commit] r7348 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 24 Jan '08

24 Jan '08

Author: anthm Date: Thu Jan 24 16:38:07 2008 New Revision: 7348 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: update Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Thu Jan 24 16:38:07 2008 @@ -2436,7 +2436,7 @@ config_data.obj = obj; config_data.name = filename; - if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC)) > -1) { + if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { curl_easy_setopt(curl_handle, CURLOPT_URL, url); curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, file_callback); curl_easy_setopt(curl_handle, CURLOPT_WRITEDATA, (void *) &config_data);

1 0

[commit] r7347 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Jan '08

24 Jan '08

Author: anthm Date: Thu Jan 24 15:49:53 2008 New Revision: 7347 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Thu Jan 24 15:49:53 2008 @@ -1009,9 +1009,27 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Challenging call %s\n", to_uri); sofia_reg_auth_challange(NULL, tech_pvt->profile, tech_pvt->nh, REG_INVITE, to_host, 0); switch_channel_hangup(channel, SWITCH_CAUSE_USER_CHALLENGE); + } else if (code == 484) { + const char *to = switch_channel_get_variable(channel, "sip_to_uri"); + const char *max_forwards = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE); + + char *to_uri = NULL; + + if (to) { + char *p; + to_uri = switch_core_session_sprintf(session, "sip:%s", to); + if ((p = strstr(to_uri, ":5060"))) { + *p = '\0'; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason); + nua_respond(tech_pvt->nh, code, reason, TAG_IF(to_uri, SIPTAG_CONTACT_STR(to_uri)), + SIPTAG_SUPPORTED_STR(NULL), SIPTAG_ACCEPT_STR(NULL), + TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), TAG_END()); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding with %d %s\n", code, reason); - nua_respond(tech_pvt->nh, code, reason, TAG_END()); + nua_respond(tech_pvt->nh, code, reason, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); } }

1 0

[commit] r7346 - freeswitch/trunk/src
by Freeswitch SVN 24 Jan '08

24 Jan '08

Author: anthm Date: Thu Jan 24 11:01:25 2008 New Revision: 7346 Modified: freeswitch/trunk/src/switch_stun.c Log: don't overrun buffer (FSCORE-95) Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Thu Jan 24 11:01:25 2008 @@ -198,7 +198,7 @@ { uint16_t cpylen; - cpylen = attribute->length > len ? attribute->length : len; + cpylen = attribute->length < len ? attribute->length : len; return memcpy(username, attribute->value, cpylen); }

1 0

[commit] r7345 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Jan '08

24 Jan '08

Author: anthm Date: Thu Jan 24 10:33:28 2008 New Revision: 7345 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: set sdp flag in more places 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 Thu Jan 24 10:33:28 2008 @@ -1315,10 +1315,10 @@ } if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { - switch_core_session_message_t msg; + switch_core_session_message_t msg = { 0 }; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Passing %d %s to other leg\n", status, phrase); - + msg.message_id = SWITCH_MESSAGE_INDICATE_RESPOND; msg.from = __FILE__; msg.numeric_arg = status; @@ -1494,6 +1494,7 @@ if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_channel_mark_pre_answered(channel); + switch_set_flag(tech_pvt, TFLAG_SDP); if (!switch_channel_test_flag(channel, CF_GEN_RINGBACK) && (uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { other_channel = switch_core_session_get_channel(other_session);

1 0

[commit] r7344 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 24 Jan '08

24 Jan '08

Author: anthm Date: Thu Jan 24 10:09:55 2008 New Revision: 7344 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: set sdp flag in more places 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 Thu Jan 24 10:09:55 2008 @@ -1553,7 +1553,7 @@ switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED"); switch_set_flag_locked(tech_pvt, TFLAG_READY); switch_channel_set_state(channel, CS_INIT); - + switch_set_flag(tech_pvt, TFLAG_SDP); if (replaces_str) { home = su_home_new(sizeof(*home)); switch_assert(home != NULL); @@ -1748,6 +1748,7 @@ if (switch_channel_get_state(channel) == CS_HIBERNATE) { switch_set_flag_locked(tech_pvt, TFLAG_READY); switch_channel_set_state(channel, CS_INIT); + switch_set_flag(tech_pvt, TFLAG_SDP); } goto done; }

1 0