- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7642 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: brian Date: Fri Feb 15 18:18:18 2008 New Revision: 7642 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: to be or not to be 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 Fri Feb 15 18:18:18 2008 @@ -1936,10 +1936,10 @@ new_b_session = switch_core_session_locate(br_b); a_session = switch_core_session_locate(br_a); sofia_info_send_sipfrag(a_session, new_b_session); - if(new_b_session) { + if (new_b_session) { switch_core_session_rwunlock(new_b_session); } - if(a_session) { + if (a_session) { switch_core_session_rwunlock(a_session); } //switch_channel_hangup(channel_b, SWITCH_CAUSE_ATTENDED_TRANSFER); @@ -2195,7 +2195,7 @@ } if ((clientcode_header = sofia_glue_get_unknown_header(sip, "x-clientcode"))) { - if(!switch_strlen_zero(clientcode_header)) { + if (!switch_strlen_zero(clientcode_header)) { switch_channel_set_variable(channel, "call_clientcode", clientcode_header); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Setting CMC to %s\n", clientcode_header); nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); @@ -2256,7 +2256,7 @@ user = url->url_user; host = url->url_host; port = url->url_port; - if(!switch_strlen_zero(url->url_params)) { + if (!switch_strlen_zero(url->url_params)) { switch_channel_set_variable(channel, params_var, url->url_params); } } @@ -2809,7 +2809,7 @@ if (b_tech_pvt && a_tech_pvt && a_tech_pvt->caller_profile) { switch_caller_profile_t *acp = a_tech_pvt->caller_profile; - if(switch_strlen_zero(acp->caller_id_name)) { + if (switch_strlen_zero(acp->caller_id_name)) { snprintf(message, sizeof(message), "From:\r\nTo: %s\r\n", acp->caller_id_number); } else { snprintf(message, sizeof(message), "From:\r\nTo: \"%s\" %s\r\n", acp->caller_id_name, acp->caller_id_number); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Feb 15 18:18:18 2008 @@ -580,7 +580,7 @@ char *ptr = NULL; int tls = 0; - if(!url) + if (!url) return SOFIA_TRANSPORT_UNKNOWN; if (url->url_scheme && !strcasecmp(url->url_scheme, "sips")) { @@ -612,13 +612,13 @@ if (!strncasecmp(ptr, "udp", 3)) { return SOFIA_TRANSPORT_UDP; } - else if(!strncasecmp(ptr, "tcp", 3)) { + else if (!strncasecmp(ptr, "tcp", 3)) { return SOFIA_TRANSPORT_TCP; } - else if(!strncasecmp(ptr, "tls", 3)) { + else if (!strncasecmp(ptr, "tls", 3)) { return SOFIA_TRANSPORT_TCP_TLS; } - else if(!strncasecmp(ptr, "sctp", 4)) { + else if (!strncasecmp(ptr, "sctp", 4)) { return SOFIA_TRANSPORT_SCTP; } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Fri Feb 15 18:18:18 2008 @@ -743,7 +743,7 @@ clean_from_user = switch_mprintf("%s", from_id ? from_id : from_user); if (is_dialog) { - if(!switch_strlen_zero(clean_to_user) && !switch_strlen_zero(clean_from_user)) { + if (!switch_strlen_zero(clean_to_user) && !switch_strlen_zero(clean_from_user)) { stream.write_function(&stream, "<local>\n<identity display=\"%s\">sip:%s@%s</identity>\n", clean_to_user, clean_to_user, host); stream.write_function(&stream, "<target uri=\"sip:%s@%s\">\n", clean_to_user, host); stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"%s\"/>\n", !strcasecmp(event_status, "hold") ? "no" : "yes" );

1 0

[commit] r7641 - freeswitch/trunk/src
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: brian Date: Fri Feb 15 18:16:01 2008 New Revision: 7641 Modified: freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_utils.c Log: if and only if Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Fri Feb 15 18:16:01 2008 @@ -93,7 +93,7 @@ } /* pull the pid from the file */ - if(fscanf(f, "%d", &pid)!=1) { + if (fscanf(f, "%d", &pid)!=1) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Unable to get the pid!\n"); } @@ -439,7 +439,7 @@ #ifndef WIN32 if (runas_user || runas_group) { - if(change_user_group(runas_user, runas_group) < 0) { + if (change_user_group(runas_user, runas_group) < 0) { fprintf(stderr, "Failed to switch user / group\n" ); return 255; } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Feb 15 18:16:01 2008 @@ -883,7 +883,7 @@ uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE); - if(!uuid) { + if (!uuid) { uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE); } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Feb 15 18:16:01 2008 @@ -145,7 +145,7 @@ l += 8; while (l >= 6) { out[bytes++] = switch_b64_table[(b>>(l-=6))%64]; - if(++y != 72) { + if (++y != 72) { continue; } //out[bytes++] = '\n'; @@ -332,7 +332,7 @@ close(ifd); } switch_snprintf(buf, B64BUFFLEN, "/bin/cat %s | %s %s %s", filename, runtime.mailer_app, runtime.mailer_app_args, to); - if(system(buf)) { + if (system(buf)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to execute command: %s\n", buf); }

1 0

[commit] r7640 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: mikej Date: Fri Feb 15 18:10:28 2008 New Revision: 7640 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: pool allocate instead. 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 Fri Feb 15 18:10:28 2008 @@ -1643,7 +1643,7 @@ { switch_channel_t *channel = switch_core_session_get_channel(member->session); switch_frame_t write_frame = { 0 }; - uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE]; + uint8_t *data; switch_timer_t timer = { 0 }; switch_codec_t *read_codec = switch_core_session_get_read_codec(member->session); uint32_t interval = read_codec->implementation->microseconds_per_frame / 1000; @@ -1666,8 +1666,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer %s success interval: %u samples: %u\n", member->conference->timer_name, interval, tsamples); - write_frame.data = data; - write_frame.buflen = sizeof(data); + write_frame.data = data = switch_core_session_alloc(member->session, SWITCH_RECOMMENDED_BUFFER_SIZE); + write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; write_frame.codec = &member->write_codec; if (!switch_test_flag(member->conference, CFLAG_ANSWERED)) {

1 0

[commit] r7639 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/endpoints/mod_portaudio mod/formats/mod_local_stream
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: mikej Date: Fri Feb 15 18:02:06 2008 New Revision: 7639 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/switch_core_speech.c freeswitch/trunk/src/switch_ivr.c Log: switch_bytes_per_frame -> switch_samples_per_frame rename Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Feb 15 18:02:06 2008 @@ -41,7 +41,7 @@ #include <switch.h> SWITCH_BEGIN_EXTERN_C -#define switch_bytes_per_frame(rate, interval) ((uint32_t)((float)rate / (1000.0f / (float)interval))) +#define switch_samples_per_frame(rate, interval) ((uint32_t)((float)rate / (1000.0f / (float)interval))) #define SWITCH_SMAX 32767 #define SWITCH_SMIN -32768 #define switch_normalize_to_16bit(n) if (n > SWITCH_SMAX) n = SWITCH_SMAX / 2; else if (n < SWITCH_SMIN) n = SWITCH_SMIN / 2; 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 Fri Feb 15 18:02:06 2008 @@ -817,7 +817,7 @@ { conference_obj_t *conference = (conference_obj_t *) obj; conference_member_t *imember, *omember; - uint32_t samples = switch_bytes_per_frame(conference->rate, conference->interval); + uint32_t samples = switch_samples_per_frame(conference->rate, conference->interval); uint32_t bytes = samples * 2; uint8_t ready = 0, total = 0; switch_timer_t timer = { 0 }; @@ -1647,7 +1647,7 @@ switch_timer_t timer = { 0 }; switch_codec_t *read_codec = switch_core_session_get_read_codec(member->session); uint32_t interval = read_codec->implementation->microseconds_per_frame / 1000; - uint32_t samples = switch_bytes_per_frame(member->conference->rate, interval); + uint32_t samples = switch_samples_per_frame(member->conference->rate, interval); uint32_t csamples = samples; uint32_t tsamples = member->orig_read_codec->implementation->samples_per_frame; uint32_t flush_len = 0; @@ -1656,7 +1656,7 @@ switch_assert(member->conference != NULL); - flush_len = switch_bytes_per_frame(member->conference->rate, member->conference->interval) * 10; + flush_len = switch_samples_per_frame(member->conference->rate, member->conference->interval) * 10; if (switch_core_timer_init(&timer, member->conference->timer_name, interval, tsamples, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed. Conference Cannot Start\n"); @@ -1952,7 +1952,7 @@ conference_member_t smember = { 0 }, *member; conference_record_t *rec = (conference_record_t *) obj; conference_obj_t *conference = rec->conference; - uint32_t samples = switch_bytes_per_frame(conference->rate, conference->interval); + uint32_t samples = switch_samples_per_frame(conference->rate, conference->interval); uint32_t low_count = 0, mux_used; char *vval; switch_timer_t timer = { 0 }; Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Fri Feb 15 18:02:06 2008 @@ -733,7 +733,7 @@ globals.read_frame.buflen = sizeof(globals.databuf); globals.cng_frame.data = globals.cngbuf; globals.cng_frame.buflen = sizeof(globals.cngbuf); - globals.cng_frame.datalen = switch_bytes_per_frame(globals.sample_rate, globals.codec_ms) * 2; + globals.cng_frame.datalen = switch_samples_per_frame(globals.sample_rate, globals.codec_ms) * 2; switch_set_flag((&globals.cng_frame), SFF_CNG); /* connect my internal structure to the blank pointer passed to me */ Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Fri Feb 15 18:02:06 2008 @@ -176,7 +176,7 @@ } source->rate = fh.samplerate; - source->samples = switch_bytes_per_frame(fh.native_rate, source->interval); + source->samples = switch_samples_per_frame(fh.native_rate, source->interval); if (switch_core_timer_init(&timer, source->timer_name, source->interval, source->samples, source->pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Can't start timer.\n"); @@ -425,7 +425,7 @@ } } - source->samples = switch_bytes_per_frame(source->rate, source->interval); + source->samples = switch_samples_per_frame(source->rate, source->interval); switch_core_hash_insert(globals.source_hash, source->name, source); Modified: freeswitch/trunk/src/switch_core_speech.c ============================================================================== --- freeswitch/trunk/src/switch_core_speech.c (original) +++ freeswitch/trunk/src/switch_core_speech.c Fri Feb 15 18:02:06 2008 @@ -81,7 +81,7 @@ sh->rate = rate; sh->name = switch_core_strdup(pool, module_name); - sh->samples = switch_bytes_per_frame(rate, interval); + sh->samples = switch_samples_per_frame(rate, interval); return sh->speech_interface->speech_open(sh, voice_name, rate, flags); } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Feb 15 18:02:06 2008 @@ -1518,7 +1518,7 @@ read_codec = switch_core_session_get_read_codec(session); interval = read_codec->implementation->microseconds_per_frame / 1000; - samples = switch_bytes_per_frame(read_codec->implementation->samples_per_second, interval); + samples = switch_samples_per_frame(read_codec->implementation->samples_per_second, interval); qlen = delay_ms / (interval); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting delay to %dms (%d frames)\n", delay_ms, qlen);

1 0

[commit] r7638 - freeswitch/trunk/src
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: mikej Date: Fri Feb 15 17:59:35 2008 New Revision: 7638 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: maybe we wont allocate a bunch of ram for no reason at all. Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Feb 15 17:59:35 2008 @@ -132,11 +132,6 @@ static switch_bool_t write_displace_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) { displace_helper_t *dh = (displace_helper_t *) user_data; - uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE]; - switch_frame_t frame = { 0 }; - - frame.data = data; - frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; switch (type) { case SWITCH_ABC_TYPE_INIT: @@ -205,11 +200,6 @@ static switch_bool_t read_displace_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) { displace_helper_t *dh = (displace_helper_t *) user_data; - uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE]; - switch_frame_t frame = { 0 }; - - frame.data = data; - frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; switch (type) { case SWITCH_ABC_TYPE_INIT:

1 0

[commit] r7637 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: anthm Date: Fri Feb 15 17:18:15 2008 New Revision: 7637 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: doh 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 Fri Feb 15 17:18:15 2008 @@ -1846,7 +1846,6 @@ /* forget the conference data we played file node data instead */ - printf("set flush 2\n"); switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); } } @@ -1859,12 +1858,10 @@ if (mux_used < bytes) { if (++low_count >= 5) { /* partial frame sitting around this long is useless and builds delay */ - printf("set flush 3\n"); switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); } } else if (mux_used > flush_len) { /* getting behind, clear the buffer */ - printf("set flush 4 %d\n", flush_len); switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); } } @@ -1893,7 +1890,6 @@ switch_mutex_unlock(member->audio_out_mutex); } else { - printf("WTF\n"); if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) { if (member->conference->comfort_noise_level) { switch_generate_sln_silence(write_frame.data, samples, member->conference->comfort_noise_level); @@ -1910,7 +1906,6 @@ if (switch_test_flag(member, MFLAG_FLUSH_BUFFER)) { if (switch_buffer_inuse(member->mux_buffer)) { - printf("do flush\n"); switch_mutex_lock(member->audio_out_mutex); switch_buffer_zero(member->mux_buffer); switch_mutex_unlock(member->audio_out_mutex);

1 0

[commit] r7636 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: anthm Date: Fri Feb 15 17:17:20 2008 New Revision: 7636 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: update 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 Fri Feb 15 17:17:20 2008 @@ -1516,7 +1516,6 @@ if (!switch_test_flag(member, MFLAG_TALKING)) { switch_event_t *event; switch_set_flag_locked(member, MFLAG_TALKING); - switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); switch_mutex_lock(member->conference->member_mutex); if (!member->conference->floor_holder || !switch_test_flag(member->conference->floor_holder, MFLAG_TALKING) || member->score > @@ -1657,7 +1656,7 @@ switch_assert(member->conference != NULL); - flush_len = switch_bytes_per_frame(member->conference->rate, member->conference->interval) * 2; + flush_len = switch_bytes_per_frame(member->conference->rate, member->conference->interval) * 10; if (switch_core_timer_init(&timer, member->conference->timer_name, interval, tsamples, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed. Conference Cannot Start\n"); @@ -1847,6 +1846,7 @@ /* forget the conference data we played file node data instead */ + printf("set flush 2\n"); switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); } } @@ -1859,10 +1859,12 @@ if (mux_used < bytes) { if (++low_count >= 5) { /* partial frame sitting around this long is useless and builds delay */ + printf("set flush 3\n"); switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); } } else if (mux_used > flush_len) { /* getting behind, clear the buffer */ + printf("set flush 4 %d\n", flush_len); switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); } } @@ -1891,6 +1893,7 @@ switch_mutex_unlock(member->audio_out_mutex); } else { + printf("WTF\n"); if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) { if (member->conference->comfort_noise_level) { switch_generate_sln_silence(write_frame.data, samples, member->conference->comfort_noise_level); @@ -1907,6 +1910,7 @@ if (switch_test_flag(member, MFLAG_FLUSH_BUFFER)) { if (switch_buffer_inuse(member->mux_buffer)) { + printf("do flush\n"); switch_mutex_lock(member->audio_out_mutex); switch_buffer_zero(member->mux_buffer); switch_mutex_unlock(member->audio_out_mutex);

1 0

[commit] r7635 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: anthm Date: Fri Feb 15 16:52:15 2008 New Revision: 7635 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: update 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 Fri Feb 15 16:52:15 2008 @@ -1870,8 +1870,7 @@ use_timer = 1; - if (mux_used >= bytes) { - + if (mux_used) { /* Flush the output buffer and write all the data (presumably muxed) back to the channel */ switch_mutex_lock(member->audio_out_mutex); write_frame.data = data;

1 0

[commit] r7634 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: anthm Date: Fri Feb 15 16:25:23 2008 New Revision: 7634 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: MODAPP-76 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 Fri Feb 15 16:25:23 2008 @@ -353,7 +353,7 @@ assert(sql); limit_execute_sql(sql, NULL); switch_safe_free(sql); - sql = switch_mprintf("insert into db_data values('%q','%q','%q','%q');", globals.hostname, argv[1], argv[2], argv[3]); + sql = switch_mprintf("insert into db_data (hostname, realm, data_key, data) values('%q','%q','%q','%q');", globals.hostname, argv[1], argv[2], argv[3]); assert(sql); limit_execute_sql(sql, NULL); switch_safe_free(sql); @@ -421,7 +421,7 @@ limit_execute_sql(sql, globals.mutex); switch_safe_free(sql); - sql = switch_mprintf("insert into db_data values('%q','%q','%q','%q');", globals.hostname, argv[1], argv[2], argv[3]); + sql = switch_mprintf("insert into db_data (hostname, realm, data_key, data) values('%q','%q','%q','%q');", globals.hostname, argv[1], argv[2], argv[3]); } else if (!strcasecmp(argv[0], "delete")) { sql = switch_mprintf("delete from db_data where realm='%q' and data_key='%q'", argv[1], argv[2]); } @@ -464,7 +464,7 @@ limit_execute_sql(sql, NULL); switch_safe_free(sql); - sql = switch_mprintf("insert into group_data values('%q','%q','%q');", globals.hostname, argv[1], argv[2]); + sql = switch_mprintf("insert into group_data (hostname, groupname, url) values('%q','%q','%q');", globals.hostname, argv[1], argv[2]); assert(sql); limit_execute_sql(sql, NULL); switch_safe_free(sql); @@ -538,7 +538,7 @@ } if (!strcasecmp(argv[0], "insert")) { - sql = switch_mprintf("insert into group_data values('%q','%q','%q');", globals.hostname, argv[1], argv[2]); + sql = switch_mprintf("insert into group_data (hostname, groupname, url) values('%q','%q','%q');", globals.hostname, argv[1], argv[2]); assert(sql); limit_execute_sql(sql, globals.mutex); switch_safe_free(sql); @@ -611,7 +611,7 @@ } switch_core_event_hook_add_state_change(session, hanguphook); - sql = switch_mprintf("insert into limit_data values('%q','%q','%q','%q');", globals.hostname, realm, id, switch_core_session_get_uuid(session)); + sql = switch_mprintf("insert into limit_data (hostname, realm, id, uuid) values('%q','%q','%q','%q');", globals.hostname, realm, id, switch_core_session_get_uuid(session)); limit_execute_sql(sql, NULL); switch_safe_free(sql);

1 0

[commit] r7633 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: anthm Date: Fri Feb 15 16:16:39 2008 New Revision: 7633 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Log: make multicast event handler nonblocking Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Fri Feb 15 16:16:39 2008 @@ -237,6 +237,7 @@ return SWITCH_STATUS_GENERR; } + switch_socket_opt_set(globals.udp_socket, SWITCH_SO_NONBLOCK, TRUE); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; @@ -247,10 +248,6 @@ { int x = 0; - if (globals.udp_socket) { - switch_socket_shutdown(globals.udp_socket, SWITCH_SHUTDOWN_READWRITE); - } - if (globals.running == 1) { globals.running = -1; while (x < 100000 && globals.running) { @@ -282,53 +279,62 @@ while (globals.running == 1) { char *myaddr; size_t len = MULTICAST_BUFFSIZE; + char *packet; + uint64_t host_hash = 0; + switch_status_t status; memset(buf, 0, len); - + switch_sockaddr_ip_get(&myaddr, globals.addr); + status = switch_socket_recvfrom(addr, globals.udp_socket, 0, buf, &len); + + if (!len) { + if (SWITCH_STATUS_IS_BREAK(status)) { + switch_yield(100000); + continue; + } - if (switch_socket_recvfrom(addr, globals.udp_socket, 0, buf, &len) == SWITCH_STATUS_SUCCESS) { - char *packet; - uint64_t host_hash = 0; + break; + } - memcpy(&host_hash, buf, sizeof(host_hash)); - packet = buf + sizeof(host_hash); + memcpy(&host_hash, buf, sizeof(host_hash)); + packet = buf + sizeof(host_hash); - if (host_hash == globals.host_hash) { - continue; - } - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nEVENT %d\n--------------------------------\n%s\n", (int) len, packet); - if (switch_event_create_subclass(&local_event, SWITCH_EVENT_CUSTOM, MULTICAST_EVENT) == SWITCH_STATUS_SUCCESS) { - char *var, *val, *term = NULL, tmpname[128]; - switch_event_add_header(local_event, SWITCH_STACK_BOTTOM, "Multicast", "yes"); - var = packet; - while (*var) { - if ((val = strchr(var, ':')) != 0) { - *val++ = '\0'; - while (*val == ' ') { - val++; - } - if ((term = strchr(val, '\r')) != 0 || (term = strchr(val, '\n')) != 0) { - *term = '\0'; - while (*term == '\r' || *term == '\n') { - term++; - } + if (host_hash == globals.host_hash) { + continue; + } + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nEVENT %d\n--------------------------------\n%s\n", (int) len, packet); + if (switch_event_create_subclass(&local_event, SWITCH_EVENT_CUSTOM, MULTICAST_EVENT) == SWITCH_STATUS_SUCCESS) { + char *var, *val, *term = NULL, tmpname[128]; + switch_event_add_header(local_event, SWITCH_STACK_BOTTOM, "Multicast", "yes"); + var = packet; + while (*var) { + if ((val = strchr(var, ':')) != 0) { + *val++ = '\0'; + while (*val == ' ') { + val++; + } + if ((term = strchr(val, '\r')) != 0 || (term = strchr(val, '\n')) != 0) { + *term = '\0'; + while (*term == '\r' || *term == '\n') { + term++; } - switch_snprintf(tmpname, sizeof(tmpname), "Orig-%s", var); - switch_event_add_header(local_event, SWITCH_STACK_BOTTOM, tmpname, "%s", val); - var = term + 1; - } else { - break; } + switch_snprintf(tmpname, sizeof(tmpname), "Orig-%s", var); + switch_event_add_header(local_event, SWITCH_STACK_BOTTOM, tmpname, "%s", val); + var = term + 1; + } else { + break; } + } - if (var && strlen(var) > 1) { - switch_event_add_body(local_event, var); - } + if (var && strlen(var) > 1) { + switch_event_add_body(local_event, var); + } - switch_event_fire(&local_event); + switch_event_fire(&local_event); - } } + } globals.running = 0;

1 0