- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8540 - in freeswitch/trunk/src: . include
by Freeswitch SVN 23 May '08

23 May '08

Author: mikej Date: Fri May 23 12:41:19 2008 New Revision: 8540 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/switch_cpp.cpp Log: change param name to avoid swig conflict Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Fri May 23 12:41:19 2008 @@ -192,7 +192,7 @@ SWITCH_DECLARE(void) setPrivate(char *var, void *val); SWITCH_DECLARE(void *)getPrivate(char *var); SWITCH_DECLARE(const char *)getVariable(char *var); - SWITCH_DECLARE(switch_status_t) process_callback_result(char *ret); + SWITCH_DECLARE(switch_status_t) process_callback_result(char *result); SWITCH_DECLARE(void) say(const char *tosay, const char *module_name, const char *say_type, const char *say_method); SWITCH_DECLARE(void) sayPhrase(const char *phrase_name, const char *phrase_data = "", const char *phrase_lang = NULL); Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Fri May 23 12:41:19 2008 @@ -1036,7 +1036,7 @@ } -SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *ret) +SWITCH_DECLARE(switch_status_t) CoreSession::process_callback_result(char *result) { switch_file_handle_t *fh = NULL; @@ -1044,7 +1044,7 @@ this_check(SWITCH_STATUS_FALSE); sanity_check(SWITCH_STATUS_FALSE); - if (switch_strlen_zero(ret)) { + if (switch_strlen_zero(result)) { return SWITCH_STATUS_SUCCESS; } @@ -1076,10 +1076,10 @@ } - if (!strncasecmp(ret, "speed", 4)) { + if (!strncasecmp(result, "speed", 4)) { char *p; - if ((p = strchr(ret, ':'))) { + if ((p = strchr(result, ':'))) { p++; if (*p == '+' || *p == '-') { int step; @@ -1096,28 +1096,28 @@ return SWITCH_STATUS_FALSE; - } else if (!strcasecmp(ret, "pause")) { + } else if (!strcasecmp(result, "pause")) { if (switch_test_flag(fh, SWITCH_FILE_PAUSE)) { switch_clear_flag(fh, SWITCH_FILE_PAUSE); } else { switch_set_flag(fh, SWITCH_FILE_PAUSE); } return SWITCH_STATUS_SUCCESS; - } else if (!strcasecmp(ret, "stop")) { + } else if (!strcasecmp(result, "stop")) { return SWITCH_STATUS_FALSE; - } else if (!strcasecmp(ret, "restart")) { + } else if (!strcasecmp(result, "restart")) { unsigned int pos = 0; fh->speed = 0; switch_core_file_seek(fh, &pos, 0, SEEK_SET); return SWITCH_STATUS_SUCCESS; - } else if (!strncasecmp(ret, "seek", 4)) { + } else if (!strncasecmp(result, "seek", 4)) { switch_codec_t *codec; unsigned int samps = 0; unsigned int pos = 0; char *p; codec = switch_core_session_get_read_codec(session); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got codec\n"); - if ((p = strchr(ret, ':'))) { + if ((p = strchr(result, ':'))) { p++; if (*p == '+' || *p == '-') { int step; @@ -1146,7 +1146,7 @@ return SWITCH_STATUS_SUCCESS; } - if (!strcmp(ret, "true") || !strcmp(ret, "undefined")) { + if (!strcmp(result, "true") || !strcmp(result, "undefined")) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "return success\n"); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r8539 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 08:42:36 2008 New Revision: 8539 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: rewrite video port too 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 May 23 08:42:36 2008 @@ -784,7 +784,7 @@ return; } - len = strlen(tech_pvt->local_sdp_str) + 256; + len = strlen(tech_pvt->local_sdp_str) + 384; if ((p = (char *)switch_stristr("c=IN IP4 ", tech_pvt->local_sdp_str))) { ip_ptr = p + 9;

1 0

[commit] r8538 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 08:39:35 2008 New Revision: 8538 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: rewrite video port too 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 May 23 08:39:35 2008 @@ -777,7 +777,7 @@ void sofia_glue_tech_patch_sdp(private_object_t *tech_pvt) { switch_size_t len; - char *p, *q, *ip_ptr = NULL, *port_ptr = NULL; + char *p, *q, *ip_ptr = NULL, *port_ptr = NULL, *vport_ptr = NULL; int x; if (switch_strlen_zero(tech_pvt->local_sdp_str)) { @@ -798,6 +798,10 @@ if ((p = (char *)switch_stristr("m=audio ", tech_pvt->local_sdp_str))) { port_ptr = p + 8; } + + if ((p = (char *)switch_stristr("m=video ", tech_pvt->local_sdp_str))) { + vport_ptr = p + 8; + } if (!(ip_ptr && port_ptr)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SDP has no audio in it.\n%s\n", @@ -840,6 +844,16 @@ while(p && *p && (*p >= '0' && *p <= '9')) { p++; } + } else if (vport_ptr && p == vport_ptr) { + char port_buf[25] = ""; + + switch_snprintf(port_buf, sizeof(port_buf), "%u", tech_pvt->adv_sdp_video_port); + strncpy(q, port_buf, strlen(port_buf)); + q += strlen(port_buf); + x = 0; + while(p && *p && (*p >= '0' && *p <= '9')) { + p++; + } } *q++ = *p++;

1 0

[commit] r8537 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Fri May 23 08:23:06 2008 New Revision: 8537 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: update 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 Fri May 23 08:23:06 2008 @@ -439,7 +439,8 @@ const char *reg_desc = "Registered"; const char *call_id = NULL; char *force_user; - + char received_data[128] = ""; + /* all callers must confirm that sip, sip->sip_request and sip->sip_contact are not NULL */ switch_assert(sip != NULL && sip->sip_contact != NULL && sip->sip_request != NULL); @@ -488,11 +489,19 @@ switch_snprintf(new_port, sizeof(new_port), ":%s", port); } + if (is_nat && (profile->pflags & PFLAG_RECIEVED_IN_NAT_REG_CONTACT)) { + switch_snprintf(received_data, sizeof(received_data), ";received=\"%s:%d\"", network_ip, network_port); + } + if (contact->m_url->url_params) { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s>%s", - display, contact->m_url->url_user, contact_host, new_port, contact->m_url->url_params, is_nat ? ";nat" : ""); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s>%s%s", + display, contact->m_url->url_user, contact_host, new_port, contact->m_url->url_params, + received_data, + is_nat ? ";nat" : ""); } else { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s>%s", display, contact->m_url->url_user, contact_host, new_port, is_nat ? ";nat" : ""); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s>%s%s", display, contact->m_url->url_user, contact_host, new_port, + received_data, + is_nat ? ";nat" : ""); } } @@ -534,13 +543,18 @@ } if ((v_contact_str = switch_event_get_header(*v_event, "sip-force-contact"))) { + + if (switch_strlen_zero(received_data) && (profile->pflags & PFLAG_RECIEVED_IN_NAT_REG_CONTACT)) { + switch_snprintf(received_data, sizeof(received_data), ";received=\"%s:%d\"", network_ip, network_port); + } + if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-tls-connectile-dysfunction")) { if (contact->m_url->url_params) { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>;nat", - display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>%s;nat", + display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params, received_data); } else { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>;nat", display, contact->m_url->url_user, network_ip, network_port); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>%s;nat", display, contact->m_url->url_user, network_ip, network_port, received_data); } if (strstr(v_contact_str, "tls")) { reg_desc = "Registered(TLSHACK)"; @@ -705,7 +719,6 @@ if (regtype == REG_REGISTER) { char *new_contact = NULL; char new_port[30] = ""; - char received_data[128] = ""; char exp_param[128] = ""; if (exptime) { @@ -717,18 +730,14 @@ switch_snprintf(new_port, sizeof(new_port), ":%s", contact->m_url->url_port); } - if ((is_nat || nat_hack) && (profile->pflags & PFLAG_RECIEVED_IN_NAT_REG_CONTACT)) { - switch_snprintf(received_data, sizeof(received_data), ";received=\"%s:%d\"", network_ip, network_port); - } - if (contact->m_url->url_params) { - new_contact = switch_mprintf("%s <sip:%s@%s%s;%s>%s%s", + new_contact = switch_mprintf("%s <sip:%s@%s%s;%s>%s", display, contact->m_url->url_user, contact->m_url->url_host, new_port, contact->m_url->url_params, - exp_param, received_data); + exp_param); } else { - new_contact = switch_mprintf("%s <sip:%s@%s%s>%s%s", + new_contact = switch_mprintf("%s <sip:%s@%s%s>%s", display, contact->m_url->url_user, contact->m_url->url_host, new_port, - exp_param, received_data); + exp_param); } nua_respond(nh,

1 0

[commit] r8536 - freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands
by Freeswitch SVN 23 May '08

23 May '08

Author: verifier Date: Fri May 23 03:05:18 2008 New Revision: 8536 Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs Log: Reply was parsed incorrectly. Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs Fri May 23 03:05:18 2008 @@ -89,9 +89,8 @@ public override CommandReply CreateReply(string dataToParse) { - dataToParse = dataToParse.Replace(" ", string.Empty); - string[] nameValue = dataToParse.Split(':'); - if (nameValue[0].ToLower() == "success") + string[] nameValue = dataToParse.Split(' '); + if (nameValue[0].Length > 0 && nameValue[0][0] == '+') return new OriginateReply(true, nameValue[1]); else {

1 0

[commit] r8535 - freeswitch/trunk/src
by Freeswitch SVN 23 May '08

23 May '08

Author: anthm Date: Thu May 22 22:50:14 2008 New Revision: 8535 Modified: freeswitch/trunk/src/switch_console.c Log: update Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Thu May 22 22:50:14 2008 @@ -525,7 +525,7 @@ if (h.words == 0) { stream.write_function(&stream, "select distinct a1 from complete where " - "a1 not in (select name from interfaces) and "); + "a1 not in (select name from interfaces) %s ", argc ? "and" : ""); } else { stream.write_function(&stream, "select distinct a%d from complete where ", h.words + 1);

1 0

[commit] r8534 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 22 May '08

22 May '08

Author: brian Date: Thu May 22 16:20:56 2008 New Revision: 8534 Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml Log: woops Modified: freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml Thu May 22 16:20:56 2008 @@ -12,7 +12,6 @@ <param name="tone-spec" value="%(1000, 0, 640)"/> <param name="callback-dialplan" value="XML"/> <param name="callback-context" value="default"/> - <param name="terminator-key" value="#"/> <param name="play-new-messages-key" value="1"/> <param name="play-saved-messages-key" value="2"/> <param name="main-menu-key" value="0"/>

1 0

[commit] r8533 - freeswitch/trunk
by Freeswitch SVN 22 May '08

22 May '08

Author: anthm Date: Thu May 22 15:45:33 2008 New Revision: 8533 Modified: freeswitch/trunk/Makefile.am Log: out of order commands Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Thu May 22 15:45:33 2008 @@ -342,8 +342,8 @@ $(MAKE) -j modules sofia-reconf: - cd libs/sofia-sip && $(MAKE) clean cd libs/sofia-sip && sh ./autogen.sh + cd libs/sofia-sip && $(MAKE) clean cd libs/sofia-sip && ./configure --prefix=$(PREFIX) --with-pic --with-glib=no --disable-shared current: update-clean

1 0

[commit] r8530 - in freeswitch/trunk: . debian
by Freeswitch SVN 22 May '08

22 May '08

Author: cypromis Date: Thu May 22 15:05:04 2008 New Revision: 8530 Modified: freeswitch/trunk/debian/changelog freeswitch/trunk/debian/control freeswitch/trunk/freeswitch.spec Log: Packaging fixes. Some filenames wrong in specfile and some typos in debian control files. Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Thu May 22 15:05:04 2008 @@ -1,11 +1,13 @@ freeswitch (1.0~rc6-1) unstable; urgency=low - * Changed to not allow pass_2833 on transcoded calls (it never worked, now it will tell you) + * Changed to not allow pass_2833 on transcoded calls + (it never worked, now it will tell you) * Enhanced sofia sip nat handling * Fix libedit build on solaris * Fix session timers in mod_sofia * Fix conference fire-call - * Change: add var_event down into the endpoints so chans with no parents can still pass options + * Change: add var_event down into the endpoints so chans + with no parents can still pass options * Added enable-post-var param to xml_rpc * Fix mod_lua build on solaris * Many fixes found by Klockwork (www.klocwork.com) @@ -15,7 +17,7 @@ * Fixed att_xfer issue * Fix sip now includes the Allow-Events header in more places --- Michael Jerris <mike(a)jerris.com> Tue, 13 May 2008 02:01:00 -0400 + -- Michael Jerris <mike(a)jerris.com> Tue, 13 May 2008 02:01:00 -0400 freeswitch (1.0~rc5-1) unstable; urgency=low Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Thu May 22 15:05:04 2008 @@ -15,77 +15,58 @@ a soft-switch. It can be used as a simple switching engine, a media gateway or a media server to host IVR applications using simple scripts or XML to control the callflow. -Homepage: http://www.freeswitch.org/ Package: freeswitch-dev Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: Development Package for the FreeSwitch open source telephony platform -Homepage: http://www.freeswitch.org/ - Package: freeswitch-spidermonkey Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: A Javascript engine for freeswitch -Homepage: http://www.freeswitch.org/ Package: freeswitch-perl Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: A perl engine for freeswitch -Homepage: http://www.freeswitch.org/ Package: freeswitch-lua Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: A lua engine for freeswitch -Homepage: http://www.freeswitch.org/ - - - Package: freeswitch-codec-passthru-g7231 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: Pass through g723.1 Codec support for the FreeSWITCH open source telephony platform -Homepage: http://www.freeswitch.org/ Package: freeswitch-codec-passthru-amr Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: Pass through AMR Codec support for the FreeSWITCH open source telephony platform -Homepage: http://www.freeswitch.org/ Package: freeswitch-codec-passthru-g729 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: Pass through g729 Codec support for the FreeSWITCH open source telephony platform -Homepage: http://www.freeswitch.org/ - - - Package: freeswitch-lang-en Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: English language files for the FreeSWITCH open source telephony platform -Homepage: http://www.freeswitch.org/ Package: freeswitch-lang-de Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: German language files for the FreeSWITCH open source telephony platform -Homepage: http://www.freeswitch.org/ Package: freeswitch-lang-fr Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: French language files for the FreeSWITCH open source telephony platform -Homepage: http://www.freeswitch.org/ Package: freeswitch-lang-it Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: Italian language files for the FreeSWITCH open source telephony platform -Homepage: http://www.freeswitch.org/ Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Thu May 22 15:05:04 2008 @@ -5,7 +5,7 @@ Summary: FreeSWITCH open source telephony platform License: MPL Group: Productivity/Telephony/Servers -Version: 1.0.rc5 +Version: 1.0.rc6 Release: 1 URL: http://www.freeswitch.org/ Packager: Michal Bielicki @@ -275,8 +275,8 @@ %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles/nat %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/dialplan/extensions -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles/default -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles/outbound +%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles/internal +%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles/external %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/jingle_profiles %ifos linux %config(noreplace) %attr(0644, freeswitch, daemon) /etc/monit.d/freeswitch.monitrc @@ -443,7 +443,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] r8529 - freeswitch/trunk
by Freeswitch SVN 22 May '08

22 May '08

Author: anthm Date: Thu May 22 14:56:51 2008 New Revision: 8529 Modified: freeswitch/trunk/Makefile.am Log: maybe if we commit this it will be more use than telling people to try it Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Thu May 22 14:56:51 2008 @@ -343,7 +343,7 @@ sofia-reconf: cd libs/sofia-sip && $(MAKE) clean - cd libs/sofia-sip && autoreconf -fi + cd libs/sofia-sip && sh ./autogen.sh cd libs/sofia-sip && ./configure --prefix=$(PREFIX) --with-pic --with-glib=no --disable-shared current: update-clean

1 0