January 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11265 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: brian Date: Fri Jan 16 17:21:04 2009 New Revision: 11265 Log: remove unused option Modified: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml Fri Jan 16 17:21:04 2009 @@ -22,7 +22,6 @@  <param name="sip-ip" value="$${local_ip_v6}"/> <param name="hold-music" value="$${hold_music}"/> -   <param name="apply-inbound-acl" value="domains"/>  Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Fri Jan 16 17:21:04 2009 @@ -54,7 +54,6 @@ <param name="hold-music" value="$${hold_music}"/> <param name="apply-nat-acl" value="rfc1918"/>  -    <param name="apply-inbound-acl" value="domains"/>

1 0

[commit] r11264 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: brian Date: Fri Jan 16 15:48:01 2009 New Revision: 11264 Log: fun.. now everyone go out and get a Logitech 350 headset Modified: freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml Fri Jan 16 15:48:01 2009 @@ -17,7 +17,7 @@   -  + <param name="hold-file" value="$${hold_music}"/>

1 0

[commit] r11263 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: anthm Date: Fri Jan 16 15:03:49 2009 New Revision: 11263 Log: hundred dolla line of code Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Fri Jan 16 15:03:49 2009 @@ -250,7 +250,8 @@ switch_set_flag_locked(b_tech_pvt, TFLAG_OUTBOUND); switch_channel_set_flag(channel, CF_ACCEPT_CNG); - switch_ivr_transfer_variable(session, tech_pvt->other_session, "process_cdr"); + //switch_ivr_transfer_variable(session, tech_pvt->other_session, "process_cdr"); + switch_ivr_transfer_variable(session, tech_pvt->other_session, NULL); if (switch_core_session_thread_launch(b_session) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n");

1 0

[commit] r11262 - freeswitch/trunk/src
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: anthm Date: Fri Jan 16 14:59:07 2009 New Revision: 11262 Log: FSCORE-266 Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jan 16 14:59:07 2009 @@ -1400,7 +1400,11 @@ uint16_t in_digit_seq = ntohs((uint16_t) rtp_session->recv_msg.header.seq); uint32_t ts = htonl(rtp_session->recv_msg.header.ts); - + if (in_digit_seq < rtp_session->dtmf_data.in_digit_seq) { + if (rtp_session->dtmf_data.in_digit_seq - in_digit_seq > 100) { + rtp_session->dtmf_data.in_digit_seq = 0; + } + } if (in_digit_seq > rtp_session->dtmf_data.in_digit_seq) {

1 0

[commit] r11261 - freeswitch/trunk/src
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: anthm Date: Fri Jan 16 14:29:56 2009 New Revision: 11261 Log: fix insane sanity check Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Jan 16 14:29:56 2009 @@ -30,7 +30,7 @@ * switch_rtp.c -- RTP * */ - +//#define DEBUG_2833 #include <switch.h> #include <switch_stun.h> #undef PACKAGE_NAME @@ -1374,6 +1374,12 @@ goto end; } +#ifdef DEBUG_2833 + if (rtp_session->dtmf_data.in_digit_sanity && !(rtp_session->dtmf_data.in_digit_sanity % 100)) { + printf("sanity %d\n", rtp_session->dtmf_data.in_digit_sanity); + } +#endif + if (rtp_session->dtmf_data.in_digit_sanity && !--rtp_session->dtmf_data.in_digit_sanity) { rtp_session->dtmf_data.last_digit = 0; rtp_session->dtmf_data.in_digit_ts = 0; @@ -1394,7 +1400,7 @@ uint16_t in_digit_seq = ntohs((uint16_t) rtp_session->recv_msg.header.seq); uint32_t ts = htonl(rtp_session->recv_msg.header.ts); - rtp_session->dtmf_data.in_digit_sanity = 2000; + if (in_digit_seq > rtp_session->dtmf_data.in_digit_seq) { @@ -1402,8 +1408,9 @@ #ifdef DEBUG_2833 - printf("read: %c %u %u %u %u %d %d\n", - key, in_digit_seq, rtp_session->dtmf_data.in_digit_seq, ts, duration, rtp_session->recv_msg.header.m, end); + printf("read: %c %u %u %u %u %d %d %s\n", + key, in_digit_seq, rtp_session->dtmf_data.in_digit_seq, + ts, duration, rtp_session->recv_msg.header.m, end, end && !rtp_session->dtmf_data.in_digit_ts ? "ignored" : ""); #endif if (rtp_session->dtmf_data.last_duration > duration && ts == rtp_session->dtmf_data.in_digit_ts) { @@ -1443,12 +1450,14 @@ } else if (!rtp_session->dtmf_data.in_digit_ts) { rtp_session->dtmf_data.in_digit_ts = ts; rtp_session->dtmf_data.first_digit = key; + rtp_session->dtmf_data.in_digit_sanity = 2000; } rtp_session->dtmf_data.last_duration = duration; #ifdef DEBUG_2833 } else { - printf("drop: %c %u %u %u %u %d %d\n", key, in_digit_seq, rtp_session->dtmf_data.in_digit_seq, ts, duration, m, end); + printf("drop: %c %u %u %u %u %d %d\n", + key, in_digit_seq, rtp_session->dtmf_data.in_digit_seq, ts, duration, rtp_session->recv_msg.header.m, end); #endif } }

1 0

[commit] r11260 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: brian Date: Fri Jan 16 13:34:27 2009 New Revision: 11260 Log: add to modules.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml 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 Fri Jan 16 13:34:27 2009 @@ -65,6 +65,7 @@ <load module="mod_speex"/> <load module="mod_h26x"/>  +   <load module="mod_sndfile"/>

1 0

[commit] r11259 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: anthm Date: Fri Jan 16 13:32:47 2009 New Revision: 11259 Log: make dual streams configurable Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h 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 Jan 16 13:32:47 2009 @@ -124,6 +124,7 @@ GFLAGS flags; switch_timer_t timer; switch_timer_t hold_timer; + int dual_streams; } globals; @@ -738,6 +739,8 @@ memset(&globals, 0, sizeof(globals)); + globals.dual_streams = 1; + if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { return status; } @@ -1287,7 +1290,7 @@ //globals.read_codec.implementation->samples_per_packet); err = OpenAudioStream(&globals.audio_stream, &inputParameters, &outputParameters, sample_rate, paClipOff, - globals.read_codec.implementation->samples_per_packet); + globals.read_codec.implementation->samples_per_packet, globals.dual_streams); /* UNLOCKED ************************************************************************************************* */ switch_mutex_unlock(globals.device_lock); @@ -1324,7 +1327,8 @@ outputParameters.sampleFormat = SAMPLE_TYPE; outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency; outputParameters.hostApiSpecificStreamInfo = NULL; - err = OpenAudioStream(&globals.ring_stream, NULL, &outputParameters, sample_rate, paClipOff, globals.read_codec.implementation->samples_per_packet); + err = OpenAudioStream(&globals.ring_stream, NULL, + &outputParameters, sample_rate, paClipOff, globals.read_codec.implementation->samples_per_packet, globals.dual_streams); /* UNLOCKED ************************************************************************************************* */ switch_mutex_unlock(globals.device_lock); Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c Fri Jan 16 13:32:47 2009 @@ -59,6 +59,10 @@ unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags, void *userData); static int oblockingIOCallback(const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags, void *userData); + +static int ioblockingIOCallback(const void *inputBuffer, void *outputBuffer, + unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags, void *userData); + static PaError PABLIO_InitFIFO(PaUtilRingBuffer * rbuf, long numFrames, long bytesPerFrame); static PaError PABLIO_TermFIFO(PaUtilRingBuffer * rbuf); @@ -104,6 +108,14 @@ return 0; } +static int ioblockingIOCallback(const void *inputBuffer, void *outputBuffer, + unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo * timeInfo, PaStreamCallbackFlags statusFlags, void *userData) +{ + iblockingIOCallback(inputBuffer, outputBuffer, framesPerBuffer, timeInfo, statusFlags, userData); + oblockingIOCallback(inputBuffer, outputBuffer, framesPerBuffer, timeInfo, statusFlags, userData); + return 0; +} + /* Allocate buffer. */ static PaError PABLIO_InitFIFO(PaUtilRingBuffer * rbuf, long numFrames, long bytesPerFrame) { @@ -230,7 +242,10 @@ */ PaError OpenAudioStream(PABLIO_Stream ** rwblPtr, const PaStreamParameters * inputParameters, - const PaStreamParameters * outputParameters, double sampleRate, PaStreamFlags streamFlags, long samples_per_packet) + const PaStreamParameters * outputParameters, + double sampleRate, PaStreamFlags streamFlags, + long samples_per_packet, + int do_dual) { long bytesPerSample = 2; PaError err; @@ -239,12 +254,16 @@ //long numBytes; int channels = 1; + if (!(inputParameters || outputParameters)) { + return -1; + } + /* Allocate PABLIO_Stream structure for caller. */ aStream = (PABLIO_Stream *) malloc(sizeof(PABLIO_Stream)); if (aStream == NULL) return paInsufficientMemory; memset(aStream, 0, sizeof(PABLIO_Stream)); - + /* Initialize PortAudio */ err = Pa_Initialize(); if (err != paNoError) @@ -265,12 +284,17 @@ err = PABLIO_InitFIFO(&aStream->inFIFO, numFrames, aStream->bytesPerFrame); if (err != paNoError) goto error; + + aStream-> has_in = 1; + } if (outputParameters) { err = PABLIO_InitFIFO(&aStream->outFIFO, numFrames, aStream->bytesPerFrame); if (err != paNoError) goto error; + + aStream-> has_out = 1; } /* Make Write FIFO appear full initially. */ @@ -280,18 +304,51 @@ /* Open a PortAudio stream that we will use to communicate with the underlying * audio drivers. */ - err = Pa_OpenStream(&aStream->istream, inputParameters, NULL, sampleRate, samples_per_packet, streamFlags, iblockingIOCallback, aStream); - err = Pa_OpenStream(&aStream->ostream, NULL, outputParameters, sampleRate, samples_per_packet, streamFlags, oblockingIOCallback, aStream); + + aStream->do_dual = do_dual; + + + + if (aStream->do_dual) { + err = Pa_OpenStream(&aStream->istream, inputParameters, NULL, sampleRate, samples_per_packet, streamFlags, iblockingIOCallback, aStream); + if (err != paNoError) { + goto error; + } + err = Pa_OpenStream(&aStream->ostream, NULL, outputParameters, sampleRate, samples_per_packet, streamFlags, oblockingIOCallback, aStream); + if (err != paNoError) { + goto error; + } + } else { + err = Pa_OpenStream(&aStream->iostream, inputParameters, outputParameters, sampleRate, samples_per_packet, streamFlags, ioblockingIOCallback, aStream); + } if (err != paNoError) goto error; + + if (aStream->do_dual) { + err = Pa_StartStream(aStream->istream); + + if (err != paNoError) { + goto error; + } - err = Pa_StartStream(aStream->istream); - err = Pa_StartStream(aStream->ostream); + err = Pa_StartStream(aStream->ostream); - if (err != paNoError) + if (err != paNoError) { + goto error; + } + + + } else { + err = Pa_StartStream(aStream->iostream); + } + + if (err != paNoError) { goto error; + } + *rwblPtr = aStream; + return paNoError; error: @@ -315,14 +372,34 @@ } } - if (Pa_IsStreamActive(aStream->istream)) { - Pa_StopStream(aStream->istream); - Pa_CloseStream(aStream->istream); - } + if (aStream->do_dual) { + if (aStream->has_in && aStream->istream) { + if (Pa_IsStreamActive(aStream->istream)) { + Pa_StopStream(aStream->istream); + } + + Pa_CloseStream(aStream->istream); + aStream->istream = NULL; + } + + if (aStream->has_out && aStream->ostream) { + if (Pa_IsStreamActive(aStream->ostream)) { + Pa_StopStream(aStream->ostream); + } - if (Pa_IsStreamActive(aStream->ostream)) { - Pa_StopStream(aStream->ostream); - Pa_CloseStream(aStream->ostream); + Pa_CloseStream(aStream->ostream); + aStream->ostream = NULL; + } + + } else { + if (aStream->iostream) { + if (Pa_IsStreamActive(aStream->iostream)) { + Pa_StopStream(aStream->iostream); + } + + Pa_CloseStream(aStream->iostream); + aStream->iostream = NULL; + } } PABLIO_TermFIFO(&aStream->inFIFO); Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h Fri Jan 16 13:32:47 2009 @@ -61,7 +61,11 @@ PaUtilRingBuffer outFIFO; PaStream *istream; PaStream *ostream; + PaStream *iostream; int bytesPerFrame; + int do_dual; + int has_in; + int has_out; } PABLIO_Stream; /* Values for flags for OpenAudioStream(). */ @@ -105,7 +109,8 @@ */ PaError OpenAudioStream(PABLIO_Stream ** rwblPtr, const PaStreamParameters * inputParameters, - const PaStreamParameters * outputParameters, double sampleRate, PaStreamCallbackFlags statusFlags, long samples_per_packet); + const PaStreamParameters * outputParameters, + double sampleRate, PaStreamCallbackFlags statusFlags, long samples_per_packet, int do_dual); PaError CloseAudioStream(PABLIO_Stream * aStream);

1 0

[commit] r11257 - freeswitch/trunk
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: brian Date: Fri Jan 16 10:52:23 2009 New Revision: 11257 Log: doh, remove mrcp Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Jan 16 10:52:23 2009 @@ -684,7 +684,6 @@ AC_CONFIG_SUBDIRS(libs/sofia-sip) AC_CONFIG_SUBDIRS(libs/speex) AC_CONFIG_SUBDIRS(libs/portaudio) -AC_CONFIG_SUBDIRS(libs/openmrcp) AC_CONFIG_SUBDIRS(libs/openzap) AC_CHECK_LIB([tiff], [TIFFOpen], AC_CONFIG_SUBDIRS(libs/spandsp), , -lm)

1 0

[commit] r11256 - freeswitch/trunk/src
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: anthm Date: Fri Jan 16 10:22:29 2009 New Revision: 11256 Log: add inherit_codec=true var to set on a leg with late negotiation to force the negotiated b leg codec into the a leg Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Jan 16 10:22:29 2009 @@ -212,7 +212,8 @@ return x; } -static uint8_t check_channel_status(switch_channel_t **peer_channels, +static uint8_t check_channel_status(switch_core_session_t *session, + switch_channel_t **peer_channels, switch_core_session_t **peer_sessions, uint32_t len, int32_t *idx, uint32_t *hups, char *file, char *key, uint8_t early_ok, uint8_t *ring_ready, uint8_t *progress, @@ -222,6 +223,14 @@ uint32_t i; *hups = 0; *idx = IDX_NADA; + int rval = 0; + switch_channel_t *caller_channel = NULL; + int pindex = -1; + + if (session) { + caller_channel = switch_core_session_get_channel(session); + } + for (i = 0; i < len; i++) { switch_channel_state_t state; @@ -233,6 +242,7 @@ } if (!*ring_ready && switch_channel_test_flag(peer_channels[i], CF_EARLY_MEDIA)) { *progress = 1; + pindex = i; } if (switch_core_session_private_event_count(peer_sessions[i])) { @@ -252,7 +262,7 @@ ) && !switch_channel_test_flag(peer_channels[i], CF_TAGGED) ) { - + if (!switch_strlen_zero(key)) { struct key_collect *collect; @@ -268,20 +278,46 @@ } } else { *idx = i; - return 0; + pindex = (uint32_t) i; + rval = 0; + goto end; } } else if (switch_channel_test_flag(peer_channels[i], CF_WINNER)) { *idx = i; - return 0; + rval = 0; + pindex = (uint32_t) i; + goto end; } } if (*hups == len) { - return 0; + rval = 0; } else { - return 1; + rval = 1; + } + + end: + + if (pindex > -1 && caller_channel && switch_channel_ready(caller_channel) && !switch_channel_media_ready(caller_channel)) { + const char *var = switch_channel_get_variable(caller_channel, "inherit_codec"); + if (switch_true(var)) { + switch_codec_implementation_t impl; + char tmp[128] = ""; + + + switch_core_session_get_read_impl(peer_sessions[pindex], &impl); + switch_snprintf(tmp, sizeof(tmp), "%s@%uk@%ui", impl.iananame, impl.samples_per_second, impl.microseconds_per_packet / 1000); + switch_channel_set_variable(caller_channel, "absolute_codec_string", tmp); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting codec string on %s to %s\n", switch_channel_get_name(caller_channel), tmp); + + + } } + + + return rval; + } struct ringback { @@ -1383,7 +1419,9 @@ } while ((!caller_channel || switch_channel_ready(caller_channel)) && - check_channel_status(peer_channels, peer_sessions, and_argc, &idx, &hups, file, key, early_ok, &ring_ready, &progress, return_ring_ready)) { + check_channel_status(session, + peer_channels, + peer_sessions, and_argc, &idx, &hups, file, key, early_ok, &ring_ready, &progress, return_ring_ready)) { time_t elapsed = switch_timestamp(NULL) - start; if (caller_channel && !sent_ring && ring_ready && !return_ring_ready) { switch_channel_ring_ready(caller_channel);

1 0

[commit] r11255 - in freeswitch/trunk: libs/esl src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: anthm Date: Fri Jan 16 09:32:10 2009 New Revision: 11255 Log: add linger event_socket command to make outbound socket notify channel disconnect and wait for you to terminate Modified: freeswitch/trunk/libs/esl/testserver.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/libs/esl/testserver.c ============================================================================== --- freeswitch/trunk/libs/esl/testserver.c (original) +++ freeswitch/trunk/libs/esl/testserver.c Fri Jan 16 09:32:10 2009 @@ -5,7 +5,10 @@ static void mycallback(esl_socket_t server_sock, esl_socket_t client_sock, struct sockaddr_in addr) { esl_handle_t handle = {{0}}; - + int done = 0; + esl_status_t status; + time_t exp = 0; + if (fork()) { close(client_sock); return; @@ -13,17 +16,37 @@ esl_attach_handle(&handle, client_sock, addr); - printf("Connected! %d\n", handle.sock); + esl_log(ESL_LOG_INFO, "Connected! %d\n", handle.sock); esl_filter(&handle, "unique-id", esl_event_get_header(handle.info_event, "caller-unique-id")); esl_events(&handle, ESL_EVENT_TYPE_PLAIN, "SESSION_HEARTBEAT CHANNEL_ANSWER CHANNEL_ORIGINATE CHANNEL_PROGRESS CHANNEL_HANGUP " "CHANNEL_BRIDGE CHANNEL_UNBRIDGE CHANNEL_OUTGOING CHANNEL_EXECUTE CHANNEL_EXECUTE_COMPLETE DTMF CUSTOM conference::maintenance"); + esl_send_recv(&handle, "linger"); + esl_execute(&handle, "answer", NULL, NULL); esl_execute(&handle, "conference", "3000@default", NULL); - while(esl_recv(&handle) == ESL_SUCCESS); - + while((status = esl_recv_timed(&handle, 1000)) != ESL_FAIL) { + if (done) { + if (time(NULL) >= exp) { + break; + } + } else if (status == ESL_SUCCESS) { + const char *type = esl_event_get_header(handle.last_event, "content-type"); + if (type && !strcasecmp(type, "text/disconnect-notice")) { + const char *dispo = esl_event_get_header(handle.last_event, "content-disposition"); + esl_log(ESL_LOG_INFO, "Got a disconnection notice dispostion: [%s]\n", dispo ? dispo : ""); + if (!strcmp(dispo, "linger")) { + done = 1; + esl_log(ESL_LOG_INFO, "Waiting 5 seconds for any remaining events.\n"); + exp = time(NULL) + 5; + } + } + } + } + + esl_log(ESL_LOG_INFO, "Disconnected! %d\n", handle.sock); esl_disconnect(&handle); } Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Jan 16 09:32:10 2009 @@ -49,7 +49,9 @@ LFLAG_SESSION = (1 << 6), LFLAG_ASYNC = (1 << 7), LFLAG_STATEFUL = (1 << 8), - LFLAG_OUTBOUND = (1 << 9) + LFLAG_OUTBOUND = (1 << 9), + LFLAG_LINGER = (1 << 10), + LFLAG_HANDLE_DISCO = (1 << 11) } event_flag_t; typedef enum { @@ -1045,22 +1047,21 @@ if (!SWITCH_STATUS_IS_BREAK(status) && status != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_FALSE; } - + + /* if (channel && !switch_channel_ready(channel)) { status = SWITCH_STATUS_FALSE; break; } + */ clen -= (int) mlen; p += mlen; } - + switch_event_add_body(*event, "%s", body); free(body); } - - - } } } @@ -1158,9 +1159,32 @@ } } - if (channel && !switch_channel_ready(channel)) { - status = SWITCH_STATUS_FALSE; - break; + if (channel && !switch_channel_ready(channel) && !switch_test_flag(listener, LFLAG_HANDLE_DISCO)) { + switch_set_flag_locked(listener, LFLAG_HANDLE_DISCO); + if (switch_test_flag(listener, LFLAG_LINGER)) { + char message[128] = ""; + int mlen; + switch_size_t len; + char disco_buf[512] = ""; + + switch_snprintf(message, sizeof(message), + "Channel %s has disconnected, lingering by request from remote.\n", switch_channel_get_name(channel)); + mlen = strlen(message); + + switch_snprintf(disco_buf, sizeof(disco_buf), "Content-Type: text/disconnect-notice\n" + "Controlled-Session-UUID: %s\n" + "Content-Disposition: linger\n" + "Content-Length: %d\n\n", + switch_core_session_get_uuid(listener->session), mlen); + + len = strlen(disco_buf); + switch_socket_send(listener->sock, disco_buf, &len); + len = mlen; + switch_socket_send(listener->sock, message, &len); + } else { + status = SWITCH_STATUS_FALSE; + break; + } } if (do_sleep) { @@ -1580,6 +1604,20 @@ } else { switch_snprintf(reply, reply_len, "-ERR invalid log level"); } + } else if (!strncasecmp(cmd, "linger", 6)) { + if (listener->session) { + switch_set_flag_locked(listener, LFLAG_LINGER); + switch_snprintf(reply, reply_len, "+OK will linger"); + } else { + switch_snprintf(reply, reply_len, "-ERR not controlling a session"); + } + } else if (!strncasecmp(cmd, "nolinger", 6)) { + if (listener->session) { + switch_clear_flag_locked(listener, LFLAG_LINGER); + switch_snprintf(reply, reply_len, "+OK will not linger"); + } else { + switch_snprintf(reply, reply_len, "-ERR not controlling a session"); + } } else if (!strncasecmp(cmd, "nolog", 5)) { flush_listener(listener, SWITCH_TRUE, SWITCH_FALSE); if (switch_test_flag(listener, LFLAG_LOG)) { @@ -1926,6 +1964,7 @@ if (listener->session) { switch_snprintf(disco_buf, sizeof(disco_buf), "Content-Type: text/disconnect-notice\n" "Controlled-Session-UUID: %s\n" + "Content-Disposition: disconnect\n" "Content-Length: %d\n\n", switch_core_session_get_uuid(listener->session), mlen); } else {

1 0