- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7424 - freeswitch/trunk/src
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 14:01:35 2008 New Revision: 7424 Modified: freeswitch/trunk/src/switch_event.c Log: cleanup Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Jan 29 14:01:35 2008 @@ -469,11 +469,11 @@ SWITCH_DECLARE(char *) switch_event_get_header(switch_event_t *event, char *header_name) { switch_event_header_t *hp; - if (header_name) { - for (hp = event->headers; hp; hp = hp->next) { - if (!strcasecmp(hp->name, header_name)) { - return hp->value; - } + if (!header_name) return NULL; + + for (hp = event->headers; hp; hp = hp->next) { + if (!strcasecmp(hp->name, header_name)) { + return hp->value; } } return NULL; @@ -481,11 +481,7 @@ SWITCH_DECLARE(char *) switch_event_get_body(switch_event_t *event) { - if (event) { - return event->body; - } - - return NULL; + return (event ? event->body : NULL); } SWITCH_DECLARE(switch_status_t) switch_event_del_header(switch_event_t *event, const char *header_name) @@ -792,9 +788,9 @@ static switch_xml_t add_xml_header(switch_xml_t xml, char *name, char *value, int offset) { - switch_xml_t header = NULL; + switch_xml_t header = switch_xml_add_child_d(xml, "header", offset); - if ((header = switch_xml_add_child_d(xml, "header", offset))) { + if (header) { switch_xml_set_attr_d(header, "name", name); switch_xml_set_attr_d(header, "value", value); }

1 0

[commit] r7423 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 13:28:32 2008 New Revision: 7423 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: cleanup 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 Tue Jan 29 13:28:32 2008 @@ -1274,16 +1274,17 @@ if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-USAGE: %s\n", BREAK_SYNTAX); - } else { - if ((psession = switch_core_session_locate(cmd))) { - switch_channel_t *channel = switch_core_session_get_channel(psession); - switch_channel_set_flag(channel, CF_BREAK); - switch_core_session_rwunlock(psession); - } else { - stream->write_function(stream, "-ERR No Such Channel!\n"); - } + return SWITCH_STATUS_SUCCESS; } + if (!(psession = switch_core_session_locate(cmd))) { + stream->write_function(stream, "-ERR No Such Channel!\n"); + return SWITCH_STATUS_SUCCESS; + } + + switch_channel_set_flag(switch_core_session_get_channel(psession), CF_BREAK); + switch_core_session_rwunlock(psession); + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r7422 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 13:01:19 2008 New Revision: 7422 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: cleanup 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 Tue Jan 29 13:01:19 2008 @@ -102,19 +102,18 @@ return SWITCH_STATUS_SUCCESS; } - static switch_status_t _find_user(const char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream, switch_bool_t tf) { switch_xml_t x_domain = NULL, x_user = NULL, xml = NULL; int argc; - char *mydata = NULL, *argv[3]; + char *mydata = NULL, *argv[3]; char *key, *user, *domain; char *xmlstr; char *path_info = NULL; char delim = ' '; char *host = NULL; const char *err = NULL; - + if (stream->event && (host = switch_event_get_header(stream->event, "http-host"))) { stream->write_function(stream, "Content-Type: text/xml\r\n\r\n"); if ((path_info = switch_event_get_header(stream->event, "http-path-info"))) { @@ -122,30 +121,30 @@ delim = '/'; } } - - if (!cmd) { + + if (!cmd) { err = "bad args"; - goto end; - } + goto end; + } + + mydata = strdup(cmd); + switch_assert(mydata); - mydata = strdup(cmd); - switch_assert(mydata); - - argc = switch_separate_string(mydata, delim, argv, (sizeof(argv) / sizeof(argv[0]))); + argc = switch_separate_string(mydata, delim, argv, (sizeof(argv) / sizeof(argv[0]))); - if (argc < 3) { + if (argc < 3) { err = "bad args"; - goto end; - } + goto end; + } key = argv[0]; user = argv[1]; domain = argv[2]; - if (!(key && user && domain)) { + if (!(key && user && domain)) { err = "bad args"; - goto end; - } + goto end; + } if (switch_xml_locate_user(key, user, domain, NULL, &xml, &x_domain, &x_user, NULL) != SWITCH_STATUS_SUCCESS) { err = "can't find user"; @@ -168,7 +167,7 @@ if (xml && x_user) { xmlstr = switch_xml_toxml(x_user, SWITCH_FALSE); switch_assert(xmlstr); - + stream->write_function(stream, "%s", xmlstr); free(xmlstr); switch_xml_free(xml); @@ -177,7 +176,6 @@ free(mydata); return SWITCH_STATUS_SUCCESS; - } SWITCH_STANDARD_API(user_exists_function) @@ -194,7 +192,7 @@ { switch_xml_t xml = NULL, obj = NULL; int argc; - char *mydata = NULL, *argv[4]; + char *mydata = NULL, *argv[4]; char *section, *tag, *tag_attr_name, *tag_attr_val; switch_event_t *params = NULL; char *xmlstr; @@ -210,33 +208,33 @@ } } - if (!cmd) { + if (!cmd) { err = "bad args"; - goto end; - } + goto end; + } mydata = strdup(cmd); - switch_assert(mydata); - - argc = switch_separate_string(mydata, delim, argv, (sizeof(argv) / sizeof(argv[0]))); + switch_assert(mydata); + + argc = switch_separate_string(mydata, delim, argv, (sizeof(argv) / sizeof(argv[0]))); - if (argc == 1 && !strcasecmp(argv[0], "root")) { + if (argc == 1 && !strcasecmp(argv[0], "root")) { const char *error; xml = switch_xml_open_root(0, &error); obj = xml; - goto end; - } + goto end; + } - if (argc < 4) { + if (argc < 4) { err = "bad args"; - goto end; - } + goto end; + } section = argv[0]; tag = argv[1]; tag_attr_name = argv[2]; tag_attr_val = argv[3]; - + switch_event_create(&params, SWITCH_EVENT_MESSAGE); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "section", section); @@ -250,8 +248,6 @@ } end: - switch_event_destroy(&params); - if (err) { if (host) { stream->write_function(stream, "<error>%s</error>\n", err); @@ -260,8 +256,6 @@ } } - switch_safe_free(params); - if (xml && obj) { xmlstr = switch_xml_toxml(obj, SWITCH_FALSE); switch_assert(xmlstr); @@ -269,12 +263,12 @@ stream->write_function(stream, "%s", xmlstr); free(xmlstr); switch_xml_free(xml); - + } + switch_event_destroy(&params); free(mydata); return SWITCH_STATUS_SUCCESS; - } SWITCH_STANDARD_API(regex_function) @@ -282,23 +276,23 @@ switch_regex_t *re = NULL; int ovector[30]; int argc; - char *mydata = NULL, *argv[3]; + char *mydata = NULL, *argv[3]; size_t len = 0; char *substituted = NULL; int proceed = 0; - if (!cmd) { - goto error; - } - - mydata = strdup(cmd); - switch_assert(mydata); - - argc = switch_separate_string(mydata, '|', argv, (sizeof(argv) / sizeof(argv[0]))); - - if (argc < 2) { - goto error; - } + if (!cmd) { + goto error; + } + + mydata = strdup(cmd); + switch_assert(mydata); + + argc = switch_separate_string(mydata, '|', argv, (sizeof(argv) / sizeof(argv[0]))); + + if (argc < 2) { + goto error; + } if ((proceed = switch_regex_perform(argv[0], argv[1], &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { if (argc > 2) { @@ -317,145 +311,140 @@ } else { stream->write_function(stream, "false"); } - goto ok; - error: - stream->write_function(stream, "-ERR"); - ok: - +error: + stream->write_function(stream, "-ERR"); +ok: switch_regex_safe_free(re); - switch_safe_free(mydata); - - return SWITCH_STATUS_SUCCESS; + switch_safe_free(mydata); + return SWITCH_STATUS_SUCCESS; } typedef enum { - O_NONE, - O_EQ, - O_NE, - O_GT, - O_GE, - O_LT, - O_LE + O_NONE, + O_EQ, + O_NE, + O_GT, + O_GE, + O_LT, + O_LE } o_t; SWITCH_STANDARD_API(cond_function) { - int argc; + int argc; char *mydata = NULL, *argv[3]; - char *expr; - char *a, *b; - double a_f = 0.0, b_f = 0.0; - o_t o = O_NONE; - int is_true = 0; - char *p; - - if (!cmd) { - goto error; - } - - mydata = strdup(cmd); - switch_assert(mydata); - - if ((p = strchr(mydata, '?'))) { - *p = ':'; - } else { - goto error; - } - - argc = switch_separate_string(mydata, ':', argv, (sizeof(argv) / sizeof(argv[0]))); - - if (argc != 3) { - goto error; - } - - a = argv[0]; - - if ((expr = strchr(a, '!'))) { - *expr++ = '\0'; - if (*expr == '=') { - o = O_NE; - } - } else if ((expr = strchr(a, '>'))) { - if (*(expr+1) == '=') { - *expr++ = '\0'; - o = O_GE; - } else { - o = O_GT; - } - } else if ((expr = strchr(a, '<'))) { - if (*(expr+1) == '=') { - *expr++ = '\0'; - o = O_LE; - } else { - o = O_LT; - } - } else if ((expr = strchr(a, '='))) { - *expr++ = '\0'; - if (*expr == '=') { - o = O_EQ; - } - } - - - if (o) { - char *s_a = NULL, *s_b = NULL; - int a_is_num, b_is_num; - *expr++ = '\0'; - b = expr; - s_a = switch_strip_spaces(a); - s_b = switch_strip_spaces(b); - a_is_num = switch_is_number(s_a); - b_is_num = switch_is_number(s_b); - - a_f = a_is_num ? atof(s_a) : (float) strlen(s_a); - b_f = b_is_num ? atof(s_b) : (float) strlen(s_b); - - switch (o) { - case O_EQ: - if (!a_is_num && !b_is_num) { - is_true = !strcmp(s_a, s_b); - } else { - is_true = a_f == b_f; - } - break; - case O_NE: - if (!a_is_num && !b_is_num) { - is_true = strcmp(s_a, s_b); - } else { - is_true = a_f != b_f; - } - break; - case O_GT: - is_true = a_f > b_f; - break; - case O_GE: - is_true = a_f >= b_f; - break; - case O_LT: - is_true = a_f < b_f; - break; - case O_LE: - is_true = a_f <= b_f; - break; - default: - break; - } - switch_safe_free(s_a); - switch_safe_free(s_b); - stream->write_function(stream, "%s", is_true ? argv[1] : argv[2]); - goto ok; - } - - error: - stream->write_function(stream, "-ERR"); - ok: + char *expr; + char *a, *b; + double a_f = 0.0, b_f = 0.0; + o_t o = O_NONE; + int is_true = 0; + char *p; - switch_safe_free(mydata); - return SWITCH_STATUS_SUCCESS; -} + if (!cmd) { + goto error; + } + + mydata = strdup(cmd); + switch_assert(mydata); + + if ((p = strchr(mydata, '?'))) { + *p = ':'; + } else { + goto error; + } + argc = switch_separate_string(mydata, ':', argv, (sizeof(argv) / sizeof(argv[0]))); + + if (argc != 3) { + goto error; + } + + a = argv[0]; + + if ((expr = strchr(a, '!'))) { + *expr++ = '\0'; + if (*expr == '=') { + o = O_NE; + } + } else if ((expr = strchr(a, '>'))) { + if (*(expr+1) == '=') { + *expr++ = '\0'; + o = O_GE; + } else { + o = O_GT; + } + } else if ((expr = strchr(a, '<'))) { + if (*(expr+1) == '=') { + *expr++ = '\0'; + o = O_LE; + } else { + o = O_LT; + } + } else if ((expr = strchr(a, '='))) { + *expr++ = '\0'; + if (*expr == '=') { + o = O_EQ; + } + } + + if (o) { + char *s_a = NULL, *s_b = NULL; + int a_is_num, b_is_num; + *expr++ = '\0'; + b = expr; + s_a = switch_strip_spaces(a); + s_b = switch_strip_spaces(b); + a_is_num = switch_is_number(s_a); + b_is_num = switch_is_number(s_b); + + a_f = a_is_num ? atof(s_a) : (float) strlen(s_a); + b_f = b_is_num ? atof(s_b) : (float) strlen(s_b); + + switch (o) { + case O_EQ: + if (!a_is_num && !b_is_num) { + is_true = !strcmp(s_a, s_b); + } else { + is_true = a_f == b_f; + } + break; + case O_NE: + if (!a_is_num && !b_is_num) { + is_true = strcmp(s_a, s_b); + } else { + is_true = a_f != b_f; + } + break; + case O_GT: + is_true = a_f > b_f; + break; + case O_GE: + is_true = a_f >= b_f; + break; + case O_LT: + is_true = a_f < b_f; + break; + case O_LE: + is_true = a_f <= b_f; + break; + default: + break; + } + switch_safe_free(s_a); + switch_safe_free(s_b); + stream->write_function(stream, "%s", is_true ? argv[1] : argv[2]); + goto ok; + } + +error: + stream->write_function(stream, "-ERR"); +ok: + + switch_safe_free(mydata); + return SWITCH_STATUS_SUCCESS; +} SWITCH_STANDARD_API(lan_addr_function) { @@ -469,7 +458,7 @@ switch_core_time_duration_t duration = {0}; char *http = NULL; int sps = 0, last_sps = 0; - + if (session) { return SWITCH_STATUS_FALSE; } @@ -486,11 +475,11 @@ } stream->write_function(stream, - "UP %u year%s, %u day%s, %u hour%s, %u minute%s, %u second%s, %u millisecond%s, %u microsecond%s\n", - duration.yr, duration.yr == 1 ? "" : "s", duration.day, duration.day == 1 ? "" : "s", - duration.hr, duration.hr == 1 ? "" : "s", duration.min, duration.min == 1 ? "" : "s", - duration.sec, duration.sec == 1 ? "" : "s", duration.ms, duration.ms == 1 ? "" : "s", duration.mms, - duration.mms == 1 ? "" : "s"); + "UP %u year%s, %u day%s, %u hour%s, %u minute%s, %u second%s, %u millisecond%s, %u microsecond%s\n", + duration.yr, duration.yr == 1 ? "" : "s", duration.day, duration.day == 1 ? "" : "s", + duration.hr, duration.hr == 1 ? "" : "s", duration.min, duration.min == 1 ? "" : "s", + duration.sec, duration.sec == 1 ? "" : "s", duration.ms, duration.ms == 1 ? "" : "s", duration.mms, + duration.mms == 1 ? "" : "s"); stream->write_function(stream, "%"SWITCH_SIZE_T_FMT" session(s) since startup\n", switch_core_session_id() - 1 ); switch_core_session_ctl(SCSC_LAST_SPS, &last_sps); @@ -589,14 +578,13 @@ } stream->write_function(stream, "+OK\n"); - end: +end: free(mydata); } else { stream->write_function(stream, "-ERR Memory error\n"); } return SWITCH_STATUS_SUCCESS; - } #define LOAD_SYNTAX "<mod_name>" @@ -685,7 +673,6 @@ return SWITCH_STATUS_SUCCESS; } - #define PARK_SYNTAX "<uuid>" SWITCH_STANDARD_API(park_function) { @@ -788,7 +775,6 @@ time_t to = 0; switch_core_session_t *rsession; - if (!cmd) { stream->write_function(stream, "-USAGE: %s\n", TONE_DETECT_SYNTAX); return SWITCH_STATUS_SUCCESS; @@ -802,13 +788,11 @@ return SWITCH_STATUS_SUCCESS; } - if (!(rsession = switch_core_session_locate(argv[0]))) { stream->write_function(stream, "-ERR Error Cannot locate session!\n"); return SWITCH_STATUS_SUCCESS; } - if (argv[4]) { uint32_t mto; if (*argv[4] == '+') { @@ -830,7 +814,7 @@ switch_ivr_tone_detect_session(rsession, argv[1], argv[2], argv[3], to, argv[5], argv[6]); stream->write_function(stream, "+OK Enabling tone detection '%s' '%s' '%s'\n", argv[1], argv[2], argv[3]); - done: +done: free(mydata); switch_core_session_rwunlock(rsession); @@ -838,14 +822,13 @@ return SWITCH_STATUS_SUCCESS; } - SWITCH_STANDARD_API(uuid_function) { switch_uuid_t uuid; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; switch_uuid_get(&uuid); - switch_uuid_format(uuid_str, &uuid); + switch_uuid_format(uuid_str, &uuid); stream->write_function(stream, "%s", uuid_str); return SWITCH_STATUS_SUCCESS; } @@ -886,8 +869,6 @@ return SWITCH_STATUS_SUCCESS; } - - #define SCHED_TRANSFER_SYNTAX "[+]<time> <uuid> <extension> [<dialplan>] [<context>]" SWITCH_STANDARD_API(sched_transfer_function) { @@ -1189,7 +1170,7 @@ action = argv[1]; path = argv[2]; limit = argv[3] ? atoi(argv[3]) : 0; - + if (switch_strlen_zero(uuid) || switch_strlen_zero(action) || switch_strlen_zero(path)) { goto usage; } @@ -1198,7 +1179,7 @@ stream->write_function(stream, "-ERR Cannot locate session!\n"); return SWITCH_STATUS_SUCCESS; } - + if (!strcasecmp(action, "start")) { switch_ivr_record_session(rsession, path, limit, NULL); } else if (!strcasecmp(action, "stop")) { @@ -1209,14 +1190,11 @@ goto done; - usage: - +usage: stream->write_function(stream, "-USAGE: %s\n", SESS_REC_SYNTAX); switch_safe_free(mycmd); - - done: - +done: if (rsession) { switch_core_session_rwunlock(rsession); } @@ -1225,7 +1203,7 @@ return SWITCH_STATUS_SUCCESS; } - +#define DISPLACE_SYNTAX "<uuid> [start|stop] <path> [<limit>] [mux]" SWITCH_STANDARD_API(session_displace_function) { switch_core_session_t *rsession = NULL; @@ -1239,11 +1217,7 @@ return SWITCH_STATUS_FALSE; } - if (switch_strlen_zero(cmd)) { - goto usage; - } - - if (!(mycmd = strdup(cmd))) { + if (switch_strlen_zero(cmd) || !(mycmd = strdup(cmd))) { goto usage; } @@ -1265,7 +1239,7 @@ stream->write_function(stream, "-ERR Cannot locate session!\n"); return SWITCH_STATUS_SUCCESS; } - + if (!strcasecmp(action, "start")) { switch_ivr_displace_session(rsession, path, limit, flags); } else if (!strcasecmp(action, "stop")) { @@ -1276,14 +1250,11 @@ goto done; - usage: - - stream->write_function(stream, "-ERR INVALID SYNTAX\n"); +usage: + stream->write_function(stream, "-USAGE: %s\n", DISPLACE_SYNTAX); switch_safe_free(mycmd); - - done: - +done: if (rsession) { switch_core_session_rwunlock(rsession); } @@ -1316,7 +1287,6 @@ return SWITCH_STATUS_SUCCESS; } - #define PAUSE_SYNTAX "<uuid> <on|off>" SWITCH_STANDARD_API(pause_function) { @@ -1370,7 +1340,7 @@ switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; uint8_t machine = 1; switch_status_t status = SWITCH_STATUS_SUCCESS; - + if (session || switch_strlen_zero(cmd)) { stream->write_function(stream, "-ERR Illegal Usage\n"); return SWITCH_STATUS_SUCCESS; @@ -1379,12 +1349,11 @@ mycmd = strdup(cmd); switch_assert(mycmd); argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - + if (argc < 2 || argc > 7) { stream->write_function(stream, "-USAGE: %s\n", ORIGINATE_SYNTAX); goto done; } - for (x = 0; x < argc && argv[x]; x++) { if (!strcasecmp(argv[x], "undef")) { @@ -1427,7 +1396,7 @@ caller_channel = switch_core_session_get_channel(caller_session); switch_channel_clear_state_handler(caller_channel, NULL); - + if (*exten == '&' && *(exten + 1)) { switch_caller_extension_t *extension = NULL; char *app_name = switch_core_session_strdup(caller_session, (exten + 1)); @@ -1462,7 +1431,7 @@ switch_core_session_rwunlock(caller_session); } - done: +done: switch_safe_free(mycmd); return status; } @@ -1494,7 +1463,7 @@ stream->write_function(stream, "-ERR Invalid syntax\n"); return SWITCH_STATUS_SUCCESS; } - + if (switch_is_digit_string(cmd)) { int64_t tmp; tmp = (uint32_t) atoi(cmd); @@ -1520,7 +1489,7 @@ stream->write_function(stream, "-ERR Invalid syntax\n"); return SWITCH_STATUS_SUCCESS; } - + if ((dcommand = strdup(cmd))) { if (!strncasecmp(dcommand, "encoded ", 8)) { encoded++; @@ -1549,13 +1518,13 @@ } stream->write_function(stream, - "<result>\n" - " <row id=\"1\">\n" - " <data>%s</data>\n" - " </row>\n" - "</result>\n", - send ? send : "ERROR" - ); + "<result>\n" + " <row id=\"1\">\n" + " <data>%s</data>\n" + " </row>\n" + "</result>\n", + send ? send : "ERROR" + ); switch_safe_free(mystream.data); switch_safe_free(edata); free(dcommand); @@ -1589,7 +1558,7 @@ } else { when = atol(tm); } - + id = switch_scheduler_add_task(when, sch_api_callback, (char *) __SWITCH_FUNC__, group, 0, strdup(dcmd), SSHF_FREE_ARG); stream->write_function(stream, "+OK Added: %u\n", id); goto good; @@ -1598,14 +1567,11 @@ stream->write_function(stream, "-ERR Invalid syntax\n"); - good: - +good: switch_safe_free(tm); - return SWITCH_STATUS_SUCCESS; } - struct bg_job { char *cmd; char *arg; @@ -1615,14 +1581,13 @@ static void *SWITCH_THREAD_FUNC bgapi_exec(switch_thread_t *thread, void *obj) { - struct bg_job *job = (struct bg_job *) obj; switch_stream_handle_t stream = { 0 }; switch_status_t status; char *reply, *freply = NULL; switch_event_t *event; char *arg; - + SWITCH_STANDARD_STREAM(stream); if ((arg = strchr(job->cmd, ' '))) { @@ -1670,7 +1635,7 @@ switch_memory_pool_t *pool; switch_thread_t *thread; switch_threadattr_t *thd_attr = NULL; - + if (!cmd) { stream->write_function(stream, "-ERR Invalid syntax\n"); return SWITCH_STATUS_SUCCESS; @@ -1693,7 +1658,6 @@ return SWITCH_STATUS_SUCCESS; } - struct holder { switch_stream_handle_t *stream; char *http; @@ -1750,7 +1714,6 @@ struct holder *holder = (struct holder *) pArg; int x; - if (holder->print_title && holder->count == 0) { if (holder->http) { holder->stream->write_function(holder->stream, "\n<tr>"); @@ -1758,8 +1721,6 @@ for (x = 0; x < argc; x++) { char *name = columnNames[x]; - - if (!name) { name = "undefined"; } @@ -1820,7 +1781,7 @@ as = argv[2]; } } - + if (stream->event) { holder.http = switch_event_get_header(stream->event, "http-host"); } @@ -1832,8 +1793,8 @@ return SWITCH_STATUS_SUCCESS; } - // If you changes the field qty or order of any of these select - // statmements, you must also change show_callback and friends to match! + /* If you changes the field qty or order of any of these select /* + /* statmements, you must also change show_callback and friends to match! */ if (!command) { stream->write_function(stream, "-USAGE: %s\n", SHOW_SYNTAX); return SWITCH_STATUS_SUCCESS; @@ -2045,13 +2006,11 @@ stream->write_function(stream, "-USAGE: %s\n", GETVAR_SYNTAX); - done: +done: switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } - - #define DUMP_SYNTAX "<uuid> [format]" SWITCH_STANDARD_API(uuid_dump_function) { @@ -2068,7 +2027,7 @@ if (argc >= 0) { char *uuid = argv[0]; char *format = argv[1]; - + if ((psession = switch_core_session_locate(uuid))) { switch_channel_t *channel; switch_event_t *event; @@ -2081,8 +2040,8 @@ switch_channel_event_set_data(channel, event); if (format && !strcasecmp(format, "xml")) { if ((xml = switch_event_xmlize(event, "%s", ""))) { - buf = switch_xml_toxml(xml, SWITCH_FALSE); - switch_xml_free(xml); + buf = switch_xml_toxml(xml, SWITCH_FALSE); + switch_xml_free(xml); } else { stream->write_function(stream, "-ERR Unable to create xml!\n"); switch_core_session_rwunlock(psession); @@ -2091,7 +2050,7 @@ } else { switch_event_serialize(event, &buf, SWITCH_TRUE); } - + switch_assert(buf); stream->raw_write_function(stream, (unsigned char *)buf, strlen(buf)); switch_event_destroy(&event); @@ -2111,15 +2070,11 @@ stream->write_function(stream, "-USAGE: %s\n", DUMP_SYNTAX); - done: +done: switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; } - - - - #define GLOBAL_SETVAR_SYNTAX "<var> <value>" SWITCH_STANDARD_API(global_setvar_function) { @@ -2158,10 +2113,10 @@ } stream->write_function(stream, "-USAGE: %s\n", GLOBAL_GETVAR_SYNTAX); - done: +done: return SWITCH_STATUS_SUCCESS; } - + SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load) { switch_api_interface_t *commands_api_interface; @@ -2187,8 +2142,7 @@ SWITCH_ADD_API(commands_api_interface, "uuid_dump", "uuid_dump", uuid_dump_function, DUMP_SYNTAX); SWITCH_ADD_API(commands_api_interface, "global_setvar", "global_setvar", global_setvar_function, GLOBAL_SETVAR_SYNTAX); SWITCH_ADD_API(commands_api_interface, "global_getvar", "global_getvar", global_getvar_function, GLOBAL_GETVAR_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "session_displace", "session displace (depricated)", - session_displace_function, "<uuid> [start|stop] <path> [<limit>] [mux]"); + SWITCH_ADD_API(commands_api_interface, "session_displace", "session displace (depricated)", session_displace_function, DISPLACE_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_displace", "session displace", session_displace_function, "<uuid> [start|stop] <path> [<limit>] [mux]"); SWITCH_ADD_API(commands_api_interface, "session_record", "session record (depricated)", session_record_function, SESS_REC_SYNTAX); SWITCH_ADD_API(commands_api_interface, "uuid_record", "session record", session_record_function, SESS_REC_SYNTAX); @@ -2211,8 +2165,6 @@ SWITCH_ADD_API(commands_api_interface, "xml_wrap", "Wrap another api command in xml", xml_wrap_api_function, "<command> <args>"); SWITCH_ADD_API(commands_api_interface, "is_lan_addr", "see if an ip is a lan addr", lan_addr_function, "<ip>"); SWITCH_ADD_API(commands_api_interface, "cond", "Eval a conditional", cond_function, "<expr> ? <true val> : <false val>"); - // remove me before final release - SWITCH_ADD_API(commands_api_interface, "qq", "Eval a conditional", cond_function, "<expr> ? <true val> : <false val>"); SWITCH_ADD_API(commands_api_interface, "regex", "Eval a regex", regex_function, "<data>|<pattern>[|<subst string>]"); SWITCH_ADD_API(commands_api_interface, "uuid_chat", "Send a chat message", uuid_chat, UUID_CHAT_SYNTAX); SWITCH_ADD_API(commands_api_interface, "find_user_xml", "find a user", find_user_function, "<key> <user> <domain>");

1 0

[commit] r7421 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 12:48:10 2008 New Revision: 7421 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: cleanup 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 Tue Jan 29 12:48:10 2008 @@ -190,9 +190,6 @@ return _find_user(cmd, session, stream, SWITCH_FALSE); } - - - SWITCH_STANDARD_API(xml_locate_function) { switch_xml_t xml = NULL, obj = NULL; @@ -218,8 +215,7 @@ goto end; } - - mydata = strdup(cmd); + mydata = strdup(cmd); switch_assert(mydata); argc = switch_separate_string(mydata, delim, argv, (sizeof(argv) / sizeof(argv[0]))); @@ -253,9 +249,7 @@ goto end; } - - end: - +end: switch_event_destroy(&params); if (err) { @@ -306,7 +300,6 @@ goto error; } - if ((proceed = switch_regex_perform(argv[0], argv[1], &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { if (argc > 2) { len = strlen(argv[0]) * 3; @@ -335,7 +328,6 @@ switch_safe_free(mydata); return SWITCH_STATUS_SUCCESS; - } typedef enum { @@ -462,8 +454,6 @@ switch_safe_free(mydata); return SWITCH_STATUS_SUCCESS; - - } @@ -597,8 +587,7 @@ stream->write_function(stream, "-ERR INVALID COMMAND\nUSAGE: fsctl %s", CTL_SYNTAX); goto end; } - - + stream->write_function(stream, "+OK\n"); end: free(mydata); @@ -725,65 +714,65 @@ switch_core_session_t *tsession = NULL, *other_session = NULL; char *mycmd = NULL, *argv[5] = { 0 }; int argc = 0; + char *tuuid = argv[0]; + char *dest = argv[1]; + char *dp = argv[2]; + char *context = argv[3]; + char *arg = NULL; if (session) { return SWITCH_STATUS_FALSE; } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { - argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - if (argc >= 2 && argc <= 5) { - char *tuuid = argv[0]; - char *dest = argv[1]; - char *dp = argv[2]; - char *context = argv[3]; - char *arg = NULL; - - if ((tsession = switch_core_session_locate(tuuid))) { - - if (*dest == '-') { - arg = dest; - dest = argv[2]; - dp = argv[3]; - context = argv[4]; - } + if (switch_strlen_zero(cmd) || !(mycmd = strdup(cmd))) { + stream->write_function(stream, "-USAGE: %s\n", TRANSFER_SYNTAX); + return SWITCH_STATUS_SUCCESS; + } - if (arg) { - switch_channel_t *channel = switch_core_session_get_channel(tsession); - arg++; - if (!strcasecmp(arg, "bleg")) { - const char *uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE); - if (uuid && (other_session = switch_core_session_locate(uuid))) { - switch_core_session_t *tmp = tsession; - tsession = other_session; - other_session = NULL; - switch_core_session_rwunlock(tmp); - } - } else if (!strcasecmp(arg, "both")) { - const char *uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE); - if (uuid && (other_session = switch_core_session_locate(uuid))) { - switch_ivr_session_transfer(other_session, dest, dp, context); - switch_core_session_rwunlock(other_session); - } - } - } - - if (switch_ivr_session_transfer(tsession, dest, dp, context) == SWITCH_STATUS_SUCCESS) { - stream->write_function(stream, "+OK\n"); - } else { - stream->write_function(stream, "-ERR\n"); - } + argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + if (argc < 2 || argc > 5) { + stream->write_function(stream, "-USAGE: %s\n", TRANSFER_SYNTAX); + goto done; + } - switch_core_session_rwunlock(tsession); - - } else { - stream->write_function(stream, "-ERR No Such Channel!\n"); + if (!(tsession = switch_core_session_locate(tuuid))) { + stream->write_function(stream, "-ERR No Such Channel!\n"); + goto done; + } + + if (*dest == '-') { + arg = dest; + dest = argv[2]; + dp = argv[3]; + context = argv[4]; + } + + if (arg) { + switch_channel_t *channel = switch_core_session_get_channel(tsession); + const char *uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE); + arg++; + if (!strcasecmp(arg, "bleg")) { + if (uuid && (other_session = switch_core_session_locate(uuid))) { + switch_core_session_t *tmp = tsession; + tsession = other_session; + other_session = NULL; + switch_core_session_rwunlock(tmp); + } + } else if (!strcasecmp(arg, "both")) { + if (uuid && (other_session = switch_core_session_locate(uuid))) { + switch_ivr_session_transfer(other_session, dest, dp, context); + switch_core_session_rwunlock(other_session); } - goto done; } } - stream->write_function(stream, "-USAGE: %s\n", TRANSFER_SYNTAX); + if (switch_ivr_session_transfer(tsession, dest, dp, context) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "+OK\n"); + } else { + stream->write_function(stream, "-ERR\n"); + } + + switch_core_session_rwunlock(tsession); done: switch_safe_free(mycmd);

1 0

[commit] r7420 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 12:24:18 2008 New Revision: 7420 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: cleanup 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 Tue Jan 29 12:24:18 2008 @@ -45,27 +45,18 @@ { switch_xml_t x_domain, xml = NULL, x_user = NULL, x_param, x_params; int argc; - char *mydata = NULL, *argv[3]; - char *key = NULL, *type = NULL, *user, *domain; + char *mydata = NULL, *argv[3], *key = NULL, *type = NULL, *user, *domain; char delim = ' '; - const char *err = NULL; const char *container = "params", *elem = "param"; switch_event_t *params = NULL; - if (!cmd) { - err = "bad args"; - goto end; - } - - mydata = strdup(cmd); - switch_assert(mydata); - - argc = switch_separate_string(mydata, delim, argv, (sizeof(argv) / sizeof(argv[0]))); + if (switch_strlen_zero(cmd) || !(mydata = strdup(cmd))) { + goto end; + } - if (argc < 3) { - err = "bad args"; - goto end; - } + if ((argc = switch_separate_string(mydata, delim, argv, (sizeof(argv) / sizeof(argv[0])))) < 3) { + goto end; + } user = argv[0]; type = argv[1]; @@ -76,56 +67,39 @@ } else { domain = "cluecon.com"; } - + switch_event_create(&params, SWITCH_EVENT_MESSAGE); - switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "user", user); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "domain", domain); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "type", type); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "key", key); + if (key && type && switch_xml_locate_user("id", user, domain, NULL, &xml, &x_domain, &x_user, params) == SWITCH_STATUS_SUCCESS) { + if (!strcmp(type, "var")) { + container = "variables"; + elem = "variable"; + } - if (switch_xml_locate_user("id", user, domain, NULL, &xml, &x_domain, &x_user, params) != SWITCH_STATUS_SUCCESS) { - err = "can't find user"; - goto end; - } - - - end: - - switch_event_destroy(&params); - - - if (xml) { - if (err) { - //stream->write_function(stream, "-Error %s\n", err); - } else { - if (!strcmp(type, "var")) { - container = "variables"; - elem = "variable"; - } - - if ((x_params = switch_xml_child(x_user, container))) { - for (x_param = switch_xml_child(x_params, elem); x_param; x_param = x_param->next) { - const char *var = switch_xml_attr(x_param, "name"); - const char *val = switch_xml_attr(x_param, "value"); - - if (!strcasecmp(var, key)) { - stream->write_function(stream, "%s", val); - break; - } - + if ((x_params = switch_xml_child(x_user, container))) { + for (x_param = switch_xml_child(x_params, elem); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr(x_param, "name"); + const char *val = switch_xml_attr(x_param, "value"); + + if (var && val && !strcasecmp(var, key)) { + stream->write_function(stream, "%s", val); + break; } + } } - switch_xml_free(xml); } +end: + switch_xml_free(xml); free(mydata); - switch_safe_free(params); + switch_event_destroy(&params); return SWITCH_STATUS_SUCCESS; - } @@ -178,9 +152,7 @@ goto end; } - - end: - +end: if (session || tf) { stream->write_function(stream, err ? "false" : "true"); switch_xml_free(xml);

1 0

[commit] r7419 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 12:15:33 2008 New Revision: 7419 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Log: typo from merge conflict Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Tue Jan 29 12:15:33 2008 @@ -828,7 +828,6 @@ } free(data); - } } /** Check home consistency.

1 0

[commit] r7418 - in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua: nta nta/sofia-sip su
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Tue Jan 29 11:03:01 2008 New Revision: 7418 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Log: merge to sofia trunk (backport fixes from freeswitch and some new api's) Thu Jan 24 03:26:58 EST 2008 Pekka.Pessi(a)nokia.com * nta.c, sofia-sip.nta.h: added nta_leg_get_seq(), nta_leg_get_rseq() Mon Jan 28 09:27:03 EST 2008 Pekka.Pessi(a)nokia.com * su_alloc.c: su_free() handles NULL gracefully Patch by Michael Jerris. Mon Jan 28 09:30:48 EST 2008 Pekka.Pessi(a)nokia.com * su_root.c: try not to segfault in su_msg_destroy() Reduced window for race condition in su_msg_destroy(). Patch by Michael Jerris. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Jan 29 11:03:01 2008 @@ -3920,6 +3920,18 @@ return NULL; } +/** Get local request sequence number. */ +uint32_t nta_leg_get_seq(nta_leg_t const *leg) +{ + return leg ? leg->leg_seq : 0; +} + +/** Get remote request sequence number. */ +uint32_t nta_leg_get_rseq(nta_leg_t const *leg) +{ + return leg ? leg->leg_rseq : 0; +} + /** Save target and route set at UAC side. * * @sa nta_leg_server_route(), @RFC3261 section 12.1.2 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta.h Tue Jan 29 11:03:01 2008 @@ -210,6 +210,12 @@ /** Get remote tag. */ SOFIAPUBFUN char const *nta_leg_get_rtag(nta_leg_t const *leg); +/** Get local request sequence number. @NEW_1_12_9 */ +SOFIAPUBFUN uint32_t nta_leg_get_seq(nta_leg_t const *leg); + +/** Get remote request sequence number. @NEW_1_12_9 */ +SOFIAPUBFUN uint32_t nta_leg_get_rseq(nta_leg_t const *leg); + /** Set UAC route. */ SOFIAPUBFUN int nta_leg_client_route(nta_leg_t *leg, sip_record_route_t const *route, Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Tue Jan 29 11:03:01 2008 @@ -780,7 +780,9 @@ */ void su_free(su_home_t *home, void *data) { - if (data) { + if (!data) + return; + if (home) { su_alloc_t *allocation; su_block_t *sub = MEMLOCK(home); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Tue Jan 29 11:03:01 2008 @@ -1046,10 +1046,13 @@ */ void su_msg_destroy(su_msg_r rmsg) { - su_msg_t *msg = rmsg[0]; + su_msg_t *msg; + assert(rmsg); rmsg[0] = NULL; + msg = rmsg[0], rmsg[0] = NULL; + if (msg) { SU_TASK_ZAP(msg->sum_to, su_msg_destroy); SU_TASK_ZAP(msg->sum_from, su_msg_destroy);

1 0

[commit] r7417 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 29 Jan '08

29 Jan '08

Author: mikej Date: Mon Jan 28 23:41:29 2008 New Revision: 7417 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: cleanup, refactor, reduce indentation. Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Jan 28 23:41:29 2008 @@ -352,19 +352,19 @@ { switch_status_t status = SWITCH_STATUS_SUCCESS; - if (member) { - if (member->session) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - } + if (!member) return status; - if (member->conference) { - status = conference_add_event_data(member->conference, event); - } + if (member->session) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + } - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + if (member->conference) { + status = conference_add_event_data(member->conference, event); } + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + return status; } @@ -384,38 +384,28 @@ /* if other_member has a relationship with member, produce it */ static conference_relationship_t *member_get_relationship(conference_member_t * member, conference_member_t * other_member) { - conference_relationship_t *rel = NULL; - - if (member != NULL && other_member != NULL) { - conference_relationship_t *global = NULL; - - switch_mutex_lock(member->flag_mutex); - switch_mutex_lock(other_member->flag_mutex); + conference_relationship_t *rel = NULL, *global = NULL; - if (member->relationships) { - for (rel = member->relationships; rel; rel = rel->next) { - if (rel->id == other_member->id) { - break; - } + if (member == NULL || other_member == NULL || member->relationships == NULL) return NULL; - /* 0 matches everyone. - (We will still test the others brcause a real match carries more clout) */ + switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(other_member->flag_mutex); - if (rel->id == 0) { - global = rel; - } - } + for (rel = member->relationships; rel; rel = rel->next) { + if (rel->id == other_member->id) { + break; } - switch_mutex_unlock(other_member->flag_mutex); - switch_mutex_unlock(member->flag_mutex); - - if (!rel && global) { - rel = global; + /* 0 matches everyone. (We will still test the others brcause a real match carries more clout) */ + if (rel->id == 0) { + global = rel; } } - return rel; + switch_mutex_unlock(other_member->flag_mutex); + switch_mutex_unlock(member->flag_mutex); + + return rel ? rel : global; } /* traverse the conference member list for the specified member id and return it's pointer */ @@ -472,14 +462,14 @@ { conference_relationship_t *rel = NULL; - if (member != NULL && id != 0 && (rel = switch_core_alloc(member->pool, sizeof(*rel)))) { - rel->id = id; + if (member == NULL || id == 0 || !(rel = switch_core_alloc(member->pool, sizeof(*rel)))) return NULL; - switch_mutex_lock(member->flag_mutex); - rel->next = member->relationships; - member->relationships = rel; - switch_mutex_unlock(member->flag_mutex); - } + rel->id = id; + + switch_mutex_lock(member->flag_mutex); + rel->next = member->relationships; + member->relationships = rel; + switch_mutex_unlock(member->flag_mutex); return rel; } @@ -490,23 +480,23 @@ switch_status_t status = SWITCH_STATUS_FALSE; conference_relationship_t *rel, *last = NULL; - if (member != NULL && id != 0) { - switch_mutex_lock(member->flag_mutex); - for (rel = member->relationships; rel; rel = rel->next) { - if (rel->id == id) { - /* we just forget about rel here cos it was allocated by the member's pool - it will be freed when the member is */ - status = SWITCH_STATUS_SUCCESS; - if (last) { - last->next = rel->next; - } else { - member->relationships = rel->next; - } + if (member == NULL || id == 0) return status; + + switch_mutex_lock(member->flag_mutex); + for (rel = member->relationships; rel; rel = rel->next) { + if (rel->id == id) { + /* we just forget about rel here cos it was allocated by the member's pool + it will be freed when the member is */ + status = SWITCH_STATUS_SUCCESS; + if (last) { + last->next = rel->next; + } else { + member->relationships = rel->next; } - last = rel; } - switch_mutex_unlock(member->flag_mutex); + last = rel; } + switch_mutex_unlock(member->flag_mutex); return status; } @@ -981,8 +971,6 @@ switch_event_fire(&event); } - - switch_mutex_lock(conference->mutex); conference_stop_file(conference, FILE_STOP_ASYNC); conference_stop_file(conference, FILE_STOP_ALL); @@ -1072,268 +1060,241 @@ static void conference_loop_fn_mute_toggle(conference_member_t * member, caller_control_action_t * action) { - if (member != NULL) { - if (switch_test_flag(member, MFLAG_CAN_SPEAK)) { - conf_api_sub_mute(member, NULL, NULL); - } else { - conf_api_sub_unmute(member, NULL, NULL); - if (!switch_test_flag(member, MFLAG_CAN_HEAR)) { - conf_api_sub_undeaf(member, NULL, NULL); - } + if (member == NULL) return; + + if (switch_test_flag(member, MFLAG_CAN_SPEAK)) { + conf_api_sub_mute(member, NULL, NULL); + } else { + conf_api_sub_unmute(member, NULL, NULL); + if (!switch_test_flag(member, MFLAG_CAN_HEAR)) { + conf_api_sub_undeaf(member, NULL, NULL); } } } static void conference_loop_fn_deafmute_toggle(conference_member_t * member, caller_control_action_t * action) { - if (member != NULL) { - if (switch_test_flag(member, MFLAG_CAN_SPEAK)) { - conf_api_sub_mute(member, NULL, NULL); - if (switch_test_flag(member, MFLAG_CAN_HEAR)) { - conf_api_sub_deaf(member, NULL, NULL); - } - } else { - conf_api_sub_unmute(member, NULL, NULL); - if (!switch_test_flag(member, MFLAG_CAN_HEAR)) { - conf_api_sub_undeaf(member, NULL, NULL); - } + if (member == NULL) return; + + if (switch_test_flag(member, MFLAG_CAN_SPEAK)) { + conf_api_sub_mute(member, NULL, NULL); + if (switch_test_flag(member, MFLAG_CAN_HEAR)) { + conf_api_sub_deaf(member, NULL, NULL); + } + } else { + conf_api_sub_unmute(member, NULL, NULL); + if (!switch_test_flag(member, MFLAG_CAN_HEAR)) { + conf_api_sub_undeaf(member, NULL, NULL); } } } static void conference_loop_fn_energy_up(conference_member_t * member, caller_control_action_t * action) { - if (member != NULL) { - char msg[512]; - switch_event_t *event; - - switch_mutex_lock(member->flag_mutex); - member->energy_level += 200; - if (member->energy_level > 3000) { - member->energy_level = 3000; - } - - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level); - switch_event_fire(&event); - } - switch_mutex_unlock(member->flag_mutex); + char msg[512]; + switch_event_t *event; - switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); - conference_member_say(member, msg, 0); + if (member == NULL) return; + switch_mutex_lock(member->flag_mutex); + member->energy_level += 200; + if (member->energy_level > 3000) { + member->energy_level = 3000; + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level); + switch_event_fire(&event); } + switch_mutex_unlock(member->flag_mutex); + + switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); + conference_member_say(member, msg, 0); } static void conference_loop_fn_energy_equ_conf(conference_member_t * member, caller_control_action_t * action) { - if (member != NULL) { - char msg[512]; - switch_event_t *event; - - switch_mutex_lock(member->flag_mutex); - member->energy_level = member->conference->energy_level; + char msg[512]; + switch_event_t *event; - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level); - switch_event_fire(&event); - } - switch_mutex_unlock(member->flag_mutex); + if (member == NULL) return; - switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); - conference_member_say(member, msg, 0); + switch_mutex_lock(member->flag_mutex); + member->energy_level = member->conference->energy_level; + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level); + switch_event_fire(&event); } + switch_mutex_unlock(member->flag_mutex); + + switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); + conference_member_say(member, msg, 0); } static void conference_loop_fn_energy_dn(conference_member_t * member, caller_control_action_t * action) { - if (member != NULL) { - char msg[512]; - switch_event_t *event; - - switch_mutex_lock(member->flag_mutex); - member->energy_level -= 100; - if (member->energy_level < 0) { - member->energy_level = 0; - } - - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level); - switch_event_fire(&event); - } - switch_mutex_unlock(member->flag_mutex); - - switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); - conference_member_say(member, msg, 0); + char msg[512]; + switch_event_t *event; + if (member == NULL) return; + switch_mutex_lock(member->flag_mutex); + member->energy_level -= 100; + if (member->energy_level < 0) { + member->energy_level = 0; + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level); + switch_event_fire(&event); } + switch_mutex_unlock(member->flag_mutex); + + switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); + conference_member_say(member, msg, 0); } static void conference_loop_fn_volume_talk_up(conference_member_t * member, caller_control_action_t * action) { - if (member != NULL) { - char msg[512]; - switch_event_t *event; - - switch_mutex_lock(member->flag_mutex); - member->volume_out_level++; - switch_normalize_volume(member->volume_out_level); - - - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-level"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level); - switch_event_fire(&event); - } - switch_mutex_unlock(member->flag_mutex); + char msg[512]; + switch_event_t *event; + if (member == NULL) return; - switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); - conference_member_say(member, msg, 0); + switch_mutex_lock(member->flag_mutex); + member->volume_out_level++; + switch_normalize_volume(member->volume_out_level); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-level"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level); + switch_event_fire(&event); } + switch_mutex_unlock(member->flag_mutex); + + switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); + conference_member_say(member, msg, 0); } static void conference_loop_fn_volume_talk_zero(conference_member_t * member, caller_control_action_t * action) { - if (member != NULL) { - char msg[512]; - switch_event_t *event; - - switch_mutex_lock(member->flag_mutex); - member->volume_out_level = 0; - - - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-level"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level); - switch_event_fire(&event); - } - switch_mutex_unlock(member->flag_mutex); - + char msg[512]; + switch_event_t *event; - switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); - conference_member_say(member, msg, 0); + if (member == NULL) return; + switch_mutex_lock(member->flag_mutex); + member->volume_out_level = 0; + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-level"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level); + switch_event_fire(&event); } + switch_mutex_unlock(member->flag_mutex); + + switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); + conference_member_say(member, msg, 0); } static void conference_loop_fn_volume_talk_dn(conference_member_t * member, caller_control_action_t * action) { - if (member != NULL) { - char msg[512]; - switch_event_t *event; - - switch_mutex_lock(member->flag_mutex); - member->volume_out_level--; - switch_normalize_volume(member->volume_out_level); - - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-level"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level); - switch_event_fire(&event); - } - switch_mutex_unlock(member->flag_mutex); + char msg[512]; + switch_event_t *event; - switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); - conference_member_say(member, msg, 0); + if (member == NULL) return; + switch_mutex_lock(member->flag_mutex); + member->volume_out_level--; + switch_normalize_volume(member->volume_out_level); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-level"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level); + switch_event_fire(&event); } + switch_mutex_unlock(member->flag_mutex); + + switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); + conference_member_say(member, msg, 0); } static void conference_loop_fn_volume_listen_up(conference_member_t * member, caller_control_action_t * action) { - if (member != NULL) { - char msg[512]; - switch_event_t *event; - - switch_mutex_lock(member->flag_mutex); - member->volume_in_level++; - switch_normalize_volume(member->volume_in_level); - - - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "gain-level"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level); - switch_event_fire(&event); - } - switch_mutex_unlock(member->flag_mutex); - - - switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); - conference_member_say(member, msg, 0); + char msg[512]; + switch_event_t *event; + if (member == NULL) return; + switch_mutex_lock(member->flag_mutex); + member->volume_in_level++; + switch_normalize_volume(member->volume_in_level); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "gain-level"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level); + switch_event_fire(&event); } + switch_mutex_unlock(member->flag_mutex); + + switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); + conference_member_say(member, msg, 0); } static void conference_loop_fn_volume_listen_zero(conference_member_t * member, caller_control_action_t * action) { - if (member != NULL) { - char msg[512]; - switch_event_t *event; - - switch_mutex_lock(member->flag_mutex); - member->volume_in_level = 0; - - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "gain-level"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level); - switch_event_fire(&event); - } - switch_mutex_unlock(member->flag_mutex); - - switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); - conference_member_say(member, msg, 0); + char msg[512]; + switch_event_t *event; + if (member == NULL) return; + switch_mutex_lock(member->flag_mutex); + member->volume_in_level = 0; + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "gain-level"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level); + switch_event_fire(&event); } + switch_mutex_unlock(member->flag_mutex); + + switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); + conference_member_say(member, msg, 0); } static void conference_loop_fn_volume_listen_dn(conference_member_t * member, caller_control_action_t * action) { - if (member != NULL) { - char msg[512]; - switch_event_t *event; - - switch_mutex_lock(member->flag_mutex); - member->volume_in_level--; - switch_normalize_volume(member->volume_in_level); - - - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "gain-level"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level); - switch_event_fire(&event); - } - switch_mutex_unlock(member->flag_mutex); - + char msg[512]; + switch_event_t *event; - switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); - conference_member_say(member, msg, 0); + if (member == NULL) return; + switch_mutex_lock(member->flag_mutex); + member->volume_in_level--; + switch_normalize_volume(member->volume_in_level); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "gain-level"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level); + switch_event_fire(&event); } + switch_mutex_unlock(member->flag_mutex); + + switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); + conference_member_say(member, msg, 0); } static void conference_loop_fn_event(conference_member_t * member, caller_control_action_t * action) @@ -1503,16 +1464,16 @@ /* launch an input thread for the call leg */ static void launch_conference_loop_input(conference_member_t * member, switch_memory_pool_t *pool) { - if (member != NULL) { - switch_thread_t *thread; - switch_threadattr_t *thd_attr = NULL; - - switch_threadattr_create(&thd_attr, pool); - switch_threadattr_detach_set(thd_attr, 1); - switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_set_flag_locked(member, MFLAG_ITHREAD); - switch_thread_create(&thread, thd_attr, conference_loop_input, member, pool); - } + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + + if (member == NULL) return; + + switch_threadattr_create(&thd_attr, pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_set_flag_locked(member, MFLAG_ITHREAD); + switch_thread_create(&thread, thd_attr, conference_loop_input, member, pool); } static caller_control_fn_table_t ccfntbl[] = { @@ -1551,14 +1512,14 @@ switch_assert(member->conference != NULL); - if (switch_core_timer_init(&timer, member->conference->timer_name, interval, tsamples, NULL) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer %s success interval: %u samples: %u\n", - member->conference->timer_name, interval, tsamples); - } else { + if (switch_core_timer_init(& timer, member->conference->timer_name, interval, tsamples, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed. Conference Cannot Start\n"); return; } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer %s success interval: %u samples: %u\n", + member->conference->timer_name, interval, tsamples); + write_frame.data = data; write_frame.buflen = sizeof(data); write_frame.codec = &member->write_codec; @@ -1573,7 +1534,7 @@ /* build a digit stream object */ if (member->conference->dtmf_parser != NULL && switch_ivr_digit_stream_new(member->conference->dtmf_parser, &member->digit_stream) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Danger Will Robinson, there is no digit parser stream object\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Danger Will Robinson, there is no digit parser stream object\n"); } if ((call_list = switch_channel_get_private(channel, "_conference_autocall_list_"))) { @@ -1583,13 +1544,13 @@ const char *flags = switch_channel_get_variable(channel, "conference_auto_outcall_flags"); const char *ann = switch_channel_get_variable(channel, "conference_auto_outcall_announce"); int to = 60; - + if (ann) { member->conference->special_announce = switch_core_strdup(member->conference->pool, ann); } switch_channel_set_private(channel, "_conference_autocall_list_", NULL); - + if (toval) { to = atoi(toval); if (to < 10 || to > 500) { @@ -1604,209 +1565,209 @@ /* Fair WARNING, If you expect the caller to hear anything or for digit handling to be proccessed, */ /* you better not block this thread loop for more than the duration of member->conference->timer_name! */ while (switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(member, MFLAG_ITHREAD) - && switch_channel_ready(channel)) { - char dtmf[128] = ""; - uint8_t file_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 }; - switch_size_t file_data_len = csamples * 2; - switch_size_t file_sample_len = csamples; - char *digit; - switch_event_t *event; - caller_control_action_t *caller_action = NULL; - int use_timer = 0; + && switch_channel_ready(channel)) { + char dtmf[128] = ""; + uint8_t file_frame[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 }; + switch_size_t file_data_len = csamples * 2; + switch_size_t file_sample_len = csamples; + char *digit; + switch_event_t *event; + caller_control_action_t *caller_action = NULL; + int use_timer = 0; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->flag_mutex); - if (switch_core_session_dequeue_event(member->session, &event) == SWITCH_STATUS_SUCCESS) { - char *from = switch_event_get_header(event, "from"); - char *to = switch_event_get_header(event, "to"); - char *proto = switch_event_get_header(event, "proto"); - char *subject = switch_event_get_header(event, "subject"); - char *hint = switch_event_get_header(event, "hint"); - char *body = switch_event_get_body(event); - char *p, *freeme = NULL; - - if ((p = strchr(to, '+')) && strncmp(to, CONF_CHAT_PROTO, strlen(CONF_CHAT_PROTO))) { - freeme = switch_mprintf("%s+%s@%s", CONF_CHAT_PROTO, member->conference->name, member->conference->domain); - to = freeme; - } - - chat_send(proto, from, to, subject, body, hint); - switch_safe_free(freeme); - switch_event_destroy(&event); - } - - if (switch_channel_test_flag(channel, CF_OUTBOUND)) { - /* test to see if outbound channel has answered */ - if (switch_channel_test_flag(channel, CF_ANSWERED) && !switch_test_flag(member->conference, CFLAG_ANSWERED)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Outbound conference channel answered, setting CFLAG_ANSWERED\n"); - switch_set_flag(member->conference, CFLAG_ANSWERED); - } - } else { - if (switch_test_flag(member->conference, CFLAG_ANSWERED) && !switch_channel_test_flag(channel, CF_ANSWERED)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CLFAG_ANSWERED set, answering inbound channel\n"); - switch_channel_answer(channel); + if (switch_core_session_dequeue_event(member->session, &event) == SWITCH_STATUS_SUCCESS) { + char *from = switch_event_get_header(event, "from"); + char *to = switch_event_get_header(event, "to"); + char *proto = switch_event_get_header(event, "proto"); + char *subject = switch_event_get_header(event, "subject"); + char *hint = switch_event_get_header(event, "hint"); + char *body = switch_event_get_body(event); + char *p, *freeme = NULL; + + if ((p = strchr(to, '+')) && strncmp(to, CONF_CHAT_PROTO, strlen(CONF_CHAT_PROTO))) { + freeme = switch_mprintf("%s+%s@%s", CONF_CHAT_PROTO, member->conference->name, member->conference->domain); + to = freeme; + } + + chat_send(proto, from, to, subject, body, hint); + switch_safe_free(freeme); + switch_event_destroy(&event); + } + + if (switch_channel_test_flag(channel, CF_OUTBOUND)) { + /* test to see if outbound channel has answered */ + if (switch_channel_test_flag(channel, CF_ANSWERED) && !switch_test_flag(member->conference, CFLAG_ANSWERED)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Outbound conference channel answered, setting CFLAG_ANSWERED\n"); + switch_set_flag(member->conference, CFLAG_ANSWERED); + } + } else { + if (switch_test_flag(member->conference, CFLAG_ANSWERED) && !switch_channel_test_flag(channel, CF_ANSWERED)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CLFAG_ANSWERED set, answering inbound channel\n"); + switch_channel_answer(channel); + } } - } - /* if we have caller digits, feed them to the parser to find an action */ - if (switch_channel_has_dtmf(channel)) { - switch_channel_dequeue_dtmf_string(channel, dtmf, sizeof(dtmf)); + /* if we have caller digits, feed them to the parser to find an action */ + if (switch_channel_has_dtmf(channel)) { + switch_channel_dequeue_dtmf_string(channel, dtmf, sizeof(dtmf)); - if (member->conference->dtmf_parser != NULL) { + if (member->conference->dtmf_parser != NULL) { - for (digit = dtmf; *digit && caller_action == NULL; digit++) { - caller_action = (caller_control_action_t *) - switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, *digit); + for (digit = dtmf; *digit && caller_action == NULL; digit++) { + caller_action = (caller_control_action_t *) + switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, *digit); + } } + /* otherwise, clock the parser so that it can handle digit timeout detection */ + } else if (member->conference->dtmf_parser != NULL) { + caller_action = (caller_control_action_t *) switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, '\0'); } - /* otherwise, clock the parser so that it can handle digit timeout detection */ - } else if (member->conference->dtmf_parser != NULL) { - caller_action = (caller_control_action_t *) switch_ivr_digit_stream_parser_feed(member->conference->dtmf_parser, member->digit_stream, '\0'); - } - /* if a caller action has been detected, handle it */ - if (caller_action != NULL && caller_action->fndesc != NULL && caller_action->fndesc->handler != NULL) { - char *param = NULL; + /* if a caller action has been detected, handle it */ + if (caller_action != NULL && caller_action->fndesc != NULL && caller_action->fndesc->handler != NULL) { + char *param = NULL; - if (caller_action->fndesc->action != CALLER_CONTROL_MENU) { - param = caller_action->data; - } + if (caller_action->fndesc->action != CALLER_CONTROL_MENU) { + param = caller_action->data; + } #ifdef INTENSE_DEBUG - switch_log_printf(SWITCH_CHANNEL_LOG, - SWITCH_LOG_INFO, - "executing caller control '%s' param '%s' on call '%u, %s, %s, %s'\n", - caller_action->fndesc->key, - param ? param : "none", member->id, switch_channel_get_name(channel), profile->caller_id_name, profile->caller_id_number); + switch_log_printf(SWITCH_CHANNEL_LOG, + SWITCH_LOG_INFO, + "executing caller control '%s' param '%s' on call '%u, %s, %s, %s'\n", + caller_action->fndesc->key, + param ? param : "none", member->id, switch_channel_get_name(channel), profile->caller_id_name, profile->caller_id_number); #endif - caller_action->fndesc->handler(member, caller_action); + caller_action->fndesc->handler(member, caller_action); - /* set up for next pass */ - caller_action = NULL; - } + /* set up for next pass */ + caller_action = NULL; + } - /* handle file and TTS frames */ - if (member->fnode) { - /* if we are done, clean it up */ - if (member->fnode->done) { - conference_file_node_t *fnode; - switch_memory_pool_t *pool; + /* handle file and TTS frames */ + if (member->fnode) { + /* if we are done, clean it up */ + if (member->fnode->done) { + conference_file_node_t *fnode; + switch_memory_pool_t *pool; - if (member->fnode->type != NODE_TYPE_SPEECH) { - switch_core_file_close(&member->fnode->fh); - } + if (member->fnode->type != NODE_TYPE_SPEECH) { + switch_core_file_close(&member->fnode->fh); + } - fnode = member->fnode; - member->fnode = member->fnode->next; + fnode = member->fnode; + member->fnode = member->fnode->next; - pool = fnode->pool; - fnode = NULL; - switch_core_destroy_memory_pool(&pool); - } else { - /* skip this frame until leadin time has expired */ - if (member->fnode->leadin) { - member->fnode->leadin--; - } else { /* send the node frame instead of the conference frame to the call leg */ - if (member->fnode->type == NODE_TYPE_SPEECH) { - switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING; - uint32_t rate = member->conference->rate; + pool = fnode->pool; + fnode = NULL; + switch_core_destroy_memory_pool(&pool); + } else { + /* skip this frame until leadin time has expired */ + if (member->fnode->leadin) { + member->fnode->leadin--; + } else { /* send the node frame instead of the conference frame to the call leg */ + if (member->fnode->type == NODE_TYPE_SPEECH) { + switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING; + uint32_t rate = member->conference->rate; + + if (switch_core_speech_read_tts(member->fnode->sh, file_frame, &file_data_len, &rate, &flags) == SWITCH_STATUS_SUCCESS) { + file_sample_len = file_data_len / 2; + } else { + file_sample_len = file_data_len = 0; + } + } else if (member->fnode->type == NODE_TYPE_FILE) { + switch_core_file_read(&member->fnode->fh, file_frame, &file_sample_len); + file_data_len = file_sample_len * 2; + } - if (switch_core_speech_read_tts(member->fnode->sh, file_frame, &file_data_len, &rate, &flags) == SWITCH_STATUS_SUCCESS) { - file_sample_len = file_data_len / 2; - } else { - file_sample_len = file_data_len = 0; + if (file_sample_len <= 0) { + member->fnode->done++; + } else { /* there is file node data to deliver */ + write_frame.data = file_frame; + write_frame.datalen = (uint32_t) file_data_len; + write_frame.samples = (uint32_t) file_sample_len; + /* Check for output volume adjustments */ + if (member->volume_out_level) { + switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level); + } + write_frame.timestamp = timer.samplecount; + switch_core_session_write_frame(member->session, &write_frame, -1, 0); + switch_core_timer_next(&timer); + + /* forget the conference data we played file node data instead */ + switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); } - } else if (member->fnode->type == NODE_TYPE_FILE) { - switch_core_file_read(&member->fnode->fh, file_frame, &file_sample_len); - file_data_len = file_sample_len * 2; } + } + } else { /* send the conferecne frame to the call leg */ + switch_buffer_t *use_buffer = NULL; + uint32_t mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer); - if (file_sample_len <= 0) { - member->fnode->done++; - } else { /* there is file node data to deliver */ - write_frame.data = file_frame; - write_frame.datalen = (uint32_t) file_data_len; - write_frame.samples = (uint32_t) file_sample_len; - /* Check for output volume adjustments */ - if (member->volume_out_level) { - switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level); + if (mux_used) { + if (mux_used < bytes) { + if (++low_count >= 5) { + /* partial frame sitting around this long is useless and builds delay */ + switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); } - write_frame.timestamp = timer.samplecount; - switch_core_session_write_frame(member->session, &write_frame, -1, 0); - switch_core_timer_next(&timer); - - /* forget the conference data we played file node data instead */ + mux_used = 0; + } else if (mux_used > bytes * 4) { + /* getting behind, clear the buffer */ switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); } } - } - } else { /* send the conferecne frame to the call leg */ - switch_buffer_t *use_buffer = NULL; - uint32_t mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer); - if (mux_used) { - if (mux_used < bytes) { - if (++low_count >= 5) { - /* partial frame sitting around this long is useless and builds delay */ - switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); + if (switch_test_flag(member, MFLAG_FLUSH_BUFFER)) { + if (mux_used) { + switch_mutex_lock(member->audio_out_mutex); + switch_buffer_zero(member->mux_buffer); + switch_mutex_unlock(member->audio_out_mutex); + mux_used = 0; } - mux_used = 0; - } else if (mux_used > bytes * 4) { - /* getting behind, clear the buffer */ - switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); + switch_clear_flag_locked(member, MFLAG_FLUSH_BUFFER); } - } - if (switch_test_flag(member, MFLAG_FLUSH_BUFFER)) { if (mux_used) { + /* Flush the output buffer and write all the data (presumably muxed) back to the channel */ switch_mutex_lock(member->audio_out_mutex); - switch_buffer_zero(member->mux_buffer); + write_frame.data = data; + use_buffer = member->mux_buffer; + low_count = 0; + + if ((write_frame.datalen = (uint32_t) switch_buffer_read(use_buffer, write_frame.data, bytes))) { + if (write_frame.datalen && switch_test_flag(member, MFLAG_CAN_HEAR)) { + write_frame.samples = write_frame.datalen / 2; + + /* Check for output volume adjustments */ + if (member->volume_out_level) { + switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level); + } + write_frame.timestamp = timer.samplecount; + switch_core_session_write_frame(member->session, &write_frame, -1, 0); + } + } + switch_mutex_unlock(member->audio_out_mutex); - mux_used = 0; - } - switch_clear_flag_locked(member, MFLAG_FLUSH_BUFFER); - } + use_timer = 1; - if (mux_used) { - /* Flush the output buffer and write all the data (presumably muxed) back to the channel */ - switch_mutex_lock(member->audio_out_mutex); - write_frame.data = data; - use_buffer = member->mux_buffer; - low_count = 0; - - if ((write_frame.datalen = (uint32_t) switch_buffer_read(use_buffer, write_frame.data, bytes))) { - if (write_frame.datalen && switch_test_flag(member, MFLAG_CAN_HEAR)) { - write_frame.samples = write_frame.datalen / 2; - - /* Check for output volume adjustments */ - if (member->volume_out_level) { - switch_change_sln_volume(write_frame.data, write_frame.samples, member->volume_out_level); - } + } else { + if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) { + switch_generate_sln_silence(write_frame.data, samples, 1400); + write_frame.datalen = bytes; + write_frame.samples = samples; write_frame.timestamp = timer.samplecount; switch_core_session_write_frame(member->session, &write_frame, -1, 0); } + use_timer = 1; } - - switch_mutex_unlock(member->audio_out_mutex); - use_timer = 1; - - } else { - if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) { - switch_generate_sln_silence(write_frame.data, samples, 1400); - write_frame.datalen = bytes; - write_frame.samples = samples; - write_frame.timestamp = timer.samplecount; - switch_core_session_write_frame(member->session, &write_frame, -1, 0); - } - use_timer = 1; } - } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->flag_mutex); - if (use_timer) { - switch_core_timer_next(&timer); - } + if (use_timer) { + switch_core_timer_next(&timer); + } } /* Rinse ... Repeat */ @@ -1818,7 +1779,7 @@ switch_core_timer_destroy(&timer); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel leaving conference, cause: %s\n", - switch_channel_cause2str(switch_channel_get_cause(channel))); + switch_channel_cause2str(switch_channel_get_cause(channel))); /* if it's an outbound channel, store the release cause in the conference struct, we might need it */ if (switch_channel_test_flag(channel, CF_OUTBOUND)) { @@ -2016,28 +1977,27 @@ /* stop playing a file for the member of the conference */ static uint32_t conference_member_stop_file(conference_member_t * member, file_stop_t stop) { + conference_file_node_t *nptr; uint32_t count = 0; - if (member != NULL) { - conference_file_node_t *nptr; + if (member == NULL) return count; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->flag_mutex); - if (stop == FILE_STOP_ALL) { - for (nptr = member->fnode; nptr; nptr = nptr->next) { - nptr->done++; - count++; - } - } else { - if (member->fnode) { - member->fnode->done++; - count++; - } + if (stop == FILE_STOP_ALL) { + for (nptr = member->fnode; nptr; nptr = nptr->next) { + nptr->done++; + count++; + } + } else { + if (member->fnode) { + member->fnode->done++; + count++; } - - switch_mutex_unlock(member->flag_mutex); } + switch_mutex_unlock(member->flag_mutex); + return count; } @@ -2058,10 +2018,7 @@ switch_mutex_unlock(conference->member_mutex); switch_mutex_unlock(conference->mutex); - if (!count) { - status = SWITCH_STATUS_FALSE; - goto done; - } + if (!count) return SWITCH_STATUS_FALSE; if (channel) { if ((expanded = switch_channel_expand_variables(channel, file)) != file) { @@ -2148,12 +2105,9 @@ done: - switch_safe_free(expanded); switch_safe_free(dfile); - - return status; } @@ -2162,79 +2116,68 @@ { switch_status_t status = SWITCH_STATUS_FALSE; char *dfile = NULL, *expanded = NULL; + conference_file_node_t *fnode, *nptr = NULL; + switch_memory_pool_t *pool; - if (member != NULL && file != NULL) { - conference_file_node_t *fnode, *nptr = NULL; - switch_memory_pool_t *pool; - - if ((expanded = switch_channel_expand_variables(switch_core_session_get_channel(member->session), file)) != file) { - file = expanded; - } else { - expanded = NULL; - } - - if (!strncasecmp(file, "say:", 4)) { - status = conference_member_say(member, file + 4, leadin); - goto done; - } + if (member == NULL || file == NULL) return status; - if (!switch_is_file_path(file)) { - if (member->conference->sound_prefix) { - if (!(dfile = switch_mprintf("%s%s%s", member->conference->sound_prefix, SWITCH_PATH_SEPARATOR, file))) { - goto done; - } - file = dfile; - } else { - status = conference_member_say(member, file, leadin); + if ((expanded = switch_channel_expand_variables(switch_core_session_get_channel(member->session), file)) != file) { + file = expanded; + } else { + expanded = NULL; + } + if (!strncasecmp(file, "say:", 4)) { + status = conference_member_say(member, file + 4, leadin); + goto done; + } + if (!switch_is_file_path(file)) { + if (member->conference->sound_prefix) { + if (!(dfile = switch_mprintf("%s%s%s", member->conference->sound_prefix, SWITCH_PATH_SEPARATOR, file))) { goto done; } - } - - /* Setup a memory pool to use. */ - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); - status = SWITCH_STATUS_MEMERR; - goto done; - } - - /* Create a node object */ - if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); - switch_core_destroy_memory_pool(&pool); - status = SWITCH_STATUS_MEMERR; + file = dfile; + } else { + status = conference_member_say(member, file, leadin); goto done; } - - fnode->type = NODE_TYPE_FILE; - fnode->leadin = leadin; - - /* Open the file */ - if (switch_core_file_open(&fnode->fh, - file, (uint8_t) 1, member->conference->rate, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, - pool) != SWITCH_STATUS_SUCCESS) { + } + /* Setup a memory pool to use. */ + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + status = SWITCH_STATUS_MEMERR; + goto done; + } + /* Create a node object */ + if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); + switch_core_destroy_memory_pool(&pool); + status = SWITCH_STATUS_MEMERR; + goto done; + } + fnode->type = NODE_TYPE_FILE; + fnode->leadin = leadin; + /* Open the file */ + if (switch_core_file_open(&fnode->fh, + file, (uint8_t) 1, member->conference->rate, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, + pool) != SWITCH_STATUS_SUCCESS) { switch_core_destroy_memory_pool(&pool); status = SWITCH_STATUS_NOTFOUND; goto done; - } - - fnode->pool = pool; - - /* Queue the node */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "queueing file '%s' for play\n", file); - switch_mutex_lock(member->flag_mutex); - for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next); - - if (nptr) { - nptr->next = fnode; - } else { - member->fnode = fnode; - } - switch_mutex_unlock(member->flag_mutex); - - status = SWITCH_STATUS_SUCCESS; } + fnode->pool = pool; + /* Queue the node */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "queueing file '%s' for play\n", file); + switch_mutex_lock(member->flag_mutex); + for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next); + if (nptr) { + nptr->next = fnode; + } else { + member->fnode = fnode; + } + switch_mutex_unlock(member->flag_mutex); + status = SWITCH_STATUS_SUCCESS; - done: +done: switch_safe_free(expanded); switch_safe_free(dfile); @@ -2245,80 +2188,79 @@ /* Say some thing with TTS in the conference room */ static switch_status_t conference_member_say(conference_member_t * member, char *text, uint32_t leadin) { + conference_obj_t *conference = (member != NULL ? member->conference : NULL); + conference_file_node_t *fnode, *nptr; + switch_memory_pool_t *pool; + switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; switch_status_t status = SWITCH_STATUS_FALSE; - if (member != NULL && !switch_strlen_zero(text)) { - conference_obj_t *conference = (member != NULL ? member->conference : NULL); - conference_file_node_t *fnode, *nptr; - switch_memory_pool_t *pool; - switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + if (member == NULL || switch_strlen_zero(text)) return SWITCH_STATUS_FALSE; - switch_assert(conference != NULL); + switch_assert(conference != NULL); - if (!(conference->tts_engine && conference->tts_voice)) { - return SWITCH_STATUS_SUCCESS; - } + if (!(conference->tts_engine && conference->tts_voice)) { + return SWITCH_STATUS_SUCCESS; + } - /* Setup a memory pool to use. */ - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); - return SWITCH_STATUS_MEMERR; - } + /* Setup a memory pool to use. */ + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + return SWITCH_STATUS_MEMERR; + } - /* Create a node object */ - if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); - switch_core_destroy_memory_pool(&pool); - return SWITCH_STATUS_MEMERR; - } + /* Create a node object */ + if (!(fnode = switch_core_alloc(pool, sizeof(*fnode)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); + switch_core_destroy_memory_pool(&pool); + return SWITCH_STATUS_MEMERR; + } + + fnode->type = NODE_TYPE_SPEECH; + fnode->leadin = leadin; + fnode->pool = pool; - fnode->type = NODE_TYPE_SPEECH; - fnode->leadin = leadin; - fnode->pool = pool; - - if (!member->sh) { - memset(&member->lsh, 0, sizeof(member->lsh)); - if (switch_core_speech_open(&member->lsh, conference->tts_engine, conference->tts_voice, - conference->rate, conference->interval, &flags, switch_core_session_get_pool(member->session)) != - SWITCH_STATUS_SUCCESS) { + if (!member->sh) { + memset(&member->lsh, 0, sizeof(member->lsh)); + if (switch_core_speech_open(&member->lsh, conference->tts_engine, conference->tts_voice, + conference->rate, conference->interval, &flags, switch_core_session_get_pool(member->session)) != + SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine); return SWITCH_STATUS_FALSE; - } - member->sh = &member->lsh; } + member->sh = &member->lsh; + } - /* Queue the node */ - switch_mutex_lock(member->flag_mutex); - for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next); + /* Queue the node */ + switch_mutex_lock(member->flag_mutex); + for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next); - if (nptr) { - nptr->next = fnode; - } else { - member->fnode = fnode; - } - - fnode->sh = member->sh; - /* Begin Generation */ - switch_sleep(200000); - - if (*text == '#') { - char *tmp = (char *)text + 1; - char *vp = tmp, voice[128] = ""; - if ((tmp = strchr(tmp, '#'))) { - text = tmp + 1; - switch_copy_string(voice, vp, (tmp - vp) + 1); - switch_core_speech_text_param_tts(fnode->sh, "voice", voice); - } - } else { - switch_core_speech_text_param_tts(fnode->sh, "voice", conference->tts_voice); - } - - switch_core_speech_feed_tts(fnode->sh, text, &flags); - switch_mutex_unlock(member->flag_mutex); + if (nptr) { + nptr->next = fnode; + } else { + member->fnode = fnode; + } - status = SWITCH_STATUS_SUCCESS; + fnode->sh = member->sh; + /* Begin Generation */ + switch_sleep(200000); + + if (*text == '#') { + char *tmp = (char *)text + 1; + char *vp = tmp, voice[128] = ""; + if ((tmp = strchr(tmp, '#'))) { + text = tmp + 1; + switch_copy_string(voice, vp, (tmp - vp) + 1); + switch_core_speech_text_param_tts(fnode->sh, "voice", voice); + } + } else { + switch_core_speech_text_param_tts(fnode->sh, "voice", conference->tts_voice); } + switch_core_speech_feed_tts(fnode->sh, text, &flags); + switch_mutex_unlock(member->flag_mutex); + + status = SWITCH_STATUS_SUCCESS; + return status; } @@ -2462,7 +2404,6 @@ switch_assert(stream != NULL); switch_assert(delim != NULL); - switch_mutex_lock(conference->member_mutex); for (member = conference->members; member; member = member->next) { @@ -2498,144 +2439,120 @@ } switch_mutex_unlock(conference->member_mutex); - } static switch_status_t conf_api_sub_mute(conference_member_t * member, switch_stream_handle_t *stream, void *data) { - switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - - if (member != NULL) { - switch_event_t *event; + switch_event_t *event; - switch_clear_flag_locked(member, MFLAG_CAN_SPEAK); - if (member->conference->muted_sound) { - conference_member_play_file(member, member->conference->muted_sound, 0); - } else { - char msg[512]; + if (member == NULL) return SWITCH_STATUS_GENERR; - switch_snprintf(msg, sizeof(msg), "Muted"); - conference_member_say(member, msg, 0); - } - if (stream != NULL) { - stream->write_function(stream, "OK mute %u\n", member->id); - } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "mute-member"); - switch_event_fire(&event); - } + switch_clear_flag_locked(member, MFLAG_CAN_SPEAK); + if (member->conference->muted_sound) { + conference_member_play_file(member, member->conference->muted_sound, 0); } else { - ret_status = SWITCH_STATUS_GENERR; + char msg[512]; + + switch_snprintf(msg, sizeof(msg), "Muted"); + conference_member_say(member, msg, 0); + } + if (stream != NULL) { + stream->write_function(stream, "OK mute %u\n", member->id); + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "mute-member"); + switch_event_fire(&event); } - return ret_status; + return SWITCH_STATUS_SUCCESS; } static switch_status_t conf_api_sub_unmute(conference_member_t * member, switch_stream_handle_t *stream, void *data) { - switch_status_t ret_status = SWITCH_STATUS_SUCCESS; + switch_event_t *event; - if (member != NULL) { - switch_event_t *event; + if (member == NULL) return SWITCH_STATUS_GENERR; - switch_set_flag_locked(member, MFLAG_CAN_SPEAK); - if (stream != NULL) { - stream->write_function(stream, "OK unmute %u\n", member->id); - } - if (member->conference->unmuted_sound) { - conference_member_play_file(member, member->conference->unmuted_sound, 0); - } else { - char msg[512]; - - switch_snprintf(msg, sizeof(msg), "Un-Muted"); - conference_member_say(member, msg, 0); - } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "unmute-member"); - switch_event_fire(&event); - } + switch_set_flag_locked(member, MFLAG_CAN_SPEAK); + if (stream != NULL) { + stream->write_function(stream, "OK unmute %u\n", member->id); + } + if (member->conference->unmuted_sound) { + conference_member_play_file(member, member->conference->unmuted_sound, 0); } else { - ret_status = SWITCH_STATUS_GENERR; + char msg[512]; + + switch_snprintf(msg, sizeof(msg), "Un-Muted"); + conference_member_say(member, msg, 0); + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "unmute-member"); + switch_event_fire(&event); } - return ret_status; + return SWITCH_STATUS_SUCCESS; } static switch_status_t conf_api_sub_deaf(conference_member_t * member, switch_stream_handle_t *stream, void *data) { - switch_status_t ret_status = SWITCH_STATUS_SUCCESS; + switch_event_t *event; - if (member != NULL) { - switch_event_t *event; + if (member == NULL) return SWITCH_STATUS_GENERR; - switch_clear_flag_locked(member, MFLAG_CAN_HEAR); - if (stream != NULL) { - stream->write_function(stream, "OK deaf %u\n", member->id); - } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "deaf-member"); - switch_event_fire(&event); - } - } else { - ret_status = SWITCH_STATUS_GENERR; + switch_clear_flag_locked(member, MFLAG_CAN_HEAR); + if (stream != NULL) { + stream->write_function(stream, "OK deaf %u\n", member->id); + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "deaf-member"); + switch_event_fire(&event); } - return ret_status; + return SWITCH_STATUS_SUCCESS; } -static switch_status_t conf_api_sub_undeaf(conference_member_t * member, switch_stream_handle_t *stream, void *data) -{ - switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - - if (member != NULL) { - switch_event_t *event; - - switch_set_flag_locked(member, MFLAG_CAN_HEAR); - if (stream != NULL) { - stream->write_function(stream, "OK undeaf %u\n", member->id); - } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "undeaf-member"); - switch_event_fire(&event); - } - } else { - ret_status = SWITCH_STATUS_GENERR; +static switch_status_t conf_api_sub_undeaf(conference_member_t * member, switch_stream_handle_t *stream, void *data) +{ + switch_event_t *event; + + if (member == NULL) return SWITCH_STATUS_GENERR; + + switch_set_flag_locked(member, MFLAG_CAN_HEAR); + if (stream != NULL) { + stream->write_function(stream, "OK undeaf %u\n", member->id); + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "undeaf-member"); + switch_event_fire(&event); } - return ret_status; + return SWITCH_STATUS_SUCCESS; } static switch_status_t conf_api_sub_kick(conference_member_t * member, switch_stream_handle_t *stream, void *data) { - switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - - if (member != NULL) { - switch_event_t *event; - - switch_mutex_lock(member->flag_mutex); - switch_clear_flag(member, MFLAG_RUNNING); - switch_set_flag(member, MFLAG_KICKED); - switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); - switch_mutex_unlock(member->flag_mutex); + switch_event_t *event; - if (stream != NULL) { - stream->write_function(stream, "OK kicked %u\n", member->id); - } + if (member == NULL) return SWITCH_STATUS_GENERR; - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "kick-member"); - switch_event_fire(&event); - } - } else { - ret_status = SWITCH_STATUS_GENERR; + switch_mutex_lock(member->flag_mutex); + switch_clear_flag(member, MFLAG_RUNNING); + switch_set_flag(member, MFLAG_KICKED); + switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); + switch_mutex_unlock(member->flag_mutex); + if (stream != NULL) { + stream->write_function(stream, "OK kicked %u\n", member->id); } - - return ret_status; + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "kick-member"); + switch_event_fire(&event); + } + return SWITCH_STATUS_SUCCESS; } @@ -2654,14 +2571,10 @@ return SWITCH_STATUS_GENERR; } - switch_mutex_lock(member->flag_mutex); switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); - switch_core_session_send_dtmf_string(member->session, (char *)data); - switch_mutex_unlock(member->flag_mutex); - if (stream != NULL) { stream->write_function(stream, "OK sent %s to %u\n", (char *) data, member->id); @@ -2679,102 +2592,76 @@ static switch_status_t conf_api_sub_energy(conference_member_t * member, switch_stream_handle_t *stream, void *data) { - switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - - if (member != NULL) { - switch_event_t *event; - - if (data) { - switch_mutex_lock(member->flag_mutex); - member->energy_level = atoi((char *) data); - switch_mutex_unlock(member->flag_mutex); - } - - if (stream != NULL) { - stream->write_function(stream, "Energy %u = %d\n", member->id, member->energy_level); - } + switch_event_t *event; - if (data) { - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level-member"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Energy-Level", "%d", member->energy_level); + if (member == NULL) return SWITCH_STATUS_GENERR; - switch_event_fire(&event); - } - } - } else { - ret_status = SWITCH_STATUS_GENERR; + if (data) { + switch_mutex_lock(member->flag_mutex); + member->energy_level = atoi((char *) data); + switch_mutex_unlock(member->flag_mutex); + } + if (stream != NULL) { + stream->write_function(stream, "Energy %u = %d\n", member->id, member->energy_level); + } + if (data && switch_event_create_subclass(& event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level-member"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Energy-Level", "%d", member->energy_level); + switch_event_fire(& event); } - return ret_status; + return SWITCH_STATUS_SUCCESS; } static switch_status_t conf_api_sub_volume_in(conference_member_t * member, switch_stream_handle_t *stream, void *data) { - switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - - if (member != NULL) { - switch_event_t *event; - - if (data) { - switch_mutex_lock(member->flag_mutex); - member->volume_in_level = atoi((char *) data); - switch_normalize_volume(member->volume_in_level); - switch_mutex_unlock(member->flag_mutex); - } + switch_event_t *event; - if (stream != NULL) { - stream->write_function(stream, "Volume IN %u = %d\n", member->id, member->volume_in_level); - } - if (data) { - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-in-member"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_in_level); + if (member == NULL) return SWITCH_STATUS_GENERR; - switch_event_fire(&event); - } - } - } else { - ret_status = SWITCH_STATUS_GENERR; + if (data) { + switch_mutex_lock(member->flag_mutex); + member->volume_in_level = atoi((char *) data); + switch_normalize_volume(member->volume_in_level); + switch_mutex_unlock(member->flag_mutex); + } + if (stream != NULL) { + stream->write_function(stream, "Volume IN %u = %d\n", member->id, member->volume_in_level); + } + if (data && switch_event_create_subclass(& event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-in-member"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_in_level); + switch_event_fire(& event); } - return ret_status; + return SWITCH_STATUS_SUCCESS; } static switch_status_t conf_api_sub_volume_out(conference_member_t * member, switch_stream_handle_t *stream, void *data) { - switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - - if (member != NULL) { - switch_event_t *event; - - if (data) { - switch_mutex_lock(member->flag_mutex); - member->volume_out_level = atoi((char *) data); - switch_normalize_volume(member->volume_out_level); - switch_mutex_unlock(member->flag_mutex); - } - - if (stream != NULL) { - stream->write_function(stream, "Volume OUT %u = %d\n", member->id, member->volume_out_level); - } + switch_event_t *event; - if (data) { - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-out-member"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_out_level); + if (member == NULL) return SWITCH_STATUS_GENERR; - switch_event_fire(&event); - } - } - } else { - ret_status = SWITCH_STATUS_GENERR; + if (data) { + switch_mutex_lock(member->flag_mutex); + member->volume_out_level = atoi((char *) data); + switch_normalize_volume(member->volume_out_level); + switch_mutex_unlock(member->flag_mutex); + } + if (stream != NULL) { + stream->write_function(stream, "Volume OUT %u = %d\n", member->id, member->volume_out_level); + } + if (data && switch_event_create_subclass(& event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-out-member"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_out_level); + switch_event_fire(& event); } - return ret_status; + return SWITCH_STATUS_SUCCESS; } static switch_status_t conf_api_sub_list(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) @@ -2893,29 +2780,26 @@ static switch_status_t conf_api_sub_say(conference_obj_t * conference, switch_stream_handle_t *stream, const char *text) { - int ret_status = SWITCH_STATUS_GENERR; + switch_event_t *event; if (switch_strlen_zero(text)) { stream->write_function(stream, "(say) Error! No text."); - return ret_status; + return SWITCH_STATUS_GENERR; } - if (conference_say(conference, text, 0) == SWITCH_STATUS_SUCCESS) { - switch_event_t *event; - - stream->write_function(stream, "(say) OK\n"); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_data(conference, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "speak-text"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Text", "%s", text); - switch_event_fire(&event); - } - ret_status = SWITCH_STATUS_SUCCESS; - } else { + if (conference_say(conference, text, 0) != SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "(say) Error!"); + return SWITCH_STATUS_GENERR; } - return ret_status; + stream->write_function(stream, "(say) OK\n"); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_data(conference, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "speak-text"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Text", "%s", text); + switch_event_fire(&event); + } + return SWITCH_STATUS_SUCCESS; } static switch_status_t conf_api_sub_saymember(conference_obj_t * conference, switch_stream_handle_t *stream, const char *text) @@ -2926,6 +2810,7 @@ char *workspace = NULL; uint32_t id = 0; conference_member_t *member; + switch_event_t *event; if (switch_strlen_zero(text)) { stream->write_function(stream, "(saymember) No Text!\n"); @@ -2960,20 +2845,19 @@ expanded = NULL; } - if (text && conference_member_say(member, (char *) text, 0) == SWITCH_STATUS_SUCCESS) { - switch_event_t *event; - - stream->write_function(stream, "(saymember) OK\n"); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "speak-text-member"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Text", "%s", text); - switch_event_fire(&event); - } - ret_status = SWITCH_STATUS_SUCCESS; - } else { + if (!text || conference_member_say(member, (char*)text, 0) != SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "(saymember) Error!"); + goto done; + } + + stream->write_function(stream, "(saymember) OK\n"); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "speak-text-member"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Text", "%s", text); + switch_event_fire(&event); } + ret_status = SWITCH_STATUS_SUCCESS; done: switch_safe_free(workspace); @@ -2983,7 +2867,6 @@ static switch_status_t conf_api_sub_stop(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) { - int ret_status = SWITCH_STATUS_GENERR; uint8_t current = 0, all = 0; switch_assert(conference != NULL); @@ -2996,68 +2879,66 @@ all = 1; } - if (current || all) { - if (argc == 4) { - uint32_t id = atoi(argv[3]); - conference_member_t *member; - - if ((member = conference_member_get(conference, id))) { - uint32_t stopped = conference_member_stop_file(member, current ? FILE_STOP_CURRENT : FILE_STOP_ALL); - stream->write_function(stream, "Stopped %u files.\n", stopped); - } else { - stream->write_function(stream, "Member: %u not found.\n", id); - } - ret_status = SWITCH_STATUS_SUCCESS; - } else { - uint32_t stopped = conference_stop_file(conference, current ? FILE_STOP_CURRENT : FILE_STOP_ALL); + if (!(current || all)) return SWITCH_STATUS_GENERR; + + if (argc == 4) { + uint32_t id = atoi(argv[3]); + conference_member_t *member; + + if ((member = conference_member_get(conference, id))) { + uint32_t stopped = conference_member_stop_file(member, current ? FILE_STOP_CURRENT : FILE_STOP_ALL); stream->write_function(stream, "Stopped %u files.\n", stopped); - ret_status = SWITCH_STATUS_SUCCESS; + } else { + stream->write_function(stream, "Member: %u not found.\n", id); } + } else { + uint32_t stopped = conference_stop_file(conference, current ? FILE_STOP_CURRENT : FILE_STOP_ALL); + stream->write_function(stream, "Stopped %u files.\n", stopped); } - - return ret_status; + return SWITCH_STATUS_SUCCESS; } static switch_status_t conf_api_sub_relate(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) { - int ret_status = SWITCH_STATUS_GENERR; + uint8_t nospeak = 0, nohear = 0, clear = 0; switch_assert(conference != NULL); switch_assert(stream != NULL); - if (argc > 4) { - uint8_t nospeak = 0, nohear = 0, clear = 0; - nospeak = strstr(argv[4], "nospeak") ? 1 : 0; - nohear = strstr(argv[4], "nohear") ? 1 : 0; + if (argc <= 4) return SWITCH_STATUS_GENERR; - if (!strcasecmp(argv[4], "clear")) { - clear = 1; - } + nospeak = strstr(argv[4], "nospeak") ? 1 : 0; + nohear = strstr(argv[4], "nohear") ? 1 : 0; - if (!(clear || nospeak || nohear)) { - ret_status = SWITCH_STATUS_GENERR; - goto done; - } - ret_status = SWITCH_STATUS_SUCCESS; + if (!strcasecmp(argv[4], "clear")) { + clear = 1; + } - if (clear) { - conference_member_t *member = NULL; - uint32_t id = atoi(argv[2]); - uint32_t oid = atoi(argv[3]); + if (!(clear || nospeak || nohear)) { + return SWITCH_STATUS_GENERR; + } + + if (clear) { + conference_member_t *member = NULL; + uint32_t id = atoi(argv[2]); + uint32_t oid = atoi(argv[3]); - if ((member = conference_member_get(conference, id))) { - member_del_relationship(member, oid); - stream->write_function(stream, "relationship %u->%u cleared.", id, oid); - } else { - stream->write_function(stream, "relationship %u->%u not found", id, oid); - } - } else if (nospeak || nohear) { - conference_member_t *member = NULL, *other_member = NULL; - uint32_t id = atoi(argv[2]); - uint32_t oid = atoi(argv[3]); + if ((member = conference_member_get(conference, id))) { + member_del_relationship(member, oid); + stream->write_function(stream, "relationship %u->%u cleared.", id, oid); + } else { + stream->write_function(stream, "relationship %u->%u not found", id, oid); + } + return SWITCH_STATUS_SUCCESS; + } + + if (nospeak || nohear) { + conference_member_t *member = NULL, *other_member = NULL; + uint32_t id = atoi(argv[2]); + uint32_t oid = atoi(argv[3]); - if ((member = conference_member_get(conference, id)) - && (other_member = conference_member_get(conference, oid))) { + if ((member = conference_member_get(conference, id)) + && (other_member = conference_member_get(conference, oid))) { conference_relationship_t *rel = NULL; if ((rel = member_get_relationship(member, other_member))) { rel->flags = 0; @@ -3077,14 +2958,12 @@ } else { stream->write_function(stream, "error!\n"); } - } else { - stream->write_function(stream, "relationship %u->%u not found", id, oid); - } + } else { + stream->write_function(stream, "relationship %u->%u not found", id, oid); } } - done: - return ret_status; + return SWITCH_STATUS_SUCCESS; } static switch_status_t conf_api_sub_lock(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) @@ -3128,54 +3007,47 @@ switch_event_fire(&event); } - return 0; } static switch_status_t conf_api_sub_dial(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) { - switch_status_t ret_status = SWITCH_STATUS_SUCCESS; + switch_call_cause_t cause; switch_assert(stream != NULL); - if (argc > 2) { - switch_call_cause_t cause; - - if (conference) { - conference_outcall(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3], &cause); - } else { - conference_outcall(NULL, argv[0], NULL, argv[2], 60, NULL, argv[4], argv[3], &cause); - } + if (argc <= 2) { + stream->write_function(stream, "Bad Args\n"); + return SWITCH_STATUS_GENERR; + } - stream->write_function(stream, "Call Requested: result: [%s]\n", switch_channel_cause2str(cause)); + if (conference) { + conference_outcall(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3], &cause); } else { - stream->write_function(stream, "Bad Args\n"); - ret_status = SWITCH_STATUS_GENERR; + conference_outcall(NULL, argv[0], NULL, argv[2], 60, NULL, argv[4], argv[3], &cause); } + stream->write_function(stream, "Call Requested: result: [%s]\n", switch_channel_cause2str(cause)); - return ret_status; + return SWITCH_STATUS_SUCCESS; } static switch_status_t conf_api_sub_bgdial(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) { - switch_status_t ret_status = SWITCH_STATUS_SUCCESS; - switch_assert(stream != NULL); - if (argc > 2) { - if (conference) { - conference_outcall_bg(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3]); - } else { - conference_outcall_bg(NULL, argv[1], NULL, argv[2], 60, NULL, argv[4], argv[3]); - } - stream->write_function(stream, "OK\n"); - } else { + if (argc <= 2) { stream->write_function(stream, "Bad Args\n"); - ret_status = SWITCH_STATUS_GENERR; + return SWITCH_STATUS_GENERR; + } + if (conference) { + conference_outcall_bg(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3]); + } else { + conference_outcall_bg(NULL, argv[1], NULL, argv[2], 60, NULL, argv[4], argv[3]); } + stream->write_function(stream, "OK\n"); - return ret_status; + return SWITCH_STATUS_SUCCESS; } static switch_status_t conf_api_sub_transfer(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) @@ -3310,39 +3182,32 @@ static switch_status_t conf_api_sub_record(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) { - switch_status_t ret_status = SWITCH_STATUS_SUCCESS; switch_assert(conference != NULL); switch_assert(stream != NULL); - if (argc > 2) { - stream->write_function(stream, "Record file %s\n", argv[2]); - launch_conference_record_thread(conference, argv[2]); - } else { - ret_status = SWITCH_STATUS_GENERR; - } + if (argc <= 2) return SWITCH_STATUS_GENERR; - return ret_status; + stream->write_function(stream, "Record file %s\n", argv[2]); + launch_conference_record_thread(conference, argv[2]); + return SWITCH_STATUS_SUCCESS; } static switch_status_t conf_api_sub_norecord(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) { - switch_status_t ret_status = SWITCH_STATUS_SUCCESS; + int all; switch_assert(conference != NULL); switch_assert(stream != NULL); - if (argc > 2) { - int all = (strcasecmp(argv[2], "all") == 0); - stream->write_function(stream, "Stop recording file %s\n", argv[2]); + if (argc <= 2) return SWITCH_STATUS_GENERR; - if (!conference_record_stop(conference, all ? NULL : argv[2]) && !all) { - stream->write_function(stream, "non-existant recording '%s'\n", argv[2]); - } - } else { - ret_status = SWITCH_STATUS_GENERR; + all = (strcasecmp(argv[2], "all") == 0); + stream->write_function(stream, "Stop recording file %s\n", argv[2]); + if (!conference_record_stop(conference, all ? NULL : argv[2]) && !all) { + stream->write_function(stream, "non-existant recording '%s'\n", argv[2]); } - return ret_status; + return SWITCH_STATUS_SUCCESS; } static switch_status_t conf_api_sub_pin(conference_obj_t * conference, switch_stream_handle_t *stream, int argc, char **argv) @@ -3812,44 +3677,40 @@ switch_core_session_t *session, char *bridgeto, uint32_t timeout, const char *flags, const char *cid_name, const char *cid_num) { struct bg_call *call = NULL; + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; - if ((call = malloc(sizeof(*call)))) { - switch_thread_t *thread; - switch_threadattr_t *thd_attr = NULL; - - memset(call, 0, sizeof(*call)); - call->conference = conference; - call->session = session; - call->timeout = timeout; - - if (bridgeto) { - call->bridgeto = strdup(bridgeto); - } - if (flags) { - call->flags = strdup(flags); - } - if (cid_name) { - call->cid_name = strdup(cid_name); - } - if (cid_num) { - call->cid_num = strdup(cid_num); - } - - if (conference_name) { - call->conference_name = strdup(conference_name); - } + if (!(call = malloc(sizeof(*call)))) return SWITCH_STATUS_MEMERR; + memset(call, 0, sizeof(*call)); + call->conference = conference; + call->session = session; + call->timeout = timeout; - switch_threadattr_create(&thd_attr, conference->pool); - switch_threadattr_detach_set(thd_attr, 1); - switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); - switch_thread_create(&thread, thd_attr, conference_outcall_run, call, conference->pool); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Lanuching BG Thread for outcall\n"); + if (bridgeto) { + call->bridgeto = strdup(bridgeto); + } + if (flags) { + call->flags = strdup(flags); + } + if (cid_name) { + call->cid_name = strdup(cid_name); + } + if (cid_num) { + call->cid_num = strdup(cid_num); + } - return SWITCH_STATUS_SUCCESS; + if (conference_name) { + call->conference_name = strdup(conference_name); } - return SWITCH_STATUS_MEMERR; + switch_threadattr_create(&thd_attr, conference->pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&thread, thd_attr, conference_outcall_run, call, conference->pool); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Lanuching BG Thread for outcall\n"); + + return SWITCH_STATUS_SUCCESS; } /* Play a file */ @@ -3890,7 +3751,6 @@ } goto done; } - if (conference->sound_prefix) { if (!(dpath = switch_mprintf("%s%s%s", conference->sound_prefix, SWITCH_PATH_SEPARATOR, path))) { @@ -4022,7 +3882,6 @@ profile_name = "default"; } - switch_event_create(&params, SWITCH_EVENT_MESSAGE); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "conf_name", conf_name); @@ -4505,7 +4364,6 @@ } } - return status; }

1 0

[commit] r7416 - in freeswitch/trunk/src: . mod/applications/mod_voicemail
by Freeswitch SVN 28 Jan '08

28 Jan '08

Author: anthm Date: Mon Jan 28 16:07:20 2008 New Revision: 7416 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/switch_ivr_play_say.c Log: tweak Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Mon Jan 28 16:07:20 2008 @@ -901,7 +901,11 @@ if (unlink(file_path) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", file_path); } - goto end; + if (switch_channel_ready(channel)) { + goto record_file; + } else { + goto end; + } } else { status = SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Mon Jan 28 16:07:20 2008 @@ -126,7 +126,9 @@ switch_event_add_header_string(hint_data, SWITCH_STACK_BOTTOM, "lang", chan_lang); if (data) { switch_event_add_header_string(hint_data, SWITCH_STACK_BOTTOM, "data", data); - } + } else { + data = ""; + } switch_channel_event_set_data(channel, hint_data); if (switch_xml_locate("phrases", NULL, NULL, NULL, &xml, &cfg, hint_data) != SWITCH_STATUS_SUCCESS) {

1 0

[commit] r7415 - freeswitch/trunk/src
by Freeswitch SVN 28 Jan '08

28 Jan '08

Author: brian Date: Mon Jan 28 15:57:45 2008 New Revision: 7415 Modified: freeswitch/trunk/src/switch_apr.c Log: tweak Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Mon Jan 28 15:57:45 2008 @@ -618,6 +618,10 @@ * from->ipaddr_ptr = inet_ntoa(from->sa.sin.sin_addr); */ } + + if (r == 35 ) { + r = SWITCH_STATUS_BREAK; + } return r; }

1 0