- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

[commit] r6887 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 18 Dec '07

18 Dec '07

Author: anthm Date: Tue Dec 18 18:07:48 2007 New Revision: 6887 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: add presence to fifo Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Tue Dec 18 18:07:48 2007 @@ -93,11 +93,87 @@ switch_hash_t *caller_hash; switch_hash_t *consumer_hash; int caller_count; + int waiting_count; int consumer_count; }; typedef struct fifo_node fifo_node_t; + +static fifo_node_t *create_node(const char *name) +{ + fifo_node_t *node; + + node = switch_core_alloc(globals.pool, sizeof(*node)); + node->name = switch_core_strdup(globals.pool, name); + + switch_queue_create(&node->fifo, SWITCH_CORE_QUEUE_LEN, globals.pool); + switch_core_hash_init(&node->caller_hash, globals.pool); + switch_core_hash_init(&node->consumer_hash, globals.pool); + switch_assert(node->fifo); + switch_mutex_init(&node->mutex, SWITCH_MUTEX_NESTED, globals.pool); + switch_core_hash_insert(globals.fifo_hash, name, node); + + return node; +} + +static void send_presence(fifo_node_t *node) +{ + switch_event_t *event; + + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "%s", "park"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", node->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s", node->name); + if (node->waiting_count > 0) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d waiting)", node->waiting_count); + } else { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Idle"); + } + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", "unknown"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", 0); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", node->waiting_count > 0 ? "CS_RING" : "CS_HANGUP"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", node->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", node->waiting_count > 0 ? "early" : "terminated"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "astate", "%s", node->waiting_count > 0 ? "early" : "terminated"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "outbound"); + switch_event_fire(&event); + } +} + + +static void pres_event_handler(switch_event_t *event) +{ + char *to = switch_event_get_header(event, "to"); + char *dup_to = NULL, *node_name; + fifo_node_t *node; + + if (!to || strncasecmp(to, "park+", 5)) { + return; + } + + dup_to = strdup(to); + switch_assert(dup_to); + + node_name = dup_to + 5; + + switch_mutex_lock(globals.mutex); + if (!(node = switch_core_hash_find(globals.fifo_hash, node_name))) { + node = create_node(node_name); + } + + switch_mutex_lock(node->mutex); + send_presence(node); + switch_mutex_unlock(node->mutex); + + switch_mutex_unlock(globals.mutex); + + switch_safe_free(dup_to); +} + #define FIFO_DESC "Fifo for stacking parked calls." #define FIFO_USAGE "<fifo name> [in [<announce file>|undef] [<music file>|undef] | out [wait|nowait] [<announce file>|undef] [<music file>|undef]]" SWITCH_STANDARD_APP(fifo_function) @@ -130,21 +206,16 @@ return; } + channel = switch_core_session_get_channel(session); + switch_mutex_lock(globals.mutex); if (!(node = switch_core_hash_find(globals.fifo_hash, argv[0]))) { - node = switch_core_alloc(globals.pool, sizeof(*node)); - node->name = switch_core_strdup(globals.pool, argv[0]); - switch_queue_create(&node->fifo, SWITCH_CORE_QUEUE_LEN, globals.pool); - switch_core_hash_init(&node->caller_hash, globals.pool); - switch_core_hash_init(&node->consumer_hash, globals.pool); - switch_assert(node->fifo); - switch_mutex_init(&node->mutex, SWITCH_MUTEX_NESTED, globals.pool); - switch_core_hash_insert(globals.fifo_hash, argv[0], node); + node = create_node(argv[0]); } switch_mutex_unlock(globals.mutex); - channel = switch_core_session_get_channel(session); + moh = switch_channel_get_variable(channel, "fifo_music"); announce = switch_channel_get_variable(channel, "fifo_announce"); @@ -177,6 +248,8 @@ switch_mutex_lock(node->mutex); node->caller_count++; + node->waiting_count++; + send_presence(node); switch_core_hash_insert(node->caller_hash, uuid, session); switch_queue_push(node->fifo, (void *)uuid); switch_mutex_unlock(node->mutex); @@ -223,6 +296,8 @@ } switch_mutex_lock(node->mutex); node->caller_count--; + node->waiting_count--; + send_presence(node); switch_core_hash_delete(node->caller_hash, uuid); switch_mutex_unlock(node->mutex); } @@ -355,6 +430,10 @@ switch_channel_set_variable(other_channel, "fifo_status", "TALKING"); switch_channel_set_variable(other_channel, "fifo_timestamp", date); switch_channel_set_variable(other_channel, "fifo_target", switch_core_session_get_uuid(session)); + switch_mutex_lock(node->mutex); + node->waiting_count--; + send_presence(node); + switch_mutex_unlock(node->mutex); switch_ivr_multi_threaded_bridge(session, other_session, on_dtmf, other_session, session); ts = switch_timestamp_now(); @@ -368,6 +447,7 @@ switch_mutex_lock(node->mutex); node->caller_count--; + send_presence(node); switch_core_hash_delete(node->caller_hash, uuid); switch_mutex_unlock(node->mutex); switch_core_session_rwunlock(other_session); @@ -475,6 +555,8 @@ switch_xml_set_attr_d(x_fifo, "consumer_count", tmp); switch_snprintf(tmp, sizeof(buffer), "%d", node->caller_count); switch_xml_set_attr_d(x_fifo, "caller_count", tmp); + switch_snprintf(tmp, sizeof(buffer), "%d", node->waiting_count); + switch_xml_set_attr_d(x_fifo, "waiting_count", tmp); cc_off = xml_hash(x_fifo, node->caller_hash, "callers", "caller", cc_off, verbose); cc_off = xml_hash(x_fifo, node->consumer_hash, "consumers", "consumer", cc_off, verbose); @@ -575,6 +657,12 @@ return SWITCH_STATUS_TERM; } + /* Subscribe to presence request events */ + if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't subscribe to presence request events!\n"); + return SWITCH_STATUS_GENERR; + } + switch_core_new_memory_pool(&globals.pool); switch_core_hash_init(&globals.fifo_hash, globals.pool); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool);

1 0

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

18 Dec '07

Author: mikej Date: Tue Dec 18 17:34:46 2007 New Revision: 6886 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 17:34:46 2007 @@ -496,20 +496,27 @@ s += strspn(s + 1, SWITCH_XML_WS) + 1; // skip whitespace after target } + if (!root) return; + if (!strcmp(target, "xml")) { // <?xml ... ?> if ((s = strstr(s, "standalone")) && !strncmp(s + strspn(s + 10, SWITCH_XML_WS "='\"") + 10, "yes", 3)) root->standalone = 1; return; } - if (!root->pi[0]) - *(root->pi = (char ***)malloc(sizeof(char **))) = NULL; //first pi + if (!root->pi[0]) { + root->pi = (char ***)malloc(sizeof(char **)); + if (!root->pi) return; + *(root->pi) = NULL; //first pi + } 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)); + if (!root->pi) return; root->pi[i] = (char **)malloc(sizeof(char *) * 3); + if (!root->pi[i]) return; root->pi[i][0] = target; root->pi[i][1] = (char *) (root->pi[i + 1] = NULL); // terminate pi list root->pi[i][2] = strdup(""); // empty document position list

1 0

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

18 Dec '07

Author: brian Date: Tue Dec 18 17:24:30 2007 New Revision: 6885 Modified: freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload Log: override sipphone to use udp because their SRV record is wrong Modified: freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload ============================================================================== --- freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload (original) +++ freeswitch/trunk/conf/dialplan/extensions/sipphone.com.noload Tue Dec 18 17:24:30 2007 @@ -1,7 +1,7 @@ <include> <extension name="sipphone.com"> <condition field="destination_number" expression="^((1222.*)$|^(1747.*))$"> - <action application="bridge" data="sofia/gateway/proxy01.sipphone.com/$1"/> + <action application="bridge" data="sofia/gateway/proxy01.sipphone.com/$1;transport=udp"/> </condition> </extension> </include>

1 0

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

18 Dec '07

Author: brian Date: Tue Dec 18 17:15:45 2007 New Revision: 6884 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Dec 18 17:15:45 2007 @@ -147,19 +147,6 @@ </condition> </extension> - <extension name="static-park"> - <condition field="destination_number" expression="^8792$"> - <action application="fifo" data="default in undef local_stream://moh"/> - </condition> - </extension> - - <extension name="unpark"> - <condition field="destination_number" expression="^8793$"> - <action application="answer"/> - <action application="fifo" data="default out nowait"/> - </condition> - </extension> -  <extension name="ivr_demo"> <condition field="destination_number" expression="5000"> @@ -174,7 +161,7 @@ --> <extension name="park"> <condition field="destination_number" expression="^5900$"> - <action application="fifo" data="default in undef soundfiles/swimp.raw"/> + <action application="fifo" data="default in undef $${moh_uri}"/> </condition> </extension> @@ -184,15 +171,6 @@ <action application="fifo" data="default out nowait"/> </condition> </extension> -  <extension name="hold_music"> <condition field="destination_number" expression="^9999$">

1 0

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

18 Dec '07

Author: stkn Date: Tue Dec 18 17:06:20 2007 New Revision: 6883 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: Correctly handle a transport= parameter passed via destination url to mod_sofia 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 Tue Dec 18 17:06:20 2007 @@ -701,18 +701,19 @@ rpid_domain = "cluecon.com"; } - if (switch_stristr("port=tcp", url)) { - transport = SOFIA_TRANSPORT_TCP; + if ((p = (char *)switch_stristr("port=", url))) { + p += 5; + transport = sofia_glue_str2transport( p ); } else { if ((t_var = switch_channel_get_variable(channel, "sip_transport"))) { - sofia_transport_t t_val; - - if ((t_val = sofia_glue_str2transport(t_var)) != SOFIA_TRANSPORT_UNKNOWN) { - transport = t_val; - } + transport = sofia_glue_str2transport(t_var); } } + if (transport == SOFIA_TRANSPORT_UNKNOWN) { + transport = SOFIA_TRANSPORT_UDP; + } + if (switch_strlen_zero(tech_pvt->invite_contact)) { if (sofia_glue_transport_has_tls(transport)) tech_pvt->invite_contact = tech_pvt->profile->tls_url;

1 0

[commit] r6882 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 18 Dec '07

18 Dec '07

Author: anthm Date: Tue Dec 18 17:06:06 2007 New Revision: 6882 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: delete repeat keys in db Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Tue Dec 18 17:06:06 2007 @@ -425,17 +425,21 @@ if (!strcasecmp(argv[0], "insert")) { + sql = switch_mprintf("delete from db_data where realm='%q' and data_key='%q'", argv[1], argv[2]); + switch_assert(sql); + limit_execute_sql(sql, globals.mutex); + switch_safe_free(sql); + sql = switch_mprintf("insert into db_data values('%q','%q','%q','%q');", globals.hostname, argv[1], argv[2], argv[3]); } else if (!strcasecmp(argv[0], "delete")) { sql = switch_mprintf("delete from db_data where realm='%q' and data_key='%q'", argv[1], argv[2]); } + switch_assert(sql); + limit_execute_sql(sql, globals.mutex); + switch_safe_free(sql); + return; - if (sql) { - limit_execute_sql(sql, globals.mutex); - switch_safe_free(sql); - return; - } error: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: db %s\n", DB_USAGE); @@ -470,6 +474,7 @@ } sql = switch_mprintf("delete from group_data where groupname='%q' and url='%q';", argv[1], argv[2]); assert(sql); + limit_execute_sql(sql, NULL); switch_safe_free(sql); sql = switch_mprintf("insert into group_data values('%q','%q','%q');", globals.hostname, argv[1], argv[2]);

1 0

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

18 Dec '07

Author: mikej Date: Tue Dec 18 16:59:48 2007 New Revision: 6881 Modified: freeswitch/trunk/src/switch_xml.cpp Log: handle some error cases. Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Tue Dec 18 16:59:48 2007 @@ -431,9 +431,21 @@ if (!*(xml->txt)) xml->txt = s; // initial character content else { // allocate our own memory and make a copy - xml->txt = (xml->flags & SWITCH_XML_TXTM) // allocate some space - ? (char *)realloc(xml->txt, (l = strlen(xml->txt)) + len) - : strcpy((char *)malloc((l = strlen(xml->txt)) + len), xml->txt); + if ((xml->flags & SWITCH_XML_TXTM)) { // allocate some space + char *tmp = (char *)realloc(xml->txt, (l = strlen(xml->txt)) + len); + if (tmp) { + xml->txt = tmp; + } else { + return; + } + } else { + char *tmp = (char *)malloc((l = strlen(xml->txt)) + len); + if (tmp) { + xml->txt = strcpy(tmp, xml->txt); + } else { + return; + } + } strcpy(xml->txt + l, s); // add new char content if (s != m) free(s); // free s if it was malloced by switch_xml_decode()

1 0