- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

19 Dec '07

Author: mikej Date: Tue Dec 18 19:27:40 2007 New Revision: 6890 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: use the dialplan and context from caller profile not sofia profile on refer 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 19:27:40 2007 @@ -1872,7 +1872,7 @@ if ((b_session = switch_core_session_locate(br))) { switch_channel_set_variable(channel, "TRANSFER_FALLBACK", from->a_user); - switch_ivr_session_transfer(b_session, exten, profile->dialplan, profile->context); + switch_ivr_session_transfer(b_session, exten, NULL, NULL); switch_core_session_rwunlock(b_session); }

1 0

[commit] r6889 - freeswitch/trunk/src
by Freeswitch SVN 18 Dec '07

18 Dec '07

Author: mikej Date: Tue Dec 18 18:45:06 2007 New Revision: 6889 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 18:45:06 2007 @@ -489,6 +489,8 @@ { int i = 0, j = 1; char *target = s; + char **sstmp; + char *stmp; s[len] = '\0'; // null terminate instruction if (*(s += strcspn(s, SWITCH_XML_WS))) { @@ -513,7 +515,9 @@ while (root->pi[i] && strcmp(target, root->pi[i][0])) i++; // find target if (!root->pi[i]) { // new target - root->pi = (char ***)realloc(root->pi, sizeof(char **) * (i + 2)); + char ***ssstmp = (char ***)realloc(root->pi, sizeof(char **) * (i + 2)); + if (!ssstmp) return; + root->pi = ssstmp; if (!root->pi) return; root->pi[i] = (char **)malloc(sizeof(char *) * 3); if (!root->pi[i]) return; @@ -524,8 +528,12 @@ while (root->pi[i][j]) j++; // find end of instruction list for this target - root->pi[i] = (char **)realloc(root->pi[i], sizeof(char *) * (j + 3)); - root->pi[i][j + 2] = (char *)realloc(root->pi[i][j + 1], j + 1); + sstmp = (char **)realloc(root->pi[i], sizeof(char *) * (j + 3)); + if (!sstmp) return; + root->pi[i] = sstmp; + stmp = (char *)realloc(root->pi[i][j + 1], j + 1); + if (!stmp) return; + root->pi[i][j + 2] = stmp; strcpy(root->pi[i][j + 2] + j - 1, (root->xml.name) ? ">" : "<"); root->pi[i][j + 1] = NULL; // null terminate pi list for this target root->pi[i][j] = s; // set instruction @@ -536,6 +544,7 @@ { char q, *c, *t, *n = NULL, *v, **ent, **pe; int i, j; + char **sstmp; pe = (char **)memcpy(malloc(sizeof(SWITCH_XML_NIL)), SWITCH_XML_NIL, sizeof(SWITCH_XML_NIL)); @@ -557,7 +566,12 @@ } for (i = 0, ent = (*c == '%') ? pe : root->ent; ent[i]; i++); - ent = (char **)realloc(ent, (i + 3) * sizeof(char *)); // space for next ent + sstmp = (char **)realloc(ent, (i + 3) * sizeof(char *)); // space for next ent + if (!sstmp) { + switch_xml_err(root, v, "Allocation Error!"); + break; + } + ent = sstmp; if (*c == '%') pe = ent; else @@ -630,8 +644,14 @@ } for (j = 1; root->attr[i][j]; j += 3); // find end of list - root->attr[i] = (char **)realloc(root->attr[i], (j + 4) * sizeof(char *)); + sstmp = (char **)realloc(root->attr[i], (j + 4) * sizeof(char *)); + + if (!sstmp) { + switch_xml_err(root, t, "Allocation Error!"); + break; + } + root->attr[i] = sstmp; root->attr[i][j + 3] = NULL; // null terminate list root->attr[i][j + 2] = c; // is it cdata? root->attr[i][j + 1] = (v) ? switch_xml_decode(v, root->ent, *c) @@ -675,8 +695,12 @@ c = (((c & 0x3FF) << 10) | (d & 0x3FF)) + 0x10000; } - while (l + 6 > max) - u = (char *)realloc(u, max += SWITCH_XML_BUFSIZE); + while (l + 6 > max) { + char *tmp; + tmp = (char *)realloc(u, max += SWITCH_XML_BUFSIZE); + if (!tmp) return NULL; + u = tmp; + } if (c < 0x80) u[l++] = (char) c; // US-ASCII subset else { // multi-byte UTF-8 sequence @@ -873,8 +897,14 @@ return NULL; do { len += (l = fread((s + len), 1, SWITCH_XML_BUFSIZE, fp)); - if (l == SWITCH_XML_BUFSIZE) - s = (char *)realloc(s, len + SWITCH_XML_BUFSIZE); + if (l == SWITCH_XML_BUFSIZE) { + char *tmp = (char *)realloc(s, len + SWITCH_XML_BUFSIZE); + if (!tmp) { + free(s); + return NULL; + } + s = tmp; + } } while (s && l == SWITCH_XML_BUFSIZE); if (!s)

1 0

[commit] r6888 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 18 Dec '07

18 Dec '07

Author: brian Date: Tue Dec 18 18:12:46 2007 New Revision: 6888 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: add this neat little thing Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Dec 18 18:12:46 2007 @@ -156,19 +156,20 @@  <extension name="park"> - <condition field="destination_number" expression="^5900$"> - <action application="fifo" data="default in undef $${moh_uri}"/> + <condition field="destination_number" expression="^(590[0-9])$"> + <action application="fifo" data="$1@$${domain} in undef $${moh_uri}"/> </condition> </extension> - +  <extension name="unpark"> - <condition field="destination_number" expression="^5901$"> + <condition field="destination_number" expression="^\*{0,2}park\+(590[0-9])$"> <action application="answer"/> - <action application="fifo" data="default out nowait"/> + <action application="fifo" data="$1@$${domain} out nowait"/> </condition> </extension>

1 0