November 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10439 - freeswitch/trunk/src
by FreeSWITCH SVN 18 Nov '08

18 Nov '08

Author: anthm Date: Tue Nov 18 10:24:52 2008 New Revision: 10439 Log: add chan vars to param event during hangup hook Modified: freeswitch/trunk/src/switch_core_state_machine.c Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Tue Nov 18 10:24:52 2008 @@ -412,6 +412,7 @@ *arg++ = '\0'; } SWITCH_STANDARD_STREAM(stream); + switch_channel_get_variables(session->channel, &stream.param_event); switch_api_execute(cmd, arg, NULL, &stream); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hangup Command %s(%s):\n%s\n", cmd, arg, switch_str_nil((char *) stream.data));

1 0

[commit] r10438 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by FreeSWITCH SVN 18 Nov '08

18 Nov '08

Author: anthm Date: Tue Nov 18 10:11:17 2008 New Revision: 10438 Log: update Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Nov 18 10:11:17 2008 @@ -1236,8 +1236,8 @@ } } - if (argv[7]) { - hits = atoi(argv[7]); + if (argv[6]) { + hits = atoi(argv[6]); if (hits < 0) { hits = 1; } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Nov 18 10:11:17 2008 @@ -1227,7 +1227,8 @@ for (i = 0; i < cont->index; i++) { if (cont->list[i].expires && cont->list[i].expires > switch_timestamp(NULL)) { - cont->list[i].hits = cont->list[i].total_hits; + cont->list[i].hits = 0; + cont->list[i].sleep = 0; cont->list[i].expires = 0; } @@ -1238,38 +1239,41 @@ if (cont->list[i].up && teletone_multi_tone_detect(&cont->list[i].mt, frame->data, frame->samples)) { switch_event_t *event; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s DETECTED\n", cont->list[i].key); - if (cont->list[i].hits) { - cont->list[i].up = cont->list[i].hits--; - cont->list[i].sleep = 25; - cont->list[i].expires = switch_timestamp(NULL) + 5; - teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map); - } else { - cont->list[i].up = 0; - } + cont->list[i].up = cont->list[i].hits++; + cont->list[i].sleep = 25; + cont->list[i].expires = switch_timestamp(NULL) + 5; + teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s HIT %d/%d\n", + cont->list[i].key, cont->list[i].up, cont->list[i].total_hits); - if (cont->list[i].app) { - if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", cont->list[i].app); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", cont->list[i].data); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); - switch_core_session_queue_private_event(cont->session, &event); - } - } - - if (switch_event_create(&event, SWITCH_EVENT_DETECTED_TONE) == SWITCH_STATUS_SUCCESS) { - switch_event_t *dup; - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Detected-Tone", cont->list[i].key); - if (switch_event_dup(&dup, event) == SWITCH_STATUS_SUCCESS) { - switch_event_fire(&dup); + if (cont->list[i].hits >= cont->list[i].total_hits) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s DETECTED\n", cont->list[i].key); + cont->list[i].up = 0; + + if (cont->list[i].app) { + if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", cont->list[i].app); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", cont->list[i].data); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); + switch_core_session_queue_private_event(cont->session, &event); + } } - if (switch_core_session_queue_event(cont->session, &event) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Event queue failed!\n"); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true"); - switch_event_fire(&event); + if (switch_event_create(&event, SWITCH_EVENT_DETECTED_TONE) == SWITCH_STATUS_SUCCESS) { + switch_event_t *dup; + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Detected-Tone", cont->list[i].key); + + if (switch_event_dup(&dup, event) == SWITCH_STATUS_SUCCESS) { + switch_event_fire(&dup); + } + + if (switch_core_session_queue_event(cont->session, &event) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Event queue failed!\n"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true"); + switch_event_fire(&event); + } } } } @@ -1325,6 +1329,9 @@ if (!switch_strlen_zero(cont->list[cont->index].key) && !strcasecmp(key, cont->list[cont->index].key)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-enabling %s\n", key); cont->list[cont->index].up = 1; + cont->list[i].hits = 0; + cont->list[i].sleep = 0; + cont->list[i].expires = 0; teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map); return SWITCH_STATUS_SUCCESS; } @@ -1340,7 +1347,7 @@ return SWITCH_STATUS_MEMERR; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding tone spec %s index %d\n", tone_spec, cont->index); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding tone spec %s index %d hits %d\n", tone_spec, cont->index, hits); i = 0; p = (char *) tone_spec; @@ -1377,7 +1384,7 @@ if (!hits) hits = 1; - cont->list[cont->index].hits = hits; + cont->list[cont->index].hits = 0; cont->list[cont->index].total_hits = hits; cont->list[cont->index].up = 1;

1 0

[commit] r10436 - freeswitch/trunk/src
by FreeSWITCH SVN 18 Nov '08

18 Nov '08

Author: anthm Date: Mon Nov 17 21:21:04 2008 New Revision: 10436 Log: update Modified: freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon Nov 17 21:21:04 2008 @@ -1192,8 +1192,10 @@ char *key; teletone_tone_map_t map; int up; + int total_hits; int hits; int sleep; + time_t expires; } switch_tone_detect_t; typedef struct { @@ -1224,6 +1226,11 @@ } for (i = 0; i < cont->index; i++) { + if (cont->list[i].expires && cont->list[i].expires > switch_timestamp(NULL)) { + cont->list[i].hits = cont->list[i].total_hits; + cont->list[i].expires = 0; + } + if (cont->list[i].sleep) { cont->list[i].sleep--; return SWITCH_TRUE; @@ -1235,6 +1242,7 @@ if (cont->list[i].hits) { cont->list[i].up = cont->list[i].hits--; cont->list[i].sleep = 25; + cont->list[i].expires = switch_timestamp(NULL) + 5; teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map); } else { cont->list[i].up = 0; @@ -1370,6 +1378,7 @@ if (!hits) hits = 1; cont->list[cont->index].hits = hits; + cont->list[cont->index].total_hits = hits; cont->list[cont->index].up = 1; cont->list[cont->index].mt.sample_rate = read_codec->implementation->actual_samples_per_second;

1 0

[commit] r10435 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/applications/mod_dptools
by FreeSWITCH SVN 18 Nov '08

18 Nov '08

Author: anthm Date: Mon Nov 17 21:05:11 2008 New Revision: 10435 Log: add hits to tone detect Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Mon Nov 17 21:05:11 2008 @@ -298,7 +298,8 @@ */ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_session_t *session, const char *key, const char *tone_spec, - const char *flags, time_t timeout, const char *app, const char *data); + const char *flags, time_t timeout, int hits, const char *app, const char *data); + Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Nov 17 21:05:11 2008 @@ -1148,14 +1148,15 @@ return SWITCH_STATUS_SUCCESS; } -#define TONE_DETECT_SYNTAX "<uuid> <key> <tone_spec> [<flags> <timeout> <app> <args>]" +#define TONE_DETECT_SYNTAX "<uuid> <key> <tone_spec> [<flags> <timeout> <app> <args> <hits>]" SWITCH_STANDARD_API(tone_detect_session_function) { - char *argv[7] = { 0 }; + char *argv[8] = { 0 }; int argc; char *mydata = NULL; time_t to = 0; switch_core_session_t *rsession; + int hits = 1; if (!cmd) { stream->write_function(stream, "-USAGE: %s\n", TONE_DETECT_SYNTAX); @@ -1193,7 +1194,14 @@ } } - switch_ivr_tone_detect_session(rsession, argv[1], argv[2], argv[3], to, argv[5], argv[6]); + if (argv[7]) { + hits = atoi(argv[7]); + if (hits < 0) { + hits = 1; + } + } + + switch_ivr_tone_detect_session(rsession, argv[1], argv[2], argv[3], to, hits, argv[5], argv[6]); stream->write_function(stream, "+OK Enabling tone detection '%s' '%s' '%s'\n", argv[1], argv[2], argv[3]); done: Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Nov 17 21:05:11 2008 @@ -1189,7 +1189,7 @@ SWITCH_STANDARD_APP(fax_detect_session_function) { - switch_ivr_tone_detect_session(session, "fax", "1100.0", "r", 0, NULL, NULL); + switch_ivr_tone_detect_session(session, "fax", "1100.0", "r", 0, 1, NULL, NULL); } SWITCH_STANDARD_APP(system_session_function) @@ -1202,10 +1202,11 @@ SWITCH_STANDARD_APP(tone_detect_session_function) { - char *argv[6] = { 0 }; + char *argv[7] = { 0 }; int argc; char *mydata = NULL; time_t to = 0; + int hits = 1; if (switch_strlen_zero(data) || !(mydata = switch_core_session_strdup(session, data))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n"); @@ -1235,9 +1236,16 @@ } } + if (argv[7]) { + hits = atoi(argv[7]); + if (hits < 0) { + hits = 1; + } + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Enabling tone detection '%s' '%s'\n", argv[0], argv[1]); - switch_ivr_tone_detect_session(session, argv[0], argv[1], argv[2], to, argv[4], argv[5]); + switch_ivr_tone_detect_session(session, argv[0], argv[1], argv[2], to, hits, argv[4], argv[5]); } SWITCH_STANDARD_APP(stop_fax_detect_session_function) Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon Nov 17 21:05:11 2008 @@ -976,7 +976,6 @@ } teletone_dtmf_detect_init(&pvt->dtmf_detect, read_codec->implementation->actual_samples_per_second); - printf ("WTF %d\n", read_codec->implementation->actual_samples_per_second); pvt->session = session; @@ -1193,6 +1192,8 @@ char *key; teletone_tone_map_t map; int up; + int hits; + int sleep; } switch_tone_detect_t; typedef struct { @@ -1217,18 +1218,28 @@ frame = switch_core_media_bug_get_read_replace_frame(bug); case SWITCH_ABC_TYPE_WRITE_REPLACE: { - + if (!frame) { frame = switch_core_media_bug_get_write_replace_frame(bug); } for (i = 0; i < cont->index; i++) { + if (cont->list[i].sleep) { + cont->list[i].sleep--; + return SWITCH_TRUE; + } if (cont->list[i].up && teletone_multi_tone_detect(&cont->list[i].mt, frame->data, frame->samples)) { switch_event_t *event; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s DETECTED\n", cont->list[i].key); - cont->list[i].up = 0; - + if (cont->list[i].hits) { + cont->list[i].up = cont->list[i].hits--; + cont->list[i].sleep = 25; + teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map); + } else { + cont->list[i].up = 0; + } + if (cont->list[i].app) { if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); @@ -1279,7 +1290,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_session_t *session, const char *key, const char *tone_spec, - const char *flags, time_t timeout, const char *app, const char *data) + const char *flags, time_t timeout, int hits, const char *app, const char *data) { switch_channel_t *channel = switch_core_session_get_channel(session); switch_codec_t *read_codec = switch_core_session_get_read_codec(session); @@ -1340,7 +1351,7 @@ } } while (next); cont->list[cont->index].map.freqs[i++] = 0; - + if (!ok) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid tone spec!\n"); return SWITCH_STATUS_FALSE; @@ -1356,6 +1367,10 @@ cont->list[cont->index].data = switch_core_session_strdup(session, data); } + if (!hits) hits = 1; + + cont->list[cont->index].hits = hits; + cont->list[cont->index].up = 1; cont->list[cont->index].mt.sample_rate = read_codec->implementation->actual_samples_per_second; teletone_multi_tone_init(&cont->list[cont->index].mt, &cont->list[cont->index].map);

1 0

[commit] r10434 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 18 Nov '08

18 Nov '08

Author: brian Date: Mon Nov 17 20:23:48 2008 New Revision: 10434 Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Nov 17 20:23:48 2008 @@ -451,10 +451,15 @@ /* Unlock the session signal to allow the ack to make it in */ // Maybe we should timeout? + switch_mutex_unlock(tech_pvt->sofia_mutex); while(switch_channel_ready(channel) && !switch_test_flag(tech_pvt, TFLAG_3PCC_HAS_ACK)) { switch_cond_next(); } + + /* Regain lock on sofia */ + switch_mutex_lock(tech_pvt->sofia_mutex); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Done waiting for ACK\n"); }

1 0

[commit] r10433 - freeswitch/trunk/scripts/contrib/mrene/mod_limit
by FreeSWITCH SVN 17 Nov '08

17 Nov '08

Author: mrene Date: Mon Nov 17 17:05:40 2008 New Revision: 10433 Log: Added limit_hash_usage(realm id) api Modified: freeswitch/trunk/scripts/contrib/mrene/mod_limit/mod_limit.c Modified: freeswitch/trunk/scripts/contrib/mrene/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/scripts/contrib/mrene/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/scripts/contrib/mrene/mod_limit/mod_limit.c Mon Nov 17 17:05:40 2008 @@ -851,6 +851,44 @@ switch_mutex_unlock(globals.limit_hash_mutex); } +#define LIMIT_HASH_USAGE_USAGE "<realm> <id>" +SWITCH_STANDARD_API(limit_hash_usage_function) +{ + int argc = 0; + char *argv[3] = { 0 }; + char *mydata = NULL; + char *hash_key = NULL; + limit_hash_item_t *item = NULL; + uint32_t count = 0; + + switch_mutex_lock(globals.limit_hash_mutex); + + if (!switch_strlen_zero(cmd)) { + switch_assert(mydata = strdup(cmd)); + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + if (argc < 2) { + stream->write_function(stream, "USAGE: limit_hash_usage %s\n", LIMIT_HASH_USAGE_USAGE); + goto end; + } + + hash_key = switch_mprintf("%s_%s", argv[0], argv[1]); + + if ((item = switch_core_hash_find(globals.limit_hash, hash_key))) { + count = item->total_usage; + } + + stream->write_function(stream, "%d", count); + +end: + switch_safe_free(mydata); + switch_safe_free(hash_key); + switch_mutex_unlock(globals.limit_hash_mutex); + + return SWITCH_STATUS_SUCCESS; +} + SWITCH_MODULE_LOAD_FUNCTION(mod_limit_load) { switch_status_t status; @@ -880,6 +918,7 @@ SWITCH_ADD_APP(app_interface, "hash", "Insert into the hashtable", HASH_DESC, hash_function, HASH_USAGE, SAF_SUPPORT_NOMEDIA) SWITCH_ADD_APP(app_interface, "group", "Manage a group", GROUP_DESC, group_function, GROUP_USAGE, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_API(commands_api_interface, "limit_hash_usage", "Gets the usage count of a limited resource", limit_hash_usage_function, LIMIT_HASH_USAGE_USAGE); SWITCH_ADD_API(commands_api_interface, "db", "db get/set", db_api_function, "[insert|delete|select]/<realm>/<key>/<value>"); switch_console_set_complete("add db insert"); switch_console_set_complete("add db delete");

1 0

[commit] r10432 - freeswitch/trunk/src
by FreeSWITCH SVN 17 Nov '08

17 Nov '08

Author: anthm Date: Mon Nov 17 17:03:49 2008 New Revision: 10432 Log: update Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Nov 17 17:03:49 2008 @@ -1131,7 +1131,7 @@ } else { /* child */ close(fds[0]); dup2(fds[1], STDOUT_FILENO); - system(command); + switch_system(command, SWITCH_TRUE); close(fds[1]); exit(0); }

1 0

[commit] r10431 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by FreeSWITCH SVN 17 Nov '08

17 Nov '08

Author: anthm Date: Mon Nov 17 16:38:17 2008 New Revision: 10431 Log: put sip: into register-proxy when it's not specified Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_ivr_async.c 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 Mon Nov 17 16:38:17 2008 @@ -913,7 +913,11 @@ } if (!switch_strlen_zero(register_proxy)) { - gateway->register_sticky_proxy = switch_core_strdup(gateway->pool, register_proxy); + if (strncasecmp(register_proxy, "sip:", 4) && strncasecmp(register_proxy, "sips:", 5)) { + gateway->register_sticky_proxy = switch_core_sprintf(gateway->pool, "sip:%s", register_proxy); + } else { + gateway->register_sticky_proxy = switch_core_strdup(gateway->pool, register_proxy); + } } gateway->retry_seconds = atoi(retry_seconds); Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon Nov 17 16:38:17 2008 @@ -976,6 +976,7 @@ } teletone_dtmf_detect_init(&pvt->dtmf_detect, read_codec->implementation->actual_samples_per_second); + printf ("WTF %d\n", read_codec->implementation->actual_samples_per_second); pvt->session = session;

1 0

[commit] r10430 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 17 Nov '08

17 Nov '08

Author: andrew Date: Mon Nov 17 16:15:52 2008 New Revision: 10430 Log: actually try to handle bind_search xml responses Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Mon Nov 17 16:15:52 2008 @@ -608,16 +608,32 @@ switch_yield(10000); /* 10ms */ } - char data[MAXATOMLEN]; + int type, size; - ei_decode_atom(rep->buff, &rep->index, data); + ei_get_type(rep->buff, &rep->index, &type, &size); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got data %s after %d milliseconds!\n", data, i*10); + if (type != ERL_STRING_EXT) /* XXX no unicode or character codes > 255 */ + return NULL; + + char *xmlstr = switch_core_alloc(ptr->listener->pool, size + 1); + + ei_decode_string(rep->buff, &rep->index, xmlstr); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got data %s after %d milliseconds!\n", xmlstr, i*10); + + if (switch_strlen_zero(xmlstr)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Result\n"); + } else if (!(xml = switch_xml_parse_str(xmlstr, strlen(xmlstr)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Parsing XML Result!\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "XML parsed OK!\n"); + } switch_core_hash_delete(ptr->listener->fetch_reply_hash, uuid_str); - free(rep->buff); - free(rep); + /*switch_safe_free(rep->buff);*/ + /*switch_safe_free(rep);*/ + /*switch_safe_free(xmlstr);*/ return xml; }

1 0

[commit] r10429 - freeswitch/trunk/src
by FreeSWITCH SVN 17 Nov '08

17 Nov '08

Author: anthm Date: Mon Nov 17 15:13:12 2008 New Revision: 10429 Log: fix linksys transfers Modified: freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Nov 17 15:13:12 2008 @@ -527,6 +527,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CUSTOM RESET\n", switch_channel_get_name(channel)); switch_channel_clear_flag(channel, CF_TRANSFER); + switch_channel_clear_flag(channel, CF_ORIGINATING); if (switch_channel_test_flag(channel, CF_ORIGINATOR)) { switch_channel_set_state(channel, CS_SOFT_EXECUTE); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Nov 17 15:13:12 2008 @@ -1645,16 +1645,18 @@ continue; } - switch_channel_clear_flag(peer_channels[i], CF_ORIGINATING); if (status == SWITCH_STATUS_SUCCESS) { + switch_channel_clear_flag(peer_channels[i], CF_ORIGINATING); if (bleg && *bleg && *bleg == peer_sessions[i]) { continue; } - } else if ((state=switch_channel_get_state(peer_channels[i])) < CS_HANGUP) { - if (!(state == CS_RESET || switch_channel_test_flag(peer_channels[i], CF_TRANSFER))) { + } else if ((state=switch_channel_get_state(peer_channels[i])) < CS_HANGUP && switch_channel_test_flag(peer_channels[i], CF_ORIGINATING)) { + if (!(state == CS_RESET || switch_channel_test_flag(peer_channels[i], CF_TRANSFER) || + switch_channel_test_flag(peer_channels[i], CF_BRIDGED))) { switch_channel_hangup(peer_channels[i], *cause); } } + switch_channel_clear_flag(peer_channels[i], CF_ORIGINATING); switch_core_session_rwunlock(peer_sessions[i]); }

1 0