- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r1684 - freeswitch/branches/freddysetiawan
by Freeswitch SVN 27 Jun '06

27 Jun '06

Author: sphere Date: Tue Jun 27 03:04:27 2006 New Revision: 1684 Added: freeswitch/branches/freddysetiawan/ Log: Creating empty folder for freddysetiawan

1 0

[commit] r1683 - freeswitch/branches/naor
by Freeswitch SVN 26 Jun '06

26 Jun '06

Author: sphere Date: Mon Jun 26 15:52:25 2006 New Revision: 1683 Added: freeswitch/branches/naor/ Log: Creating empty folder for naor

1 0

[commit] r1682 - freeswitch/trunk/src
by Freeswitch SVN 26 Jun '06

26 Jun '06

Author: anthm Date: Mon Jun 26 14:26:56 2006 New Revision: 1682 Modified: freeswitch/trunk/src/switch_xml.c Log: make toxml generate nicer output Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Jun 26 14:26:56 2006 @@ -908,9 +908,6 @@ switch_xml_free(MAIN_XML_ROOT); MAIN_XML_ROOT = NULL; } else { - char *tmp = NULL; - tmp = switch_xml_toxml(MAIN_XML_ROOT); - printf(tmp); *err = "Success"; switch_set_flag(MAIN_XML_ROOT, SWITCH_XML_ROOT); }

1 0

[commit] r1681 - freeswitch/trunk/src
by Freeswitch SVN 26 Jun '06

26 Jun '06

Author: anthm Date: Mon Jun 26 14:26:23 2006 New Revision: 1681 Modified: freeswitch/trunk/src/switch_xml.c Log: make toxml generate nicer output Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Jun 26 14:26:23 2006 @@ -908,6 +908,9 @@ switch_xml_free(MAIN_XML_ROOT); MAIN_XML_ROOT = NULL; } else { + char *tmp = NULL; + tmp = switch_xml_toxml(MAIN_XML_ROOT); + printf(tmp); *err = "Success"; switch_set_flag(MAIN_XML_ROOT, SWITCH_XML_ROOT); } @@ -1001,26 +1004,32 @@ return *dst; } +#define XML_INDENT " " // Recursively converts each tag to xml appending it to *s. Reallocates *s if // its length excedes max. start is the location of the previous tag in the // parent tag's character content. Returns *s. static char *switch_xml_toxml_r(switch_xml_t xml, char **s, switch_size_t *len, switch_size_t *max, - switch_size_t start, char ***attr) + switch_size_t start, char ***attr, uint32_t *count) { int i, j; char *txt = (xml->parent) ? xml->parent->txt : ""; switch_size_t off = 0; + uint32_t lcount = 0; // parent character content up to this tag *s = switch_xml_ampencode(txt + start, xml->off - start, s, len, max, 0); - while (*len + strlen(xml->name) + 4 > *max) // reallocate s + while (*len + strlen(xml->name) + 5 + (strlen(XML_INDENT) * (*count)) > *max) // reallocate s *s = realloc(*s, *max += SWITCH_XML_BUFSIZE); + for (lcount = 0; lcount < *count; lcount++) { + *len += sprintf(*s + *len, "%s", XML_INDENT); // indent + } + *len += sprintf(*s + *len, "<%s", xml->name); // open tag for (i = 0; xml->attr[i]; i += 2) { // tag attributes if (switch_xml_attr(xml, xml->attr[i]) != xml->attr[i + 1]) continue; - while (*len + strlen(xml->attr[i]) + 7 > *max) // reallocate s + while (*len + strlen(xml->attr[i]) + 7 + (strlen(XML_INDENT) * (*count)) > *max) // reallocate s *s = realloc(*s, *max += SWITCH_XML_BUFSIZE); *len += sprintf(*s + *len, " %s=\"", xml->attr[i]); @@ -1032,26 +1041,43 @@ for (j = 1; attr[i] && attr[i][j]; j += 3) { // default attributes if (! attr[i][j + 1] || switch_xml_attr(xml, attr[i][j]) != attr[i][j + 1]) continue; // skip duplicates and non-values - while (*len + strlen(attr[i][j]) + 7 > *max) // reallocate s + while (*len + strlen(attr[i][j]) + 8 + (strlen(XML_INDENT) * (*count)) > *max) // reallocate s *s = realloc(*s, *max += SWITCH_XML_BUFSIZE); *len += sprintf(*s + *len, " %s=\"", attr[i][j]); switch_xml_ampencode(attr[i][j + 1], 0, s, len, max, 1); *len += sprintf(*s + *len, "\""); } - *len += sprintf(*s + *len, ">"); + *len += sprintf(*s + *len, xml->child ? ">\n" : "/>\n"); - *s = (xml->child) ? switch_xml_toxml_r(xml->child, s, len, max, 0, attr) //child - : switch_xml_ampencode(xml->txt, 0, s, len, max, 0); //data - - while (*len + strlen(xml->name) + 4 > *max) // reallocate s + if (xml->child) { + (*count)++; + *s = switch_xml_toxml_r(xml->child, s, len, max, 0, attr, count); + } else { + *s = switch_xml_ampencode(xml->txt, 0, s, len, max, 0); //data + } + + while (*len + strlen(xml->name) + 5 + (strlen(XML_INDENT) * (*count)) > *max) // reallocate s *s = realloc(*s, *max += SWITCH_XML_BUFSIZE); - *len += sprintf(*s + *len, "</%s>", xml->name); // close tag + if (xml->child) { + for (lcount = 0; lcount < *count; lcount++) { + *len += sprintf(*s + *len, "%s", XML_INDENT); // indent + } + *len += sprintf(*s + (*len), "</%s>\n", xml->name); // close tag + } + while (txt[off] && off < xml->off) off++; // make sure off is within bounds - return (xml->ordered) ? switch_xml_toxml_r(xml->ordered, s, len, max, off, attr) - : switch_xml_ampencode(txt + off, 0, s, len, max, 0); + + if (xml->ordered) { + return switch_xml_toxml_r(xml->ordered, s, len, max, off, attr, count); + + } else { + if (*count > 0) + (*count)--; + return switch_xml_ampencode(txt + off, 0, s, len, max, 0); + } } // converts an switch_xml structure back to xml, returning it as a string that must @@ -1063,6 +1089,7 @@ switch_size_t len = 0, max = SWITCH_XML_BUFSIZE; char *s = strcpy(malloc(max), ""), *t, *n; int i, j, k; + uint32_t count = 0; if (! xml || ! xml->name) return realloc(s, len + 1); while (root->xml.parent) root = (switch_xml_root_t)root->xml.parent; // root tag @@ -1073,12 +1100,12 @@ if (root->pi[i][k][j - 1] == '>') continue; // not pre-root while (len + strlen(t = root->pi[i][0]) + strlen(n) + 7 > max) s = realloc(s, max += SWITCH_XML_BUFSIZE); - len += sprintf(s + len, "<?%s%s%s?>\n", t, *n ? " " : "", n); + len += sprintf(s + len, "<?%s%s%s?>", t, *n ? " " : "", n); } } xml->parent = xml->ordered = NULL; - s = switch_xml_toxml_r(xml, &s, &len, &max, 0, root->attr); + s = switch_xml_toxml_r(xml, &s, &len, &max, 0, root->attr, &count); xml->parent = p; xml->ordered = o;

1 0

[commit] r1680 - freeswitch/branches/ix
by Freeswitch SVN 26 Jun '06

26 Jun '06

Author: sphere Date: Mon Jun 26 12:14:25 2006 New Revision: 1680 Added: freeswitch/branches/ix/ Log: Creating empty folder for ix

1 0

[commit] r1679 - freeswitch/trunk/src/mod/codecs/mod_ilbc
by Freeswitch SVN 26 Jun '06

26 Jun '06

Author: anthm Date: Mon Jun 26 10:59:39 2006 New Revision: 1679 Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c Log: adj Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c Mon Jun 26 10:59:39 2006 @@ -225,7 +225,7 @@ static const switch_codec_implementation_t ilbc_102_8k_30ms_implementation = { - /*.ianacode */ 97, + /*.ianacode */ 102, /*.iananame */ "iLBC", /*.samples_per_second */ 8000, /*.bits_per_second */ NO_OF_BYTES_30MS*8*8000/BLOCKL_30MS,

1 0

[commit] r1678 - freeswitch/branches/rambler82
by Freeswitch SVN 26 Jun '06

26 Jun '06

Author: sphere Date: Mon Jun 26 04:31:23 2006 New Revision: 1678 Added: freeswitch/branches/rambler82/ Log: Creating empty folder for rambler82

1 0

[commit] r1677 - in freeswitch/branches/athompson/trunk: . src/mod/applications/mod_sleep
by Freeswitch SVN 26 Jun '06

26 Jun '06

Author: athompson Date: Mon Jun 26 00:01:15 2006 New Revision: 1677 Added: freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep/ freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep/mod_sleep.c Modified: freeswitch/branches/athompson/trunk/modules.conf.in Log: Add a sleep application for putting a delay in the dialplan. Modified: freeswitch/branches/athompson/trunk/modules.conf.in ============================================================================== --- freeswitch/branches/athompson/trunk/modules.conf.in (original) +++ freeswitch/branches/athompson/trunk/modules.conf.in Mon Jun 26 00:01:15 2006 @@ -5,6 +5,7 @@ applications/mod_echo applications/mod_ivrtest applications/mod_playback +applications/mod_sleep applications/mod_skel #applications/mod_rss #asr_tts/mod_cepstral Added: freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep/mod_sleep.c ============================================================================== --- (empty file) +++ freeswitch/branches/athompson/trunk/src/mod/applications/mod_sleep/mod_sleep.c Mon Jun 26 00:01:15 2006 @@ -0,0 +1,71 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * Andrew Thompson <athompson(a)collectiveholdings.com> + * + * mod_sleep.c -- Sleep Module + * + */ +#include <switch.h> + +static const char modname[] = "mod_sleep"; + +static void sleep_function(switch_core_session_t *session, char *data) +{ + char *delay = NULL; + + delay = switch_core_session_strdup(session, data); + /* 1000000 seems to be equiv to 1 second */ + switch_sleep(atof(delay) * 1000000); +} + +static const switch_application_interface_t sleep_application_interface = { + /*.interface_name */ "sleep", + /*.application_function */ sleep_function, + NULL,NULL,NULL,NULL +}; + +static switch_loadable_module_interface_t sleep_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ &sleep_application_interface, + /*.api_interface */ NULL, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL +}; + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +{ + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &sleep_module_interface; + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +}

1 0

[commit] r1676 - freeswitch/branches/athompson/trunk
by Freeswitch SVN 26 Jun '06

26 Jun '06

Author: athompson Date: Sun Jun 25 21:08:10 2006 New Revision: 1676 Added: freeswitch/branches/athompson/trunk/ - copied from r1675, /freeswitch/trunk/ Log: Copy from trunk to my branch.

1 0

[commit] r1675 - freeswitch/branches/fireshine
by Freeswitch SVN 25 Jun '06

25 Jun '06

Author: sphere Date: Sun Jun 25 06:18:23 2006 New Revision: 1675 Added: freeswitch/branches/fireshine/ Log: Creating empty folder for fireshine

1 0