March 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7920 - freeswitch/trunk/src
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: mikej Date: Tue Mar 18 17:40:32 2008 New Revision: 7920 Modified: freeswitch/trunk/src/switch_core_io.c Log: tweak Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Mar 18 17:40:32 2008 @@ -107,6 +107,7 @@ top: if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + *frame = NULL; return SWITCH_STATUS_FALSE; }

1 0

[commit] r7919 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: mikej Date: Tue Mar 18 16:24:22 2008 New Revision: 7919 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c Log: Tue Mar 18 16:16:49 EDT 2008 Pekka.Pessi(a)nokia.com * nta: fixed checks for rfc2543 retransmssions/CANCEL/ACK Thanks to Michael Jerris for reporting this problem. fix for SFSIP-49 Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 18 16:24:22 2008 @@ -1 +1 @@ -Wed Mar 5 17:21:10 EST 2008 +Tue Mar 18 16:23:57 EDT 2008 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 Mar 18 16:24:22 2008 @@ -5322,9 +5322,9 @@ !(irq->irq_tag_set && to->a_tag == NULL)) ; /* Match top Via header field */ - else if (str0casecmp(irq->irq_via->v_branch, v->v_branch) == 0 && - strcasecmp(irq->irq_via->v_host, v->v_host) == 0 && - str0cmp(irq->irq_via->v_port, v->v_port) == 0) + else if (str0casecmp(irq->irq_via->v_branch, v->v_branch) != 0 || + strcasecmp(irq->irq_via->v_host, v->v_host) != 0 || + str0cmp(irq->irq_via->v_port, v->v_port) != 0) ; /* Match Request-URI */ else if (url_cmp(irq->irq_rq->rq_url, rq->rq_url)) @@ -5337,9 +5337,9 @@ return irq; /* found */ if (return_ack && irq->irq_method == sip_method_invite) - *return_ack = irq; + return *return_ack = irq, NULL; else if (return_cancel && irq->irq_method != sip_method_ack) - *return_cancel = irq; + return *return_cancel = irq, NULL; } } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c Tue Mar 18 16:24:22 2008 @@ -203,6 +203,10 @@ nta_incoming_t *irq, sip_t const *sip); +static int wait_for_ack_or_cancel(agent_t *ag, + nta_incoming_t *irq, + sip_t const *sip); + int agent_callback(agent_t *ag, nta_agent_t *nta, msg_t *msg, @@ -321,6 +325,7 @@ return 500; } + int new_leg_callback_200(agent_t *ag, nta_leg_t *leg, nta_incoming_t *irq, @@ -363,6 +368,20 @@ return 200; } +int new_leg_callback_180(agent_t *ag, + nta_leg_t *leg, + nta_incoming_t *irq, + sip_t const *sip) +{ + int status = new_leg_callback_200(ag, leg, irq, sip); + if (status == 200) { + ag->ag_irq = irq; + status = 180; + } + return status; +} + + static client_check_f client_check_to_tag; static client_check_f * const default_checks[] = { @@ -1038,6 +1057,8 @@ BEGIN(); + nta_leg_bind(ag->ag_server_leg, leg_callback_200, ag); + *url = *ag->ag_contact->m_url; url->url_port = "*"; url->url_params = "transport=tcp"; @@ -2546,9 +2567,112 @@ TEST_P(ag->ag_latest_leg, ag->ag_server_leg); } + while (su_recv(ag->ag_sink_socket, m1, sizeof m1, MSG_TRUNC) >= 0) + ; + + { + /* test INVITE/CANCEL with rfc2543 */ + char const template2[] = + "%s " URL_PRINT_FORMAT " SIP/2.0\r\n" + "Via: SIP/2.0/UDP 127.0.0.1:%s;x-kuik=%p\r\n" + "CSeq: %u %s\r\n" + "Call-ID: %p.dfsdhfsjkhsdjk.dfsjfhsduifhsjfsfjkfsd\r\n" + "From: Evil Forker <sip:evel@forker.com>;tag=test_nta-%s\r\n" + "To: Bob the Builder <sip:bob@example.net>%s\r\n" + "Content-Length: 0\r\n" + "\r\n"; + + nta_leg_bind(ag->ag_server_leg, new_leg_callback_180, ag); + + snprintf(m1, sizeof m1, + template2, + "INVITE", URL_PRINT_ARGS(u1), + /* Via */ ag->ag_sink_port, m1, + /* CSeq */ 15, "INVITE", + /* Call-ID */ (void *)(ag + 2), + /* From tag */ "2.6.1", + /* To tag */ ""); + l1 = strlen(m1); + TEST_1((size_t)su_sendto(ag->ag_sink_socket, m1, l1, 0, su, sulen) == l1); + recv_udp(ag, r1, sizeof r1); + + l1 = strlen("SIP/2.0 180 "); + TEST_1(memcmp(r1, "SIP/2.0 180 ", l1) == 0); + + TEST_1(ag->ag_irq); + nta_incoming_bind(ag->ag_irq, wait_for_ack_or_cancel, ag); + + snprintf(m2, sizeof m2, + template2, + "CANCEL", URL_PRINT_ARGS(u1), + /* Via */ ag->ag_sink_port, m1, + /* CSeq */ 15, "CANCEL", + /* Call-ID */ (void *)(ag + 2), + /* From tag */ "2.6.1", + /* To tag */ ""); + l2 = strlen(m2); + + TEST_1((size_t)su_sendto(ag->ag_sink_socket, m2, l2, 0, su, sulen) == l2); + recv_udp(ag, r1, sizeof r1); + recv_udp(ag, r2, sizeof r2); + + l1 = strlen("SIP/2.0 200 "); + TEST_1(strstr(r1, "15 CANCEL")); + TEST_1(memcmp(r1, "SIP/2.0 200 ", l1) == 0); + + TEST_1(strstr(r2, "15 INVITE")); + TEST_1(memcmp(r2, "SIP/2.0 487 ", l1) == 0); + + TEST_1(nta_incoming_status(ag->ag_irq) == 487); + + snprintf(m2, sizeof m2, + template2, + "ACK", URL_PRINT_ARGS(u1), + /* Via */ ag->ag_sink_port, m1, + /* CSeq */ 15, "ACK", + /* Call-ID */ (void *)(ag + 2), + /* From tag */ "2.6.1", + /* To tag */ ""); + l2 = strlen(m2); + + TEST_1((size_t)su_sendto(ag->ag_sink_socket, m2, l2, 0, su, sulen) == l2); + + nta_leg_destroy(ag->ag_bob_leg); ag->ag_bob_leg = NULL; + } + + while (su_recv(ag->ag_sink_socket, m1, sizeof m1, MSG_TRUNC) >= 0) + ; + END(); } +static +int wait_for_ack_or_cancel(agent_t *ag, + nta_incoming_t *irq, + sip_t const *sip) +{ + sip_method_t method; + + method = sip ? sip->sip_request->rq_method : sip_method_unknown; + + if (method == sip_method_cancel) { + nta_incoming_treply(ag->ag_irq, SIP_487_REQUEST_CANCELLED, TAG_END()); + } + else if (method == sip_method_ack) { + nta_incoming_destroy(irq); + ag->ag_irq = NULL; + ag->ag_running = 0; + } + else { /* Timeout */ + nta_incoming_destroy(irq); + ag->ag_irq = NULL; + ag->ag_running = 0; + } + + return 0; +} + + /* ---------------------------------------------------------------------- */ /* Test INVITE, dialogs */

1 0

[commit] r7918 - in freeswitch/trunk/src/mod: applications/mod_dptools languages/mod_spidermonkey
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: anthm Date: Tue Mar 18 14:48:32 2008 New Revision: 7918 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: make some sleep and javascript ok with no-media Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Mar 18 14:48:32 2008 @@ -1760,7 +1760,7 @@ SWITCH_ADD_API(api_interface, "presence", "presence", presence_api_function, "<user> <rpid> <message>"); SWITCH_ADD_APP(app_interface, "privacy", "Set privacy on calls", "Set caller privacy on calls.", privacy_function, "off|on|name|full|number", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "transfer", "Transfer a channel", TRANSFER_LONG_DESC, transfer_function, "<exten> [<dialplan> <context>]", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "sleep", "Pause a channel", SLEEP_LONG_DESC, sleep_function, "<pausemilliseconds>", SAF_NONE); + SWITCH_ADD_APP(app_interface, "sleep", "Pause a channel", SLEEP_LONG_DESC, sleep_function, "<pausemilliseconds>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "delay_echo", "echo audio at a specified delay", "Delay n ms", delay_function, "<delay ms>", SAF_NONE); SWITCH_ADD_APP(app_interface, "strftime", NULL, NULL, strftime_function, NULL, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "phrase", "Say a Phrase", "Say a Phrase", phrase_function, "<macro_name>,<data>", SAF_NONE); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Mar 18 14:48:32 2008 @@ -72,6 +72,14 @@ } \ } while (foo == 1) +#define CHANNEL_MEDIA_SANITY_CHECK() do { \ + if (!switch_channel_media_ready(channel)) { \ + eval_some_js("~throw new Error(\"Session is not in media mode!\");", cx, obj, rval); \ + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); \ + return JS_FALSE; \ + } \ + } while (foo == 1) + static void session_destroy(JSContext * cx, JSObject * obj); static JSBool session_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval); static JSBool session_originate(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval); @@ -1092,7 +1100,7 @@ jsval nval , *rval = &nval; JSContext *cx = cb_state->cx; JSObject *obj = cb_state->obj; - + METHOD_SANITY_CHECK(); jss->stack_depth++; @@ -1317,7 +1325,11 @@ static JSBool session_flush_digits(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { struct js_session *jss = JS_GetPrivate(cx, obj); + switch_channel_t *channel; + METHOD_SANITY_CHECK(); + channel = switch_core_session_get_channel(jss->session); + CHANNEL_MEDIA_SANITY_CHECK(); switch_channel_flush_dtmf(switch_core_session_get_channel(jss->session)); @@ -1362,6 +1374,8 @@ channel = switch_core_session_get_channel(jss->session); CHANNEL_SANITY_CHECK(); + CHANNEL_MEDIA_SANITY_CHECK(); + if (argc > 0) { file_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); if (switch_strlen_zero(file_name)) { @@ -1429,6 +1443,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); CHANNEL_SANITY_CHECK(); + CHANNEL_MEDIA_SANITY_CHECK(); if (argc > 0) { if ((function = JS_ValueToFunction(cx, argv[0]))) { @@ -1485,6 +1500,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); CHANNEL_SANITY_CHECK(); + CHANNEL_MEDIA_SANITY_CHECK(); if (argc > 0) { phrase_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); @@ -1612,6 +1628,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); CHANNEL_SANITY_CHECK(); + CHANNEL_MEDIA_SANITY_CHECK(); if (argc > 0) { file_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); @@ -1781,9 +1798,11 @@ METHOD_SANITY_CHECK(); + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); channel = switch_core_session_get_channel(jss->session); CHANNEL_SANITY_CHECK(); + CHANNEL_MEDIA_SANITY_CHECK(); if (argc < 3) { return JS_FALSE; @@ -1986,6 +2005,7 @@ METHOD_SANITY_CHECK(); channel = switch_core_session_get_channel(jss->session); + CHANNEL_MEDIA_SANITY_CHECK(); started = switch_timestamp_now(); @@ -3483,7 +3503,7 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_API(api_interface, "jsrun", "run a script", launch_async, "jsrun <script> [additional_vars [...]]"); SWITCH_ADD_API(api_interface, "jsapi", "execute an api call", jsapi_function, "jsapi <script> [additional_vars [...]]"); - SWITCH_ADD_APP(app_interface, "javascript", "Launch JS ivr", "Run a javascript ivr on a channel", js_dp_function, "<script> [additional_vars [...]]", SAF_NONE); + SWITCH_ADD_APP(app_interface, "javascript", "Launch JS ivr", "Run a javascript ivr on a channel", js_dp_function, "<script> [additional_vars [...]]", SAF_SUPPORT_NOMEDIA); curl_global_init(CURL_GLOBAL_ALL);

1 0

[commit] r7917 - freeswitch/trunk/src
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: anthm Date: Tue Mar 18 14:34:30 2008 New Revision: 7917 Modified: freeswitch/trunk/src/switch_rtp.c Log: fix jitter buffer issue from earlier code rearrangement Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Mar 18 14:34:30 2008 @@ -1138,11 +1138,10 @@ } if (rtp_session->timer.interval) { + check = (uint8_t) (switch_core_timer_check(&rtp_session->timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS); if (bytes) { - check++; switch_core_timer_sync(&rtp_session->timer); } else { - check = (uint8_t) (switch_core_timer_check(&rtp_session->timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS); if (check && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTO_CNG) && rtp_session->timer.samplecount >= (rtp_session->last_write_samplecount + (rtp_session->samples_per_interval * 50))) { uint8_t data[10] = { 0 }; @@ -1180,6 +1179,32 @@ goto end; } + + + if (rtp_session->jb && ((bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) || check)) { + if (bytes) { + if (rtp_session->recv_msg.header.m) { + stfu_n_reset(rtp_session->jb); + } + + stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, bytes - rtp_header_len); + bytes = 0; + } + + if ((jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { + memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); + if (jb_frame->plc) { + *flags |= SFF_PLC; + } + bytes = jb_frame->dlen + rtp_header_len; + rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); + rtp_session->recv_msg.header.pt = rtp_session->payload; + } else { + goto cng; + } + } + + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_RECV)) { int sbytes = (int) bytes; err_status_t stat = 0; @@ -1217,24 +1242,6 @@ bytes = sbytes; } - if (rtp_session->jb && bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) { - if (rtp_session->recv_msg.header.m) { - stfu_n_reset(rtp_session->jb); - } - - stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, bytes - rtp_header_len); - if ((jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { - memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); - if (jb_frame->plc) { - *flags |= SFF_PLC; - } - bytes = jb_frame->dlen + rtp_header_len; - rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); - } else { - bytes = 0; - continue; - } - } /* RFC2833 ... like all RFC RE: VoIP, guarenteed to drive you to insanity!

1 0

[commit] r7916 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: anthm Date: Tue Mar 18 14:22:13 2008 New Revision: 7916 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: update Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Mar 18 14:22:13 2008 @@ -2616,6 +2616,13 @@ jss->cx = cx; jss->obj = obj; JS_SetPrivate(cx, obj, jss); + + if (argc > 0) { + char *uuid = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); + if (uuid) { + jss->session = switch_core_session_locate(uuid); + } + } return JS_TRUE; }

1 0

[commit] r7915 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: mikej Date: Tue Mar 18 13:14:26 2008 New Revision: 7915 Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml Log: sample config for MODAPP-81 Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Tue Mar 18 13:14:26 2008 @@ -89,6 +89,8 @@ <param name="caller-id-name" value="$${outbound_caller_name}"/>  <param name="caller-id-number" value="$${outbound_caller_id}"/> +  +  </profile> <profile name="wideband">

1 0

[commit] r7914 - in freeswitch/trunk: docs src/mod/applications/mod_conference
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: mikej Date: Tue Mar 18 12:17:17 2008 New Revision: 7914 Modified: freeswitch/trunk/docs/AUTHORS freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add conference profile param suppress-events to allow you to turn off certain events. (MODAPP-81) Modified: freeswitch/trunk/docs/AUTHORS ============================================================================== --- freeswitch/trunk/docs/AUTHORS (original) +++ freeswitch/trunk/docs/AUTHORS Tue Mar 18 12:17:17 2008 @@ -35,6 +35,7 @@ Jonas Gauffin <jonas at gauffin dot org> - Bugfixes and additions in mod_spidermonkey_odbc Damjan Jovanovic <moctodliamgtavojtodnajmad backwards> - mod_java Juan Jose Comellas <juanjo(a)comellas.org> - Patch to switch_utils for arg parsing. + Dale Thatcher <freeswitch at dalethatcher dot com> - Additions to mod_conference. A big THANK YOU goes to: 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 Tue Mar 18 12:17:17 2008 @@ -26,6 +26,7 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * Neal Horman <neal at wanlink dot com> * Bret McDanel <trixter at 0xdecafbad dot com> + * Dale Thatcher <freeswitch at dalethatcher dot com> * * * mod_conference.c -- Software Conference Bridge @@ -56,6 +57,8 @@ #define MIN(a, b) ((a)<(b)?(a):(b)) #endif +#define test_eflag(conference, flag) ((conference)->eflags & flag) + typedef enum { FILE_STOP_CURRENT, FILE_STOP_ALL, @@ -157,6 +160,35 @@ NODE_TYPE_SPEECH } node_type_t; +typedef enum { + EFLAG_ADD_MEMBER = (1 << 0), + EFLAG_DEL_MEMBER = (1 << 1), + EFLAG_ENERGY_LEVEL = (1 << 2), + EFLAG_VOLUME_LEVEL = (1 << 3), + EFLAG_GAIN_LEVEL = (1 << 4), + EFLAG_DTMF = (1 << 5), + EFLAG_STOP_TALKING = (1 << 6), + EFLAG_START_TALKING = (1 << 7), + EFLAG_MUTE_MEMBER = (1 << 8), + EFLAG_UNMUTE_MEMBER = (1 << 9), + EFLAG_DEAF_MEMBER = (1 << 10), + EFLAG_UNDEAF_MEMBER = (1 << 11), + EFLAG_KICK_MEMBER = (1 << 12), + EFLAG_DTMF_MEMBER = (1 << 13), + EFLAG_ENERGY_LEVEL_MEMBER = (1 << 14), + EFLAG_VOLUME_IN_MEMBER = (1 << 15), + EFLAG_VOLUME_OUT_MEMBER = (1 << 16), + EFLAG_PLAY_FILE = (1 << 17), + EFLAG_PLAY_FILE_MEMBER = (1 << 18), + EFLAG_SPEAK_TEXT = (1 << 19), + EFLAG_SPEAK_TEXT_MEMBER = (1 << 20), + EFLAG_LOCK = (1 << 21), + EFLAG_UNLOCK = (1 << 22), + EFLAG_TRANSFER = (1 << 23), + EFLAG_BGDIAL_RESULT = (1 << 24), + EFLAG_FLOOR_CHANGE = (1 << 25) +} event_type_t; + typedef struct conference_file_node { switch_file_handle_t fh; switch_speech_handle_t *sh; @@ -229,6 +261,7 @@ uint32_t not_talking_buf_len; int comfort_noise_level; int video_running; + uint32_t eflags; } conference_obj_t; /* Relationship with another member */ @@ -596,7 +629,8 @@ switch_set_flag(conference, CFLAG_ENFORCE_MIN); } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(conference, EFLAG_ADD_MEMBER) && + 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", "add-member"); switch_event_fire(&event); @@ -711,7 +745,8 @@ conference->floor_holder = conference->members; } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(conference, EFLAG_DEL_MEMBER) && + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); conference_add_event_data(conference, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "del-member"); @@ -1215,7 +1250,8 @@ member->energy_level = 3000; } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL) && + 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); @@ -1237,7 +1273,8 @@ 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) { + if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL) && + 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); @@ -1262,7 +1299,8 @@ member->energy_level = 0; } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL) && + 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); @@ -1285,7 +1323,8 @@ 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) { + if (test_eflag(member->conference, EFLAG_VOLUME_LEVEL) && + 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); @@ -1307,7 +1346,8 @@ 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) { + if (test_eflag(member->conference, EFLAG_VOLUME_LEVEL) && + 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); @@ -1330,7 +1370,8 @@ 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) { + if (test_eflag(member->conference, EFLAG_VOLUME_LEVEL) && + 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); @@ -1353,7 +1394,8 @@ 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) { + if (test_eflag(member->conference, EFLAG_GAIN_LEVEL) && + 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); @@ -1375,7 +1417,8 @@ 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) { + if (test_eflag(member->conference, EFLAG_GAIN_LEVEL) && + 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); @@ -1398,7 +1441,8 @@ 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) { + if (test_eflag(member->conference, EFLAG_GAIN_LEVEL) && + 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); @@ -1413,7 +1457,8 @@ static void conference_loop_fn_event(conference_member_t * member, caller_control_action_t * action) { switch_event_t *event; - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(member->conference, EFLAG_DTMF) && + 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", "dtmf"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "DTMF-Key", "%s", action->binded_dtmf); @@ -1469,7 +1514,8 @@ hangover_hits = hangunder_hits = 0; switch_clear_flag_locked(member, MFLAG_TALKING); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(member->conference, EFLAG_STOP_TALKING) && + 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", "stop-talking"); switch_event_fire(&event); @@ -1520,7 +1566,8 @@ if (!member->conference->floor_holder || !switch_test_flag(member->conference->floor_holder, MFLAG_TALKING) || member->score > member->conference->floor_holder->score + 200) { - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(member->conference, EFLAG_FLOOR_CHANGE) && + 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", "floor-change"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Old-ID", "%d", @@ -1533,7 +1580,8 @@ } switch_mutex_unlock(member->conference->member_mutex); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(member->conference, EFLAG_START_TALKING) && + 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", "start-talking"); switch_event_fire(&event); @@ -1550,7 +1598,8 @@ hangover_hits = hangunder_hits = 0; switch_clear_flag_locked(member, MFLAG_TALKING); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(member->conference, EFLAG_STOP_TALKING) && + 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", "stop-talking"); switch_event_fire(&event); @@ -2631,7 +2680,8 @@ 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) { + if (test_eflag(member->conference, EFLAG_MUTE_MEMBER) && + 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); @@ -2658,7 +2708,8 @@ 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) { + if (test_eflag(member->conference, EFLAG_UNMUTE_MEMBER) && + 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); @@ -2719,7 +2770,8 @@ if (stream != NULL) { stream->write_function(stream, "OK kicked %u\n", member->id); } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(member->conference, EFLAG_KICK_MEMBER) && + 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); @@ -2752,7 +2804,8 @@ stream->write_function(stream, "OK sent %s to %u\n", (char *) data, member->id); } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(member->conference, EFLAG_DTMF_MEMBER) && + 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", "dtmf-member"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Digits", "%s", dtmf); @@ -2776,7 +2829,8 @@ 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) { + if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL_MEMBER) && + 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); @@ -2801,7 +2855,8 @@ 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) { + if (test_eflag(member->conference, EFLAG_VOLUME_IN_MEMBER) && + 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); @@ -2826,7 +2881,8 @@ 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) { + if (test_eflag(member->conference, EFLAG_VOLUME_OUT_MEMBER) && 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); @@ -2915,7 +2971,8 @@ if (argc == 3) { if (conference_play_file(conference, argv[2], 0, NULL, async) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "(play) Playing file %s\n", argv[2]); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(conference, EFLAG_PLAY_FILE) && + 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", "play-file"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "File", "%s", argv[2]); @@ -2932,7 +2989,8 @@ if ((member = conference_member_get(conference, id))) { if (conference_member_play_file(member, argv[2], 0) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "(play) Playing file %s to member %u\n", argv[2], id); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(conference, EFLAG_PLAY_FILE_MEMBER) && + 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", "play-file-member"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "File", "%s", argv[2]); @@ -2965,7 +3023,8 @@ } stream->write_function(stream, "(say) OK\n"); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(conference, EFLAG_SPEAK_TEXT) && + 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); @@ -3023,7 +3082,8 @@ } stream->write_function(stream, "(saymember) OK\n"); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(member->conference, EFLAG_SPEAK_TEXT_MEMBER) && + 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); @@ -3151,7 +3211,8 @@ switch_set_flag_locked(conference, CFLAG_LOCKED); stream->write_function(stream, "OK %s locked\n", argv[0]); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(conference, EFLAG_LOCK) && + 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", "lock"); switch_event_fire(&event); @@ -3173,7 +3234,8 @@ switch_clear_flag_locked(conference, CFLAG_LOCKED); stream->write_function(stream, "OK %s unlocked\n", argv[0]); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(conference, EFLAG_UNLOCK) && + 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", "unlock"); switch_event_fire(&event); @@ -3332,7 +3394,8 @@ stream->write_function(stream, "OK Members sent to conference %s.\n", argv[2]); /* tell them what happened */ - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(conference, EFLAG_TRANSFER) && + 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, "Old-Conference-Name", "%s", conference->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Conference-Name", "%s", argv[3]); @@ -3827,7 +3890,8 @@ conference_outcall(call->conference, call->conference_name, call->session, call->bridgeto, call->timeout, call->flags, call->cid_name, call->cid_num, &cause); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + if (test_eflag(call->conference, EFLAG_BGDIAL_RESULT) && + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_data(call->conference, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "bgdial-result"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Result", "%s", switch_channel_cause2str(cause)); @@ -3958,6 +4022,76 @@ } +static void clear_eflags(char *events, uint32_t * f) +{ + char buf[512] = ""; + char* next = NULL; + char* event = buf; + + if (events) { + switch_copy_string(buf, events, sizeof(buf)); + + while (event) { + next = strchr(event, ','); + if (next) { + *next++ = '\0'; + } + + if (!strcmp(event, "add-member")) { + *f &= ~EFLAG_ADD_MEMBER; + } else if (!strcmp(event, "del-member")) { + *f &= ~EFLAG_DEL_MEMBER; + } else if (!strcmp(event, "energy-level")) { + *f &= ~EFLAG_ENERGY_LEVEL; + } else if (!strcmp(event, "volume-level")) { + *f &= ~EFLAG_VOLUME_LEVEL; + } else if (!strcmp(event, "gain-level")) { + *f &= ~EFLAG_GAIN_LEVEL; + } else if (!strcmp(event, "dtmf")) { + *f &= ~EFLAG_DTMF; + } else if (!strcmp(event, "stop-talking")) { + *f &= ~EFLAG_STOP_TALKING; + } else if (!strcmp(event, "start-talking")) { + *f &= ~EFLAG_START_TALKING; + } else if (!strcmp(event, "mute-member")) { + *f &= ~EFLAG_MUTE_MEMBER; + } else if (!strcmp(event, "unmute-member")) { + *f &= ~EFLAG_UNMUTE_MEMBER; + } else if (!strcmp(event, "kick-member")) { + *f &= ~EFLAG_KICK_MEMBER; + } else if (!strcmp(event, "dtmf-member")) { + *f &= ~EFLAG_DTMF_MEMBER; + } else if (!strcmp(event, "energy-level-member")) { + *f &= ~EFLAG_ENERGY_LEVEL_MEMBER; + } else if (!strcmp(event, "volume-in-member")) { + *f &= ~EFLAG_VOLUME_IN_MEMBER; + } else if (!strcmp(event, "volume-out-member")) { + *f &= ~EFLAG_VOLUME_OUT_MEMBER; + } else if (!strcmp(event, "play-file")) { + *f &= ~EFLAG_PLAY_FILE; + } else if (!strcmp(event, "play-file-member")) { + *f &= ~EFLAG_PLAY_FILE_MEMBER; + } else if (!strcmp(event, "speak-text")) { + *f &= ~EFLAG_SPEAK_TEXT; + } else if (!strcmp(event, "speak-text-member")) { + *f &= ~EFLAG_SPEAK_TEXT_MEMBER; + } else if (!strcmp(event, "lock")) { + *f &= ~EFLAG_LOCK; + } else if (!strcmp(event, "unlock")) { + *f &= ~EFLAG_UNLOCK; + } else if (!strcmp(event, "transfer")) { + *f &= ~EFLAG_TRANSFER; + } else if (!strcmp(event, "bgdial-result")) { + *f &= ~EFLAG_BGDIAL_RESULT; + } else if (!strcmp(event, "floor-change")) { + *f &= ~EFLAG_FLOOR_CHANGE; + } + + event = next; + } + } +} + SWITCH_STANDARD_APP(conference_auto_function) { switch_channel_t *channel = switch_core_session_get_channel(session); @@ -4653,6 +4787,7 @@ uint32_t rate = 8000, interval = 20; switch_status_t status; int comfort_noise_level = 0; + char *suppress_events = NULL; /* Validate the conference name */ if (switch_strlen_zero(name)) { @@ -4768,7 +4903,9 @@ anounce_count = 0; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "anounce-count is invalid, not anouncing member counts\n"); } - } + } else if (!strcasecmp(var, "suppress-events") && !switch_strlen_zero(val)) { + suppress_events = val; + } } /* Set defaults and various paramaters */ @@ -4918,6 +5055,11 @@ conference->interval = interval; conference->dtmf_parser = NULL; + conference->eflags = 0xFFFFFFFF; + if (!switch_strlen_zero(suppress_events)) { + clear_eflags(suppress_events, &conference->eflags); + } + /* caller control configuration chores */ if (switch_ivr_digit_stream_parser_new(conference->pool, &conference->dtmf_parser) == SWITCH_STATUS_SUCCESS) {

1 0

[commit] r7913 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: brian Date: Tue Mar 18 11:03:34 2008 New Revision: 7913 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Mar 18 11:03:34 2008 @@ -143,7 +143,8 @@ <anti-action application="set" data="call_timeout=30"/> <anti-action application="set" data="sip_exclude_contact=${network_addr}"/> <anti-action application="set" data="hangup_after_bridge=true"/> - <anti-action application="set" data="continue_on_fail=NORMAL_TEMPORARY_FAILURE,BUSY,USER_BUSY,NO_ANSWER,TIMEOUT,NO_ROUTE_DESTINATION,CALL_REJECTED"/> +  + <anti-action application="set" data="continue_on_fail=true"/> <anti-action application="db" data="insert/call_return/${dialed_ext}/${caller_id_number}"/> <anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/> <anti-action application="bridge" data="user/${dialed_ext}@$${domain}"/>

1 0

[commit] r7912 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: cparker Date: Tue Mar 18 10:55:35 2008 New Revision: 7912 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: Make sure timestamps are RFC compliant. Reported in MODEVENT-19 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Tue Mar 18 10:55:35 2008 @@ -147,10 +147,7 @@ char *uuid_str; switch_time_exp_t tm; - switch_size_t retsize; - const char *fmt = "%Y-%m-%d %T"; - char created[80] = "", answered[80] = "", transferred[80] = "", hungup[80] = ""; - + char buffer[32]; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Entering my_on_ring\n"); @@ -207,23 +204,6 @@ calltransferdate = profile->times->transferred; callenddate = profile->times->hungup; - if (callstartdate > 0) { - switch_time_exp_lt(&tm, callstartdate); - switch_strftime(created, &retsize, sizeof(created), fmt, &tm); - } - if (callanswerdate > 0) { - switch_time_exp_lt(&tm, callanswerdate); - switch_strftime(answered, &retsize, sizeof(answered), fmt, &tm); - } - if (calltransferdate > 0) { - switch_time_exp_lt(&tm, calltransferdate); - switch_strftime(transferred, &retsize, sizeof(transferred), fmt, &tm); - } - if (callenddate > 0) { - switch_time_exp_lt(&tm, callenddate); - switch_strftime(hungup, &retsize, sizeof(hungup), fmt, &tm); - } - if (profile->username) { if (rc_avpair_add(rad_config, &send, PW_USER_NAME, (void *)profile->username, -1, 0) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, @@ -313,36 +293,56 @@ } } if (callstartdate > 0) { - if (rc_avpair_add(rad_config, &send, PW_FS_CALLSTARTDATE, &created, -1, PW_FS_PEC) == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed adding Freeswitch-Callstartdate: %s\n", created); + switch_time_exp_lt(&tm, callstartdate); + switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, + tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600); + if (rc_avpair_add(rad_config, &send, PW_FS_CALLSTARTDATE, &buffer, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Callstartdate: %s\n", buffer); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } } if (callanswerdate > 0) { - if (rc_avpair_add(rad_config, &send, PW_FS_CALLANSWERDATE, &answered, -1, PW_FS_PEC) == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed adding Freeswitch-Callanswerdate: %s\n", answered); + switch_time_exp_lt(&tm, callanswerdate); + switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, + tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600); + if (rc_avpair_add(rad_config, &send, PW_FS_CALLANSWERDATE, &buffer, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Callanswerdate: %s\n", buffer); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } } if (calltransferdate > 0) { - if (rc_avpair_add(rad_config, &send, PW_FS_CALLTRANSFERDATE, &transferred, -1, PW_FS_PEC) == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed adding Freeswitch-Calltransferdate: %s\n", transferred); + switch_time_exp_lt(&tm, calltransferdate); + switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, + tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600); + if (rc_avpair_add(rad_config, &send, PW_FS_CALLTRANSFERDATE, &buffer, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Calltransferdate: %s\n", buffer); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } } if (callenddate > 0) { - if (rc_avpair_add(rad_config, &send, PW_FS_CALLENDDATE, &hungup, -1, PW_FS_PEC) == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed adding Freeswitch-Callenddate: %s\n", hungup); + switch_time_exp_lt(&tm, callenddate); + switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, + tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600); + if (rc_avpair_add(rad_config, &send, PW_FS_CALLENDDATE, &buffer, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Callenddate: %s\n", buffer); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } @@ -381,8 +381,8 @@ rc_handle *rad_config; int retval = 0; VALUE_PAIR *send = NULL; - uint32_t client_port = 0; - uint32_t status_type = PW_STATUS_STOP; + uint32_t client_port = 0; + uint32_t status_type = PW_STATUS_STOP; switch_time_t callstartdate = 0; switch_time_t callanswerdate = 0; switch_time_t callenddate = 0; @@ -392,9 +392,7 @@ char *uuid_str; switch_time_exp_t tm; - switch_size_t retsize; - const char *fmt = "%Y-%m-%d %T"; - char created[80] = "", answered[80] = "", transferred[80] = "", hungup[80] = ""; + char buffer[32] = ""; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Entering my_on_hangup\n"); @@ -452,23 +450,6 @@ calltransferdate = profile->times->transferred; callenddate = profile->times->hungup; - if (callstartdate > 0) { - switch_time_exp_lt(&tm, callstartdate); - switch_strftime(created, &retsize, sizeof(created), fmt, &tm); - } - if (callanswerdate > 0) { - switch_time_exp_lt(&tm, callanswerdate); - switch_strftime(answered, &retsize, sizeof(answered), fmt, &tm); - } - if (calltransferdate > 0) { - switch_time_exp_lt(&tm, calltransferdate); - switch_strftime(transferred, &retsize, sizeof(transferred), fmt, &tm); - } - if (callenddate > 0) { - switch_time_exp_lt(&tm, callenddate); - switch_strftime(hungup, &retsize, sizeof(hungup), fmt, &tm); - } - if (switch_channel_test_flag(channel,CF_ANSWERED)) { if (callstartdate && callanswerdate) { if (callenddate) @@ -590,36 +571,56 @@ } if (callstartdate > 0) { - if (rc_avpair_add(rad_config, &send, PW_FS_CALLSTARTDATE, &created, -1, PW_FS_PEC) == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed adding Freeswitch-Callstartdate: %s\n", created); + switch_time_exp_lt(&tm, callstartdate); + switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, + tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600); + if (rc_avpair_add(rad_config, &send, PW_FS_CALLSTARTDATE, &buffer, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Callstartdate: %s\n", buffer); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } } if (callanswerdate > 0) { - if (rc_avpair_add(rad_config, &send, PW_FS_CALLANSWERDATE, &answered, -1, PW_FS_PEC) == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed adding Freeswitch-Callanswerdate: %s\n", answered); + switch_time_exp_lt(&tm, callanswerdate); + switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, + tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600); + if (rc_avpair_add(rad_config, &send, PW_FS_CALLANSWERDATE, &buffer, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Callanswerdate: %s\n", buffer); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } } if (calltransferdate > 0) { - if (rc_avpair_add(rad_config, &send, PW_FS_CALLTRANSFERDATE, &transferred, -1, PW_FS_PEC) == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed adding Freeswitch-Calltransferdate: %s\n", transferred); + switch_time_exp_lt(&tm, calltransferdate); + switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, + tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600); + if (rc_avpair_add(rad_config, &send, PW_FS_CALLTRANSFERDATE, &buffer, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Calltransferdate: %s\n", buffer); rc_destroy(rad_config); return SWITCH_STATUS_TERM; } } if (callenddate > 0) { - if (rc_avpair_add(rad_config, &send, PW_FS_CALLENDDATE, &hungup, -1, PW_FS_PEC) == NULL) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "failed adding Freeswitch-Callenddate: %s\n", hungup); + switch_time_exp_lt(&tm, callenddate); + switch_snprintf(buffer, sizeof(buffer), "%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d", + tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, + tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_usec, + tm.tm_gmtoff / 3600, tm.tm_gmtoff % 3600); + if (rc_avpair_add(rad_config, &send, PW_FS_CALLENDDATE, &buffer, -1, PW_FS_PEC) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "failed adding Freeswitch-Callenddate: %s\n", buffer); rc_destroy(rad_config); return SWITCH_STATUS_TERM; }

1 0

[commit] r7911 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: cparker Date: Tue Mar 18 10:44:01 2008 New Revision: 7911 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.conf.xml Log: Clean up setting defaults, expose seqfile config option. Reported in MODEVENT-19 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Tue Mar 18 10:44:01 2008 @@ -40,6 +40,7 @@ static char cf[] = "mod_radius_cdr.conf"; static char my_dictionary[PATH_MAX]; +static char my_seqfile[PATH_MAX]; static char * my_deadtime; /* 0 */ static char * my_timeout; /* 5 */ static char * my_retries; /* 3 */ @@ -72,9 +73,9 @@ return NULL; } - if (rc_add_config(rad_config, "seqfile", "/var/run/radius.seq", "mod_radius_cdr.c", 0) != 0) { + if (rc_add_config(rad_config, "seqfile", my_seqfile, "mod_radius_cdr.c", 0) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "setting seqfile = /var/run/radius.seq failed\n"); + "setting seqfile = %s failed\n", my_seqfile); rc_destroy(rad_config); return NULL; } @@ -655,6 +656,9 @@ my_timeout = "5"; my_retries = "3"; + my_deadtime = "0"; + strncpy(my_seqfile, "/var/run/radius.seq", PATH_MAX-1); + strncpy(my_dictionary, "/usr/local/freeswitch/conf/radius/dictionary", PATH_MAX-1); for( int i = 0; i < SERVER_MAX; i++ ) { my_servers[i][0] = '\0'; @@ -667,10 +671,10 @@ if ((settings = switch_xml_child(cfg, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { - char *var = (char *) switch_xml_attr_soft(param, "name"); - char *val = (char *) switch_xml_attr_soft(param, "value"); + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); - if (!strcmp(var, "acctserver")) { + if (!strcmp(var, "acctserver")) { if (num_servers < SERVER_MAX) { strncpy(my_servers[num_servers],val,255-1); num_servers++; @@ -679,15 +683,21 @@ "you can only specify %d radius servers, ignoring excess server entry\n", SERVER_MAX); } } - else if (!strcmp(var, "dictionary")) { + else if (!strcmp(var, "dictionary")) { strncpy(my_dictionary,val,PATH_MAX-1); } + else if (!strcmp(var, "seqfile")) { + strncpy(my_seqfile,val,PATH_MAX-1); + } else if (!strcmp(var, "radius_timeout")) { my_timeout = strdup(val); } else if (!strcmp(var, "radius_retries")) { my_retries = strdup(val); } + else if (!strcmp(var, "radius_deadtime")) { + my_deadtime = strdup(val); + } } } Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.conf.xml ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.conf.xml (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.conf.xml Tue Mar 18 10:44:01 2008 @@ -1,12 +1,21 @@ <configuration name="mod_radius_cdr.conf" description="RADIUS CDR Configuration"> <settings> -  +  <param name="dictionary" value="/usr/local/freeswitch/conf/radius/dictionary"/> +  + <param name="dictionary" value="/var/run/radius.seq"/> + +  +  +  + <param name="acctserver" value="127.0.0.1:1813:testing123"/> + <param name="acctserver" value="10.0.0.254:1813:testing123"/> + <param name="acctserver" value="192.168.10.10:1813:testing123"/> +  <param name="radius_retries" value="3"/>  <param name="radius_timeout" value="5"/> -  <param name="radius_deadtime" value="0"/> - -  -  -  - <param name="acctserver" value="127.0.0.1:1813:testing123"/> - <param name="acctserver" value="10.0.0.254:1813:testing123"/> - <param name="acctserver" value="192.168.10.10:1813:testing123"/> </settings> </configuration>

1 0