December 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6903 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 19 Dec '07

19 Dec '07

Author: brian Date: Wed Dec 19 14:43:11 2007 New Revision: 6903 Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml Log: add openzap 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 Wed Dec 19 14:43:11 2007 @@ -33,6 +33,7 @@ <load module="mod_sofia"/>   +   <load module="mod_commands"/>

1 0

[commit] r6902 - freeswitch/trunk/src/include
by Freeswitch SVN 19 Dec '07

19 Dec '07

Author: mikej Date: Wed Dec 19 10:36:07 2007 New Revision: 6902 Modified: freeswitch/trunk/src/include/switch_log.h freeswitch/trunk/src/include/switch_platform.h Log: add functions param details for msvc code analysis. Modified: freeswitch/trunk/src/include/switch_log.h ============================================================================== --- freeswitch/trunk/src/include/switch_log.h (original) +++ freeswitch/trunk/src/include/switch_log.h Wed Dec 19 10:36:07 2007 @@ -74,7 +74,7 @@ \param pool the memory pool to use \note to be called at application startup by the core */ -SWITCH_DECLARE(switch_status_t) switch_log_init(switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_status_t) switch_log_init(_In_ switch_memory_pool_t *pool); /*! \brief Shut down the logging engine @@ -94,30 +94,32 @@ \param ... variable args \note there are channel macros to supply the first 4 parameters */ -SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line, - const char *userdata, switch_log_level_t level, const char *fmt, ...) PRINTF_FUNCTION(7, 8); +SWITCH_DECLARE(void) switch_log_printf(_In_ switch_text_channel_t channel, _In_z_ const char *file, + _In_z_ const char *func, _In_ int line, + _In_opt_z_ const char *userdata, _In_ switch_log_level_t level, + _In_z_ _Printf_format_string_ const char *fmt, ...) PRINTF_FUNCTION(7, 8); /*! \brief Shut down the logging engine \note to be called at application termination by the core */ -SWITCH_DECLARE(switch_status_t) switch_log_bind_logger(switch_log_function_t function, switch_log_level_t level); +SWITCH_DECLARE(switch_status_t) switch_log_bind_logger(_In_ switch_log_function_t function, _In_ switch_log_level_t level); /*! \brief Return the name of the specified log level \param level the level \return the name of the log level */ -SWITCH_DECLARE(const char *) switch_log_level2str(switch_log_level_t level); +_Ret_z_ SWITCH_DECLARE(const char *) switch_log_level2str(_In_ switch_log_level_t level); /*! \brief Return the level number of the specified log level name \param str the name of the level \return the log level */ -SWITCH_DECLARE(switch_log_level_t) switch_log_str2level(const char *str); +SWITCH_DECLARE(switch_log_level_t) switch_log_str2level(_In_z_ const char *str); -SWITCH_DECLARE(uint32_t) switch_log_str2mask(const char *str); +SWITCH_DECLARE(uint32_t) switch_log_str2mask(_In_z_ const char *str); #define switch_log_check_mask(_mask, _level) (_mask & (1 << _level)) ///\} Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Wed Dec 19 10:36:07 2007 @@ -296,6 +296,20 @@ #ifndef switch_assert #define switch_assert(expr) assert(expr) #endif + +#ifndef __ATTR_SAL + /* used for msvc code analysis */ + /* http://msdn2.microsoft.com/en-us/library/ms235402.aspx */ +#define _In_ +#define _In_z_ +#define _In_opt_z_ +#define _Printf_format_string_ +#define _Ret_opt_z_ +#define _Ret_z_ +#define _Check_return_ +#endif + + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r6900 - freeswitch/trunk/scripts/contrib/trixter/dialplan
by Freeswitch SVN 19 Dec '07

19 Dec '07

Author: trixter Date: Wed Dec 19 03:04:54 2007 New Revision: 6900 Added: freeswitch/trunk/scripts/contrib/trixter/dialplan/README Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml Log: Fixed and a readme. DO NOT READ THE README FILE. It contains secret information and should never be read under any circumstances. Seriously, dont read it. I am not joking. Added: freeswitch/trunk/scripts/contrib/trixter/dialplan/README ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/README Wed Dec 19 03:04:54 2007 @@ -0,0 +1,189 @@ +This dialplan was originally based on work by intralanman however I refactored +what he did so that it was more configurable. Now instead of requiring multiple +different dialplans you have one and channel variables which lets you set +a per user dial mapping very easily. + +I originally started working on this for http://fswebpanel.sf.net a web based +configuration tool I am working on for FreeSWITCH. Currently fswebpanel supports +this dialplan, and you can create users that set the variables. This makes +it much easier to deal with. + + +=-=-=-=-=-=-=-=-=-=-=-=-=-=- +SCOPE AND PURPOSE +=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +This directory is designed to provide drop in replacement dialing plans that +simulate what the PSTN normally provides. It is not intended to provide a +black list of numbers, what may be high cost, etc. With that said, if you +want to add variables that would define these things I suggest that you add +them at the end of the file instead of mixed throughout. This makes it +easier if someone wants a clean dialplan vs someone who wants to implement +advanced features. + +The reason to make a dialplan that matches what the traditional phone company +does is simply so that users feel more comfortable using the phone system. +It is bothersome, to me at least, to have to learn a whole new way to place +calls, especially when it is trivial to map what I dial as a user to what +some foreign system expects. + + + +=-=-=-=-=-=-=-=-=-=-=-=-=-=- +EXPLANATION OF DIALPLAN +=-=-=-=-=-=-=-=-=-=-=-=-=-=- +There are multiple files and it can become a little confusing, so I will attempt +to explain how to use this information should you decide to. My hope is that it +will eventually be part of the default config, until then you must manually +configure this. + +localized.dialplan.xml is a DIALPLAN file. You must edit your dialplan, +typically in INSTALL/conf/dialplan/default.xml where INSTALL is your +install directory (eg /usr/local/freeswitch on unix like systems). + +If you want this to be used *with* your default context you must remove +the lines + +<context name="INT-Numbering-Plan"> +</context> + +and place the remainder in the default context tags. + + +They have their own context tags so that they may be used seperately +should you opt to do that. + +You should not have to edit anything else to get this to work, unless +your provider requires you to prefix numbers with something. This +is often not the case, so it should work with the majority of providers. + + + + +=-=-=-=-=-=-=-=-=-=-=-=-=-=- +EXPLANATION OF THE VARIABLE FILES +=-=-=-=-=-=-=-=-=-=-=-=-=-=- +There are several variable files, one for a given region that has been done +so far. These variables are used by the dialplan to figure out how to +deal with a call. An attempt is made to query enum, if that fails +then it will use the default gateway that is defined. + +You may set these variables globally, or you may set them on a per user +basis from the user directory. The option is yours. + +There are two types of variables, static which are simply strings, +and regexps. Due to the way variables are used you should not +attempt to use a regexp unless it is indicated that it is a regexp. + + + + +<variable name="default_gateway" value="asterlink.com"/> + + + + +<variable name="default_country_code" value="31"/> + + + + +<variable name="default_international_prefix" value="00"/> + + +<variable name="default_international_regexp" value="^00(\d+)$"/> + + + +<variable name="default_domestic_regexp" value="^0([1-9]\d+)$"/> + + + + +<variable name="default_local_prefix" value="20"/> + + + + +<variable name="default_local_regexp" value="^([1-9]\d+)$"/> + + + + +<variable name="default_emergency_number" value="^112$"/> + + +=-=-=-=-=-=-=-=-=-=-=-=-=-=- +HOW TO MAKE A DIALPLAN +=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +This is quite simple, just copy one of the existing dialplan.XX.xml files +to dialplan.YY.xml where YY is the 2 letter country code for the area you +are going to do. For Europe the NL one will likely be correct for all but +the country code. + +The reason to use the 2 letter ISO country code (IE - Ireland, UK - United Kingdom +ES - Spain, etc) is so that everything is standardized and generally a fixed length. +One exception I am aware of is NANPA which is 18 or so countries (all country code '1') +Since there are multiple countries the numbering authority is used instead. + +Please keep all filenames in lowercase. This helps with sorted lists, since +an ASCII sort would split entries that have different cases when they should +otherwise be next to each other. + +Now that you have a new file, simply edit the values and you are done. If you share +this information then others may more easily have a dialing plan that works the way +they expect it to. + +DONT FORGET TO ADD YOUR NAME IN COMMENTS AT THE TOP OF THE FILE. I cannot +possibly know every dialing plan that exists, and for now since I am maintaining +this, someone may have a question about something that I wont be able to answer. +It would be best if they could get hold of you directly to resolve any issues +that may arise. + +Email the file to trixternospam(a)0xdecafbad.com and I will add it here. Eventually +there will be a place with fswebpanel to provide this information, and its possible +that this may be merged into FS trunk, when either of those happen I will close this +area down and request that they be filed directly where they can be used by more +people more easily. Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nanpa.xml Wed Dec 19 03:04:54 2007 @@ -13,7 +13,7 @@ <variablename="default_local_prefix" value="800"/>  -<variable name="default_international_regexp" value="^${default_international_prefix}(\d+)$"/> +<variable name="default_international_regexp" value="^011(\d+)$"/>  <variable name="default_domestic_regexp" value="^1?([2-9]\d{2}[2-9]\d{6})$"/> Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/dialplan.nl.xml Wed Dec 19 03:04:54 2007 @@ -13,7 +13,7 @@ <variable name="default_local_prefix" value="20"/>  -<variable name="default_international_regexp" value="^${default_international_prefix}(\d+)$"/> +<variable name="default_international_regexp" value="^00(\d+)$"/>  <variable name="default_domestic_regexp" value="^0([1-9]\d+)$"/> Modified: freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml (original) +++ freeswitch/trunk/scripts/contrib/trixter/dialplan/localized.dialplan.xml Wed Dec 19 03:04:54 2007 @@ -19,7 +19,7 @@ For international --> <extension name="INT-International"> - <condition field="destination_number" expression="^${default_international_regexp}$"> + <condition field="destination_number" expression="${default_international_regexp}"> <action application="set" data="continue_on_fail=true"/> <action application="set" data="hangup_after_bridge=true"/> <action application="enum" data="$1"/>

1 0

[commit] r6897 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 19 Dec '07

19 Dec '07

Author: mikej Date: Wed Dec 19 00:41:14 2007 New Revision: 6897 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: fix build. Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Wed Dec 19 00:41:14 2007 @@ -77,9 +77,11 @@ static int do_rand(void) { + double r; + int index; srand(getpid() + ++S); - double r = ((double)rand() / ((double)(RAND_MAX)+(double)(1))); - int index = (r * 9) + 1; + r = ((double)rand() / ((double)(RAND_MAX)+(double)(1))); + index = (int)(r * 9) + 1; return index; }

1 0

[commit] r6896 - in freeswitch/trunk/w32: . Library
by Freeswitch SVN 19 Dec '07

19 Dec '07

Author: mikej Date: Wed Dec 19 00:31:21 2007 New Revision: 6896 Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj freeswitch/trunk/w32/module_debug.vsprops Log: enable code analysis by default. Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Wed Dec 19 00:31:21 2007 @@ -57,6 +57,7 @@ WarnAsError="true" DebugInformationFormat="3" ForcedIncludeFiles="" + EnablePREfast="true" /> <Tool Name="VCManagedResourceCompilerTool" @@ -502,11 +503,11 @@ > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File Modified: freeswitch/trunk/w32/module_debug.vsprops ============================================================================== --- freeswitch/trunk/w32/module_debug.vsprops (original) +++ freeswitch/trunk/w32/module_debug.vsprops Wed Dec 19 00:31:21 2007 @@ -12,6 +12,7 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" DebugInformationFormat="3" + EnablePREfast="true" /> <Tool Name="VCLinkerTool"

1 0

[commit] r6895 - in freeswitch/trunk/conf: autoload_configs dialplan
by Freeswitch SVN 19 Dec '07

19 Dec '07

Author: brian Date: Tue Dec 18 22:48:01 2007 New Revision: 6895 Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml freeswitch/trunk/conf/dialplan/default.xml Log: update to configs Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml Tue Dec 18 22:48:01 2007 @@ -1,12 +1,14 @@ <configuration name="local_stream.conf" description="stream files from local dir"> <directory name="moh/8000" path="$${base_dir}/sounds/music/8000"> <param name="rate" value="8000"/> + <param name="shuffle" value="true"/> <param name="channels" value="1"/> <param name="interval" value="2"/> <param name="timer_name" value="soft"/> </directory> <directory name="moh/16000" path="$${base_dir}/sounds/music/16000"> <param name="rate" value="16000"/> + <param name="shuffle" value="true"/> <param name="channels" value="1"/> <param name="interval" value="2"/> <param name="timer_name" value="soft"/> Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Dec 18 22:48:01 2007 @@ -10,7 +10,7 @@ </extension> <extension name="intercept-ext"> - <condition field="destination_number" expression="^886(\d+)$"> + <condition field="destination_number" expression="^\*\*(\d+)$"> <action application="answer"/> <action application="intercept" data="${db(select/last_dial_ext/$1)}"/> <action application="sleep" data="2000"/>

1 0

[commit] r6894 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Dec '07

19 Dec '07

Author: mikej Date: Tue Dec 18 22:34:37 2007 New Revision: 6894 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: protect against null deref. 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 Tue Dec 18 22:34:37 2007 @@ -1807,7 +1807,11 @@ switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; uint32_t timeout = 60; char *tuuid_str; - const char *port = refer_to->r_url->url_port; + const char *port = NULL; + + if (refer_to && refer_to->r_url && refer_to->r_url->url_port) { + port = refer_to->r_url->url_port; + } if (switch_strlen_zero(port)) { port = "5060";

1 0

[commit] r6893 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by Freeswitch SVN 19 Dec '07

19 Dec '07

Author: mikej Date: Tue Dec 18 22:29:07 2007 New Revision: 6893 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Log: drip, drip, drip... whoops. Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Tue Dec 18 22:29:07 2007 @@ -166,7 +166,7 @@ switch (event->event_id) { case SWITCH_EVENT_LOG: - return; + goto end; default: switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Multicast-Sender", "%s", globals.hostname); if (switch_event_serialize(event, &packet, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { @@ -180,6 +180,9 @@ break; } } +end: + free(buf); + return; } @@ -318,6 +321,7 @@ } globals.running = 0; + free(buf); return SWITCH_STATUS_TERM; }

1 0

[commit] r6892 - freeswitch/trunk/src
by Freeswitch SVN 19 Dec '07

19 Dec '07

Author: mikej Date: Tue Dec 18 20:37:27 2007 New Revision: 6892 Modified: freeswitch/trunk/src/switch_xml.cpp Log: more error case handling. Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Tue Dec 18 20:37:27 2007 @@ -936,7 +936,9 @@ madvise(m, root->len = l, MADV_NORMAL); // put it back to normal } else { // mmap failed, read file into memory #endif // HAVE_MMAP - l = read(fd, m = malloc(st.st_size), st.st_size); + m = malloc(st.st_size); + if (!m) return NULL; + l = read(fd, m, st.st_size); root = (switch_xml_root_t) switch_xml_parse_str((char *)m, l); root->dynamic = 1; // so we know to free s in switch_xml_free() #ifdef HAVE_MMAP @@ -1011,7 +1013,7 @@ for (int n = 0; n < glob.FileCount(); ++n) { dir_path = strdup(glob.File(n)); - assert(dir_path); + switch_assert(dir_path); if ((e = strrchr(dir_path, *SWITCH_PATH_SEPARATOR))) { *e = '\0'; } @@ -1218,7 +1220,9 @@ if ((fd = open(file, O_RDONLY, 0)) > -1) { fstat(fd, &st); - l = read(fd, m = malloc(st.st_size), st.st_size); + m = malloc(st.st_size); + switch_assert(m); + l = read(fd, m, st.st_size); root = (switch_xml_root_t) switch_xml_parse_str((char *)m, l); root->dynamic = 1; close(fd); @@ -1532,8 +1536,11 @@ } while (s != e) { - while (*dlen + 10 > *max) - *dst = (char *)realloc(*dst, *max += SWITCH_XML_BUFSIZE); + while (*dlen + 10 > *max) { + char *tmp = (char *)realloc(*dst, *max += SWITCH_XML_BUFSIZE); + if (!tmp) return *dst; + *dst = tmp; + } if (immune) { if (*s == '\0') { @@ -1592,8 +1599,11 @@ // 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) + 5 + (strlen(XML_INDENT) * (*count)) + 1 > *max) // reallocate s - *s = (char *)realloc(*s, *max += SWITCH_XML_BUFSIZE); + while (*len + strlen(xml->name) + 5 + (strlen(XML_INDENT) * (*count)) + 1 > *max) { // reallocate s + char *tmp = (char *)realloc(*s, *max += SWITCH_XML_BUFSIZE); + if (!tmp) return *s; + *s = tmp; + } if (*(*s + (*len) - 1) == '>') { *len += sprintf(*s + *len, "\n"); // indent @@ -1606,8 +1616,11 @@ 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 + (strlen(XML_INDENT) * (*count)) > *max) // reallocate s - *s = (char *)realloc(*s, *max += SWITCH_XML_BUFSIZE); + while (*len + strlen(xml->attr[i]) + 7 + (strlen(XML_INDENT) * (*count)) > *max) { // reallocate s + char *tmp = (char *)realloc(*s, *max += SWITCH_XML_BUFSIZE); + if (!tmp) return *s; + *s = tmp; + } *len += sprintf(*s + *len, " %s=\"", xml->attr[i]); switch_xml_ampencode(xml->attr[i + 1], 0, s, len, max, 1); @@ -1618,8 +1631,11 @@ 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]) + 8 + (strlen(XML_INDENT) * (*count)) > *max) // reallocate s - *s = (char *)realloc(*s, *max += SWITCH_XML_BUFSIZE); + while (*len + strlen(attr[i][j]) + 8 + (strlen(XML_INDENT) * (*count)) > *max) { // reallocate s + char *tmp = (char *)realloc(*s, *max += SWITCH_XML_BUFSIZE); + if (!tmp) return *s; + *s = tmp; + } *len += sprintf(*s + *len, " %s=\"", attr[i][j]); switch_xml_ampencode(attr[i][j + 1], 0, s, len, max, 1); @@ -1636,9 +1652,11 @@ *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 = (char *)realloc(*s, *max += SWITCH_XML_BUFSIZE); - + while (*len + strlen(xml->name) + 5 + (strlen(XML_INDENT) * (*count)) > *max) { // reallocate s + char *tmp = (char *)realloc(*s, *max += SWITCH_XML_BUFSIZE); + if (!tmp) return *s; + *s = tmp; + } if (xml->child || xml->txt) { if (*(*s + (*len) - 1) == '\n') { @@ -1927,9 +1945,13 @@ return xml; // nothing to do if (xml->attr == SWITCH_XML_NIL) { // first attribute xml->attr = (char **)malloc(4 * sizeof(char *)); + if (!xml->attr) return NULL; xml->attr[1] = strdup(""); // empty list of malloced names/vals - } else - xml->attr = (char **)realloc(xml->attr, (l + 4) * sizeof(char *)); + } else { + char **tmp = (char **)realloc(xml->attr, (l + 4) * sizeof(char *)); + if (!tmp) return xml; + xml->attr = tmp; + } xml->attr[l] = (char *) name; // set attribute name xml->attr[l + 2] = NULL; // null terminate attribute list @@ -1951,10 +1973,13 @@ if (value) xml->attr[l + 1] = (char *) value; // set attribute value else { // remove attribute + char **tmp; if (xml->attr[c + 1][l / 2] & SWITCH_XML_NAMEM) free(xml->attr[l]); memmove(xml->attr + l, xml->attr + l + 2, (c - l + 2) * sizeof(char *)); - xml->attr = (char **)realloc(xml->attr, (c + 2) * sizeof(char *)); + tmp =(char **)realloc(xml->attr, (c + 2) * sizeof(char *)); + if (!tmp) return xml; + xml->attr = tmp; memmove(xml->attr[c + 1] + (l / 2), xml->attr[c + 1] + (l / 2) + 1, (c / 2) - (l / 2)); // fix list of which name/vals are malloced } xml->flags &= ~SWITCH_XML_DUP; // clear strdup() flag

1 0

[commit] r6891 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 19 Dec '07

19 Dec '07

Author: brian Date: Tue Dec 18 19:44:51 2007 New Revision: 6891 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: ring_ready just in case a call on hold is transfered they get ringing instead of silence Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Dec 18 19:44:51 2007 @@ -111,6 +111,7 @@ <action application="answer"/> <action application="sleep" data="1000"/> <action application="voicemail" data="check default $${domain} ${dialed_ext}"/> + <anti-action application="ring_ready"/> <anti-action application="set" data="call_timeout=130"/> <anti-action application="set" data="hangup_after_bridge=true"/> <anti-action application="set" data="continue_on_fail=true"/>

1 0