From 3869906357444d769cd91abe000fea242efe7790 Mon Sep 17 00:00:00 2001 From: Dmitry Podgorny Date: Tue, 30 Aug 2016 23:34:24 +0300 Subject: [PATCH] Fixed spacing in event.c --- src/event.c | 334 ++++++++++++++++++++++++++-------------------------- 1 file changed, 167 insertions(+), 167 deletions(-) diff --git a/src/event.c b/src/event.c index 85140fc..2d73f55 100644 --- a/src/event.c +++ b/src/event.c @@ -14,15 +14,15 @@ */ /** @defgroup EventLoop Event loop - * These functions manage the Strophe event loop. - * + * These functions manage the Strophe event loop. + * * Simple tools can use xmpp_run() and xmpp_stop() to manage the life * cycle of the program. A common idiom is to set up a few initial * event handers, call xmpp_run(), and then respond and react to * events as they come in. At some point, one of the handlers will * call xmpp_stop() to quit the event loop which leads to the program * terminating. - * + * * More complex programs will have their own event loops, and should * ensure that xmpp_run_once() is called regularly from there. For * example, a GUI program will already include an event loop to @@ -92,90 +92,90 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout) /* send queued data */ connitem = ctx->connlist; while (connitem) { - conn = connitem->conn; - if (conn->state != XMPP_STATE_CONNECTED) { - connitem = connitem->next; - continue; - } + conn = connitem->conn; + if (conn->state != XMPP_STATE_CONNECTED) { + connitem = connitem->next; + continue; + } - /* if we're running tls, there may be some remaining data waiting to - * be sent, so push that out */ - if (conn->tls) { - ret = tls_clear_pending_write(conn->tls); + /* if we're running tls, there may be some remaining data waiting to + * be sent, so push that out */ + if (conn->tls) { + ret = tls_clear_pending_write(conn->tls); - if (ret < 0 && !tls_is_recoverable(tls_error(conn->tls))) { - /* an error occured */ - xmpp_debug(ctx, "xmpp", "Send error occured, disconnecting."); - conn->error = ECONNABORTED; - conn_disconnect(conn); - } - } + if (ret < 0 && !tls_is_recoverable(tls_error(conn->tls))) { + /* an error occured */ + xmpp_debug(ctx, "xmpp", "Send error occured, disconnecting."); + conn->error = ECONNABORTED; + conn_disconnect(conn); + } + } - /* write all data from the send queue to the socket */ - sq = conn->send_queue_head; - while (sq) { - towrite = sq->len - sq->written; + /* write all data from the send queue to the socket */ + sq = conn->send_queue_head; + while (sq) { + towrite = sq->len - sq->written; - if (conn->tls) { - ret = tls_write(conn->tls, &sq->data[sq->written], towrite); + if (conn->tls) { + ret = tls_write(conn->tls, &sq->data[sq->written], towrite); - if (ret < 0 && !tls_is_recoverable(tls_error(conn->tls))) { - /* an error occured */ - conn->error = tls_error(conn->tls); - break; - } else if (ret < towrite) { - /* not all data could be sent now */ - if (ret >= 0) sq->written += ret; - break; - } + if (ret < 0 && !tls_is_recoverable(tls_error(conn->tls))) { + /* an error occured */ + conn->error = tls_error(conn->tls); + break; + } else if (ret < towrite) { + /* not all data could be sent now */ + if (ret >= 0) sq->written += ret; + break; + } - } else { - ret = sock_write(conn->sock, &sq->data[sq->written], towrite); + } else { + ret = sock_write(conn->sock, &sq->data[sq->written], towrite); - if (ret < 0 && !sock_is_recoverable(sock_error())) { - /* an error occured */ - conn->error = sock_error(); - break; - } else if (ret < towrite) { - /* not all data could be sent now */ - if (ret >= 0) sq->written += ret; - break; - } - } + if (ret < 0 && !sock_is_recoverable(sock_error())) { + /* an error occured */ + conn->error = sock_error(); + break; + } else if (ret < towrite) { + /* not all data could be sent now */ + if (ret >= 0) sq->written += ret; + break; + } + } - /* all data for this queue item written, delete and move on */ - xmpp_free(ctx, sq->data); - tsq = sq; - sq = sq->next; - xmpp_free(ctx, tsq); + /* all data for this queue item written, delete and move on */ + xmpp_free(ctx, sq->data); + tsq = sq; + sq = sq->next; + xmpp_free(ctx, tsq); - /* pop the top item */ - conn->send_queue_head = sq; - /* if we've sent everything update the tail */ - if (!sq) conn->send_queue_tail = NULL; - } + /* pop the top item */ + conn->send_queue_head = sq; + /* if we've sent everything update the tail */ + if (!sq) conn->send_queue_tail = NULL; + } - /* tear down connection on error */ - if (conn->error) { - /* FIXME: need to tear down send queues and random other things - * maybe this should be abstracted */ - xmpp_debug(ctx, "xmpp", "Send error occured, disconnecting."); - conn->error = ECONNABORTED; - conn_disconnect(conn); - } - - connitem = connitem->next; + /* tear down connection on error */ + if (conn->error) { + /* FIXME: need to tear down send queues and random other things + * maybe this should be abstracted */ + xmpp_debug(ctx, "xmpp", "Send error occured, disconnecting."); + conn->error = ECONNABORTED; + conn_disconnect(conn); + } + + connitem = connitem->next; } /* reset parsers if needed */ for (connitem = ctx->connlist; connitem; connitem = connitem->next) { - if (connitem->conn->reset_parser) - conn_parser_reset(connitem->conn); + if (connitem->conn->reset_parser) + conn_parser_reset(connitem->conn); } /* fire any ready timed handlers, then - make sure we don't wait past the time when timed handlers need + make sure we don't wait past the time when timed handlers need to be called */ next = handler_fire_timed(ctx); @@ -183,47 +183,47 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout) tv.tv_sec = usec / 1000000; tv.tv_usec = usec % 1000000; - FD_ZERO(&rfds); + FD_ZERO(&rfds); FD_ZERO(&wfds); /* find events to watch */ connitem = ctx->connlist; while (connitem) { - conn = connitem->conn; - - switch (conn->state) { - case XMPP_STATE_CONNECTING: - /* connect has been called and we're waiting for it to complete */ - /* connection will give us write or error events */ - - /* make sure the timeout hasn't expired */ - if (time_elapsed(conn->timeout_stamp, time_stamp()) <= - conn->connect_timeout) - FD_SET(conn->sock, &wfds); - else { - conn->error = ETIMEDOUT; - xmpp_info(ctx, "xmpp", "Connection attempt timed out."); - conn_disconnect(conn); - } - break; - case XMPP_STATE_CONNECTED: - FD_SET(conn->sock, &rfds); - break; - case XMPP_STATE_DISCONNECTED: - /* do nothing */ - default: - break; - } - - /* Check if there is something in the SSL buffer. */ - if (conn->tls) { - tls_read_bytes += tls_pending(conn->tls); - } - - if (conn->state != XMPP_STATE_DISCONNECTED && conn->sock > max) - max = conn->sock; + conn = connitem->conn; - connitem = connitem->next; + switch (conn->state) { + case XMPP_STATE_CONNECTING: + /* connect has been called and we're waiting for it to complete */ + /* connection will give us write or error events */ + + /* make sure the timeout hasn't expired */ + if (time_elapsed(conn->timeout_stamp, time_stamp()) <= + conn->connect_timeout) + FD_SET(conn->sock, &wfds); + else { + conn->error = ETIMEDOUT; + xmpp_info(ctx, "xmpp", "Connection attempt timed out."); + conn_disconnect(conn); + } + break; + case XMPP_STATE_CONNECTED: + FD_SET(conn->sock, &rfds); + break; + case XMPP_STATE_DISCONNECTED: + /* do nothing */ + default: + break; + } + + /* Check if there is something in the SSL buffer. */ + if (conn->tls) { + tls_read_bytes += tls_pending(conn->tls); + } + + if (conn->state != XMPP_STATE_DISCONNECTED && conn->sock > max) + max = conn->sock; + + connitem = connitem->next; } /* check for events */ @@ -237,36 +237,36 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout) /* select errored */ if (ret < 0) { - if (!sock_is_recoverable(sock_error())) - xmpp_error(ctx, "xmpp", "event watcher internal error %d", - sock_error()); - return; + if (!sock_is_recoverable(sock_error())) + xmpp_error(ctx, "xmpp", "event watcher internal error %d", + sock_error()); + return; } - + /* no events happened */ if (ret == 0 && tls_read_bytes == 0) return; /* process events */ connitem = ctx->connlist; while (connitem) { - conn = connitem->conn; + conn = connitem->conn; - switch (conn->state) { - case XMPP_STATE_CONNECTING: - if (FD_ISSET(conn->sock, &wfds)) { - /* connection complete */ + switch (conn->state) { + case XMPP_STATE_CONNECTING: + if (FD_ISSET(conn->sock, &wfds)) { + /* connection complete */ - /* check for error */ + /* check for error */ ret = sock_connect_error(conn->sock); - if (ret != 0) { - /* connection failed */ - xmpp_debug(ctx, "xmpp", "connection failed, error %d", ret); - conn_disconnect(conn); - break; - } + if (ret != 0) { + /* connection failed */ + xmpp_debug(ctx, "xmpp", "connection failed, error %d", ret); + conn_disconnect(conn); + break; + } - conn->state = XMPP_STATE_CONNECTED; - xmpp_debug(ctx, "xmpp", "connection successful"); + conn->state = XMPP_STATE_CONNECTED; + xmpp_debug(ctx, "xmpp", "connection successful"); if (conn->tls_legacy_ssl) { xmpp_debug(ctx, "xmpp", "using legacy SSL connection"); @@ -277,52 +277,52 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout) } } - /* send stream init */ - conn_open_stream(conn); - } + /* send stream init */ + conn_open_stream(conn); + } - break; - case XMPP_STATE_CONNECTED: - if (FD_ISSET(conn->sock, &rfds) || (conn->tls && tls_pending(conn->tls))) { - if (conn->tls) { - ret = tls_read(conn->tls, buf, 4096); - } else { - ret = sock_read(conn->sock, buf, 4096); - } + break; + case XMPP_STATE_CONNECTED: + if (FD_ISSET(conn->sock, &rfds) || (conn->tls && tls_pending(conn->tls))) { + if (conn->tls) { + ret = tls_read(conn->tls, buf, 4096); + } else { + ret = sock_read(conn->sock, buf, 4096); + } - if (ret > 0) { - ret = parser_feed(conn->parser, buf, ret); - if (!ret) { - /* parse error, we need to shut down */ - /* FIXME */ - xmpp_debug(ctx, "xmpp", "parse error, disconnecting"); - conn_disconnect(conn); - } - } else { - if (conn->tls) { - if (!tls_is_recoverable(tls_error(conn->tls))) - { - xmpp_debug(ctx, "xmpp", "Unrecoverable TLS error, %d.", tls_error(conn->tls)); - conn->error = tls_error(conn->tls); - conn_disconnect(conn); - } - } else { - /* return of 0 means socket closed by server */ - xmpp_debug(ctx, "xmpp", "Socket closed by remote host."); - conn->error = ECONNRESET; - conn_disconnect(conn); - } - } - } + if (ret > 0) { + ret = parser_feed(conn->parser, buf, ret); + if (!ret) { + /* parse error, we need to shut down */ + /* FIXME */ + xmpp_debug(ctx, "xmpp", "parse error, disconnecting"); + conn_disconnect(conn); + } + } else { + if (conn->tls) { + if (!tls_is_recoverable(tls_error(conn->tls))) + { + xmpp_debug(ctx, "xmpp", "Unrecoverable TLS error, %d.", tls_error(conn->tls)); + conn->error = tls_error(conn->tls); + conn_disconnect(conn); + } + } else { + /* return of 0 means socket closed by server */ + xmpp_debug(ctx, "xmpp", "Socket closed by remote host."); + conn->error = ECONNRESET; + conn_disconnect(conn); + } + } + } - break; - case XMPP_STATE_DISCONNECTED: - /* do nothing */ - default: - break; - } + break; + case XMPP_STATE_DISCONNECTED: + /* do nothing */ + default: + break; + } - connitem = connitem->next; + connitem = connitem->next; } /* fire any ready handlers */ @@ -343,7 +343,7 @@ void xmpp_run(xmpp_ctx_t *ctx) ctx->loop_status = XMPP_LOOP_RUNNING; while (ctx->loop_status == XMPP_LOOP_RUNNING) { - xmpp_run_once(ctx, DEFAULT_TIMEOUT); + xmpp_run_once(ctx, DEFAULT_TIMEOUT); } /* make it possible to start event loop again */ @@ -365,5 +365,5 @@ void xmpp_stop(xmpp_ctx_t *ctx) xmpp_debug(ctx, "event", "Stopping event loop."); if (ctx->loop_status == XMPP_LOOP_RUNNING) - ctx->loop_status = XMPP_LOOP_QUIT; + ctx->loop_status = XMPP_LOOP_QUIT; }