/*
- *
* Copyright (c) 1998-2012 by the citadel.org team
*
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
#include "sysdep.h"
}
-void StopClientWatchers(AsyncIO *IO)
+void StopClientWatchers(AsyncIO *IO, int CloseFD)
{
ev_timer_stop (event_base, &IO->rw_timeout);
ev_timer_stop(event_base, &IO->conn_fail);
ev_io_stop(event_base, &IO->send_event);
ev_io_stop(event_base, &IO->recv_event);
- if (IO->SendBuf.fd != 0) {
+ if (CloseFD && (IO->SendBuf.fd > 0)) {
close(IO->SendBuf.fd);
+ IO->SendBuf.fd = -1;
+ IO->RecvBuf.fd = -1;
}
- IO->SendBuf.fd = 0;
- IO->RecvBuf.fd = 0;
}
void StopCurlWatchers(AsyncIO *IO)
EVM_syslog(LOG_DEBUG, "EVENT Terminating \n");
- StopClientWatchers(IO);
+ StopClientWatchers(IO, 1);
if (IO->DNS.Channel != NULL) {
ares_destroy(IO->DNS.Channel);
StrBufPlain(IO->ErrMsg, errmsg, -1);
break;
default:
- rc = StrBuf_write_one_chunk_callback(watcher->fd,
- 0/*TODO*/,
+ rc = StrBuf_write_one_chunk_callback(IO->SendBuf.fd,
+ 0,
&IO->SendBuf);
}
}
}
else if (rc < 0) {
- IO_Timeout_callback(loop, &IO->rw_timeout, revents);
+ if (errno != EAGAIN) {
+ StopClientWatchers(IO, 1);
+ EV_syslog(LOG_DEBUG,
+ "EVENT: Socket Invalid! [%d] [%s] [%d]\n",
+ errno, strerror(errno), IO->SendBuf.fd);
+ StrBufPrintf(IO->ErrMsg,
+ "Socket Invalid! [%s]",
+ strerror(errno));
+ SetNextTimeout(IO, 0.0);
+ }
}
/* else : must write more. */
}
static void
set_start_callback(struct ev_loop *loop, AsyncIO *IO, int revents)
{
+ ev_timer_stop(event_base, &IO->conn_fail);
+ ev_timer_start(event_base, &IO->rw_timeout);
+
switch(IO->NextState) {
case eReadMore:
case eReadMessage:
case eReadFile:
+ StrBufAppendBufPlain(IO->ErrMsg, HKEY("[while waiting for greeting]"), 0);
ev_io_start(event_base, &IO->recv_event);
break;
case eSendReply:
static void
IO_connestd_callback(struct ev_loop *loop, ev_io *watcher, int revents)
{
- AsyncIO *IO = watcher->data;
-
- IO->Now = ev_now(event_base);
- EVM_syslog(LOG_DEBUG, "connect() succeeded.\n");
-
- ev_io_stop(loop, &IO->conn_event);
- ev_timer_stop (event_base, &IO->conn_fail);
- set_start_callback(loop, IO, revents);
+ AsyncIO *IO = watcher->data;
+ int so_err = 0;
+ socklen_t lon = sizeof(so_err);
+ int err;
+
+ IO->Now = ev_now(event_base);
+ EVM_syslog(LOG_DEBUG, "connect() succeeded.\n");
+
+ ev_io_stop(loop, &IO->conn_event);
+ ev_timer_stop(event_base, &IO->conn_fail);
+
+ err = getsockopt(IO->SendBuf.fd,
+ SOL_SOCKET,
+ SO_ERROR,
+ (void*)&so_err,
+ &lon);
+
+ if ((err == 0) && (so_err != 0))
+ {
+ EV_syslog(LOG_DEBUG, "connect() failed [%d][%s]\n",
+ so_err,
+ strerror(so_err));
+ IO_connfail_callback(loop, &IO->conn_fail, revents);
+
+ }
+ else
+ {
+ EVM_syslog(LOG_DEBUG, "connect() succeeded\n");
+ set_start_callback(loop, IO, revents);
+ }
}
+
static void
IO_recv_callback(struct ev_loop *loop, ev_io *watcher, int revents)
{
}
break;
default:
- nbytes = StrBuf_read_one_chunk_callback(watcher->fd,
- 0 /*TODO */,
+ nbytes = StrBuf_read_one_chunk_callback(IO->RecvBuf.fd,
+ 0,
&IO->RecvBuf);
break;
}
if (nbytes > 0) {
HandleInbound(IO);
} else if (nbytes == 0) {
- IO_Timeout_callback(loop, &IO->rw_timeout, revents);
+ StopClientWatchers(IO, 1);
+ SetNextTimeout(IO, 0.01);
return;
} else if (nbytes == -1) {
- // FD is gone. kick it.
- StopClientWatchers(IO);
- EV_syslog(LOG_DEBUG,
- "EVENT: Socket Invalid! %s \n",
- strerror(errno));
- ShutDownCLient(IO);
+ if (errno != EAGAIN) {
+ // FD is gone. kick it.
+ StopClientWatchers(IO, 1);
+ EV_syslog(LOG_DEBUG,
+ "EVENT: Socket Invalid! [%d] [%s] [%d]\n",
+ errno, strerror(errno), IO->SendBuf.fd);
+ StrBufPrintf(IO->ErrMsg,
+ "Socket Invalid! [%s]",
+ strerror(errno));
+ SetNextTimeout(IO, 0.0);
+ }
return;
}
}
if (rc >= 0){
EVM_syslog(LOG_DEBUG, "connect() immediate success.\n");
set_start_callback(event_base, IO, 0);
- ev_timer_start(event_base, &IO->rw_timeout);
return IO->NextState;
}
else if (errno == EINPROGRESS) {
projects / citadel.git / blobdiff