summaryrefslogtreecommitdiff
path: root/src/core/net-disconnect.c
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2000-07-16 20:18:05 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2000-07-16 20:18:05 +0000
commitc2397475c5105dc6d5db1fac0ee1d8f33b77b237 (patch)
tree0076cdb290a2c15627812f94c117d6c4d621ea85 /src/core/net-disconnect.c
parent2a1052bbcef9318e42df9a87cc4cfb9fe8ef5a40 (diff)
downloadirssi-c2397475c5105dc6d5db1fac0ee1d8f33b77b237.zip
Cleaned up code.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@480 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core/net-disconnect.c')
-rw-r--r--src/core/net-disconnect.c38
1 files changed, 17 insertions, 21 deletions
diff --git a/src/core/net-disconnect.c b/src/core/net-disconnect.c
index 9f95a34f..0f604ab3 100644
--- a/src/core/net-disconnect.c
+++ b/src/core/net-disconnect.c
@@ -51,11 +51,7 @@ static void sig_disconnect(NET_DISCONNECT_REC *rec)
int ret;
/* check if there's any data waiting in socket */
- for (;;) {
- ret = net_receive(rec->handle, buf, sizeof(buf));
- if (ret <= 0)
- break;
- }
+ while ((ret = net_receive(rec->handle, buf, sizeof(buf))) > 0) ;
if (ret == -1) {
/* socket was closed */
@@ -68,7 +64,6 @@ static int sig_timeout_disconnect(void)
NET_DISCONNECT_REC *rec;
GSList *tmp, *next;
time_t now;
- int ret;
/* check if we've waited enough for sockets to close themselves */
now = time(NULL);
@@ -77,7 +72,7 @@ static int sig_timeout_disconnect(void)
next = tmp->next;
if (rec->created+MAX_CLOSE_WAIT <= now)
- sig_disconnect(rec);
+ net_disconnect_remove(rec);
}
if (disconnects == NULL) {
@@ -85,9 +80,7 @@ static int sig_timeout_disconnect(void)
function */
timeout_tag = -1;
}
- ret = disconnects != NULL ? 1 : 0;
-
- return ret;
+ return disconnects != NULL;
}
/* Try to let the other side close the connection, if it still isn't
@@ -97,14 +90,17 @@ void net_disconnect_later(int handle)
NET_DISCONNECT_REC *rec;
rec = g_new(NET_DISCONNECT_REC, 1);
- disconnects = g_slist_append(disconnects, rec);
-
rec->created = time(NULL);
rec->handle = handle;
- rec->tag = g_input_add(handle, G_INPUT_READ, (GInputFunction) sig_disconnect, rec);
+ rec->tag = g_input_add(handle, G_INPUT_READ,
+ (GInputFunction) sig_disconnect, rec);
+
+ if (timeout_tag == -1) {
+ timeout_tag = g_timeout_add(10000, (GSourceFunc)
+ sig_timeout_disconnect, NULL);
+ }
- if (timeout_tag == -1)
- timeout_tag = g_timeout_add(10000, (GSourceFunc) sig_timeout_disconnect, NULL);
+ disconnects = g_slist_append(disconnects, rec);
}
void net_disconnect_init(void)
@@ -121,9 +117,6 @@ void net_disconnect_deinit(void)
struct timeval tv;
fd_set set;
- if (disconnects == NULL)
- return;
-
/* give the sockets a chance to disconnect themselves.. */
max = time(NULL)+MAX_QUIT_CLOSE_WAIT;
first = 1;
@@ -141,12 +134,15 @@ void net_disconnect_deinit(void)
FD_SET(rec->handle, &set);
tv.tv_sec = first ? 0 : max-now;
tv.tv_usec = first ? 100000 : 0;
- if (select(rec->handle+1, &set, NULL, NULL, &tv) > 0 && FD_ISSET(rec->handle, &set)) {
+ if (select(rec->handle+1, &set, NULL, NULL, &tv) > 0 &&
+ FD_ISSET(rec->handle, &set)) {
/* data coming .. check if we can close the handle */
sig_disconnect(rec);
} else if (first) {
- /* Display the text when we have already waited for a while */
- printf(_("Please wait, waiting for servers to close connections..\n"));
+ /* Display the text when we have already waited
+ for a while */
+ printf(_("Please wait, waiting for servers to close "
+ "connections..\n"));
fflush(stdout);
first = 0;