<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16721] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16721">16721</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-02-22 12:35:21 -0600 (Mon, 22 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/ESL-32">ESL-32</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibseslsrceslc">freeswitch/trunk/libs/esl/src/esl.c</a></li>
<li><a href="#freeswitchtrunklibseslsrcincludeeslh">freeswitch/trunk/libs/esl/src/include/esl.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibseslsrceslc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/src/esl.c (16720 => 16721)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/src/esl.c 2010-02-22 17:10:01 UTC (rev 16720)
+++ freeswitch/trunk/libs/esl/src/esl.c 2010-02-22 18:35:21 UTC (rev 16721)
</span><span class="lines">@@ -378,8 +378,13 @@
</span><span class="cx"> return s;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void sock_setup(esl_handle_t *handle)
</del><ins>+static int sock_setup(esl_handle_t *handle)
</ins><span class="cx"> {
</span><ins>+
+ if (handle->sock == ESL_SOCK_INVALID) {
+ return ESL_FAIL;
+ }
+
</ins><span class="cx"> #ifdef WIN32
</span><span class="cx"> BOOL bOptVal = TRUE;
</span><span class="cx"> int bOptLen = sizeof(BOOL);
</span><span class="lines">@@ -388,28 +393,33 @@
</span><span class="cx"> int x = 1;
</span><span class="cx"> setsockopt(handle->sock, IPPROTO_TCP, TCP_NODELAY, &x, sizeof(x));
</span><span class="cx"> #endif
</span><ins>+
+ return ESL_SUCCESS;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ESL_DECLARE(esl_status_t) esl_attach_handle(esl_handle_t *handle, esl_socket_t socket, struct sockaddr_in *addr)
</span><span class="cx"> {
</span><ins>+
+ if (!handle || socket == ESL_SOCK_INVALID) {
+ return ESL_FAIL;
+ }
+
</ins><span class="cx"> handle->sock = socket;
</span><ins>+
</ins><span class="cx"> if (addr) {
</span><span class="cx"> handle->addr = *addr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (handle->sock == ESL_SOCK_INVALID) {
</del><ins>+ if (sock_setup(handle) != ESL_SUCCESS) {
</ins><span class="cx"> return ESL_FAIL;
</span><span class="cx"> }
</span><del>-
-
</del><ins>+
</ins><span class="cx"> if (!handle->mutex) {
</span><span class="cx"> esl_mutex_create(&handle->mutex);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> handle->connected = 1;
</span><span class="cx">
</span><del>- sock_setup(handle);
-
</del><span class="cx"> esl_send_recv(handle, "connect\n\n");
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -439,13 +449,23 @@
</span><span class="cx">
</span><span class="cx"> snprintf(event_buf, sizeof(event_buf), "sendevent %s\n", esl_event_name(event->event_id));
</span><span class="cx">
</span><del>- send(handle->sock, event_buf, strlen(event_buf), 0);
- send(handle->sock, txt, strlen(txt), 0);
- send(handle->sock, "\n\n", 2, 0);
</del><ins>+ if (send(handle->sock, event_buf, strlen(event_buf), 0)) goto fail;
+ if (send(handle->sock, txt, strlen(txt), 0)) goto fail;
+ if (send(handle->sock, "\n\n", 2, 0)) goto fail;
+
+ free(txt);
</ins><span class="cx">
</span><ins>+ return ESL_SUCCESS;
+
+
+ fail:
+
+ handle->connected = 0;
+
</ins><span class="cx"> free(txt);
</span><span class="cx">
</span><del>- return ESL_SUCCESS;
</del><ins>+ return ESL_FAIL;
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ESL_DECLARE(esl_status_t) esl_execute(esl_handle_t *handle, const char *app, const char *arg, const char *uuid)
</span><span class="lines">@@ -457,9 +477,9 @@
</span><span class="cx"> const char *bl_buf = "async: true\n";
</span><span class="cx"> char send_buf[1292] = "";
</span><span class="cx">
</span><del>- if (!handle->connected) {
- return ESL_FAIL;
- }
</del><ins>+ if (!handle || !handle->connected || handle->sock == ESL_SOCK_INVALID) {
+ return ESL_FAIL;
+ }
</ins><span class="cx">
</span><span class="cx"> if (uuid) {
</span><span class="cx"> snprintf(cmd_buf, sizeof(cmd_buf), "sendmsg %s", uuid);
</span><span class="lines">@@ -484,9 +504,9 @@
</span><span class="cx"> {
</span><span class="cx"> char send_buf[1024] = "";
</span><span class="cx">
</span><del>- if (!handle->connected) {
- return ESL_FAIL;
- }
</del><ins>+ if (!handle || !handle->connected || handle->sock == ESL_SOCK_INVALID) {
+ return ESL_FAIL;
+ }
</ins><span class="cx">
</span><span class="cx"> snprintf(send_buf, sizeof(send_buf), "filter %s %s\n\n", header, value);
</span><span class="cx">
</span><span class="lines">@@ -499,9 +519,9 @@
</span><span class="cx"> char send_buf[1024] = "";
</span><span class="cx"> const char *type = "plain";
</span><span class="cx">
</span><del>- if (!handle->connected) {
- return ESL_FAIL;
- }
</del><ins>+ if (!handle || !handle->connected || handle->sock == ESL_SOCK_INVALID) {
+ return ESL_FAIL;
+ }
</ins><span class="cx">
</span><span class="cx"> if (etype == ESL_EVENT_TYPE_XML) {
</span><span class="cx"> type = "xml";
</span><span class="lines">@@ -677,7 +697,7 @@
</span><span class="cx">
</span><span class="cx"> fail:
</span><span class="cx">
</span><del>- esl_disconnect(handle);
</del><ins>+ handle->connected = 0;
</ins><span class="cx">
</span><span class="cx"> return ESL_FAIL;
</span><span class="cx"> }
</span><span class="lines">@@ -687,10 +707,17 @@
</span><span class="cx"> esl_mutex_t *mutex = handle->mutex;
</span><span class="cx"> esl_status_t status = ESL_FAIL;
</span><span class="cx">
</span><ins>+ if (handle->destroyed) {
+ return ESL_FAIL;
+ }
+
</ins><span class="cx"> if (mutex) {
</span><span class="cx"> esl_mutex_lock(mutex);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ handle->destroyed = 1;
+ handle->connected = 0;
+
</ins><span class="cx"> esl_event_safe_destroy(&handle->race_event);
</span><span class="cx"> esl_event_safe_destroy(&handle->last_event);
</span><span class="cx"> esl_event_safe_destroy(&handle->last_sr_event);
</span><span class="lines">@@ -703,14 +730,13 @@
</span><span class="cx"> status = ESL_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- handle->connected = 0;
-
</del><span class="cx"> if (mutex) {
</span><span class="cx"> esl_mutex_unlock(mutex);
</span><ins>+ esl_mutex_lock(mutex);
+ esl_mutex_unlock(mutex);
</ins><span class="cx"> esl_mutex_destroy(&mutex);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -721,6 +747,10 @@
</span><span class="cx"> int max, activity;
</span><span class="cx"> esl_status_t status = ESL_SUCCESS;
</span><span class="cx">
</span><ins>+ if (!handle || !handle->connected || handle->sock == ESL_SOCK_INVALID) {
+ return ESL_FAIL;
+ }
+
</ins><span class="cx"> if (check_q) {
</span><span class="cx"> esl_mutex_lock(handle->mutex);
</span><span class="cx"> if (handle->race_event) {
</span><span class="lines">@@ -730,10 +760,6 @@
</span><span class="cx"> esl_mutex_unlock(handle->mutex);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!handle || !handle->connected || handle->sock == -1) {
- return ESL_FAIL;
- }
-
</del><span class="cx"> tv.tv_usec = ms * 1000;
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -754,6 +780,7 @@
</span><span class="cx"> max = handle->sock + 1;
</span><span class="cx">
</span><span class="cx"> if ((activity = select(max, &rfds, NULL, &efds, &tv)) < 0) {
</span><ins>+ handle->connected = 0;
</ins><span class="cx"> return ESL_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -761,7 +788,28 @@
</span><span class="cx"> return ESL_BREAK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (activity && FD_ISSET(handle->sock, &rfds)) {
</del><ins>+ tv.tv_usec = 0;
+
+ FD_ZERO(&rfds);
+ FD_ZERO(&efds);
+
+#ifdef WIN32
+#pragma warning( push )
+#pragma warning( disable : 4127 )
+ FD_SET(handle->sock, &rfds);
+ FD_SET(handle->sock, &efds);
+#pragma warning( pop )
+#else
+ FD_SET(handle->sock, &rfds);
+ FD_SET(handle->sock, &efds);
+#endif
+
+ activity = select(max, &rfds, NULL, &efds, &tv);
+
+ if (activity < 0) {
+ handle->connected = 0;
+ status = ESL_FAIL;
+ } else if (activity > 0 && FD_ISSET(handle->sock, &rfds)) {
</ins><span class="cx"> if (esl_recv_event(handle, check_q, save_event)) {
</span><span class="cx"> status = ESL_FAIL;
</span><span class="cx"> }
</span><span class="lines">@@ -789,11 +837,19 @@
</span><span class="cx"> esl_ssize_t len;
</span><span class="cx"> int zc = 0;
</span><span class="cx">
</span><del>- if (!handle->connected) {
</del><ins>+
+ if (!handle || !handle->connected || handle->sock == ESL_SOCK_INVALID) {
</ins><span class="cx"> return ESL_FAIL;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> esl_mutex_lock(handle->mutex);
</span><ins>+
+ if (!handle->connected || handle->sock == ESL_SOCK_INVALID) {
+ handle->connected = 0;
+ esl_mutex_unlock(handle->mutex);
+ return ESL_FAIL;
+ }
+
</ins><span class="cx"> esl_event_safe_destroy(&handle->last_event);
</span><span class="cx"> esl_event_safe_destroy(&handle->last_ievent);
</span><span class="cx">
</span><span class="lines">@@ -822,7 +878,7 @@
</span><span class="cx"> rrval = recv(handle->sock, c, 1, 0);
</span><span class="cx"> if (rrval == 0) {
</span><span class="cx"> if (++zc >= 100) {
</span><del>- esl_disconnect(handle);
</del><ins>+ handle->connected = 0;
</ins><span class="cx"> esl_mutex_unlock(handle->mutex);
</span><span class="cx"> return ESL_DISCONNECTED;
</span><span class="cx"> }
</span><span class="lines">@@ -987,7 +1043,8 @@
</span><span class="cx">
</span><span class="cx"> fail:
</span><span class="cx">
</span><del>- esl_disconnect(handle);
</del><ins>+ handle->connected = 0;
+
</ins><span class="cx"> return ESL_FAIL;
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -996,19 +1053,22 @@
</span><span class="cx"> {
</span><span class="cx"> const char *e = cmd + strlen(cmd) -1;
</span><span class="cx">
</span><del>- if (!handle->connected) {
</del><ins>+
+ if (!handle || !handle->connected || handle->sock == ESL_SOCK_INVALID) {
</ins><span class="cx"> return ESL_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> esl_log(ESL_LOG_DEBUG, "SEND\n%s\n", cmd);
</span><span class="cx">
</span><span class="cx"> if (send(handle->sock, cmd, strlen(cmd), 0) != (int)strlen(cmd)) {
</span><ins>+ handle->connected = 0;
</ins><span class="cx"> strerror_r(handle->errnum, handle->err, sizeof(handle->err));
</span><span class="cx"> return ESL_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(*e == '\n' && *(e-1) == '\n')) {
</span><span class="cx"> if (send(handle->sock, "\n\n", 2, 0) != 2) {
</span><ins>+ handle->connected = 0;
</ins><span class="cx"> strerror_r(handle->errnum, handle->err, sizeof(handle->err));
</span><span class="cx"> return ESL_FAIL;
</span><span class="cx"> }
</span><span class="lines">@@ -1024,13 +1084,19 @@
</span><span class="cx"> const char *hval;
</span><span class="cx"> esl_status_t status;
</span><span class="cx">
</span><del>- if (!handle->connected) {
</del><ins>+ if (!handle || !handle->connected || handle->sock == ESL_SOCK_INVALID) {
+ return ESL_FAIL;
+ }
+
+ esl_mutex_lock(handle->mutex);
+
+
+ if (!handle->connected || handle->sock == ESL_SOCK_INVALID) {
+ handle->connected = 0;
+ esl_mutex_unlock(handle->mutex);
</ins><span class="cx"> return ESL_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
- esl_mutex_lock(handle->mutex);
-
</del><span class="cx"> esl_event_safe_destroy(&handle->last_event);
</span><span class="cx"> esl_event_safe_destroy(&handle->last_sr_event);
</span><span class="cx">
</span><span class="lines">@@ -1063,6 +1129,13 @@
</span><span class="cx">
</span><span class="cx"> esl_mutex_unlock(handle->mutex);
</span><span class="cx"> esl_mutex_lock(handle->mutex);
</span><ins>+
+ if (!handle->connected || handle->sock == ESL_SOCK_INVALID) {
+ handle->connected = 0;
+ esl_mutex_unlock(handle->mutex);
+ return ESL_FAIL;
+ }
+
</ins><span class="cx"> goto recv;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibseslsrcincludeeslh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/src/include/esl.h (16720 => 16721)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/src/include/esl.h 2010-02-22 17:10:01 UTC (rev 16720)
+++ freeswitch/trunk/libs/esl/src/include/esl.h 2010-02-22 18:35:21 UTC (rev 16721)
</span><span class="lines">@@ -290,6 +290,7 @@
</span><span class="cx"> esl_mutex_t *mutex;
</span><span class="cx"> int async_execute;
</span><span class="cx"> int event_lock;
</span><ins>+ int destroyed;
</ins><span class="cx"> } esl_handle_t;
</span><span class="cx">
</span><span class="cx"> /*! \brief Used internally for truth test */
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>