- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

[commit] r7910 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: mikej Date: Tue Mar 18 10:24:40 2008 New Revision: 7910 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: tweak help. Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Tue Mar 18 10:24:40 2008 @@ -634,7 +634,7 @@ SWITCH_ADD_APP(app_interface, "db", "Insert to the db", DB_DESC, db_function, DB_USAGE, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "group", "Manage a group", GROUP_DESC, group_function, GROUP_USAGE, SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_API(commands_api_interface, "db", "db get/set", db_api_function, "[get|set]/<realm>/<key>/<value>"); + SWITCH_ADD_API(commands_api_interface, "db", "db get/set", db_api_function, "[insert|delete|select]/<realm>/<key>/<value>"); SWITCH_ADD_API(commands_api_interface, "group", "group [insert|delete|call]", group_api_function, "[insert|delete|call]:<group name>:<url>"); /* indicate that the module should continue to be loaded */

1 0

[commit] r7909 - freeswitch/trunk/src/mod/applications/mod_enum
by Freeswitch SVN 18 Mar '08

18 Mar '08

Author: anthm Date: Mon Mar 17 23:24:03 2008 New Revision: 7909 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: resolve MODAPP-80 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Mon Mar 17 23:24:03 2008 @@ -279,46 +279,57 @@ const unsigned char *dend = rr->dnsrr_dend; unsigned char *dn = rr->dnsrr_dn; const unsigned char *c; - char *ptr; char flags; int order; int preference; - char *nme; char *service = NULL; char *regex = NULL; char *replace = NULL; int argc = 0; char *argv[4] = { 0 }; - int leap; + int n; + char string_arg[3][256] = {{0}}; switch (rr->dnsrr_typ) { - - case DNS_T_NAPTR: /* prio weight port targetDN */ + case DNS_T_NAPTR:/* prio weight port targetDN */ c = dptr; - c += 2 + 2 + 2; - if (dns_getdn(pkt, &c, end, dn, DNS_MAXDN) <= 0 || c != dend) + c += 4; /* order, pref */ + + for (n = 0; n < 3; ++n) { + if (c >= dend) { + goto xperr; + } else { + c += *c + 1; + } + } + + if (dns_getdn(pkt, &c, end, dn, DNS_MAXDN) <= 0 || c != dend) { goto xperr; + } + c = dptr; + order = dns_get16(c+0); + preference = dns_get16(c+2); + flags = (char) dns_get16(c + 4); + c += 4; - leap = *dn; - nme = (char *) dn + 1; + for(n = 0; n < 3; n++) { + uint32_t len = *c++, cpylen = len; + if (len > sizeof(string_arg[n]) - 1) { + cpylen = sizeof(string_arg[n]) - 1; + } + strncpy(string_arg[n], (char *)c, cpylen); + *(string_arg[n] + len) = '\0'; + c += len; + } - order = dns_get16(c + 0); - preference = dns_get16(c + 2); - flags = (char) dns_get16(c + 4); + service = string_arg[1]; - if ((ptr = nme + leap)) { - service = nme; - *ptr++ = '\0'; - argc = switch_separate_string(ptr, '!', argv, (sizeof(argv) / sizeof(argv[0]))); + if ((argc = switch_separate_string(string_arg[2], '!', argv, (sizeof(argv) / sizeof(argv[0]))))) { regex = argv[1]; replace = argv[2]; - } - - for (ptr = replace; ptr && *ptr; ptr++) { - if (*ptr == '\\') { - *ptr = '$'; - } + } else { + goto xperr; } if (flags && service && regex && replace) { @@ -350,7 +361,7 @@ } } } - + add_result(q, order, preference, service, uri); } @@ -365,7 +376,7 @@ return; - xperr: + xperr: //printf("<parse error>\n"); return; }

1 0

[commit] r7908 - in freeswitch/trunk/src: . include include/private
by Freeswitch SVN 17 Mar '08

17 Mar '08

Author: anthm Date: Mon Mar 17 19:26:38 2008 New Revision: 7908 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_codec.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_media_bug.c Log: update Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Mon Mar 17 19:26:38 2008 @@ -138,6 +138,7 @@ switch_frame_t enc_read_frame; uint8_t raw_read_buf[SWITCH_RECOMMENDED_BUFFER_SIZE]; uint8_t enc_read_buf[SWITCH_RECOMMENDED_BUFFER_SIZE]; + switch_codec_t bug_codec; }; struct switch_media_bug { Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Mar 17 19:26:38 2008 @@ -1025,6 +1025,8 @@ int channels, uint32_t flags, const switch_codec_settings_t *codec_settings, switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_status_t) switch_core_codec_copy(switch_codec_t *codec, switch_codec_t *new_codec, switch_memory_pool_t *pool); + /*! \brief Encode data using a codec handle \param codec the codec handle to use Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Mon Mar 17 19:26:38 2008 @@ -154,6 +154,35 @@ } +SWITCH_DECLARE(switch_status_t) switch_core_codec_copy(switch_codec_t *codec, switch_codec_t *new_codec, switch_memory_pool_t *pool) +{ + switch_status_t status; + + switch_assert(codec != NULL); + switch_assert(new_codec != NULL); + + if (pool) { + new_codec->memory_pool = pool; + } else { + if ((status = switch_core_new_memory_pool(&new_codec->memory_pool)) != SWITCH_STATUS_SUCCESS) { + return status; + } + switch_set_flag(new_codec, SWITCH_CODEC_FLAG_FREE_POOL); + } + + new_codec->codec_interface = codec->codec_interface; + new_codec->implementation = codec->implementation; + new_codec->flags = codec->flags; + + if (codec->fmtp_in) { + new_codec->fmtp_in = switch_core_strdup(new_codec->memory_pool, codec->fmtp_in); + } + + new_codec->implementation->init(new_codec, new_codec->flags, NULL); + + return SWITCH_STATUS_SUCCESS; +} + SWITCH_DECLARE(switch_status_t) switch_core_codec_init(switch_codec_t *codec, char *codec_name, char *fmtp, uint32_t rate, int ms, int channels, uint32_t flags, const switch_codec_settings_t *codec_settings, switch_memory_pool_t *pool) @@ -305,6 +334,8 @@ switch_core_destroy_memory_pool(&codec->memory_pool); } + memset(codec, 0, sizeof(*codec)); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Mon Mar 17 19:26:38 2008 @@ -186,7 +186,7 @@ if (read_frame->codec || is_cng) { session->raw_read_frame.datalen = session->raw_read_frame.buflen; - + if (is_cng) { memset(session->raw_read_frame.data, 255, read_frame->codec->implementation->bytes_per_frame); session->raw_read_frame.datalen = read_frame->codec->implementation->bytes_per_frame; @@ -194,7 +194,15 @@ read_frame = &session->raw_read_frame; status = SWITCH_STATUS_SUCCESS; } else { - status = switch_core_codec_decode(read_frame->codec, + switch_codec_t *use_codec = read_frame->codec; + if (do_bugs) { + if (!session->bug_codec.implementation) { + switch_core_codec_copy(read_frame->codec, &session->bug_codec, switch_core_session_get_pool(session)); + } + use_codec = &session->bug_codec; + } + + status = switch_core_codec_decode(use_codec, session->read_codec, read_frame->data, read_frame->datalen, Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Mon Mar 17 19:26:38 2008 @@ -288,6 +288,10 @@ return SWITCH_STATUS_SUCCESS; } + if (session->bug_codec.implementation) { + switch_core_codec_destroy(&session->bug_codec); + } + return SWITCH_STATUS_FALSE; } @@ -342,6 +346,10 @@ switch_thread_rwlock_unlock(session->bug_rwlock); status = switch_core_media_bug_close(&bp); } + + if (!session->bugs && session->bug_codec.implementation) { + switch_core_codec_destroy(&session->bug_codec); + } return status; }

1 0

[commit] r7907 - freeswitch/trunk/src
by Freeswitch SVN 17 Mar '08

17 Mar '08

Author: anthm Date: Mon Mar 17 15:45:39 2008 New Revision: 7907 Modified: freeswitch/trunk/src/switch_time.c Log: do less work in timer thread to meet silly new kernels half way Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Mar 17 15:45:39 2008 @@ -39,7 +39,7 @@ #endif #define MAX_TICK UINT32_MAX - 1024 - +#define MS_PER_TICK 10 static switch_memory_pool_t *module_pool = NULL; static struct { @@ -364,25 +364,19 @@ tick = 0; } - - for (x = 0; x <= MAX_ELEMENTS; x++) { - int i = x, index; - - if (i == 0) { - i = 1; - } - - index = (current_ms % i == 0) ? i : 0; - - if (TIMER_MATRIX[index].count) { - TIMER_MATRIX[index].tick++; - if (TIMER_MATRIX[x].tick == MAX_TICK) { - TIMER_MATRIX[x].tick = 0; - TIMER_MATRIX[x].roll++; + if ((current_ms % MS_PER_TICK) == 0) { + for (x = MS_PER_TICK; x <= MAX_ELEMENTS; x += MS_PER_TICK) { + if ((current_ms % x) == 0) { + if (TIMER_MATRIX[x].count) { + TIMER_MATRIX[x].tick++; + if (TIMER_MATRIX[x].tick == MAX_TICK) { + TIMER_MATRIX[x].tick = 0; + TIMER_MATRIX[x].roll++; + } + } } } } - if (current_ms == MAX_ELEMENTS) { current_ms = 0; }

1 0

[commit] r7906 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Mar '08

17 Mar '08

Author: anthm Date: Mon Mar 17 13:43:51 2008 New Revision: 7906 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: wtf Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Mar 17 13:43:51 2008 @@ -436,7 +436,6 @@ void *pop; switch_mutex_lock(profile->ireg_mutex); while (switch_queue_trypop(profile->sql_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { - printf("WTF [%s]\n", (char *)pop); sofia_glue_actually_execute_sql(profile, SWITCH_TRUE, (char *) pop, NULL); free(pop); }

1 0