January 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

09 Jan '09

Author: brian Date: Thu Jan 8 21:28:52 2009 New Revision: 11101 Log: avoid segfault when playing a 48k wav as a transfer ringback to an 8k ulaw channel Modified: freeswitch/trunk/src/switch_core_file.c Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Thu Jan 8 21:28:52 2009 @@ -165,7 +165,7 @@ switch_assert(fh->buffer); } if (!fh->dbuf) { - fh->dbuflen = fh->resampler->to_len * 8; + fh->dbuflen = fh->resampler->to_len * 10; fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); } switch_assert(fh->resampler->to_len <= fh->dbuflen);

1 0

[commit] r11100 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 08 Jan '09

08 Jan '09

Author: anthm Date: Thu Jan 8 13:45:44 2009 New Revision: 11100 Log: comment out incomplete code Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 8 13:45:44 2009 @@ -2351,8 +2351,8 @@ switch_channel_set_variable(tech_pvt->channel, "has_t38", "true"); switch_channel_set_private(tech_pvt->channel, "t38_options", t38_options); - switch_channel_set_flag(tech_pvt->channel, CF_PROXY_MEDIA); - switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA); + //switch_channel_set_flag(tech_pvt->channel, CF_PROXY_MEDIA); + //switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA); } else if (m->m_type == sdp_media_audio && m->m_port && !got_audio) { sdp_rtpmap_t *map;

1 0

[commit] r11099 - in freeswitch/trunk/src/mod: applications/mod_conference xml_int/mod_xml_rpc
by FreeSWITCH SVN 08 Jan '09

08 Jan '09

Author: brian Date: Thu Jan 8 11:36:32 2009 New Revision: 11099 Log: update Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c 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 8 11:36:32 2009 @@ -3895,7 +3895,7 @@ { char *lbuf = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; - char *http = NULL; + char *http = NULL, *type = NULL; int argc; char *argv[25] = { 0 }; @@ -3905,11 +3905,14 @@ if (stream->param_event) { http = switch_event_get_header(stream->param_event, "http-host"); + type = switch_event_get_header(stream->param_event, "content-type"); } if (http) { /* Output must be to a web browser */ - stream->write_function(stream, "<pre>\n"); + if (type && !strcasecmp(type, "text/html")) { + stream->write_function(stream, "<pre>\n"); + } } if (!(lbuf = strdup(cmd))) { Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Thu Jan 8 11:36:32 2009 @@ -449,7 +449,7 @@ char *fs_user = NULL, *fs_domain = NULL; char *path_info = NULL; abyss_bool ret = TRUE; - int html = 0, text = 0; + int html = 0, text = 0, xml = 0; stream.data = r; stream.write_function = http_stream_write; @@ -467,6 +467,9 @@ } else if ((command = strstr(r->requestInfo.uri, "/txtapi/"))) { command += 8; text++; + } else if ((command = strstr(r->requestInfo.uri, "/xmlapi/"))) { + command += 8; + xml++; } else { return FALSE; } @@ -529,6 +532,8 @@ switch_event_add_header_string(stream.param_event, SWITCH_STACK_BOTTOM, "Content-type", "text/html"); else if (text) switch_event_add_header_string(stream.param_event, SWITCH_STACK_BOTTOM, "Content-type", "text/plain"); + else if (xml) + switch_event_add_header_string(stream.param_event, SWITCH_STACK_BOTTOM, "Content-type", "text/xml"); if (fs_user) switch_event_add_header_string(stream.param_event, SWITCH_STACK_BOTTOM, "FreeSWITCH-User", fs_user); if (fs_domain)

1 0

[commit] r11098 - freeswitch/trunk/src
by FreeSWITCH SVN 08 Jan '09

08 Jan '09

Author: anthm Date: Thu Jan 8 10:43:07 2009 New Revision: 11098 Log: add bridge/unbridge too Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Jan 8 10:43:07 2009 @@ -1214,6 +1214,8 @@ event->event_id == SWITCH_EVENT_CHANNEL_ANSWER || event->event_id == SWITCH_EVENT_CHANNEL_PARK || event->event_id == SWITCH_EVENT_CHANNEL_UNPARK || + event->event_id == SWITCH_EVENT_CHANNEL_BRIDGE || + event->event_id == SWITCH_EVENT_CHANNEL_UNBRIDGE || event->event_id == SWITCH_EVENT_CHANNEL_PROGRESS || event->event_id == SWITCH_EVENT_CHANNEL_PROGRESS_MEDIA || event->event_id == SWITCH_EVENT_CHANNEL_HANGUP ||

1 0

[commit] r11097 - freeswitch/trunk/src
by FreeSWITCH SVN 08 Jan '09

08 Jan '09

Author: anthm Date: Thu Jan 8 10:41:32 2009 New Revision: 11097 Log: add park/unpark to verbose event list Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Jan 8 10:41:32 2009 @@ -1212,6 +1212,8 @@ event->event_id == SWITCH_EVENT_CHANNEL_ORIGINATE || event->event_id == SWITCH_EVENT_CHANNEL_UUID || event->event_id == SWITCH_EVENT_CHANNEL_ANSWER || + event->event_id == SWITCH_EVENT_CHANNEL_PARK || + event->event_id == SWITCH_EVENT_CHANNEL_UNPARK || event->event_id == SWITCH_EVENT_CHANNEL_PROGRESS || event->event_id == SWITCH_EVENT_CHANNEL_PROGRESS_MEDIA || event->event_id == SWITCH_EVENT_CHANNEL_HANGUP ||

1 0

[commit] r11090 - in freeswitch/trunk/src: . mod/formats/mod_sndfile
by FreeSWITCH SVN 08 Jan '09

08 Jan '09

Author: anthm Date: Wed Jan 7 19:42:09 2009 New Revision: 11090 Log: fix resampling issues (add to 1.0 branch) Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c freeswitch/trunk/src/switch_core_file.c Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Wed Jan 7 19:42:09 2009 @@ -237,7 +237,7 @@ handle->sample_count += *len; - return SWITCH_STATUS_SUCCESS; + return *len ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; } static switch_status_t sndfile_file_write(switch_file_handle_t *handle, void *data, size_t *len) Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Wed Jan 7 19:42:09 2009 @@ -125,21 +125,27 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh, void *data, switch_size_t *len) { switch_status_t status; - switch_size_t orig_len = *len; + switch_size_t want, got, orig_len = *len; switch_assert(fh != NULL); switch_assert(fh->file_interface != NULL); - if (fh->buffer && switch_buffer_inuse(fh->buffer)) { + if (fh->buffer && switch_buffer_inuse(fh->buffer) >= *len * 2) { *len = switch_buffer_read(fh->buffer, data, orig_len * 2) / 2; return SWITCH_STATUS_SUCCESS; } - if ((status = fh->file_interface->file_read(fh, data, len)) != SWITCH_STATUS_SUCCESS) { + want = *len; + + more: + + if ((status = fh->file_interface->file_read(fh, data, len)) != SWITCH_STATUS_SUCCESS || !*len) { *len = 0; goto done; } + got = *len; + if (!switch_test_flag(fh, SWITCH_FILE_NATIVE) && fh->native_rate != fh->samplerate) { if (!fh->resampler) { if (switch_resample_create(&fh->resampler, @@ -153,9 +159,9 @@ fh->resampler->to_len = switch_resample_process(fh->resampler, fh->resampler->from, fh->resampler->from_len, fh->resampler->to, fh->resampler->to_size, 0); - if (fh->resampler->to_len > orig_len) { + if (fh->resampler->to_len < want || fh->resampler->to_len > orig_len) { if (!fh->buffer) { - switch_buffer_create_dynamic(&fh->buffer, fh->resampler->to_len * 2, fh->resampler->to_len * 4, fh->resampler->to_len * 8); + switch_buffer_create_dynamic(&fh->buffer, fh->resampler->to_len * 4, fh->resampler->to_len * 8, fh->resampler->to_len * 32); switch_assert(fh->buffer); } if (!fh->dbuf) { @@ -163,17 +169,23 @@ fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); } switch_assert(fh->resampler->to_len <= fh->dbuflen); - + switch_float_to_short(fh->resampler->to, (int16_t *) fh->dbuf, fh->resampler->to_len); switch_buffer_write(fh->buffer, fh->dbuf, fh->resampler->to_len * 2); + + if (switch_buffer_inuse(fh->buffer) < want * 2) { + *len = want - fh->resampler->to_len; + goto more; + } *len = switch_buffer_read(fh->buffer, data, orig_len * 2) / 2; } else { switch_float_to_short(fh->resampler->to, data, fh->resampler->to_len); *len = fh->resampler->to_len; } + } - + done: return status;

1 0

[commit] r11088 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 07 Jan '09

07 Jan '09

Author: anthm Date: Wed Jan 7 12:09:55 2009 New Revision: 11088 Log: issue from http://track.sipfoundry.org/browse/XECS-2079 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 7 12:09:55 2009 @@ -2754,7 +2754,8 @@ SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), - SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), + TAG_IF((profile->pflags & PFLAG_DISABLE_100REL), NUTAG_INCLUDE_EXTRA_SDP(1)), TAG_END()); } else if(profile->pflags & PFLAG_3PCC_PROXY){ //3PCC proxy mode delays the 200 OK until the call is answered switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOSDP"); @@ -2839,7 +2840,8 @@ SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), - SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), + TAG_IF((profile->pflags & PFLAG_DISABLE_100REL), NUTAG_INCLUDE_EXTRA_SDP(1)), TAG_END()); launch_media_on_hold(session); switch_core_session_rwunlock(other_session); @@ -2905,7 +2907,8 @@ SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), - SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), + TAG_IF((profile->pflags & PFLAG_DISABLE_100REL), NUTAG_INCLUDE_EXTRA_SDP(1)), TAG_END()); } else { nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); }

1 0

[commit] r11085 - in freeswitch/trunk/src: . include mod/languages/mod_spidermonkey
by FreeSWITCH SVN 07 Jan '09

07 Jan '09

Author: mikej Date: Wed Jan 7 08:25:08 2009 New Revision: 11085 Log: fix windows build breakage from svn rev 11084 Modified: freeswitch/trunk/src/include/switch_dso.h freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_dso.c Modified: freeswitch/trunk/src/include/switch_dso.h ============================================================================== --- freeswitch/trunk/src/include/switch_dso.h (original) +++ freeswitch/trunk/src/include/switch_dso.h Wed Jan 7 08:25:08 2009 @@ -30,10 +30,10 @@ typedef void * switch_dso_data_t; -void switch_dso_destroy(switch_dso_lib_t *lib); -switch_dso_lib_t switch_dso_open(const char *path, int global, char **err); -switch_dso_func_t switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err); -void *switch_dso_data_sym(switch_dso_lib_t lib, const char *sym, char **err); +SWITCH_DECLARE(void) switch_dso_destroy(switch_dso_lib_t *lib); +SWITCH_DECLARE(switch_dso_lib_t) switch_dso_open(const char *path, int global, char **err); +SWITCH_DECLARE(switch_dso_func_t) switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err); +SWITCH_DECLARE(void *) switch_dso_data_sym(switch_dso_lib_t lib, const char *sym, char **err); #endif Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Jan 7 08:25:08 2009 @@ -927,8 +927,8 @@ err: - if (err) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Loading module %s\n**%s**\n", filename, err); + if (err || !module) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Loading module %s\n**%s**\n", filename, switch_str_nil(err)); switch_safe_free(derr); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/switch_dso.c ============================================================================== --- freeswitch/trunk/src/switch_dso.c (original) +++ freeswitch/trunk/src/switch_dso.c Wed Jan 7 08:25:08 2009 @@ -24,14 +24,14 @@ #ifdef WIN32 -void switch_dso_destroy(switch_dso_lib_t *lib) { +SWITCH_DECLARE(void) switch_dso_destroy(switch_dso_lib_t *lib) { if (lib && *lib) { FreeLibrary(*lib); *lib = NULL; } } -switch_dso_lib_t switch_dso_open(const char *path, int global, char **err) { +SWITCH_DECLARE(switch_dso_lib_t) switch_dso_open(const char *path, int global, char **err) { HINSTANCE lib; lib = LoadLibraryEx(path, NULL, 0); @@ -48,7 +48,7 @@ return lib; } -switch_dso_func_t switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err) { +SWITCH_DECLARE(switch_dso_func_t) switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err) { FARPROC func = GetProcAddress(lib, sym); if (!func) { DWORD error = GetLastError(); @@ -57,7 +57,7 @@ return (switch_dso_func_t)func; } -void *switch_dso_data_sym(switch_dso_lib_t lib, const char *sym, char **err) { +SWITCH_DECLARE(void *) switch_dso_data_sym(switch_dso_lib_t lib, const char *sym, char **err) { FARPROC addr = GetProcAddress(lib, sym); if (!addr) { DWORD error = GetLastError();

1 0

[commit] r11084 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 07 Jan '09

07 Jan '09

Author: anthm Date: Tue Jan 6 18:43:25 2009 New Revision: 11084 Log: load global symbols in spidemonkey and change to new dso code (add to 1.0 branch) Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Jan 6 18:43:25 2009 @@ -42,7 +42,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown); -SWITCH_MODULE_DEFINITION(mod_spidermonkey, mod_spidermonkey_load, mod_spidermonkey_shutdown, NULL); +SWITCH_MODULE_DEFINITION_EX(mod_spidermonkey, mod_spidermonkey_load, mod_spidermonkey_shutdown, NULL, SMODF_GLOBAL_SYMBOLS); #define METHOD_SANITY_CHECK() if (!jss || !jss->session) { \ eval_some_js("~throw new Error(\"You must call the session.originate method before calling this method!\");", cx, obj, rval); \ @@ -882,50 +882,54 @@ static switch_status_t sm_load_file(char *filename) { sm_loadable_module_t *module = NULL; - switch_dso_handle_t *dso = NULL; + switch_dso_lib_t dso = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; - switch_dso_handle_sym_t function_handle = NULL; + switch_loadable_module_function_table_t *function_handle = NULL; spidermonkey_init_t spidermonkey_init = NULL; const sm_module_interface_t *module_interface = NULL, *mp; - - int loading = 1; + char *derr = NULL; const char *err = NULL; - char derr[512] = ""; switch_assert(filename != NULL); - status = switch_dso_load(&dso, filename, module_manager.pool); + if (!(dso = switch_dso_open(filename, 1, &derr))) { + status = SWITCH_STATUS_FALSE; + } - while (loading) { - if (status != SWITCH_STATUS_SUCCESS) { - switch_dso_error(dso, derr, sizeof(derr)); - err = derr; - break; - } + if (derr || status != SWITCH_STATUS_SUCCESS) { + err = derr; + goto err; + } - status = switch_dso_sym(&function_handle, dso, "spidermonkey_init"); - spidermonkey_init = (spidermonkey_init_t) (intptr_t) function_handle; + function_handle = switch_dso_data_sym(dso, "spidermonkey_init", &derr); - if (spidermonkey_init == NULL) { - err = "Cannot Load"; - break; - } + if (!function_handle || derr) { + status = SWITCH_STATUS_FALSE; + err = derr; + goto err; + } - if (spidermonkey_init(&module_interface) != SWITCH_STATUS_SUCCESS) { - err = "Module load routine returned an error"; - break; - } + spidermonkey_init = (spidermonkey_init_t) (intptr_t) function_handle; - if (!(module = (sm_loadable_module_t *) switch_core_permanent_alloc(sizeof(*module)))) { - err = "Could not allocate memory\n"; - break; - } + if (spidermonkey_init == NULL) { + err = "Cannot Load"; + goto err; + } + + if (spidermonkey_init(&module_interface) != SWITCH_STATUS_SUCCESS) { + err = "Module load routine returned an error"; + goto err; + } - loading = 0; + if (!(module = (sm_loadable_module_t *) switch_core_permanent_alloc(sizeof(*module)))) { + err = "Could not allocate memory\n"; } + err: + if (err) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Loading module %s\n**%s**\n", filename, err); + switch_safe_free(derr); return SWITCH_STATUS_GENERR; }

1 0

[commit] r11083 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 06 Jan '09

06 Jan '09

Author: anthm Date: Tue Jan 6 17:40:28 2009 New Revision: 11083 Log: add more sanity checks Modified: freeswitch/trunk/libs/esl/src/esl.c Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Tue Jan 6 17:40:28 2009 @@ -368,6 +368,10 @@ { char *txt; + if (!handle->connected) { + return ESL_FAIL; + } + esl_event_serialize(handle->last_ievent, &txt, ESL_TRUE); esl_log(ESL_LOG_DEBUG, "SEND EVENT\n%s\n", txt); @@ -388,6 +392,10 @@ char arg_buf[512] = ""; char send_buf[1292] = ""; + if (!handle->connected) { + return ESL_FAIL; + } + if (uuid) { snprintf(cmd_buf, sizeof(cmd_buf), "sendmsg %s", uuid); } @@ -571,7 +579,7 @@ ESL_DECLARE(esl_status_t) esl_disconnect(esl_handle_t *handle) { esl_mutex_t *mutex = handle->mutex; - esl_status_t status = ESL_SUCCESS; + esl_status_t status = ESL_FAIL; if (mutex) { esl_mutex_lock(mutex); @@ -585,6 +593,7 @@ if (handle->sock != ESL_SOCK_INVALID) { closesocket(handle->sock); handle->sock = ESL_SOCK_INVALID; + status = ESL_SUCCESS; } handle->connected = 0; @@ -605,6 +614,10 @@ int max, activity; esl_status_t status = ESL_SUCCESS; + if (!handle->connected) { + return ESL_FAIL; + } + tv.tv_usec = ms * 1000; esl_mutex_lock(handle->mutex); @@ -660,6 +673,11 @@ esl_ssize_t len; int zc = 0; + + if (!handle->connected) { + return ESL_FAIL; + } + esl_mutex_lock(handle->mutex); esl_event_safe_destroy(&handle->last_event); @@ -858,6 +876,10 @@ { const char *e = cmd + strlen(cmd) -1; + if (!handle->connected) { + return ESL_FAIL; + } + esl_log(ESL_LOG_DEBUG, "SEND\n%s\n", cmd); if (send(handle->sock, cmd, strlen(cmd), 0) != (int)strlen(cmd)) { @@ -882,6 +904,10 @@ const char *hval; esl_status_t status; + if (!handle->connected) { + return ESL_FAIL; + } + esl_mutex_lock(handle->mutex); if ((status = esl_send(handle, cmd))) {

1 0