- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7075 - in freeswitch/trunk: conf/autoload_configs conf/dialplan libs/libedit scripts/socket src src/include src/mod/applications/mod_commands src/mod/applications/mod_conference src/mod/applications/mod_fifo src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Jan '08

03 Jan '08

Author: anthm Date: Thu Jan 3 16:34:44 2008 New Revision: 7075 Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/libs/libedit/configure freeswitch/trunk/scripts/socket/sock.pl freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_rtp.c freeswitch/trunk/src/switch_time.c Log: cross t's and dot i's 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 Thu Jan 3 16:34:44 2008 @@ -68,7 +68,7 @@  <param name="moh-sound" value="$${moh_uri}"/>  -  + <param name="enter-sound" value="tone_stream://%(1000,0,500)"/>    Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Jan 3 16:34:44 2008 @@ -98,6 +98,7 @@ </extension> <extension name="extension-intercom"> + <condition field="${sip_to_params}" expression="intercom\=true" continue="on-true"/> <condition field="destination_number" expression="^8(10[01][0-9])$"> <action application="set" data="dialed_ext=$1"/> <action application="export" data="sip_h_Call-Info=<sip:$${domain}>;answer-after=0"/> @@ -166,7 +167,7 @@ </extension> <extension name="rtp_multicast_page"> - <condition field="destination_number" expression="^pagegroup$"> + <condition field="destination_number" expression="^pagegroup$|^7243"> <action application="esf_page_group"/> </condition> </extension> @@ -215,6 +216,13 @@ </condition> </extension> + <extension name="milliwatt"> + <condition field="destination_number" expression="^9997$"> + <action application="answer"/> + <action application="playback" data="tone_stream://%(10000,0,1004);loops=-1"/> + </condition> + </extension> + <extension name="tone_stream"> <condition field="destination_number" expression="^9998$"> <action application="answer"/> Modified: freeswitch/trunk/libs/libedit/configure ============================================================================== --- freeswitch/trunk/libs/libedit/configure (original) +++ freeswitch/trunk/libs/libedit/configure Thu Jan 3 16:34:44 2008 @@ -420,7 +420,7 @@ # Identity of this package. PACKAGE_NAME='libedit' -PACKAGE_TARNAME='libedit-20071219' +PACKAGE_TARNAME='libedit-20071230' PACKAGE_VERSION='2.10' PACKAGE_STRING='libedit 2.10' PACKAGE_BUGREPORT='' @@ -1816,7 +1816,7 @@ # Define the identity of the package. - PACKAGE='libedit-20071219' + PACKAGE='libedit-20071230' VERSION='2.10' Modified: freeswitch/trunk/scripts/socket/sock.pl ============================================================================== --- freeswitch/trunk/scripts/socket/sock.pl (original) +++ freeswitch/trunk/scripts/socket/sock.pl Thu Jan 3 16:34:44 2008 @@ -22,7 +22,7 @@ $o = $fs->call_command("answer"); #to turn on events when in async mode $o = $fs->raw_command("myevents"); -$o = $fs->call_command("playback", "/ram/swimp.raw"); +$o = $fs->call_command("echo"); #comment exit in async mode @@ -38,6 +38,7 @@ } if ($r->{event}->{'event-name'} !~ /execute/i) { printf "wtf $data->{'unique-id'}\n"; + print "."; $o = $fs->call_command("break"); $o = $fs->call_command("hangup"); } Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Thu Jan 3 16:34:44 2008 @@ -205,7 +205,7 @@ */ SWITCH_DECLARE(switch_status_t) switch_ivr_record_session(switch_core_session_t *session, char *file, uint32_t limit, switch_file_handle_t *fh); SWITCH_DECLARE(switch_status_t) switch_ivr_eavesdrop_session(switch_core_session_t *session, const char *uuid, switch_eavesdrop_flag_t flags); -SWITCH_DECLARE(switch_status_t) switch_ivr_displace_session(switch_core_session_t *session, char *file, uint32_t limit, const char *flags); +SWITCH_DECLARE(switch_status_t) switch_ivr_displace_session(switch_core_session_t *session, const char *file, uint32_t limit, const char *flags); SWITCH_DECLARE(switch_status_t) switch_ivr_stop_displace_session(switch_core_session_t *session, const char *file); /*! Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Jan 3 16:34:44 2008 @@ -195,6 +195,8 @@ switch_memory_pool_t *memory_pool; /*! private data for loadable modules to store information */ void *private_info; + /*! remaining time from last call to _check()*/ + switch_size_t diff; }; typedef enum { Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Jan 3 16:34:44 2008 @@ -2028,7 +2028,7 @@ } switch_assert(buf); - stream->write_function(stream, buf); + stream->raw_write_function(stream, (unsigned char *)buf, strlen(buf)); switch_event_destroy(&event); free(buf); } else { 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 Thu Jan 3 16:34:44 2008 @@ -558,7 +558,7 @@ conference_stop_file(conference, FILE_STOP_ASYNC); } if(conference->enter_sound) { - conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 0); + conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session), 1); } } @@ -808,7 +808,7 @@ /* Lead in time */ if (conference->fnode->leadin) { conference->fnode->leadin--; - } else { + } else if (!conference->fnode->done) { file_sample_len = samples; if (conference->fnode->type == NODE_TYPE_SPEECH) { switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING; @@ -837,7 +837,7 @@ /* Lead in time */ if (conference->async_fnode->leadin) { conference->async_fnode->leadin--; - } else { + } else if (!conference->async_fnode->done) { file_sample_len = samples; switch_core_file_read(&conference->async_fnode->fh, async_file_frame, &file_sample_len); if (file_sample_len <= 0) { Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Thu Jan 3 16:34:44 2008 @@ -84,6 +84,7 @@ switch_hash_t *fifo_hash; switch_mutex_t *mutex; switch_memory_pool_t *pool; + int running; } globals; @@ -105,6 +106,10 @@ { fifo_node_t *node; + if (!globals.running) { + return NULL; + } + node = switch_core_alloc(globals.pool, sizeof(*node)); node->name = switch_core_strdup(globals.pool, name); @@ -122,6 +127,10 @@ { switch_event_t *event; + if (!globals.running) { + return; + } + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "%s", "park"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", node->name); @@ -139,7 +148,6 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", node->waiting_count > 0 ? "CS_RING" : "CS_HANGUP"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", node->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", node->waiting_count > 0 ? "early" : "terminated"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "astate", "%s", node->waiting_count > 0 ? "early" : "terminated"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); } @@ -151,6 +159,10 @@ char *to = switch_event_get_header(event, "to"); char *dup_to = NULL, *node_name; fifo_node_t *node; + + if (!globals.running) { + return; + } if (!to || strncasecmp(to, "park+", 5)) { return; @@ -192,7 +204,9 @@ switch_time_t ts = switch_timestamp_now(); switch_size_t retsize; - + if (!globals.running) { + return; + } if (switch_strlen_zero(data)) { @@ -577,6 +591,11 @@ const void *var; int x = 0, verbose = 0; + + if (!globals.running) { + return SWITCH_STATUS_FALSE; + } + if (!switch_strlen_zero(cmd)) { data = strdup(cmd); switch_assert(data); @@ -672,6 +691,7 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_APP(app_interface, "fifo", "Park with FIFO", FIFO_DESC, fifo_function, FIFO_USAGE, SAF_NONE); SWITCH_ADD_API(commands_api_interface, "fifo", "Return data about a fifo", fifo_api_function, FIFO_API_SYNTAX); + globals.running = 1; return SWITCH_STATUS_SUCCESS; } @@ -684,7 +704,10 @@ switch_hash_index_t *hi; void *val, *pop; fifo_node_t *node; + switch_memory_pool_t *pool = globals.pool; switch_mutex_lock(globals.mutex); + + globals.running = 0; /* Cleanup*/ for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); @@ -695,9 +718,11 @@ switch_core_hash_destroy(&node->caller_hash); switch_core_hash_destroy(&node->consumer_hash); } - switch_mutex_unlock(globals.mutex); switch_core_hash_destroy(&globals.fifo_hash); - switch_core_destroy_memory_pool(&globals.pool); + memset(&globals, 0, sizeof(globals)); + switch_mutex_unlock(globals.mutex); + + switch_core_destroy_memory_pool(&pool); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Jan 3 16:34:44 2008 @@ -252,30 +252,11 @@ cause = switch_channel_get_cause(channel); if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) && cause != SWITCH_CAUSE_ATTENDED_TRANSFER) { - const char *buuid; - switch_core_session_t *bsession; - switch_channel_t *bchannel; - const char *lost_ext; - - + if (tech_pvt->max_missed_packets) { switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); } switch_channel_presence(tech_pvt->channel, "unknown", "unhold"); - if ((buuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { - if ((bsession = switch_core_session_locate(buuid))) { - bchannel = switch_core_session_get_channel(bsession); - if (switch_channel_test_flag(bchannel, CF_BROADCAST)) { - if ((lost_ext = switch_channel_get_variable(bchannel, "left_hanging_extension"))) { - switch_ivr_session_transfer(bsession, lost_ext, NULL, NULL); - } - switch_channel_clear_flag(bchannel, CF_BROADCAST); - switch_channel_set_flag(bchannel, CF_BREAK); - } - switch_core_session_rwunlock(bsession); - } - } - switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); } 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 Thu Jan 3 16:34:44 2008 @@ -1382,25 +1382,38 @@ if (sendonly) { if (!switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { const char *stream; + switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD); switch_channel_presence(tech_pvt->channel, "unknown", "hold"); + if (tech_pvt->max_missed_packets) { switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets * 10); } + if (!(stream = switch_channel_get_variable(tech_pvt->channel, SWITCH_HOLD_MUSIC_VARIABLE))) { stream = tech_pvt->profile->hold_music; } + if (stream) { - switch_ivr_broadcast(switch_core_session_get_uuid(tech_pvt->session), stream, SMF_ECHO_BLEG | SMF_LOOP); + switch_ivr_displace_session(tech_pvt->session, stream, 0, "rl"); } } } else { if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { - switch_channel_clear_flag_partner(tech_pvt->channel, CF_BROADCAST); + const char *stream; + if (tech_pvt->max_missed_packets) { switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); } - switch_channel_set_flag_partner(tech_pvt->channel, CF_BREAK); + + if (!(stream = switch_channel_get_variable(tech_pvt->channel, SWITCH_HOLD_MUSIC_VARIABLE))) { + stream = tech_pvt->profile->hold_music; + } + + if (stream) { + switch_ivr_stop_displace_session(tech_pvt->session, stream); + } + switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); switch_channel_presence(tech_pvt->channel, "unknown", "unhold"); } Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Thu Jan 3 16:34:44 2008 @@ -94,7 +94,7 @@ { switch_io_event_hook_read_frame_t *ptr; switch_status_t status; - int need_codec, perfect, do_bugs = 0, do_resample = 0; + int need_codec, perfect, do_bugs = 0, do_resample = 0, is_cng = 0; unsigned int flag = 0; top: @@ -131,11 +131,14 @@ switch_assert(session != NULL); switch_assert(*frame != NULL); - if (switch_test_flag(*frame, SFF_CNG)) { status = SWITCH_STATUS_SUCCESS; - goto done; - } + if (!session->bugs) { + goto done; + } + is_cng = 1; + + } switch_assert((*frame)->codec != NULL); if ((session->read_codec && (*frame)->codec && session->read_codec->implementation != (*frame)->codec->implementation)) { @@ -163,16 +166,25 @@ if (status == SWITCH_STATUS_SUCCESS && need_codec) { switch_frame_t *enc_frame, *read_frame = *frame; - if (read_frame->codec) { + if (read_frame->codec || is_cng) { session->raw_read_frame.datalen = session->raw_read_frame.buflen; - status = switch_core_codec_decode(read_frame->codec, - session->read_codec, - read_frame->data, - read_frame->datalen, - session->read_codec->implementation->actual_samples_per_second, - session->raw_read_frame.data, &session->raw_read_frame.datalen, &session->raw_read_frame.rate, &flag); - if (do_resample && status == SWITCH_STATUS_SUCCESS) { + 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; + session->raw_read_frame.samples = session->raw_read_frame.datalen / sizeof(int16_t); + read_frame = &session->raw_read_frame; + status = SWITCH_STATUS_SUCCESS; + } else { + status = switch_core_codec_decode(read_frame->codec, + session->read_codec, + read_frame->data, + read_frame->datalen, + session->read_codec->implementation->actual_samples_per_second, + session->raw_read_frame.data, &session->raw_read_frame.datalen, &session->raw_read_frame.rate, &flag); + } + + if (do_resample && ((status == SWITCH_STATUS_SUCCESS) || is_cng)) { status = SWITCH_STATUS_RESAMPLE; } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Thu Jan 3 16:34:44 2008 @@ -506,6 +506,9 @@ } else { event->headers = hp->next; } + if (hp == event->last_header || !hp->next) { + event->last_header = lp; + } FREE(hp->name); FREE(hp->value); memset(hp, 0, sizeof(*hp)); Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Thu Jan 3 16:34:44 2008 @@ -98,9 +98,10 @@ typedef struct { switch_file_handle_t fh; int mux; + int loop; } displace_helper_t; -static switch_bool_t displace_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) +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]; @@ -154,7 +155,12 @@ } if (st != SWITCH_STATUS_SUCCESS || len == 0) { - return SWITCH_FALSE; + if (dh->loop) { + uint32_t pos = 0; + switch_core_file_seek(&dh->fh, &pos, 0, SEEK_SET); + } else { + return SWITCH_FALSE; + } } switch_core_media_bug_set_write_replace_frame(bug, rframe); @@ -168,6 +174,80 @@ return SWITCH_TRUE; } + + +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: + break; + case SWITCH_ABC_TYPE_CLOSE: + if (dh) { + switch_core_file_close(&dh->fh); + } + break; + case SWITCH_ABC_TYPE_WRITE_REPLACE: + { + switch_frame_t *rframe = switch_core_media_bug_get_write_replace_frame(bug); + if (dh && !dh->mux) { + memset(rframe->data, 255, rframe->datalen); + } + switch_core_media_bug_set_write_replace_frame(bug, rframe); + } + break; + case SWITCH_ABC_TYPE_READ_REPLACE: + if (dh) { + switch_frame_t *rframe = NULL; + switch_size_t len; + switch_status_t st; + rframe = switch_core_media_bug_get_read_replace_frame(bug); + len = rframe->samples; + + if (dh->mux) { + int16_t buf[1024]; + int16_t *fp = rframe->data; + uint32_t x; + + st = switch_core_file_read(&dh->fh, buf, &len); + + for(x = 0; x < (uint32_t) len; x++) { + int32_t mixed = fp[x] + buf[x]; + switch_normalize_to_16bit(mixed); + fp[x] = (int16_t) mixed; + } + } else { + st = switch_core_file_read(&dh->fh, rframe->data, &len); + rframe->samples = (uint32_t) len; + rframe->datalen = rframe->samples * 2; + } + + if (st != SWITCH_STATUS_SUCCESS || len == 0) { + if (dh->loop) { + uint32_t pos = 0; + switch_core_file_seek(&dh->fh, &pos, 0, SEEK_SET); + } else { + return SWITCH_FALSE; + } + } + + switch_core_media_bug_set_read_replace_frame(bug, rframe); + } + break; + case SWITCH_ABC_TYPE_WRITE: + default: + break; + } + + return SWITCH_TRUE; +} + SWITCH_DECLARE(switch_status_t) switch_ivr_stop_displace_session(switch_core_session_t *session, const char *file) { switch_media_bug_t *bug; @@ -184,7 +264,7 @@ } -SWITCH_DECLARE(switch_status_t) switch_ivr_displace_session(switch_core_session_t *session, char *file, uint32_t limit, const char *flags) +SWITCH_DECLARE(switch_status_t) switch_ivr_displace_session(switch_core_session_t *session, const char *file, uint32_t limit, const char *flags) { switch_channel_t *channel; switch_codec_t *read_codec; @@ -206,15 +286,13 @@ return SWITCH_STATUS_MEMERR; } - - + read_codec = switch_core_session_get_read_codec(session); switch_assert(read_codec != NULL); dh->fh.channels = read_codec->implementation->number_of_channels; dh->fh.samplerate = read_codec->implementation->actual_samples_per_second; - - + if (switch_core_file_open(&dh->fh, file, read_codec->implementation->number_of_channels, @@ -236,7 +314,17 @@ dh->mux++; } - if ((status = switch_core_media_bug_add(session, displace_callback, dh, to, SMBF_WRITE_REPLACE | SMBF_READ_REPLACE, &bug)) != SWITCH_STATUS_SUCCESS) { + if (flags && strchr(flags, 'l')) { + dh->loop++; + } + + if (flags && strchr(flags, 'r')) { + status = switch_core_media_bug_add(session, read_displace_callback, dh, to, SMBF_WRITE_REPLACE | SMBF_READ_REPLACE, &bug); + } else { + status = switch_core_media_bug_add(session, write_displace_callback, dh, to, SMBF_WRITE_REPLACE | SMBF_READ_REPLACE, &bug); + } + + if (status != SWITCH_STATUS_SUCCESS) { switch_core_file_close(&dh->fh); return status; } @@ -1600,105 +1688,108 @@ switch_core_session_t *other_session = NULL; const char *other_uuid = NULL; char *app = "playback"; + char *cause = NULL; + char *mypath; + char *p; switch_assert(path); - if ((session = switch_core_session_locate(uuid))) { - char *cause = NULL; - char *mypath; - char *p; + if (!(session = switch_core_session_locate(uuid))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "uuid [%s] does not match an existing session.\n", switch_str_nil(uuid)); + return SWITCH_STATUS_FALSE; + } - master = session; + master = session; - channel = switch_core_session_get_channel(session); - switch_assert(channel != NULL); + channel = switch_core_session_get_channel(session); + switch_assert(channel != NULL); - if ((switch_channel_test_flag(channel, CF_EVENT_PARSE))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Channel [%s] already broadcasting...broadcast aborted\n", - switch_channel_get_name(channel)); - switch_core_session_rwunlock(session); - return SWITCH_STATUS_FALSE; - } + if ((switch_channel_test_flag(channel, CF_EVENT_PARSE))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Channel [%s] already broadcasting...broadcast aborted\n", + switch_channel_get_name(channel)); + switch_core_session_rwunlock(session); + return SWITCH_STATUS_FALSE; + } - mypath = strdup(path); + mypath = strdup(path); - if ((nomedia = switch_channel_test_flag(channel, CF_BYPASS_MEDIA))) { - switch_ivr_media(uuid, SMF_REBRIDGE); - } + if ((nomedia = switch_channel_test_flag(channel, CF_BYPASS_MEDIA))) { + switch_ivr_media(uuid, SMF_REBRIDGE); + } - if ((p = strchr(mypath, ':')) && *(p+1) == ':') { - app = mypath; - *p++ = '\0'; - *p++ = '\0'; - path = p; - } - - if ((cause = strchr(app, '!'))) { - *cause++ = '\0'; - if (!cause) { - cause = "normal_clearing"; - } + if ((p = strchr(mypath, ':')) && *(p+1) == ':') { + app = mypath; + *p++ = '\0'; + *p++ = '\0'; + path = p; + } + + if ((cause = strchr(app, '!'))) { + *cause++ = '\0'; + if (!cause) { + cause = "normal_clearing"; } + } - if ((flags & SMF_ECHO_BLEG) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) - && (other_session = switch_core_session_locate(other_uuid))) { - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-name", "%s", app); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-arg", "%s", path); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event-lock", "%s", "true"); - if ((flags & SMF_LOOP)) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1); - } - - switch_core_session_queue_private_event(other_session, &event); + if ((flags & SMF_ECHO_BLEG) && (other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) + && (other_session = switch_core_session_locate(other_uuid))) { + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-name", "%s", app); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-arg", "%s", path); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event-lock", "%s", "true"); + if ((flags & SMF_LOOP)) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1); } - - switch_core_session_rwunlock(other_session); - master = other_session; - other_session = NULL; + + switch_core_session_queue_private_event(other_session, &event); } - - if ((flags & SMF_ECHO_ALEG)) { - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-name", "%s", app); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-arg", "%s", path); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event-lock", "%s", "true"); - if ((flags & SMF_LOOP)) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1); - } - switch_core_session_queue_private_event(session, &event); + + switch_core_session_rwunlock(other_session); + master = other_session; + other_session = NULL; + } + + if ((flags & SMF_ECHO_ALEG)) { + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-name", "%s", app); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-arg", "%s", path); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event-lock", "%s", "true"); + if ((flags & SMF_LOOP)) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1); } - master = session; + switch_core_session_queue_private_event(session, &event); } + master = session; + } - if (nomedia) { - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "nomedia"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "nomedia-uuid", "%s", uuid); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event-lock", "%s", "true"); - switch_core_session_queue_private_event(master, &event); - } + if (nomedia) { + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "nomedia"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "nomedia-uuid", "%s", uuid); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event-lock", "%s", "true"); + switch_core_session_queue_private_event(master, &event); } + } - if (cause) { - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-name", "hangup"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-arg", "%s", cause); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event-lock", "%s", "true"); - switch_core_session_queue_private_event(session, &event); - } + if (cause) { + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-name", "hangup"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-arg", "%s", cause); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event-lock", "%s", "true"); + switch_core_session_queue_private_event(session, &event); } - - switch_core_session_rwunlock(session); - switch_safe_free(mypath); } + switch_core_session_rwunlock(session); + switch_safe_free(mypath); + + return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Jan 3 16:34:44 2008 @@ -1101,12 +1101,8 @@ break; do_continue: - - if (rtp_session->ms_per_packet) { - switch_yield((rtp_session->ms_per_packet / 1000) * 750); - } else { - switch_yield(1000); - } + + switch_yield(1000); } *payload_type = (switch_payload_t) rtp_session->recv_msg.header.pt; Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Thu Jan 3 16:34:44 2008 @@ -187,7 +187,7 @@ { timer_private_t *private_info = timer->private_info; switch_status_t status = SWITCH_STATUS_SUCCESS; - switch_size_t diff; + if (globals.RUNNING != 1 || !private_info->ready) { return SWITCH_STATUS_SUCCESS; @@ -196,12 +196,12 @@ check_roll(); if (TIMER_MATRIX[timer->interval].tick < private_info->reference) { - diff = private_info->reference - TIMER_MATRIX[timer->interval].tick; + timer->diff = private_info->reference - TIMER_MATRIX[timer->interval].tick; } else { - diff = 0; + timer->diff = 0; } - if (diff) { + if (timer->diff) { status = SWITCH_STATUS_FALSE; } else { timer_step(timer);

1 0

[commit] r7074 - freeswitch/trunk/scripts/tonegen
by Freeswitch SVN 03 Jan '08

03 Jan '08

Author: anthm Date: Wed Jan 2 20:39:46 2008 New Revision: 7074 Added: freeswitch/trunk/scripts/tonegen/ freeswitch/trunk/scripts/tonegen/rtttl2tgml.pl Log: add script Added: freeswitch/trunk/scripts/tonegen/rtttl2tgml.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/tonegen/rtttl2tgml.pl Wed Jan 2 20:39:46 2008 @@ -0,0 +1,60 @@ +use SMS::Ringtone::RTTTL::Parser; + +our $NOTES = { + 'A' =>[27.50, 55.00, 110.00, 220.00, 440.00, 880.00, 1760.00, 3520.00], + 'A#' =>[29.14, 58.27, 116.54, 233.08, 466.16, 932.33, 1864.66, 3729.31], + 'B' =>[30.87, 61.74, 123.47, 246.94, 493.88, 987.77, 1975.53, 3951.07], + 'C' =>[16.35, 32.70, 65.41, 130.81, 261.63, 523.25, 1046.50, 2093.00, 4186.01], + 'C#' =>[17.32, 34.65, 69.30, 138.59, 277.18, 554.37, 1108.73, 2217.46, 4434.92], + 'D' =>[18.35, 36.71, 73.42, 146.83, 293.66, 587.33, 1174.66, 2349.32, 4698.64], + 'D#' =>[19.45, 38.89, 77.78, 155.56, 311.13, 622.25, 1244.51, 2489.02, 4978.03], + 'E' =>[20.60, 41.20, 82.41, 164.81, 329.63, 659.26, 1318.51, 2637.02], + 'F' =>[21.83, 43.65, 87.31, 174.61, 349.23, 698.46, 1396.91, 2793.83], + 'F#' =>[23.12, 46.25, 92.50, 185.00, 369.99, 739.99, 1479.98, 2959.96], + 'G' =>[24.50, 49.00, 98.00, 196.00, 392.00, 783.99, 1567.98, 3135.96], + 'G#' =>[25.96, 51.91, 103.83, 207.65, 415.30, 830.61, 1661.22, 3322.44], + 'P' =>[0, 0, 0, 0, 0, 0, 0, 0] + }; + + +my $file = shift or die "no file\n"; + +my $rtttl = `cat $file`; + +$rtttl =~ s/\n//g; + +#$rtttl =~ tr/[a-z]/[A-Z]/; +#print $rtttl; + +my $r = new SMS::Ringtone::RTTTL::Parser($rtttl); +# ....or.... +#my $r = new SMS::Ringtone::RTTTL::Parser($rtttl,{'STRICT_NOTE_PART_ORDER' => 0}); + + +# Check for errors +if ($r->has_errors()) { + print STDERR "The following RTTTL errors were found:\n"; + foreach (@{$r->get_errors()}) { + print STDERR "$_\n"; + } + #exit; +} + +# Dump parse results to STDOUT +#$r->puke(); + +$all = $r->get_notes(); + +$ms_per_beat = int (60000 / $r->get_bpm()); + +foreach (@{$all}) { + + my $ms = $ms_per_beat * (1 / $_->[0]) * 4; + + #print STDERR "$_->[0] $_->[1] $_->[2] $_->[3]\n"; + + print "%($ms, 0, $NOTES->{$_->[1]}->[$_->[2]]);\n"; + +} + +

1 0

[commit] r7073 - in freeswitch/trunk: build conf/autoload_configs
by Freeswitch SVN 03 Jan '08

03 Jan '08

Author: brian Date: Wed Jan 2 20:35:30 2008 New Revision: 7073 Modified: freeswitch/trunk/build/modules.conf.in freeswitch/trunk/conf/autoload_configs/modules.conf.xml Log: add this to the default build Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Wed Jan 2 20:35:30 2008 @@ -9,6 +9,7 @@ applications/mod_voicemail applications/mod_limit applications/mod_expr +applications/mod_esf #applications/mod_soundtouch #applications/mod_rss #asr_tts/mod_cepstral Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Wed Jan 2 20:35:30 2008 @@ -43,6 +43,7 @@ <load module="mod_fifo"/> <load module="mod_voicemail"/> <load module="mod_limit"/> + <load module="mod_esf"/>

1 0

[commit] r7072 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Jan '08

03 Jan '08

Author: mikej Date: Wed Jan 2 20:29:28 2008 New Revision: 7072 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: duplicate var. 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 Wed Jan 2 20:29:28 2008 @@ -1283,7 +1283,6 @@ } if ((status == 180 || status == 183 || status == 200)) { - switch_channel_t *channel = switch_core_session_get_channel(session); const char *astate = "early"; url_t *from = NULL, *to = NULL, *contact = NULL;

1 0

[commit] r7071 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 03 Jan '08

03 Jan '08

Author: brian Date: Wed Jan 2 20:29:24 2008 New Revision: 7071 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: add multicast_page_example for snom and linksys Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Jan 2 20:29:24 2008 @@ -165,6 +165,12 @@ </condition> </extension> + <extension name="rtp_multicast_page"> + <condition field="destination_number" expression="^pagegroup$"> + <action application="esf_page_group"/> + </condition> + </extension> +

1 0

[commit] r7070 - freeswitch/trunk/src/mod/applications/mod_esf
by Freeswitch SVN 03 Jan '08

03 Jan '08

Author: brian Date: Wed Jan 2 20:23:24 2008 New Revision: 7070 Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c Log: now that this works with linksys and snom remove the ls from app name Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c (original) +++ freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c Wed Jan 2 20:23:24 2008 @@ -238,7 +238,7 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_APP(app_interface, "esf_ls_page_group", NULL, NULL, bcast_function, NULL, SAF_NONE); + SWITCH_ADD_APP(app_interface, "esf_page_group", NULL, NULL, bcast_function, NULL, SAF_NONE); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r7069 - in freeswitch/trunk/src: . include
by Freeswitch SVN 03 Jan '08

03 Jan '08

Author: anthm Date: Wed Jan 2 20:21:26 2008 New Revision: 7069 Modified: freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/switch_event.c Log: cleanup events Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Wed Jan 2 20:21:26 2008 @@ -90,6 +90,8 @@ switch_event_subclass_t *subclass; /*! the event headers */ switch_event_header_t *headers; + /*! the event headers tail pointer */ + switch_event_header_t *last_header; /*! the body of the event */ char *body; /*! user data from the subclass provider */ @@ -174,6 +176,16 @@ SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, const char *fmt, ...) PRINTF_FUNCTION(4, 5); +/*! + \brief Add a string header to an event + \param event the event to add the header to + \param stack the stack sense (stack it on the top or on the bottom) + \param header_name the name of the header to add + \param data the value of the header + \return SWITCH_STATUS_SUCCESS if the header was added +*/ +SWITCH_DECLARE(switch_status_t) switch_event_add_header_string(switch_event_t *event, switch_stack_t stack, const char *header_name, const char *data); + SWITCH_DECLARE(switch_status_t) switch_event_del_header(switch_event_t *event, const char *header_name); /*! @@ -272,6 +284,17 @@ */ SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, const char *fmt, ...) PRINTF_FUNCTION(2, 3); +SWITCH_DECLARE(switch_status_t) switch_event_create_pres_in_detailed(_In_z_ char *file, _In_z_ char *func, _In_ int line, + _In_z_ const char *proto, _In_z_ const char *login, + _In_z_ const char *from, _In_z_ const char *from_domain, + _In_z_ const char *status, _In_z_ const char *event_type, + _In_z_ const char *alt_event_type, _In_ int event_count, + _In_z_ const char *unique_id, _In_z_ const char *channel_state, + _In_z_ const char *answer_state, _In_z_ const char *call_direction); +#define switch_event_create_pres_in(event) switch_event_create_pres_in_detailed(__FILE__, (char * )__SWITCH_FUNC__, __LINE__, \ + proto, login, from, from_domain, status, event_type, alt_event_type, event_count, \ + unique_id, channel_state, answer_state, call_direction) + /*! \brief Reserve a subclass assuming the owner string is the current filename Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Jan 2 20:21:26 2008 @@ -44,8 +44,6 @@ static switch_mutex_t *EVENT_QUEUE_HAVEMORE_MUTEX = NULL; static switch_thread_cond_t *EVENT_QUEUE_CONDITIONAL = NULL; static switch_memory_pool_t *RUNTIME_POOL = NULL; -/* static switch_memory_pool_t *APOOL = NULL; */ -/* static switch_memory_pool_t *BPOOL = NULL; */ static switch_memory_pool_t *THRUNTIME_POOL = NULL; static switch_queue_t *EVENT_QUEUE[3] = { 0, 0, 0 }; static int POOL_COUNT_MAX = SWITCH_CORE_QUEUE_LEN; @@ -55,35 +53,6 @@ static int EVENT_QUEUE_HAVEMORE = 0; static switch_queue_t *EVENT_RECYCLE_QUEUE = NULL; static switch_queue_t *EVENT_HEADER_RECYCLE_QUEUE = NULL; -#if 0 -static void *locked_alloc(switch_size_t len) -{ - void *mem; - - switch_mutex_lock(POOL_LOCK); - /* <LOCKED> ----------------------------------------------- */ - mem = switch_core_alloc(THRUNTIME_POOL, len); - switch_mutex_unlock(POOL_LOCK); - /* </LOCKED> ---------------------------------------------- */ - - return mem; -} - -static void *locked_dup(char *str) -{ - char *dup; - - switch_mutex_lock(POOL_LOCK); - /* <LOCKED> ----------------------------------------------- */ - dup = switch_core_strdup(THRUNTIME_POOL, str); - switch_mutex_unlock(POOL_LOCK); - /* </LOCKED> ---------------------------------------------- */ - - return dup; -} -#define ALLOC(size) locked_alloc(size) -#define DUP(str) locked_dup(str) -#endif static char *my_dup (const char *s) { @@ -159,12 +128,10 @@ "ALL" }; - static int switch_events_match(switch_event_t *event, switch_event_node_t *node) { int match = 0; - if (node->event_id == SWITCH_EVENT_ALL) { match++; @@ -225,7 +192,6 @@ for (;;) { int any; - len[1] = switch_queue_size(EVENT_QUEUE[SWITCH_PRIORITY_NORMAL]); len[2] = switch_queue_size(EVENT_QUEUE[SWITCH_PRIORITY_LOW]); len[0] = switch_queue_size(EVENT_QUEUE[SWITCH_PRIORITY_HIGH]); @@ -285,7 +251,6 @@ } } - THREAD_RUNNING = 0; return NULL; } @@ -311,7 +276,6 @@ switch_event_destroy(event); } - SWITCH_DECLARE(switch_status_t) switch_event_running(void) { return THREAD_RUNNING ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; @@ -339,12 +303,10 @@ } return SWITCH_STATUS_FALSE; - } SWITCH_DECLARE(switch_status_t) switch_event_reserve_subclass_detailed(char *owner, char *subclass_name) { - switch_event_subclass_t *subclass; switch_assert(RUNTIME_POOL != NULL); @@ -378,21 +340,18 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Returning %d recycled event header(s) %d bytes\n", size, (int) sizeof(switch_event_header_t) * size); - while (switch_queue_trypop(EVENT_HEADER_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) { free(pop); } while (switch_queue_trypop(EVENT_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) { free(pop); } - } SWITCH_DECLARE(switch_status_t) switch_event_shutdown(void) { int x = 0, last = 0; - if (THREAD_RUNNING > 0) { THREAD_RUNNING = -1; @@ -436,8 +395,6 @@ return SWITCH_STATUS_SUCCESS; } - - SWITCH_DECLARE(switch_status_t) switch_event_init(switch_memory_pool_t *pool) { switch_thread_t *thread; @@ -451,19 +408,6 @@ switch_assert(pool != NULL); THRUNTIME_POOL = RUNTIME_POOL = pool; - /* - if (switch_core_new_memory_pool(&THRUNTIME_POOL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate memory pool\n"); - return SWITCH_STATUS_MEMERR; - } - */ - /* - if (switch_core_new_memory_pool(&BPOOL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Could not allocate memory pool\n"); - return SWITCH_STATUS_MEMERR; - } - */ - /* THRUNTIME_POOL = APOOL; */ switch_queue_create(&EVENT_QUEUE[0], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[1], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[2], POOL_COUNT_MAX + 10, THRUNTIME_POOL); @@ -513,7 +457,7 @@ switch_event_reserve_subclass((char *)subclass_name); (*event)->subclass = switch_core_hash_find(CUSTOM_HASH, subclass_name); } - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Subclass", "%s", subclass_name); + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Subclass", subclass_name); } return SWITCH_STATUS_SUCCESS; @@ -577,6 +521,42 @@ return status; } +static switch_status_t switch_event_base_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, char *data) +{ + switch_event_header_t *header; + void *pop; + + if (switch_queue_trypop(EVENT_HEADER_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) { + header = (switch_event_header_t *) pop; + } else { + header = ALLOC(sizeof(*header)); + switch_assert(header); + } + + memset(header, 0, sizeof(*header)); + + header->name = DUP(header_name); + header->value = data; + + if (stack == SWITCH_STACK_TOP) { + header->next = event->headers; + event->headers = header; + if (!event->last_header) { + event->last_header = header; + } + } else { + if (event->last_header) { + event->last_header->next = header; + } else { + event->headers = header; + header->next = NULL; + } + event->last_header = header; + } + + return SWITCH_STATUS_SUCCESS; +} + SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, const char *fmt, ...) { int ret = 0; @@ -589,40 +569,19 @@ if (ret == -1) { return SWITCH_STATUS_MEMERR; - } else { - switch_event_header_t *header, *hp; - void *pop; - - if (switch_queue_trypop(EVENT_HEADER_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) { - header = (switch_event_header_t *) pop; - } else { - header = ALLOC(sizeof(*header)); - switch_assert(header); - } - - memset(header, 0, sizeof(*header)); + } - header->name = DUP(header_name); - header->value = data; - if (stack == SWITCH_STACK_TOP) { - header->next = event->headers; - event->headers = header; - } else { - for (hp = event->headers; hp && hp->next; hp = hp->next); - - if (hp) { - hp->next = header; - } else { - event->headers = header; - header->next = NULL; - } - } - return SWITCH_STATUS_SUCCESS; + return switch_event_base_add_header(event, stack, header_name, data); +} +SWITCH_DECLARE(switch_status_t) switch_event_add_header_string(switch_event_t *event, switch_stack_t stack, const char *header_name, const char *data) +{ + if (data) { + return switch_event_base_add_header(event, stack, header_name, DUP(data)); } + return SWITCH_STATUS_GENERR; } - SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, const char *fmt, ...) { int ret = 0; @@ -787,7 +746,6 @@ switch_snprintf(buf + len, dlen - len, "%s: %s\n", hp->name, switch_strlen_zero(encode_buf) ? "_undef_" : encode_buf); len = strlen(buf); - } /* we are done with the memory we used for encoding, give it back */ @@ -869,7 +827,6 @@ } } - for (hp = event->headers; hp; hp = hp->next) { add_xml_header(xml, hp->name, hp->value, off++); } @@ -901,10 +858,8 @@ return xml; } - SWITCH_DECLARE(switch_status_t) switch_event_fire_detailed(char *file, char *func, int line, switch_event_t **event, void *user_data) { - switch_time_exp_t tm; char date[80] = ""; switch_size_t retsize; @@ -923,26 +878,25 @@ return SWITCH_STATUS_FALSE; } - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Name", "%s", switch_event_name((*event)->event_id)); - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Core-UUID", "%s", switch_core_get_uuid()); - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "FreeSWITCH-Hostname", "%s", hostname); - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "FreeSWITCH-IPv4", "%s", guess_ip_v4); - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "FreeSWITCH-IPv6", "%s", guess_ip_v6); - + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Name", switch_event_name((*event)->event_id)); + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Core-UUID", switch_core_get_uuid()); + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "FreeSWITCH-Hostname", hostname); + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "FreeSWITCH-IPv4", guess_ip_v4); + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "FreeSWITCH-IPv6", guess_ip_v6); switch_time_exp_lt(&tm, ts); switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Date-Local", "%s", date); + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Date-Local", date); switch_rfc822_date(date, ts); - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Date-GMT", "%s", date); + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Date-GMT", date); switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Date-timestamp", "%"SWITCH_UINT64_T_FMT, (uint64_t)ts); - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Calling-File", "%s", switch_cut_path(file)); - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Calling-Function", "%s", func); + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Calling-File", switch_cut_path(file)); + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Calling-Function", func); switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Calling-Line-Number", "%d", line); if ((*event)->subclass) { - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Subclass", "%s", (*event)->subclass->name); - switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Event-Subclass-Owner", "%s", (*event)->subclass->owner); + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Subclass", (*event)->subclass->name); + switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Subclass-Owner", (*event)->subclass->owner); } if (user_data) { @@ -975,7 +929,6 @@ switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); } - *event = NULL; return SWITCH_STATUS_SUCCESS; @@ -1023,6 +976,34 @@ return SWITCH_STATUS_MEMERR; } +SWITCH_DECLARE(switch_status_t) switch_event_create_pres_in_detailed(char *file, char *func, int line, + const char *proto, const char *login, + const char *from, const char *from_domain, + const char *status, const char *event_type, + const char *alt_event_type, int event_count, + const char *unique_id, const char *channel_state, + const char *answer_state, const char *call_direction) +{ + switch_event_t *pres_event; + + if (switch_event_create_subclass(&pres_event, SWITCH_EVENT_PRESENCE_IN, SWITCH_EVENT_SUBCLASS_ANY) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "proto", proto); + switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "login", login); + switch_event_add_header(pres_event, SWITCH_STACK_TOP, "from", "%s@%s", from, from_domain); + switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "status", status); + switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "event_type", event_type); + switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "alt_event_type", alt_event_type); + switch_event_add_header(pres_event, SWITCH_STACK_TOP, "event_count", "%d", event_count); + switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "unique-id", alt_event_type); + switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "channel-state", channel_state); + switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "answer-state", answer_state); + switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "call-direction", call_direction); + switch_event_fire_detailed(file, func, line, &pres_event, NULL); + return SWITCH_STATUS_SUCCESS; + } + return SWITCH_STATUS_MEMERR; +} + /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r7068 - freeswitch/trunk/src
by Freeswitch SVN 03 Jan '08

03 Jan '08

Author: anthm Date: Wed Jan 2 20:01:04 2008 New Revision: 7068 Modified: freeswitch/trunk/src/switch_event.c Log: fix indent Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Jan 2 20:01:04 2008 @@ -105,7 +105,7 @@ #endif /* make sure this is synced with the switch_event_types_t enum in switch_types.h -also never put any new ones before EVENT_ALL + also never put any new ones before EVENT_ALL */ static char *EVENT_NAMES[] = { "CUSTOM", @@ -452,17 +452,17 @@ THRUNTIME_POOL = RUNTIME_POOL = pool; /* - if (switch_core_new_memory_pool(&THRUNTIME_POOL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate memory pool\n"); - return SWITCH_STATUS_MEMERR; - } + if (switch_core_new_memory_pool(&THRUNTIME_POOL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate memory pool\n"); + return SWITCH_STATUS_MEMERR; + } */ /* - if (switch_core_new_memory_pool(&BPOOL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Could not allocate memory pool\n"); - return SWITCH_STATUS_MEMERR; - } - */ + if (switch_core_new_memory_pool(&BPOOL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Could not allocate memory pool\n"); + return SWITCH_STATUS_MEMERR; + } + */ /* THRUNTIME_POOL = APOOL; */ switch_queue_create(&EVENT_QUEUE[0], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[1], POOL_COUNT_MAX + 10, THRUNTIME_POOL);

1 0

[commit] r7067 - in freeswitch/trunk/src: include mod/applications/mod_dptools mod/endpoints/mod_iax mod/endpoints/mod_sofia
by Freeswitch SVN 03 Jan '08

03 Jan '08

Author: anthm Date: Wed Jan 2 19:50:53 2008 New Revision: 7067 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: update Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Jan 2 19:50:53 2008 @@ -428,7 +428,7 @@ SWITCH_MESSAGE_INDICATE_HOLD - indicate hold SWITCH_MESSAGE_INDICATE_UNHOLD - indicate unhold SWITCH_MESSAGE_INDICATE_REDIRECT - indicate redirect - SWITCH_MESSAGE_INDICATE_REJECT - indicate reject + SWITCH_MESSAGE_INDICATE_RESPOND - indicate reject SWITCH_MESSAGE_INDICATE_BROADCAST - indicate media broadcast SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT - indicate media broadcast </pre> @@ -447,7 +447,7 @@ SWITCH_MESSAGE_INDICATE_HOLD, SWITCH_MESSAGE_INDICATE_UNHOLD, SWITCH_MESSAGE_INDICATE_REDIRECT, - SWITCH_MESSAGE_INDICATE_REJECT, + SWITCH_MESSAGE_INDICATE_RESPOND, SWITCH_MESSAGE_INDICATE_BROADCAST, SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT } switch_core_session_message_types_t; 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 Wed Jan 2 19:50:53 2008 @@ -416,14 +416,14 @@ } -SWITCH_STANDARD_APP(reject_function) +SWITCH_STANDARD_APP(respond_function) { switch_core_session_message_t msg = { 0 }; - /* Tell the channel to reject the call */ + /* Tell the channel to respond the call */ msg.from = __FILE__; msg.string_arg = data; - msg.message_id = SWITCH_MESSAGE_INDICATE_REJECT; + msg.message_id = SWITCH_MESSAGE_INDICATE_RESPOND; switch_core_session_receive_message(session, &msg); } @@ -1631,7 +1631,8 @@ SWITCH_ADD_APP(app_interface, "detect_speech", "Detect speech", "Detect speech on a channel.", detect_speech_function, DETECT_SPEECH_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "ivr", "Run an ivr menu", "Run an ivr menu.", ivr_application_function, "<menu_name>", SAF_NONE); SWITCH_ADD_APP(app_interface, "redirect", "Send session redirect", "Send a redirect message to a session.", redirect_function, "<redirect_data>", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "reject", "Send session reject", "Send a reject message to a session.", reject_function, "<reject_data>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "respond", "Send session respond", "Send a respond message to a session.", respond_function, "<respond_data>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "reject", "Send session reject (depricated)", "Send a respond message to a session.", respond_function, "<respond_data>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "queue_dtmf", "Queue dtmf to be sent", "Queue dtmf to be sent from a session", queue_dtmf_function, "<dtmf_data>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "sched_hangup", SCHED_HANGUP_DESCR, SCHED_HANGUP_DESCR, sched_hangup_function, "[+]<time> [<cause>]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "sched_broadcast", SCHED_BROADCAST_DESCR, SCHED_BROADCAST_DESCR, sched_broadcast_function, "[+]<time> <path> [aleg|bleg|both]", SAF_SUPPORT_NOMEDIA); Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Wed Jan 2 19:50:53 2008 @@ -761,7 +761,7 @@ switch_assert(tech_pvt != NULL); switch (msg->message_id) { - case SWITCH_MESSAGE_INDICATE_REJECT: + case SWITCH_MESSAGE_INDICATE_RESPOND: { if (tech_pvt->iax_session) { iax_reject(tech_pvt->iax_session, msg->string_arg ? msg->string_arg : "Call Rejected"); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Jan 2 19:50:53 2008 @@ -415,6 +415,7 @@ } nua_respond(tech_pvt->nh, SIP_200_OK, + NUTAG_AUTOANSWER(0), NUTAG_SESSION_TIMER(session_timeout), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), @@ -932,46 +933,45 @@ nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END()); } break; - case SWITCH_MESSAGE_INDICATE_REJECT: - if (msg->string_arg) { - int code = 0; - char *reason = NULL; - - if (switch_channel_test_flag(channel, CF_ANSWERED)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Call is already answered, Rejecting with hangup\n"); - switch_channel_hangup(channel, SWITCH_CAUSE_CALL_REJECTED); - } else { + case SWITCH_MESSAGE_INDICATE_RESPOND: + if (msg->numeric_arg || msg->string_arg) { + int code = msg->numeric_arg; + const char *reason = NULL; + if (code) { + reason = msg->string_arg; + } else { if (!switch_strlen_zero(msg->string_arg)){ code = atoi(msg->string_arg); if ((reason = strchr(msg->string_arg, ' '))) { reason++; - } + } } + } - if (!reason && code != 407) { - reason = "Call Refused"; - } + if (!reason && code != 407) { + reason = "Call Refused"; + } - if (!(code > 400 && code < 700)) { - code = 488; - } + if (!(code > 400 && code < 700)) { + code = 488; + } - if (code == 407) { - const char *to_uri = switch_channel_get_variable(channel, "sip_to_uri"); - const char *to_host = reason; + if (code == 407) { + const char *to_uri = switch_channel_get_variable(channel, "sip_to_uri"); + const char *to_host = reason; - if (switch_strlen_zero(to_host)) { - to_host = switch_channel_get_variable(channel, "sip_to_host"); - } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Challenging call %s\n", to_uri); - sofia_reg_auth_challange(NULL, tech_pvt->profile, tech_pvt->nh, REG_INVITE, to_host, 0); - switch_channel_hangup(channel, SWITCH_CAUSE_USER_CHALLENGE); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Rejecting with %d %s\n", code, reason); - nua_respond(tech_pvt->nh, code, reason, TAG_END()); + if (switch_strlen_zero(to_host)) { + to_host = switch_channel_get_variable(channel, "sip_to_host"); } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Challenging call %s\n", to_uri); + sofia_reg_auth_challange(NULL, tech_pvt->profile, tech_pvt->nh, REG_INVITE, to_host, 0); + switch_channel_hangup(channel, SWITCH_CAUSE_USER_CHALLENGE); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Rejecting with %d %s\n", code, reason); + nua_respond(tech_pvt->nh, code, reason, TAG_END()); } + } break; case SWITCH_MESSAGE_INDICATE_RINGING: @@ -1023,6 +1023,7 @@ switch_channel_mark_pre_answered(channel); nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, + NUTAG_AUTOANSWER(0), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), TAG_END()); } 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 Wed Jan 2 19:50:53 2008 @@ -436,27 +436,27 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Created agent for %s\n", profile->name); nua_set_params(profile->nua, - NUTAG_APPL_METHOD("OPTIONS"), - NUTAG_APPL_METHOD("NOTIFY"), - NUTAG_APPL_METHOD("INFO"), - NUTAG_AUTOANSWER(0), - NUTAG_AUTOALERT(0), - NUTAG_ALLOW("REGISTER"), - NUTAG_ALLOW("REFER"), - NUTAG_ALLOW("INFO"), - NUTAG_ALLOW("NOTIFY"), - NUTAG_ALLOW_EVENTS("talk"), - NUTAG_SESSION_TIMER(profile->session_timeout), - NTATAG_MAX_PROCEEDING(profile->max_proceeding), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW("PUBLISH")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW("SUBSCRIBE")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ENABLEMESSAGE(1)), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("presence")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("dialog")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("call-info")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("presence.winfo")), - TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("message-summary")), - SIPTAG_SUPPORTED_STR("100rel, precondition, timer"), SIPTAG_USER_AGENT_STR(profile->user_agent), TAG_END()); + NUTAG_APPL_METHOD("OPTIONS"), + NUTAG_APPL_METHOD("NOTIFY"), + NUTAG_APPL_METHOD("INFO"), + NUTAG_AUTOANSWER(0), + NUTAG_AUTOALERT(0), + NUTAG_ALLOW("REGISTER"), + NUTAG_ALLOW("REFER"), + NUTAG_ALLOW("INFO"), + NUTAG_ALLOW("NOTIFY"), + NUTAG_ALLOW_EVENTS("talk"), + NUTAG_SESSION_TIMER(profile->session_timeout), + NTATAG_MAX_PROCEEDING(profile->max_proceeding), + TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW("PUBLISH")), + TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW("SUBSCRIBE")), + TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ENABLEMESSAGE(1)), + TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("presence")), + TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("dialog")), + TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("call-info")), + TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("presence.winfo")), + TAG_IF((profile->pflags & PFLAG_PRESENCE), NUTAG_ALLOW_EVENTS("message-summary")), + SIPTAG_SUPPORTED_STR("100rel, precondition, timer"), SIPTAG_USER_AGENT_STR(profile->user_agent), TAG_END()); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set params for %s\n", profile->name); @@ -1260,79 +1260,102 @@ { - if (sip && session && (status == 180 || status == 183 || status == 200)) { + if (sip && session) { switch_channel_t *channel = switch_core_session_get_channel(session); - const char *astate = "early"; - url_t *from = NULL, *to = NULL, *contact = NULL; - - if (sip->sip_to) { - to = sip->sip_to->a_url; - } - if (sip->sip_from) { - from = sip->sip_from->a_url; - } - if (sip->sip_contact) { - contact = sip->sip_contact->m_url; - } - - if (status == 200) { - astate = "confirmed"; + const char *uuid; + switch_core_session_t *other_session; + + if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { + switch_core_session_message_t msg; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Passing %d %s to other leg\n", status, phrase); + + msg.message_id = SWITCH_MESSAGE_INDICATE_RESPOND; + msg.from = __FILE__; + msg.numeric_arg = status; + msg.string_arg = phrase; + switch_core_session_receive_message(other_session, &msg); + switch_core_session_rwunlock(other_session); + } + + return; } - if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED) && - !switch_channel_test_flag(channel, CF_RING_READY)) { - const char *from_user = "", *from_host = "", *to_user = "", *to_host = "", *contact_user = "", *contact_host = ""; - const char *user_agent = "", *call_id = ""; - char *sql = NULL; + if ((status == 180 || status == 183 || status == 200)) { + switch_channel_t *channel = switch_core_session_get_channel(session); + const char *astate = "early"; + url_t *from = NULL, *to = NULL, *contact = NULL; - if (sip->sip_user_agent) { - user_agent = switch_str_nil(sip->sip_user_agent->g_string); + if (sip->sip_to) { + to = sip->sip_to->a_url; } - - if (sip->sip_call_id) { - call_id = switch_str_nil(sip->sip_call_id->i_id); + if (sip->sip_from) { + from = sip->sip_from->a_url; } - - if (to) { - from_user = switch_str_nil(to->url_user); + if (sip->sip_contact) { + contact = sip->sip_contact->m_url; } - if (from) { - from_host = switch_str_nil(from->url_host); - to_user = switch_str_nil(from->url_user); - to_host = switch_str_nil(from->url_host); + if (status == 200) { + astate = "confirmed"; } - if (contact) { - contact_user = switch_str_nil(contact->url_user); - contact_host = switch_str_nil(contact->url_host); - } + if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED) && + !switch_channel_test_flag(channel, CF_RING_READY)) { + const char *from_user = "", *from_host = "", *to_user = "", *to_host = "", *contact_user = "", *contact_host = ""; + const char *user_agent = "", *call_id = ""; + char *sql = NULL; - sql = switch_mprintf( - "insert into sip_dialogs values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q')", - call_id, - switch_core_session_get_uuid(session), - to_user, - to_host, - from_user, - from_host, - contact_user, - contact_host, - astate, - "outbound", - user_agent - ); + if (sip->sip_user_agent) { + user_agent = switch_str_nil(sip->sip_user_agent->g_string); + } - switch_assert(sql); + if (sip->sip_call_id) { + call_id = switch_str_nil(sip->sip_call_id->i_id); + } + + if (to) { + from_user = switch_str_nil(to->url_user); + } + + if (from) { + from_host = switch_str_nil(from->url_host); + to_user = switch_str_nil(from->url_user); + to_host = switch_str_nil(from->url_host); + } + + if (contact) { + contact_user = switch_str_nil(contact->url_user); + contact_host = switch_str_nil(contact->url_host); + } - sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); - free(sql); - } else if (status == 200) { - char *sql = NULL; - sql = switch_mprintf("update sip_dialogs set state='%s' where uuid='%s';\n", astate, switch_core_session_get_uuid(session)); - switch_assert(sql); - sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); - free(sql); + sql = switch_mprintf( + "insert into sip_dialogs values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q')", + call_id, + switch_core_session_get_uuid(session), + to_user, + to_host, + from_user, + from_host, + contact_user, + contact_host, + astate, + "outbound", + user_agent + ); + + switch_assert(sql); + + sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); + free(sql); + } else if (status == 200) { + char *sql = NULL; + sql = switch_mprintf("update sip_dialogs set state='%s' where uuid='%s';\n", astate, switch_core_session_get_uuid(session)); + switch_assert(sql); + sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); + free(sql); + } } } } @@ -1390,6 +1413,8 @@ } } + state_process: + switch ((enum nua_callstate) ss_state) { case nua_callstate_init: break; @@ -1537,6 +1562,10 @@ goto done; } } + + } else { + ss_state = nua_callstate_completed; + goto state_process; } break; @@ -1589,6 +1618,14 @@ switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } } + + + nua_respond(tech_pvt->nh, SIP_200_OK, + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), + SOATAG_AUDIO_AUX("cn telephone-event"), + NUTAG_INCLUDE_EXTRA_SDP(1), + TAG_END()); } } break; 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 Wed Jan 2 19:50:53 2008 @@ -836,6 +836,7 @@ } nua_invite(tech_pvt->nh, + NUTAG_AUTOANSWER(0), NUTAG_SESSION_TIMER(session_timeout), TAG_IF(!switch_strlen_zero(tech_pvt->rpid), SIPTAG_HEADER_STR(tech_pvt->rpid)), TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)), @@ -1069,6 +1070,10 @@ switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); tech_pvt->fmtp_out = switch_core_session_strdup(tech_pvt->session, tech_pvt->write_codec.fmtp_out); + if (switch_rtp_ready(tech_pvt->rtp_session)) { + switch_rtp_set_default_payload(tech_pvt->rtp_session, tech_pvt->pt); + } + return SWITCH_STATUS_SUCCESS; } @@ -1428,20 +1433,39 @@ greed: x = 0; + + //xxxxxx + if (tech_pvt->rm_encoding) { + for (map = m->m_rtpmaps; map; map = map->rm_next) { + if (map->rm_pt < 96) { + match = (map->rm_pt == tech_pvt->pt) ? 1 : 0; + } else { + match = strcasecmp(switch_str_nil(map->rm_encoding), tech_pvt->iananame) ? 0 : 1; + } + + if (match) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Our existing codec is still good, let's keep it\n"); + goto end; + } + } + } + + + for (map = m->m_rtpmaps; map; map = map->rm_next) { int32_t i; const switch_codec_implementation_t *mimp = NULL, *near_match = NULL; const char *rm_encoding; if (x++ < skip) { - printf("skip %s\n", map->rm_encoding); + //printf("skip %s\n", map->rm_encoding); continue; } if (!(rm_encoding = map->rm_encoding)) { rm_encoding = ""; } - + if (!te && !strcasecmp(rm_encoding, "telephone-event")) { te = tech_pvt->te = (switch_payload_t) map->rm_pt; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set 2833 dtmf payload to %u\n", te); @@ -1632,6 +1656,8 @@ } } + end: + switch_set_flag_locked(tech_pvt, TFLAG_SDP); return match;

1 0

[commit] r7066 - freeswitch/trunk/src/mod/applications/mod_esf
by Freeswitch SVN 03 Jan '08

03 Jan '08

Author: brian Date: Wed Jan 2 19:21:58 2008 New Revision: 7066 Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c Log: fix Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c (original) +++ freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c Wed Jan 2 19:21:58 2008 @@ -153,11 +153,12 @@ } if (ready == SEND_TYPE_RTP) { + switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET); if (!(rtp_port = switch_rtp_request_port(guess_ip))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP Port Error\n"); goto fail; } - switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET); + rtp_session = switch_rtp_new(guess_ip, rtp_port, mcast_ip,

1 0